Revision: 70990 http://trac.macports.org/changeset/70990 Author: ryandesign@macports.org Date: 2010-08-28 23:55:26 -0700 (Sat, 28 Aug 2010) Log Message: ----------- vantages: do not search in /usr/local or /opt/local for things; do support build_arch Modified Paths: -------------- trunk/dports/net/vantages/Portfile Added Paths: ----------- trunk/dports/net/vantages/files/patch-bad_paths.diff Modified: trunk/dports/net/vantages/Portfile =================================================================== --- trunk/dports/net/vantages/Portfile 2010-08-29 06:12:53 UTC (rev 70989) +++ trunk/dports/net/vantages/Portfile 2010-08-29 06:55:26 UTC (rev 70990) @@ -4,6 +4,7 @@ name vantages version 0.8.5b +revision 1 categories net platforms darwin maintainers nomaintainer @@ -28,7 +29,11 @@ checksums sha1 6cc7d538b75a778ed1889c89485b72aa85a10298 \ rmd160 6cce5d9f2eb339f7d13661c67e72fd1e50e16708 extract.suffix .tgz -patchfiles patch-makefile_fixes.diff + +patchfiles patch-makefile_fixes.diff \ + patch-bad_paths.diff + +# /usr/bin/ranlib: library member: libshttpd.a(compat_unix.c) is not an object file (not allowed in a library with multiple architectures) universal_variant no depends_lib port:curl-ca-bundle \ @@ -42,8 +47,18 @@ port:p5-term-readkey \ port:sqlite3 -build.args CC="${configure.cc}" +use_autoreconf yes +configure.universal_args-delete --disable-dependency-tracking + +if {[variant_exists universal] && [variant_isset universal]} { + set archflags ${configure.universal_cflags} +} else { + set archflags ${configure.cc_archflags} +} + +build.args CC="${configure.cc} ${archflags}" + livecheck.type regex livecheck.url ${homepage}download.html livecheck.regex "${name}-(\[0-9.a-d\]+)${extract.suffix}" Added: trunk/dports/net/vantages/files/patch-bad_paths.diff =================================================================== --- trunk/dports/net/vantages/files/patch-bad_paths.diff (rev 0) +++ trunk/dports/net/vantages/files/patch-bad_paths.diff 2010-08-29 06:55:26 UTC (rev 70990) @@ -0,0 +1,80 @@ +--- configure.in.orig 2010-08-26 15:29:47.000000000 -0500 ++++ configure.in 2010-08-29 01:22:40.000000000 -0500 +@@ -84,7 +84,7 @@ + # hunt through several directories trying to find the libraries + if test "x$SQLITE3_LIBS" = "x"; then + old_LDFLAGS="$LDFLAGS" +- for try in $sqlite3_lib_dir /usr/lib /usr/local/lib /opt/local/lib; do ++ for try in $sqlite3_lib_dir /usr/lib; do + LDFLAGS="$old_LDFLAGS -L$try" + unset ac_cv_lib_sqlite3_sqlite3_open + AC_CHECK_LIB(sqlite3, sqlite3_open, +@@ -132,7 +132,7 @@ + # hunt through several directories trying to find the libraries + if test "x$GPGME_LIB" = "x"; then + old_LDFLAGS="$LDFLAGS" +- for try in $gpgme_lib_dir /usr/lib /usr/local/lib /opt/local/lib; do ++ for try in $gpgme_lib_dir /usr/lib; do + LDFLAGS="$old_LDFLAGS -L$try" + unset ac_cv_lib_gpgme_pthread_gpgme_check_version + AC_CHECK_LIB(gpgme-pthread, gpgme_check_version, +@@ -159,7 +159,7 @@ + # hunt through several directories trying to find the libraries + if test "x$GPG_ERROR_LIB" = "x"; then + old_LDFLAGS="$LDFLAGS" +- for try in $gpg_error_lib_dir /usr/lib /usr/local/lib /opt/local/lib; do ++ for try in $gpg_error_lib_dir /usr/lib; do + LDFLAGS="$old_LDFLAGS -L$try" + unset ac_cv_lib_gpg_error_gpg_err_init + AC_CHECK_LIB(gpg-error, gpg_err_init, +@@ -182,7 +182,7 @@ + # hunt through several directories trying to find the libraries + if test "x$EXPAT_LIB" = "x"; then + old_LDFLAGS="$LDFLAGS" +- for try in $expat_lib_dir /usr/lib /usr/local/lib /opt/local/lib; do ++ for try in $expat_lib_dir /usr/lib; do + LDFLAGS="$old_LDFLAGS -L$try" + unset ac_cv_lib_expat_XML_ParserCreate + AC_CHECK_LIB(expat, XML_ParserCreate, +@@ -205,7 +205,7 @@ + # hunt through several directories trying to find the libraries + if test "x$PCAP_LIB" = "x"; then + old_LDFLAGS="$LDFLAGS" +- for try in $pcap_lib_dir /usr/lib /usr/local/lib /opt/local/lib; do ++ for try in $pcap_lib_dir /usr/lib; do + LDFLAGS="$old_LDFLAGS -L$try" + unset ac_cv_lib_pcap_pcap_open_live + AC_CHECK_LIB(pcap, pcap_open_live, +@@ -240,7 +240,7 @@ + if test "x$OPENSSL_LIB" = "x" && test "x$CRYPTO_LIB" = "x" + then + old_LDFLAGS="$LDFLAGS" +- for try in $openssl_lib_dir /usr/lib /usr/local/lib /opt/local/lib; do ++ for try in $openssl_lib_dir /usr/lib; do + LDFLAGS="$old_LDFLAGS -L$try" + unset ac_cv_lib_openssl_EVP_PKEY_new + AC_CHECK_LIB(ssl, EVP_PKEY_new, +--- dns/Makefile.in.orig 2010-04-02 01:21:08.000000000 -0500 ++++ dns/Makefile.in 2010-08-29 01:23:25.000000000 -0500 +@@ -43,7 +43,7 @@ + DEFINES = -g -Wall -Werror -D_LIBVDNS_VERSION=@LIBTOOL_VERSION_INFO@ @DEFS@ --no-strict-aliasing + CFLAGS = @CFLAGS@ @CPPFLAGS@ $(DEFINES) + CXXFLAGS = @CXXFLAGS@ $(DEFINES) +-CPPFLAGS = -DDEBUG -D_POSIX_THREADS -D_REENTRANT -I/usr/local/include -I/opt/local/include @CPPFLAGS@ ++CPPFLAGS = -DDEBUG -D_POSIX_THREADS -D_REENTRANT @CPPFLAGS@ + + DNS_OBJS = dns_a.o dns_compression.o dns_header.o dns_name.o \ + dns_packet.o dns_rr_fact.o dns_dnskey.o dns_rr.o \ +--- src/Makefile-full.in.orig 2010-04-21 19:42:23.000000000 -0500 ++++ src/Makefile-full.in 2010-08-29 01:24:31.000000000 -0500 +@@ -33,8 +33,8 @@ + DEFINES = -g -Wall -Werror @DEFS@ + CFLAGS = @CFLAGS@ @CPPFLAGS@ $(DEFINES) + CXXFLAGS = @CXXFLAGS@ +-CPPFLAGS = -DDEBUG -D_POSIX_THREADS -D_REENTRANT -I../dns -I../shttpd-1.42/src -I/usr/local/include -I/opt/local/include -I/usr/local/include/gpgme @CPPFLAGS@ +-LDFLAGS = -L../lib -L../dns/lib -L/usr/local/lib -L/opt/local/lib @LDFLAGS@ ++CPPFLAGS = -DDEBUG -D_POSIX_THREADS -D_REENTRANT -I../dns -I../shttpd-1.42/src @CPPFLAGS@ ++LDFLAGS = -L../lib -L../dns/lib @LDFLAGS@ + LIBS = -lshttpd -lvdns @LIBS@ + + libtool = @libtool@