[pkgsrc/trunk]: pkgsrc/www Restructure the following packages:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www Restructure the following packages:
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:02:59 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff99ef249437
branches:  trunk
changeset: 541435:ff99ef249437
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 22 16:24:31 2008 +0000

description:
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:

 www/htmldoc-x11/DESCR       |   8 +++++---
 www/htmldoc-x11/Makefile    |  22 +++++++++-------------
 www/htmldoc/DESCR           |   4 ++--
 www/htmldoc/Makefile        |  41 +++++++++++++++++++++++++++++++++--------
 www/htmldoc/Makefile.common |  25 -------------------------
 www/htmldoc/options.mk      |  17 +++++++++++++++++
 6 files changed, 66 insertions(+), 51 deletions(-)

diffs (153 lines):

diff -r 3c772b73920f -r ff99ef249437 www/htmldoc-x11/DESCR
--- a/www/htmldoc-x11/DESCR     Tue Apr 22 16:23:57 2008 +0000
+++ b/www/htmldoc-x11/DESCR     Tue Apr 22 16:24:31 2008 +0000
@@ -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 -r 3c772b73920f -r ff99ef249437 www/htmldoc-x11/Makefile
--- a/www/htmldoc-x11/Makefile  Tue Apr 22 16:23:57 2008 +0000
+++ b/www/htmldoc-x11/Makefile  Tue Apr 22 16:24:31 2008 +0000
@@ -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=       htmldoc-x11-${HTMLDOC_VERSION}
-PKGREVISION=   6
-COMMENT=       Converts HTML to indexed HTML, PDF and/or PostScript (GUI available)
+PKGNAME=       ${PKGNAME_BASE:S/-/-x11-/}
 
-CONFLICTS=             htmldoc-[0-9]*
-
-CONFIGURE_ARGS+=       --with-gui --with-x
+FILESDIR=      ${.CURDIR}/../../www/htmldoc/files
+PATCHDIR=      ${.CURDIR}/../../www/htmldoc/patches
+PKGDIR=                ${.CURDIR}/../../www/htmldoc
 
-.include "../../x11/fltk/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
+DESCR_SRC=     ${.CURDIR}/DESCR
 
-.include "../../mk/bsd.pkg.mk"
+PKG_OPTIONS.htmldoc+=  htmldoc-gui
+
+.include "../../www/htmldoc/Makefile"
diff -r 3c772b73920f -r ff99ef249437 www/htmldoc/DESCR
--- a/www/htmldoc/DESCR Tue Apr 22 16:23:57 2008 +0000
+++ b/www/htmldoc/DESCR Tue Apr 22 16:24:31 2008 +0000
@@ -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 -r 3c772b73920f -r ff99ef249437 www/htmldoc/Makefile
--- a/www/htmldoc/Makefile      Tue Apr 22 16:23:57 2008 +0000
+++ b/www/htmldoc/Makefile      Tue Apr 22 16:24:31 2008 +0000
@@ -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 $
+
+# This section contains variables that might be overridden.
+PKGNAME?=      ${PKGNAME_BASE}
+COMMENT?=      Converts HTML to indexed HTML, PDF and/or PostScript
 
-.include "Makefile.common"
+# 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-[0-9]*
+CONFLICTS+=    htmldoc-x11-[0-9]*
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.easysw.com/htmldoc/
 
-PKGNAME=       htmldoc-${HTMLDOC_VERSION}
-PKGREVISION=   4
-COMMENT=       Converts HTML to indexed HTML, PDF and/or PostScript
+# 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"
 
-CONFLICTS=             htmldoc-x11-[0-9]*
+WRKSRC=                        ${WRKDIR}/${DISTNAME:S/-source//}
+GNU_CONFIGURE=         yes
+USE_LANGUAGES=         c c++
 
-CONFIGURE_ARGS+=       --without-gui --without-x
+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 -r 3c772b73920f -r ff99ef249437 www/htmldoc/Makefile.common
--- a/www/htmldoc/Makefile.common       Tue Apr 22 16:23:57 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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 -r 3c772b73920f -r ff99ef249437 www/htmldoc/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/htmldoc/options.mk    Tue Apr 22 16:24:31 2008 +0000
@@ -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
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc ejabberd
Next by Date: [pkgsrc/trunk]: pkgsrc revbumps due to libevent update.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc ejabberd
Next by Thread: [pkgsrc/trunk]: pkgsrc revbumps due to libevent update.
Indexes:
Home | Main Index | Thread Index | Old Index