diff options
author | jlam <jlam> | 2004-02-14 17:21:49 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-02-14 17:21:49 +0000 |
commit | b45eb2df79959745d55a13ebb9be1bf0249b1cbd (patch) | |
tree | fda78a130b1b3c39c8fedb7ab038d97acccd27a7 /print | |
parent | 32369af4aa7c6b66ccff80e3a8958db1e50cf726 (diff) | |
download | pkgsrc-b45eb2df79959745d55a13ebb9be1bf0249b1cbd.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 'print')
-rw-r--r-- | print/cjk-lyx/Makefile | 5 | ||||
-rw-r--r-- | print/ggv/Makefile | 3 | ||||
-rw-r--r-- | print/ggv2/Makefile | 3 | ||||
-rw-r--r-- | print/gimp-print-cups/Makefile | 3 | ||||
-rw-r--r-- | print/gimp-print-escputil/Makefile | 3 | ||||
-rw-r--r-- | print/gimp-print-ijs/Makefile | 6 | ||||
-rw-r--r-- | print/gimp-print-lib/Makefile | 3 | ||||
-rw-r--r-- | print/gimp-print/Makefile | 3 | ||||
-rw-r--r-- | print/gnome-print/Makefile | 3 | ||||
-rw-r--r-- | print/gpdf/Makefile | 4 | ||||
-rw-r--r-- | print/ja-vfxdvik/Makefile | 4 | ||||
-rw-r--r-- | print/libgnomeprint/Makefile | 3 | ||||
-rw-r--r-- | print/libgnomeprintui/Makefile | 3 | ||||
-rw-r--r-- | print/mp/Makefile | 3 | ||||
-rw-r--r-- | print/pdflib/Makefile.common | 6 | ||||
-rw-r--r-- | print/scribus/Makefile | 4 |
16 files changed, 20 insertions, 39 deletions
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index 8bfea036877..bcae5665a16 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:51 reed Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:49 jlam Exp $ DISTNAME= lyx-${LYX_VERS} PKGNAME= cjk-${DISTNAME} @@ -29,10 +29,7 @@ USE_PERL5= yes USE_X11= yes USE_GCC_SHLIB= yes GNU_CONFIGURE= yes - USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/sigc++/libtool .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 0d6c47d080d..8c996b71c35 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.45 2004/02/14 17:21:49 jlam Exp $ # DISTNAME= ggv-1.0.2 @@ -17,7 +17,6 @@ USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_X11BASE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../devel/bonobo/buildlink2.mk" .include "../../devel/oaf/buildlink2.mk" diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index 3c127ae7959..4cfec84174c 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/11 05:20:54 xtraeme Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= ggv-2.4.1 @@ -20,7 +20,6 @@ USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make USE_X11= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCONF2_SCHEMAS= ggv.schemas diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile index 1a60fd66b62..6e4bcd2075f 100644 --- a/print/gimp-print-cups/Makefile +++ b/print/gimp-print-cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= gimp-print-4.2.5 @@ -19,7 +19,6 @@ CONFIGURE_ARGS+= --without-translated-ppds CONFIGURE_ARGS+= --enable-escputil=no CONFIGURE_ARGS+= --enable-libgimpprint=no USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_GNU_TOOLS+= make USE_BUILDLINK2= yes diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile index af033f17485..9c77ad2b3a6 100644 --- a/print/gimp-print-escputil/Makefile +++ b/print/gimp-print-escputil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/06 10:36:10 tron Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:50 jlam Exp $ DISTNAME= gimp-print-4.2.5 PKGNAME= gimp-print-escputil-4.2.5 @@ -20,7 +20,6 @@ CONFIGURE_ARGS+= --without-gimp CONFIGURE_ARGS+= --without-cups --without-translated-ppds CONFIGURE_ARGS+= --enable-libgimpprint=no USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_GNU_TOOLS+= make USE_BUILDLINK2= yes diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile index 6ce63bbd8f8..e4d1e9d1d8c 100644 --- a/print/gimp-print-ijs/Makefile +++ b/print/gimp-print-ijs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:50 jlam Exp $ DISTNAME= gimp-print-4.2.5 PKGNAME= gimp-print-ijs-4.2.5 @@ -11,6 +11,7 @@ HOMEPAGE= http://gimp-print.sourceforge.net/ COMMENT= GIMP print IJS server USE_BUILDLINK2= # defined +USE_LIBTOOL= # defined USE_GNU_TOOLS+= make GNU_CONFIGURE= # defined @@ -23,9 +24,6 @@ CONFIGURE_ARGS+= --without-translated-ppds CONFIGURE_ARGS+= --disable-escputil CONFIGURE_ARGS+= --disable-libgimpprint -USE_LIBTOOL= # defined -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - BUILD_DIRS= ${WRKSRC}/lib ${WRKSRC}/src/ghost DOCDIR= ${PREFIX}/share/doc/gimp-print-ijs diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile index 921e3511f7b..c5d00b15690 100644 --- a/print/gimp-print-lib/Makefile +++ b/print/gimp-print-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= gimp-print-4.2.5 @@ -20,7 +20,6 @@ USE_BUILDLINK2= yes USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool INFO_FILES= gimpprint.info GNU_CONFIGURE= yes diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile index abd2c07d0ec..3e818e19fb8 100644 --- a/print/gimp-print/Makefile +++ b/print/gimp-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= gimp-print-4.2.5 @@ -18,7 +18,6 @@ CONFIGURE_ARGS+= --without-cups --without-translated-ppds CONFIGURE_ARGS+= --enable-escputil=no CONFIGURE_ARGS+= --enable-libgimpprint=no USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_GNU_TOOLS+= make USE_BUILDLINK2= yes USE_X11= yes diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index a2eb3f707f7..a690a89c5e1 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2004/01/03 18:49:51 reed Exp $ +# $NetBSD: Makefile,v 1.60 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= gnome-print-0.36 @@ -14,7 +14,6 @@ USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-admin # currently unstable diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile index 57a12d4aa7c..88ecf43c455 100644 --- a/print/gpdf/Makefile +++ b/print/gpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/09 18:47:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= gpdf-0.112 @@ -22,8 +22,6 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/libbonobo/buildlink2.mk" .include "../../devel/libbonoboui/buildlink2.mk" diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile index e8e4a17c0de..bce06cfabc3 100644 --- a/print/ja-vfxdvik/Makefile +++ b/print/ja-vfxdvik/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:50 jlam Exp $ DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS} PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS} @@ -30,7 +30,7 @@ USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/config/config -LIBTOOL_OVERRIDE= ${WRKSRC}/config/klibtool +LIBTOOL_OVERRIDE= klibtool GNU_CONFIGURE= YES CONFIGURE_ARGS+=--enable-local-texmf=${PREFIX}/share/texmf.local \ --without-texinfo \ diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index eff28e8c3fe..24135852b00 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/02/13 14:04:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= libgnomeprint-2.4.2 @@ -22,7 +22,6 @@ GNU_CONFIGURE= YES BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.4 -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomeprint/libgnomeprint-2.2.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile index 169d48b4b4e..86604d11ab2 100644 --- a/print/libgnomeprintui/Makefile +++ b/print/libgnomeprintui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/02/11 02:34:55 xtraeme Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= libgnomeprintui-2.4.2 @@ -20,7 +20,6 @@ USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no diff --git a/print/mp/Makefile b/print/mp/Makefile index 49e7451ebe1..9904b1d8a9a 100644 --- a/print/mp/Makefile +++ b/print/mp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/09/21 21:33:09 kim Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:50 jlam Exp $ # DISTNAME= mpdist-3.7.1 @@ -13,7 +13,6 @@ COMMENT= PostScript pretty printer GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_X11= yes .include "../../mk/bsd.prefs.mk" diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common index 4dc9c389f08..4db6f4460b0 100644 --- a/print/pdflib/Makefile.common +++ b/print/pdflib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile.common,v 1.11 2004/02/14 17:21:50 jlam Exp $ DISTNAME= pdflib-${PDFLIB_DIST_VERS} PKGREVISION= 1 @@ -20,6 +20,7 @@ DISTINFO_FILE= ${.CURDIR}/../pdflib/distinfo PATCHDIR= ${.CURDIR}/../pdflib/patches USE_BUILDLINK2= YES +USE_LIBTOOL= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-pnglib @@ -36,8 +37,5 @@ CONFIGURE_ARGS+= --enable-cxx=no CPPFLAGS+= -Dunix -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../graphics/png/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" diff --git a/print/scribus/Makefile b/print/scribus/Makefile index e32cb2eaa6f..542eb4d0d3c 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:50 jlam Exp $ DISTNAME= scribus-1.1.1 PKGREVISION= 1 @@ -19,7 +19,7 @@ USE_GNU_TOOLS+= make PTHREAD_OPTS+= require USE_LIBTOOL= YES -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= libtool GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-qt-dir=${QTDIR} \ |