diff options
| author | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
| commit | bae2639e49cd3cf3ee78c2ed8e82c3a277c91404 (patch) | |
| tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /print/xpdf | |
| parent | cd541833a6d47d522a3c2b271309abd492b2464c (diff) | |
| download | pkgsrc-bae2639e49cd3cf3ee78c2ed8e82c3a277c91404.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'print/xpdf')
| -rw-r--r-- | print/xpdf/Makefile | 17 | ||||
| -rw-r--r-- | print/xpdf/PLIST | 2 |
2 files changed, 9 insertions, 10 deletions
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 |