diff options
| author | jlam <jlam> | 2004-02-14 17:21:32 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-14 17:21:32 +0000 |
| commit | c46da24c142eef5eab634a945d7e1d201115cb8b (patch) | |
| tree | f363875d965b55b56e856a921189b2693e263e28 /converters | |
| parent | 3edd1034586f43044621b6199d089c2117f97947 (diff) | |
| download | pkgsrc-c46da24c142eef5eab634a945d7e1d201115cb8b.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 'converters')
| -rw-r--r-- | converters/fribidi/Makefile | 3 | ||||
| -rw-r--r-- | converters/libiconv/Makefile | 4 | ||||
| -rw-r--r-- | converters/psiconv/Makefile | 7 | ||||
| -rw-r--r-- | converters/wv/Makefile | 3 | ||||
| -rw-r--r-- | converters/wv2/Makefile | 4 |
5 files changed, 6 insertions, 15 deletions
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile index bc2f8f56e52..8e4ee8497b9 100644 --- a/converters/fribidi/Makefile +++ b/converters/fribidi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/12/14 01:16:39 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= fribidi-0.10.4 @@ -14,7 +14,6 @@ USE_BUILDLINK2= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/fribidi.pc.in TEST_TARGET= check diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index a29a787d524..0630ac7a2b7 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/01/05 11:17:10 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= libiconv-1.9.1 @@ -16,8 +16,6 @@ USE_BUILDLINK3= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libcharset/libtool TEST_TARGET= check diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index 0922b4c8966..0e3cd454f36 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/01/03 18:49:36 reed Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= psiconv-0.8.3 @@ -12,13 +12,10 @@ COMMENT= PSION 5 file format data conversion utilities USE_BUILDLINK2= YES USE_X11= YES - +USE_LIBTOOL= YES GNU_CONFIGURE= YES CPPFLAGS+= -DIMAGEMAGICK -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - DOCDIR= ${PREFIX}/share/doc/psiconv post-install: diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 258ddd5a64b..54124db5e7d 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/01/23 21:50:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= wv-1.0.0 @@ -17,7 +17,6 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/wv-1.0.pc.in MAKEFILE= GNUmakefile diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile index a9920c5db7a..2cf12ab547c 100644 --- a/converters/wv2/Makefile +++ b/converters/wv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/09 18:47:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:35 jlam Exp $ # DISTNAME= wv2-0.2.1 @@ -17,8 +17,6 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.libiconv} |