diff options
author | jlam <jlam@pkgsrc.org> | 2008-04-22 16:24:31 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2008-04-22 16:24:31 +0000 |
commit | 7a9ee81fcc3e8a4d69dda2c26c8d272e783a111b (patch) | |
tree | e23c5ae24d1b2d487e3cd64d21c2a7207cf0eadd /www/htmldoc-x11 | |
parent | 7f4de2f919a2013baee70f5be7334483ba1ad35d (diff) | |
download | pkgsrc-7a9ee81fcc3e8a4d69dda2c26c8d272e783a111b.tar.gz |
Restructure the following packages:
www/htmldoc
www/htmldoc-x11
The latter is now just www/htmldoc built with a specific set of options.
Changes include:
+ Add options.mk that supports a new option:
htmldoc-gui Build with GUI support
+ Remove Makefile.common and move all logic into htmldoc/Makefile and
htmldoc/options.mk.
+ Add full DESTDIR support.
+ Bump the PKGREVISION for htmldoc and htmldoc-x11 to 7. Both packages
now track and use the same PKGREVISION number.
Diffstat (limited to 'www/htmldoc-x11')
-rw-r--r-- | www/htmldoc-x11/DESCR | 8 | ||||
-rw-r--r-- | www/htmldoc-x11/Makefile | 20 |
2 files changed, 13 insertions, 15 deletions
diff --git a/www/htmldoc-x11/DESCR b/www/htmldoc-x11/DESCR index 8b9510da39d..f0c15b51103 100644 --- a/www/htmldoc-x11/DESCR +++ b/www/htmldoc-x11/DESCR @@ -1,4 +1,6 @@ -HTMLDOC is a program that generates indexed HTML, Adobe(R) PostScriptTM, and -PDF files from HTML "source" files that you create using your favorite HTML -editor. HTMLDOC includes a simple GUI interface to manage your HTML files and +HTMLDOC is a program that generates indexed HTML, PostScript, and PDF +files from HTML "source" files that you create using your favorite HTML +editor. + +HTMLDOC includes a simple GUI interface to manage your HTML files and automatically (re)generate files for viewing and printing. diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile index befd50d2dbd..d2d30f70408 100644 --- a/www/htmldoc-x11/Makefile +++ b/www/htmldoc-x11/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.12 2008/01/18 05:09:50 tnn Exp $ -# +# $NetBSD: Makefile,v 1.13 2008/04/22 16:24:31 jlam Exp $ -.include "../../www/htmldoc/Makefile.common" +PKGNAME= ${PKGNAME_BASE:S/-/-x11-/} -PKGNAME= htmldoc-x11-${HTMLDOC_VERSION} -PKGREVISION= 6 -COMMENT= Converts HTML to indexed HTML, PDF and/or PostScript (GUI available) +FILESDIR= ${.CURDIR}/../../www/htmldoc/files +PATCHDIR= ${.CURDIR}/../../www/htmldoc/patches +PKGDIR= ${.CURDIR}/../../www/htmldoc -CONFLICTS= htmldoc-[0-9]* +DESCR_SRC= ${.CURDIR}/DESCR -CONFIGURE_ARGS+= --with-gui --with-x +PKG_OPTIONS.htmldoc+= htmldoc-gui -.include "../../x11/fltk/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" +.include "../../www/htmldoc/Makefile" |