CVS commit: pkgsrc/www

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 30 12:54:21 UTC 2016

Modified Files:
        pkgsrc/www/htmldoc: Makefile options.mk
        pkgsrc/www/htmldoc-x11: Makefile
Added Files:
        pkgsrc/www/htmldoc: Makefile.common

Log Message:
Fix options framework abuse by htmldoc-x11.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/htmldoc/Makefile
cvs rdiff -u -r0 -r1.14 pkgsrc/www/htmldoc/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/htmldoc/options.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/htmldoc-x11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/htmldoc/Makefile
diff -u pkgsrc/www/htmldoc/Makefile:1.42 pkgsrc/www/htmldoc/Makefile:1.43
--- pkgsrc/www/htmldoc/Makefile:1.42    Sat Dec 17 14:20:32 2016
+++ pkgsrc/www/htmldoc/Makefile Fri Dec 30 12:54:20 2016
@@ -1,38 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2016/12/17 14:20:32 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2016/12/30 12:54:20 wiz Exp $
 
-# This section contains variables that might be overridden.
-PKGNAME?=      ${PKGNAME_BASE}
-COMMENT?=      Converts HTML to indexed HTML, PDF and/or PostScript
-
-# Normal package Makefile contents follow.
-DISTNAME=      htmldoc-1.8.27-source
-PKGNAME_BASE=  ${DISTNAME:S/-source//}
 PKGREVISION=   15
-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.htmldoc.org/
-LICENSE=       gnu-gpl-v2
-
-# ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown
-NOT_FOR_PLATFORM=      NetBSD-1.[3-4]*-alpha
-
-.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}
+CONFIGURE_ARGS+=       --without-gui --without-x
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "${.CURDIR}/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/htmldoc/options.mk
diff -u pkgsrc/www/htmldoc/options.mk:1.3 pkgsrc/www/htmldoc/options.mk:1.4
--- pkgsrc/www/htmldoc/options.mk:1.3   Fri Jul  3 14:04:12 2009
+++ pkgsrc/www/htmldoc/options.mk       Fri Dec 30 12:54:20 2016
@@ -1,11 +1,10 @@
-# $NetBSD: options.mk,v 1.3 2009/07/03 14:04:12 drochner Exp $
+# $NetBSD: options.mk,v 1.4 2016/12/30 12:54:20 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.htmldoc
-PKG_SUPPORTED_OPTIONS=         x11
+PKG_SUPPORTED_OPTIONS=         # empty
 PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls ssl
 PKG_SUGGESTED_OPTIONS=         ssl
-PKG_OPTIONS_LEGACY_OPTS+=      htmldoc-gui:x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -32,14 +31,3 @@ CONFIGURE_ARGS+=     --disable-gnutls
 .else
 CONFIGURE_ARGS+=       --disable-ssl
 .endif
-
-###
-### X11 GUI support
-###
-.if !empty(PKG_OPTIONS:Mx11)
-.  include "../../x11/fltk/buildlink3.mk"
-.  include "../../x11/libXpm/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-gui --with-x
-.else
-CONFIGURE_ARGS+=       --without-gui --without-x
-.endif

Index: pkgsrc/www/htmldoc-x11/Makefile
diff -u pkgsrc/www/htmldoc-x11/Makefile:1.19 pkgsrc/www/htmldoc-x11/Makefile:1.20
--- pkgsrc/www/htmldoc-x11/Makefile:1.19        Thu Nov 15 13:44:14 2012
+++ pkgsrc/www/htmldoc-x11/Makefile     Fri Dec 30 12:54:21 2016
@@ -1,16 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2012/11/15 13:44:14 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2016/12/30 12:54:21 wiz Exp $
 
-PKGNAME=       ${PKGNAME_BASE:S/-/-x11-/}
+PKGNAME=       htmldoc-x11-${VERSION}
 PKGREVISION=   2
 
-FILESDIR=      ${.CURDIR}/../../www/htmldoc/files
-PATCHDIR=      ${.CURDIR}/../../www/htmldoc/patches
-PKGDIR=                ${.CURDIR}/../../www/htmldoc
+CONFIGURE_ARGS+=       --with-gui --with-x
 
-DESCR_SRC=     ${.CURDIR}/DESCR
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS.htmldoc+=  x11
-
-.include "../../www/htmldoc/Makefile"
+.include "../../x11/fltk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../www/htmldoc/Makefile.common"
+.include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/www/htmldoc/Makefile.common
diff -u /dev/null pkgsrc/www/htmldoc/Makefile.common:1.14
--- /dev/null   Fri Dec 30 12:54:21 2016
+++ pkgsrc/www/htmldoc/Makefile.common  Fri Dec 30 12:54:20 2016
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile.common,v 1.14 2016/12/30 12:54:20 wiz Exp $
+#
+# used by www/htmldoc/Makefile
+# used by www/htmldoc-x11/Makefile
+
+# This section contains variables that might be overridden.
+PKGNAME?=      ${PKGNAME_BASE}
+COMMENT?=      Converts HTML to indexed HTML, PDF and/or PostScript
+
+# Normal package Makefile contents follow.
+VERSION=       1.8.27
+DISTNAME=      htmldoc-${VERSION}-source
+PKGNAME_BASE=  ${DISTNAME:S/-source//}
+CATEGORIES=    www
+MASTER_SITES=  ftp://ftp.easysw.com/pub/htmldoc/${PKGVERSION_NOREV}/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+#HOMEPAGE=     http://www.htmldoc.org/
+LICENSE=       gnu-gpl-v2
+
+PATCHDIR=              ${.CURDIR}/../../www/htmldoc/patches
+DISTINFO_FILE=         ${.CURDIR}/../../www/htmldoc/distinfo
+PLIST_SRC=             ${.CURDIR}/../../www/htmldoc/PLIST
+
+.include "${.CURDIR}/../../www/htmldoc/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 "../../devel/zlib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"