[100096] trunk/dports/irc/bahamut

ryandesign at macports.org ryandesign at macports.org
Tue Nov 27 17:03:36 PST 2012


Revision: 100096
          https://trac.macports.org/changeset/100096
Author:   ryandesign at macports.org
Date:     2012-11-27 17:03:35 -0800 (Tue, 27 Nov 2012)
Log Message:
-----------
bahamut: update to 2.0.4; fix livecheck to find this latest release; enable universal variant; fix order of includes in Makefiles to prevent build failure when nds2-client is installed (it installs ${prefix}/include/channel.h); simplify destroot further; blacklist clang for now to fix build failure (#37151); take maintainership with openmaintainer

Modified Paths:
--------------
    trunk/dports/irc/bahamut/Portfile

Added Paths:
-----------
    trunk/dports/irc/bahamut/files/patch-CPPFLAGS.diff
    trunk/dports/irc/bahamut/files/patch-support.c.diff

Removed Paths:
-------------
    trunk/dports/irc/bahamut/files/patch-support.c

Modified: trunk/dports/irc/bahamut/Portfile
===================================================================
--- trunk/dports/irc/bahamut/Portfile	2012-11-28 00:30:06 UTC (rev 100095)
+++ trunk/dports/irc/bahamut/Portfile	2012-11-28 01:03:35 UTC (rev 100096)
@@ -5,8 +5,8 @@
 
 name                bahamut
 conflicts           whois
-version             1.8.9
-maintainers         nomaintainer
+version             2.0.4
+maintainers         ryandesign openmaintainer
 categories          irc
 platforms           darwin
 
@@ -17,43 +17,35 @@
 homepage            http://www.dal.net/?page=Bahamut
 master_sites        http://code.dal.net/release/
 
-distname            ${name}-${version}-release
+checksums           rmd160  064658279a5fd1fd64bc118693e60d9847c2baf1 \
+                    sha256  4a045e66de03972e56b3c9cc33d98e60a5d52f826afb89ba06d4b42f4aa241d1
 
-checksums           md5     e1a2b6ffab3c7a88bdd0a3561da4e5ee \
-                    sha1    64b783ed04983bb1f5ea2b75b3a479888413fb3e \
-                    rmd160  35b61b35aac8240b984c2a91ac16dcc47fb1a29b
-
 depends_lib         port:openssl
-#depends_lib         lib:libsoup-2:libsoup port:evolution-data-server
 
-worksrcdir          ${name}-${version}
+patchfiles          patch-CPPFLAGS.diff \
+                    patch-support.c.diff
 
-patchfiles          patch-support.c
+# Undefined symbols:
+#  "_first_visible_channel", referenced from:
+#      _m_who in m_who.o
+compiler.blacklist  clang
 
-universal_variant   no
-
 configure.args      --enable-openssl=${prefix}
 
-post-configure {
-    reinplace "s|INSTALL_DIR=${prefix}|INSTALL_DIR=${destroot}${prefix}|g" \
-        ${worksrcpath}/Makefile \
-        ${worksrcpath}/src/Makefile \
-        ${worksrcpath}/tools/Makefile \
-        ${worksrcpath}/doc/Makefile
-}
+configure.universal_args-delete --disable-dependency-tracking
 
+destroot.destdir    INSTALL_DIR=${destroot}${prefix}
+
 post-destroot {
-    file rename ${destroot}${prefix}/convert_conf ${destroot}${prefix}/bin/
-    file rename ${destroot}${prefix}/mkpasswd ${destroot}${prefix}/bin/
-    file rename ${destroot}${prefix}/ircd ${destroot}${prefix}/bin/
-    file rename ${destroot}${prefix}/ircd.motd ${destroot}${prefix}/etc/
-    file rename ${destroot}${prefix}/opers.txt ${destroot}${prefix}/etc/
-    file rename ${destroot}${prefix}/template.conf ${destroot}${prefix}/etc/
-    file rename ${destroot}${prefix}/reference.conf ${destroot}${prefix}/etc/
-    file rename ${destroot}${prefix}/make-cert.cnf ${destroot}${prefix}/etc/
-    file rename ${destroot}${prefix}/make-cert.sh ${destroot}${prefix}/bin/
+    foreach f {ircd mkpasswd make-cert.sh} {
+        move ${destroot}${prefix}/${f} ${destroot}${prefix}/bin
+    }
+    foreach f {ircd.motd make-cert.cnf opers.txt reference.conf template.conf} {
+        move ${destroot}${prefix}/${f} ${destroot}${prefix}/etc
+    }
     reinplace "s|${destroot}${prefix}|${prefix}/etc|g" ${destroot}${prefix}/bin/make-cert.sh
 }
 
 livecheck.type      regex
+livecheck.url       [lindex ${master_sites} 0]
 livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/irc/bahamut/files/patch-CPPFLAGS.diff
===================================================================
--- trunk/dports/irc/bahamut/files/patch-CPPFLAGS.diff	                        (rev 0)
+++ trunk/dports/irc/bahamut/files/patch-CPPFLAGS.diff	2012-11-28 01:03:35 UTC (rev 100096)
@@ -0,0 +1,22 @@
+--- src/Makefile.in.orig	2012-11-25 16:51:16.000000000 -0600
++++ src/Makefile.in	2012-11-27 18:43:29.000000000 -0600
+@@ -8,7 +8,7 @@
+ INSTALL_BIN=@INSTALL_PROGRAM@
+ INSTALL_DIR=@INSTALL_DIR@
+ CFLAGS=@CFLAGS@ -fno-strict-aliasing
+-CPPFLAGS=@CPPFLAGS@ -I../include
++CPPFLAGS=-I../include @CPPFLAGS@
+ LDFLAGS=@LDFLAGS@
+ 
+ RES_SRC =
+--- tools/Makefile.in.orig	2012-11-25 16:51:16.000000000 -0600
++++ tools/Makefile.in	2012-11-27 18:43:23.000000000 -0600
+@@ -8,7 +8,7 @@
+ INSTALL_BIN=@INSTALL_PROGRAM@
+ INSTALL_DIR=@INSTALL_DIR@
+ CFLAGS=@CFLAGS@ -fno-strict-aliasing
+-CPPFLAGS=@CPPFLAGS@ -I../include
++CPPFLAGS=-I../include @CPPFLAGS@
+ LDFLAGS=@LDFLAGS@
+ 
+ mkpasswd_SOURCES = mkpasswd.c

Deleted: trunk/dports/irc/bahamut/files/patch-support.c
===================================================================
--- trunk/dports/irc/bahamut/files/patch-support.c	2012-11-28 00:30:06 UTC (rev 100095)
+++ trunk/dports/irc/bahamut/files/patch-support.c	2012-11-28 01:03:35 UTC (rev 100096)
@@ -1,18 +0,0 @@
---- src/support.c.org	Thu Jan  6 14:52:31 2005
-+++ src/support.c	Thu Jan  6 14:52:55 2005
-@@ -33,7 +33,6 @@
- 				 */
- extern void outofmemory();
- 
--#if !defined( HAVE_STRTOKEN )
- /*
-  * *  strtoken.c --   walk through a string of tokens, using a set
-  * of separators 
-@@ -69,7 +68,6 @@
-     *save = pos;
-     return (tmp);
- }
--#endif /* !HAVE_STRTOKEN */
- 
- #if !defined( HAVE_STRTOK )
- /* NOT encouraged to use! */

Copied: trunk/dports/irc/bahamut/files/patch-support.c.diff (from rev 100095, trunk/dports/irc/bahamut/files/patch-support.c)
===================================================================
--- trunk/dports/irc/bahamut/files/patch-support.c.diff	                        (rev 0)
+++ trunk/dports/irc/bahamut/files/patch-support.c.diff	2012-11-28 01:03:35 UTC (rev 100096)
@@ -0,0 +1,18 @@
+--- src/support.c.org	Thu Jan  6 14:52:31 2005
++++ src/support.c	Thu Jan  6 14:52:55 2005
+@@ -33,7 +33,6 @@
+ 				 */
+ extern void outofmemory();
+ 
+-#if !defined( HAVE_STRTOKEN )
+ /*
+  * *  strtoken.c --   walk through a string of tokens, using a set
+  * of separators 
+@@ -69,7 +68,6 @@
+     *save = pos;
+     return (tmp);
+ }
+-#endif /* !HAVE_STRTOKEN */
+ 
+ #if !defined( HAVE_STRTOK )
+ /* NOT encouraged to use! */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121127/ec6daf64/attachment-0001.html>


More information about the macports-changes mailing list