summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2008-04-22 16:24:31 +0000
committerjlam <jlam@pkgsrc.org>2008-04-22 16:24:31 +0000
commit7a9ee81fcc3e8a4d69dda2c26c8d272e783a111b (patch)
treee23c5ae24d1b2d487e3cd64d21c2a7207cf0eadd /www
parent7f4de2f919a2013baee70f5be7334483ba1ad35d (diff)
downloadpkgsrc-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')
-rw-r--r--www/htmldoc-x11/DESCR8
-rw-r--r--www/htmldoc-x11/Makefile20
-rw-r--r--www/htmldoc/DESCR4
-rw-r--r--www/htmldoc/Makefile41
-rw-r--r--www/htmldoc/Makefile.common25
-rw-r--r--www/htmldoc/options.mk17
6 files changed, 65 insertions, 50 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"
diff --git a/www/htmldoc/DESCR b/www/htmldoc/DESCR
index e745a326bb3..9889d9e3d90 100644
--- a/www/htmldoc/DESCR
+++ b/www/htmldoc/DESCR
@@ -1,3 +1,3 @@
-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
+HTMLDOC is a program that generates indexed HTML, PostScript, and PDF
+files from HTML "source" files that you create using your favorite HTML
editor.
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index 523f6e85f64..5cabb93c211 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,14 +1,39 @@
-# $NetBSD: Makefile,v 1.23 2008/01/18 05:09:49 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.24 2008/04/22 16:24:31 jlam Exp $
-.include "Makefile.common"
+# This section contains variables that might be overridden.
+PKGNAME?= ${PKGNAME_BASE}
+COMMENT?= Converts HTML to indexed HTML, PDF and/or PostScript
-PKGNAME= htmldoc-${HTMLDOC_VERSION}
-PKGREVISION= 4
-COMMENT= Converts HTML to indexed HTML, PDF and/or PostScript
+# Normal package Makefile contents follow.
+DISTNAME= htmldoc-1.8.23-source
+PKGNAME_BASE= ${DISTNAME:S/-source//}
+PKGREVISION= 7
+CATEGORIES= www
+MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/${PKGVERSION_NOREV}/
+EXTRACT_SUFX= .tar.bz2
-CONFLICTS= htmldoc-x11-[0-9]*
+CONFLICTS+= htmldoc-[0-9]*
+CONFLICTS+= htmldoc-x11-[0-9]*
-CONFIGURE_ARGS+= --without-gui --without-x
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://www.easysw.com/htmldoc/
+# ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown
+NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
+.include "options.mk"
+
+WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
+
+INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin
+INSTALL_MAKE_FLAGS+= datadir=${DESTDIR}${PREFIX}/share
+INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/htmldoc/Makefile.common b/www/htmldoc/Makefile.common
deleted file mode 100644
index 80d5bb0eb0b..00000000000
--- a/www/htmldoc/Makefile.common
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile.common,v 1.12 2006/05/12 10:42:26 joerg Exp $
-#
-
-HTMLDOC_VERSION= 1.8.23
-DISTNAME= htmldoc-${HTMLDOC_VERSION}-source
-CATEGORIES= www
-MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/${HTMLDOC_VERSION}/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-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
-
-DISTINFO_FILE= ${.CURDIR}/../htmldoc/distinfo
-PATCHDIR= ${.CURDIR}/../htmldoc/patches
-PLIST_SRC= ${.CURDIR}/../htmldoc/PLIST
-
-WRKSRC= ${WRKDIR}/htmldoc-${HTMLDOC_VERSION}
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c c++
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
diff --git a/www/htmldoc/options.mk b/www/htmldoc/options.mk
new file mode 100644
index 00000000000..13680361594
--- /dev/null
+++ b/www/htmldoc/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2008/04/22 16:24:31 jlam Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.htmldoc
+PKG_SUPPORTED_OPTIONS= htmldoc-gui
+
+.include "../../mk/bsd.options.mk"
+
+###
+### X11 GUI support
+###
+.if !empty(PKG_OPTIONS:Mhtmldoc-gui)
+. include "../../x11/fltk/buildlink3.mk"
+. include "../../x11/libXpm/buildlink3.mk"
+CONFIGURE_ARGS+= --with-gui --with-x
+.else
+CONFIGURE_ARGS+= --without-gui --without-x
+.endif