diff options
author | jlam <jlam> | 2004-02-14 17:21:49 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-02-14 17:21:49 +0000 |
commit | d47945d673325870bc418182e8c0af6211854624 (patch) | |
tree | fda78a130b1b3c39c8fedb7ab038d97acccd27a7 /www | |
parent | 8142f918549f15ba28b3f87278b5e149893f7483 (diff) | |
download | pkgsrc-d47945d673325870bc418182e8c0af6211854624.tar.gz |
LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}. Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
Diffstat (limited to 'www')
-rw-r--r-- | www/ap-php4/Makefile | 4 | ||||
-rw-r--r-- | www/apache2/Makefile | 4 | ||||
-rw-r--r-- | www/curl/Makefile | 3 | ||||
-rw-r--r-- | www/epiphany/Makefile | 3 | ||||
-rw-r--r-- | www/fcgi/Makefile | 6 | ||||
-rw-r--r-- | www/galeon/Makefile | 3 | ||||
-rw-r--r-- | www/gtkhtml/Makefile | 4 | ||||
-rw-r--r-- | www/gtkhtml3/Makefile | 3 | ||||
-rw-r--r-- | www/kimagemapeditor/Makefile | 4 | ||||
-rw-r--r-- | www/libghttp/Makefile | 3 | ||||
-rw-r--r-- | www/libgtkhtml/Makefile | 3 | ||||
-rw-r--r-- | www/libwww/Makefile | 3 | ||||
-rw-r--r-- | www/neon/Makefile | 4 | ||||
-rw-r--r-- | www/php4/Makefile | 5 | ||||
-rw-r--r-- | www/quanta3/Makefile | 3 | ||||
-rw-r--r-- | www/swish-e/Makefile | 3 |
16 files changed, 21 insertions, 37 deletions
diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile index da19b82e731..27b9832e2a7 100644 --- a/www/ap-php4/Makefile +++ b/www/ap-php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2004/01/12 09:46:04 cjep Exp $ +# $NetBSD: Makefile,v 1.36 2004/02/14 17:21:54 jlam Exp $ # PKGNAME= ap-php-${PHP_BASE_VERS} @@ -9,7 +9,7 @@ DEPENDS+= php>=${PHP_BASE_VERS}:../../www/php4 USE_BUILDLINK2= YES APACHE_MODULE= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool .include "../../www/php4/Makefile.php" diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 3ccff810a91..f5d63391464 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/01/27 08:11:05 grant Exp $ +# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:54 jlam Exp $ PKGNAME= apache-${APACHE_VERSION} PKGREVISION= 3 @@ -16,7 +16,7 @@ USE_BUILDLINK2= YES USE_PKGINSTALL= YES #USE_LIBTOOL= YES -#LIBTOOL_OVERRIDE= ${WRKSRC}/srclib/apr/libtool +#LIBTOOL_OVERRIDE= libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-layout=NetBSD diff --git a/www/curl/Makefile b/www/curl/Makefile index 91bc7969f4a..74bae0af290 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/01/23 22:52:28 recht Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:54 jlam Exp $ DISTNAME= curl-7.11.0 CATEGORIES= www @@ -16,7 +16,6 @@ BUILD_DEFS+= USE_INET6 USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index a9a4cee6ca3..ce3dfdde2cd 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/14 00:24:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:54 jlam Exp $ # DISTNAME= epiphany-1.0.7 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= YES DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile index a67342da58d..38f100c10ce 100644 --- a/www/fcgi/Makefile +++ b/www/fcgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/11/10 17:25:13 gavan Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:54 jlam Exp $ DISTNAME= fcgi-2.4.0 CATEGORIES= www devel @@ -11,10 +11,8 @@ COMMENT= FastCGI application development kit USE_BUILDLINK2= YES USE_GCC_SHLIB= YES GNU_CONFIGURE= YES -PTHREAD_OPTS+= require - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 198a1e353dc..12dcb63a711 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2004/02/05 08:48:54 abs Exp $ +# $NetBSD: Makefile,v 1.62 2004/02/14 17:21:54 jlam Exp $ DISTNAME= galeon-1.2.13 PKGREVISION= 2 @@ -22,7 +22,6 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_GNU_TOOLS+= make GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \ diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 8edfc56a89a..1d6ab7b3732 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/01/24 15:23:46 grant Exp $ +# $NetBSD: Makefile,v 1.37 2004/02/14 17:21:54 jlam Exp $ DISTNAME= gtkhtml-1.1.10 PKGREVISION= 2 @@ -15,9 +15,7 @@ USE_X11BASE= YES USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES - USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 1b3a6648cc3..ac1b96e4837 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/11 03:59:51 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:54 jlam Exp $ # DISTNAME= gtkhtml-3.0.9 @@ -16,7 +16,6 @@ USE_GNU_TOOLS+= make USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/src/libgtkhtml.pc.in GNU_CONFIGURE= yes diff --git a/www/kimagemapeditor/Makefile b/www/kimagemapeditor/Makefile index 4d163745cc4..c16107a8e23 100644 --- a/www/kimagemapeditor/Makefile +++ b/www/kimagemapeditor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/24 15:23:47 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:54 jlam Exp $ DISTNAME= kimagemapeditor-1.0 PKGREVISION= 3 @@ -15,8 +15,6 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdelibs3/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile index 33be5d06ae8..8e18a3d8a45 100644 --- a/www/libghttp/Makefile +++ b/www/libghttp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/11 09:53:02 xtraeme Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:54 jlam Exp $ DISTNAME= libghttp-1.0.9 CATEGORIES= www gnome @@ -11,6 +11,5 @@ COMMENT= GNOME http client library USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.pkg.mk" diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 4393062182a..06c837462d7 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/02/13 19:36:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:54 jlam Exp $ # DISTNAME= libgtkhtml-2.4.1 @@ -19,7 +19,6 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_X11= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libgtkhtml-2.0.pc.in .include "../../devel/gail/buildlink3.mk" diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 1011d8e715c..ce551ae9c1b 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2004/02/12 21:22:35 minskim Exp $ +# $NetBSD: Makefile,v 1.51 2004/02/14 17:21:54 jlam Exp $ DISTNAME= w3c-libwww-5.4.0 PKGNAME= libwww-5.4.0 @@ -19,7 +19,6 @@ SITES_libwww-configure-5.4.0.gz= ${MASTER_SITE_LOCAL} USE_BUILDLINK3= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-zlib --with-regex --without-x diff --git a/www/neon/Makefile b/www/neon/Makefile index c97c224716a..0e7f9c1d86d 100644 --- a/www/neon/Makefile +++ b/www/neon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/12/20 19:44:39 heinz Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:54 jlam Exp $ DISTNAME= neon-0.24.4 CATEGORIES= www @@ -9,9 +9,7 @@ HOMEPAGE= http://www.webdav.org/neon/ COMMENT= HTTP and WebDAV client library USE_BUILDLINK2= # defined - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= neon.pc.in GNU_CONFIGURE= # defined diff --git a/www/php4/Makefile b/www/php4/Makefile index a6855330c49..199aaa6db07 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/01/24 15:23:47 grant Exp $ +# $NetBSD: Makefile,v 1.37 2004/02/14 17:21:54 jlam Exp $ PKGNAME= php-${PHP_BASE_VERS} CATEGORIES+= lang @@ -9,7 +9,8 @@ CONFLICTS+= ap-php-4.0.3pl1 USE_BUILDLINK2= YES USE_PKGINSTALL= YES # PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now -# LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +# LIBTOOL_OVERRIDE= libtool +LIBTOOL_OVERRIDE= # empty USE_GNU_TOOLS+= make .include "Makefile.php" diff --git a/www/quanta3/Makefile b/www/quanta3/Makefile index 99decacca27..e4667cd0c86 100644 --- a/www/quanta3/Makefile +++ b/www/quanta3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/02/05 02:25:36 markd Exp $ +# $NetBSD: Makefile,v 1.15 2004/02/14 17:21:54 jlam Exp $ DISTNAME= quanta-${_KDE_VERSION} CATEGORIES= www @@ -12,7 +12,6 @@ USE_PERL5= build USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile index c19d0fdc8f6..4fcfda25510 100644 --- a/www/swish-e/Makefile +++ b/www/swish-e/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/23 21:55:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:54 jlam Exp $ # FreeBSD Id: ports/www/swish-e/Makefile,v 1.3 1999/08/31 02:43:18 peter Exp DISTNAME= swish-e-2.4.1 @@ -12,7 +12,6 @@ COMMENT= Simple web indexing for humans - enhanced GNU_CONFIGURE= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} |