diff options
author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
commit | 1c57323789a922a7182ba378831f2c0a336a6959 (patch) | |
tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /print | |
parent | ee84541509a09b09b26167f474c4b53185c17b5f (diff) | |
download | pkgsrc-1c57323789a922a7182ba378831f2c0a336a6959.tar.gz |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'print')
-rw-r--r-- | print/foomatic-gswrapper/Makefile | 6 | ||||
-rw-r--r-- | print/ghostscript-nox11/Makefile | 4 | ||||
-rw-r--r-- | print/ghostscript-nox11/Makefile.common | 6 | ||||
-rw-r--r-- | print/ghostscript/Makefile | 6 | ||||
-rw-r--r-- | print/gimp-print-lib/Makefile | 6 | ||||
-rw-r--r-- | print/gimp-print-lib/distinfo | 2 | ||||
-rw-r--r-- | print/gimp-print-lib/patches/patch-ac | 2 | ||||
-rw-r--r-- | print/ja-vflib-utils/Makefile | 6 | ||||
-rw-r--r-- | print/ja-vflib-utils/PLIST | 2 | ||||
-rw-r--r-- | print/mgv/Makefile | 14 | ||||
-rw-r--r-- | print/mpage/Makefile | 6 | ||||
-rw-r--r-- | print/tcl-pdflib/Makefile | 13 | ||||
-rw-r--r-- | print/tcl-pdflib/PLIST | 2 | ||||
-rw-r--r-- | print/xpdf/Makefile | 17 | ||||
-rw-r--r-- | print/xpdf/PLIST | 2 | ||||
-rw-r--r-- | print/xpp/Makefile | 17 |
16 files changed, 56 insertions, 55 deletions
diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile index 256bdbcb20c..0646a83905f 100644 --- a/print/foomatic-gswrapper/Makefile +++ b/print/foomatic-gswrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/03/17 16:02:34 fredb Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:50:28 jlam Exp $ DISTNAME= foomatic-gswrapper PKGNAME= foomatic-gswrapper-1.2 @@ -20,7 +20,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV} DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES WRKSRC= ${WRKDIR} EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME} @@ -31,5 +31,5 @@ do-build: # nothing do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ghostscript-nox11/Makefile b/print/ghostscript-nox11/Makefile index 02ce28f0d92..5b6a03b1e84 100644 --- a/print/ghostscript-nox11/Makefile +++ b/print/ghostscript-nox11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/16 23:34:37 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:29 jlam Exp $ PKGNAME= ghostscript-nox11-${GS_VERS} PKGREVISION= 4 @@ -6,7 +6,7 @@ COMMENT= Aladdin Postscript interpreter without X11 drivers CONFLICTS= ghostscript{,-x11}-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../print/ghostscript-nox11/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index ac8dd764f2d..4c7547c3c3a 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2002/05/31 15:19:59 seb Exp $ +# $NetBSD: Makefile.common,v 1.34 2002/08/25 21:50:29 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -285,5 +285,5 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOCDIR}/${MJC_DRV} ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOCDIR}/${MJC_DRV} -.include "../../graphics/png/buildlink.mk" -.include "../../print/ja-vflib-lib/buildlink.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../print/ja-vflib-lib/buildlink2.mk" diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile index 0c458b0be3e..1947d221362 100644 --- a/print/ghostscript/Makefile +++ b/print/ghostscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/03/16 23:34:37 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:28 jlam Exp $ PKGNAME= ghostscript-${GS_VERS} PKGREVISION= 4 @@ -6,7 +6,8 @@ COMMENT= Aladdin Postscript interpreter CONFLICTS= ghostscript{,-x11,-nox11}-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES .include "../../print/ghostscript-nox11/Makefile.common" @@ -14,7 +15,6 @@ MAKEFRAGS+= ${FILESDIR}/devs.x11 GS_DISPLAY_DEVICE= x11.dev XLIBS= Xt SM ICE Xext X11 -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" # arm32 compiler has an optimizer problem diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile index 38ef8b020cc..9e8d7ef2e2c 100644 --- a/print/gimp-print-lib/Makefile +++ b/print/gimp-print-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/05/03 12:43:06 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:50:30 jlam Exp $ # DISTNAME= gimp-print-4.2.1 @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://gimp-print.sourceforge.net/ COMMENT= drivers for Canon, Epson, Lexmark, and PCL printers -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -24,5 +24,5 @@ CONFIGURE_ARGS+= --without-translated-ppds CONFIGURE_ARGS+= --without-samples CONFIGURE_ARGS+= --disable-escputil -.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/gimp-print-lib/distinfo b/print/gimp-print-lib/distinfo index c7645b22f5a..ddbb2224e08 100644 --- a/print/gimp-print-lib/distinfo +++ b/print/gimp-print-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/06/30 20:57:12 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:50:30 jlam Exp $ SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8 Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes diff --git a/print/gimp-print-lib/patches/patch-ac b/print/gimp-print-lib/patches/patch-ac index 8ecb1de321b..a929489bd78 100644 --- a/print/gimp-print-lib/patches/patch-ac +++ b/print/gimp-print-lib/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2002/06/30 20:57:13 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2002/08/25 21:50:31 jlam Exp $ --- src/Makefile.in.orig Fri Apr 26 20:56:31 2002 +++ src/Makefile.in diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile index b110f2baf30..096df4e6a60 100644 --- a/print/ja-vflib-utils/Makefile +++ b/print/ja-vflib-utils/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:08 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:32 jlam Exp $ PKGNAME= ja-vflib-utils-${VFLIB_VERSION} COMMENT= Utilities for manipulating VFlib vector font files BUILDLINK_DEPENDS.vflib=ja-vflib-lib>=${VFLIB_VERSION} -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined .include "../../print/ja-vflib-lib/Makefile.common" @@ -14,5 +14,5 @@ CONFIGURE_ARGS+= --enable-tools --with-x ALL_TARGET= build-tools INSTALL_TARGET= install-tools -.include "../../print/ja-vflib-lib/buildlink.mk" +.include "../../print/ja-vflib-lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ja-vflib-utils/PLIST b/print/ja-vflib-utils/PLIST index a1f482f56c9..131e5af484e 100644 --- a/print/ja-vflib-utils/PLIST +++ b/print/ja-vflib-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:08 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:50:32 jlam Exp $ bin/disol bin/fmtest bin/kban diff --git a/print/mgv/Makefile b/print/mgv/Makefile index 4b9919222b0..918a6eab000 100644 --- a/print/mgv/Makefile +++ b/print/mgv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/04/23 02:08:54 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:50:32 jlam Exp $ DISTNAME= mgv-3.1.5 PKGREVISION= 1 @@ -13,17 +13,17 @@ DEPENDS+= ghostscript-[6-9]*:../../print/ghostscript GNU_CONFIGURE= yes USE_X11BASE= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes -CONFIGURE_ARGS+= --with-motif-includes=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --with-motif-libs=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-motif-includes=${MOTIFBASE}/include +CONFIGURE_ARGS+= --with-motif-libs=${MOTIFBASE}/lib post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${PREFIX}/share/mgv/3.1.5/help ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html ${LN} -fs ${PREFIX}/share/mgv/3.1.5/help ${PREFIX}/share/doc/html/mgv -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/print/mpage/Makefile b/print/mpage/Makefile index 3d6afe0d26d..2234928b015 100644 --- a/print/mpage/Makefile +++ b/print/mpage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/02/16 01:21:52 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:50:33 jlam Exp $ # DISTNAME= mpage-2.5 @@ -9,8 +9,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org COMMENT= Print multiple pages per sheet of paper -USE_BUILDLINK_ONLY= yes -ALL_TARGET= default +USE_BUILDLINK2= yes +ALL_TARGET= default .include "../../mk/bsd.prefs.mk" diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile index bf62d498e5e..c4a88c496a6 100644 --- a/print/tcl-pdflib/Makefile +++ b/print/tcl-pdflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:38 fredb Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 21:50:34 jlam Exp $ .include "../pdflib/Makefile.common" @@ -6,12 +6,12 @@ PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS} PKGREVISION= 1 COMMENT= Tcl interface to PDFlib for generating PDF files -USE_BUILDLINK_ONLY= YES BUILDLINK_DEPENDS.pdflib= pdflib>=${PDFLIB_BASE_VERS} +USE_BUILDLINK2= YES CONFIGURE_ARGS+= --with-tcl=${TCLSH} -CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_DIR}/include" -TCLSH= ${LOCALBASE}/bin/tclsh +CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include" +TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh DIRS_TO_BUILD= bind/tcl @@ -30,6 +30,7 @@ do-install: ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} .endfor -.include "../pdflib/buildlink.mk" -.include "../../lang/tcl/buildlink.mk" +.include "../pdflib/buildlink2.mk" +.include "../../lang/tcl/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/print/tcl-pdflib/PLIST b/print/tcl-pdflib/PLIST index 28bba5698a4..a84ac3a2d0f 100644 --- a/print/tcl-pdflib/PLIST +++ b/print/tcl-pdflib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/30 03:59:05 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:50:34 jlam Exp $ lib/tcl8.3/pdflib/pdflib_tcl.a lib/tcl8.3/pdflib/pdflib_tcl.la lib/tcl8.3/pdflib/pdflib_tcl.so diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 3cec75f81ee..846b81b7093 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/07/19 12:43:51 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:34 jlam Exp $ # DISTNAME= xpdf-1.00 @@ -15,13 +15,12 @@ DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts CONFLICTS= xpdf-crypto-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES -USE_FREETYPE2= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-freetype2-includes=${BUILDLINK_DIR}/include/freetype2 -CONFIGURE_ARGS+= --with-t1-includes=${BUILDLINK_DIR}/include +CONFIGURE_ARGS+= --with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include/freetype2 +CONFIGURE_ARGS+= --with-t1-includes=${BUILDLINK_PREFIX.t1lib}/include CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" MAKE_ENV+= SED="${SED}" ECHO="${ECHO}" @@ -31,8 +30,8 @@ MAKE_ENV+= SED="${SED}" ECHO="${ECHO}" CONFIGURE_ARGS+= --enable-a4-paper .endif -.include "../../fonts/t1lib/buildlink.mk" -.include "../../graphics/freetype2/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../fonts/t1lib/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/print/xpdf/PLIST b/print/xpdf/PLIST index 933ad69190d..68f1ad35339 100644 --- a/print/xpdf/PLIST +++ b/print/xpdf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/06/10 10:58:58 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:35 jlam Exp $ bin/xpdf bin/pdffonts bin/pdftops diff --git a/print/xpp/Makefile b/print/xpp/Makefile index 30071ff3575..3489d79c238 100644 --- a/print/xpp/Makefile +++ b/print/xpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/03/13 17:37:40 fredb Exp $ +# $NetBSD: Makefile,v 1.17 2002/08/25 21:50:35 jlam Exp $ DISTNAME= xpp-1.0 PKGREVISION= 1 @@ -9,11 +9,12 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://cups.sourceforge.net/xpp/index.html COMMENT= X Printing Panel -USE_BUILDLINK_ONLY= # defined -USE_GMAKE= # defined -GNU_CONFIGURE= # defined +USE_BUILDLINK2= # defined +USE_X11= # defined +USE_GMAKE= # defined +GNU_CONFIGURE= # defined -DOCDIR= ${PREFIX}/share/doc/xpp +DOCDIR= ${PREFIX}/share/doc/xpp pre-configure: cd ${WRKSRC}; ${TOUCH} Makefile.in aclocal.m4 configure @@ -22,7 +23,7 @@ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR} -.include "../../print/cups/buildlink.mk" -.include "../../x11/fltk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../print/cups/buildlink2.mk" +.include "../../x11/fltk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" |