diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-23 23:34:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-23 23:34:59 +0000 |
| commit | f2c0e2bffd443772f38eacd6eb89951e00b3bd62 (patch) | |
| tree | 0a26af8b9358b084ac649ec83d1acdc5bada7d58 /www | |
| parent | caade430d2e26c88f6491f2c4de76e85f8c9d5a4 (diff) | |
| download | pkgsrc-f2c0e2bffd443772f38eacd6eb89951e00b3bd62.tar.gz | |
buildlink1 -> buildlink2
Diffstat (limited to 'www')
| -rw-r--r-- | www/htmldoc-x11/Makefile | 22 | ||||
| -rw-r--r-- | www/htmldoc/Makefile | 13 | ||||
| -rw-r--r-- | www/htmldoc/Makefile.common | 15 |
3 files changed, 24 insertions, 26 deletions
diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile index fadc949502b..3d27ce16fb0 100644 --- a/www/htmldoc-x11/Makefile +++ b/www/htmldoc-x11/Makefile @@ -1,21 +1,17 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/06 21:44:43 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/23 23:35:00 jlam Exp $ # -PKGNAME= htmldoc-x11-${HTMLDOC_VERSION} - -COMMENT= Converts HTML to indexed HTML, PDF and/or PostScript (GUI available) +.include "../htmldoc/Makefile.common" -DISTINFO_FILE= ${.CURDIR}/../htmldoc/distinfo -PLIST_SRC= ${.CURDIR}/../htmldoc/PLIST +PKGNAME= htmldoc-x11-${HTMLDOC_VERSION} +COMMENT= Converts HTML to indexed HTML, PDF and/or PostScript (GUI available) -# defined in Makefile.common but x11.buildlink.mk must pick it up -GNU_CONFIGURE= YES +CONFLICTS= htmldoc-[0-9]* +USE_X11= # defined CONFIGURE_ARGS+= --with-gui --with-x -CONFLICTS= htmldoc-[0-9]* +.include "../../x11/fltk/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" -.include "../../x11/fltk/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" -.include "../htmldoc/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile index 8acc1117c96..d2157a52aae 100644 --- a/www/htmldoc/Makefile +++ b/www/htmldoc/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.17 2002/05/06 21:42:37 seb Exp $ +# $NetBSD: Makefile,v 1.18 2002/09/23 23:34:59 jlam Exp $ # -PKGNAME= htmldoc-${HTMLDOC_VERSION} - -COMMENT= Converts HTML to indexed HTML, PDF and/or PostScript +.include "${.CURDIR}/Makefile.common" -CONFIGURE_ARGS+= --without-gui --without-x +PKGNAME= htmldoc-${HTMLDOC_VERSION} +COMMENT= Converts HTML to indexed HTML, PDF and/or PostScript CONFLICTS= htmldoc-x11-[0-9]* -.include "${.CURDIR}/Makefile.common" +CONFIGURE_ARGS+= --without-gui --without-x + +.include "../../mk/bsd.pkg.mk" diff --git a/www/htmldoc/Makefile.common b/www/htmldoc/Makefile.common index 062bf3acf8f..fa8d0c6ff00 100644 --- a/www/htmldoc/Makefile.common +++ b/www/htmldoc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2002/05/06 21:42:37 seb Exp $ +# $NetBSD: Makefile.common,v 1.2 2002/09/23 23:34:59 jlam Exp $ # HTMLDOC_VERSION= 1.8.19 @@ -13,11 +13,12 @@ HOMEPAGE= http://www.easysw.com/htmldoc/ NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha #ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown -GNU_CONFIGURE= YES +DISTINFO_FILE= ${.CURDIR}/../htmldoc/distinfo +PLIST_SRC= ${.CURDIR}/../htmldoc/PLIST -BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +GNU_CONFIGURE= YES -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" |