Fri Dec 30 12:54:21 2016 UTC ()
Fix options framework abuse by htmldoc-x11.


(wiz)
diff -r1.42 -r1.43 pkgsrc/www/htmldoc/Makefile
diff -r0 -r1.14 pkgsrc/www/htmldoc/Makefile.common
diff -r1.3 -r1.4 pkgsrc/www/htmldoc/options.mk
diff -r1.19 -r1.20 pkgsrc/www/htmldoc-x11/Makefile
cvs diff -r1.42 -r1.43 pkgsrc/www/htmldoc/Makefile (expand / switch to unified diff)

--- pkgsrc/www/htmldoc/Makefile 2016/12/17 14:20:32 1.42
+++ pkgsrc/www/htmldoc/Makefile 2016/12/30 12:54:20 1.43
@@ -1,38 +1,8 @@ @@ -1,38 +1,8 @@
1# $NetBSD: Makefile,v 1.42 2016/12/17 14:20:32 joerg Exp $ 1# $NetBSD: Makefile,v 1.43 2016/12/30 12:54:20 wiz Exp $
2 2
3# This section contains variables that might be overridden. 
4PKGNAME?= ${PKGNAME_BASE} 
5COMMENT?= Converts HTML to indexed HTML, PDF and/or PostScript 
6 
7# Normal package Makefile contents follow. 
8DISTNAME= htmldoc-1.8.27-source 
9PKGNAME_BASE= ${DISTNAME:S/-source//} 
10PKGREVISION= 15 3PKGREVISION= 15
11CATEGORIES= www 
12MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/${PKGVERSION_NOREV}/ 
13EXTRACT_SUFX= .tar.bz2 
14 
15CONFLICTS+= htmldoc-[0-9]* 
16CONFLICTS+= htmldoc-x11-[0-9]* 
17 
18MAINTAINER= pkgsrc-users@NetBSD.org 
19HOMEPAGE= http://www.htmldoc.org/ 
20LICENSE= gnu-gpl-v2 
21 
22# ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown 
23NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha 
24 
25.include "options.mk" 
26 
27WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 
28GNU_CONFIGURE= yes 
29USE_LANGUAGES= c c++ 
30 4
31INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin 5CONFIGURE_ARGS+= --without-gui --without-x
32INSTALL_MAKE_FLAGS+= datadir=${DESTDIR}${PREFIX}/share 
33INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} 
34 6
35.include "../../devel/zlib/buildlink3.mk" 7.include "${.CURDIR}/Makefile.common"
36.include "../../mk/jpeg.buildlink3.mk" 
37.include "../../graphics/png/buildlink3.mk" 
38.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/www/htmldoc/Makefile.common
# $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
#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"
cvs diff -r1.3 -r1.4 pkgsrc/www/htmldoc/options.mk (expand / switch to unified diff)

--- pkgsrc/www/htmldoc/options.mk 2009/07/03 14:04:12 1.3
+++ pkgsrc/www/htmldoc/options.mk 2016/12/30 12:54:20 1.4
@@ -1,45 +1,33 @@ @@ -1,45 +1,33 @@
1# $NetBSD: options.mk,v 1.3 2009/07/03 14:04:12 drochner Exp $ 1# $NetBSD: options.mk,v 1.4 2016/12/30 12:54:20 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.htmldoc 3PKG_OPTIONS_VAR= PKG_OPTIONS.htmldoc
4PKG_SUPPORTED_OPTIONS= x11 4PKG_SUPPORTED_OPTIONS= # empty
5PKG_OPTIONS_OPTIONAL_GROUPS= ssl 5PKG_OPTIONS_OPTIONAL_GROUPS= ssl
6PKG_OPTIONS_GROUP.ssl= gnutls ssl 6PKG_OPTIONS_GROUP.ssl= gnutls ssl
7PKG_SUGGESTED_OPTIONS= ssl 7PKG_SUGGESTED_OPTIONS= ssl
8PKG_OPTIONS_LEGACY_OPTS+= htmldoc-gui:x11 
9 8
10.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
11 10
12### 11###
13### SSL support 12### SSL support
14### 13###
15.if !empty(PKG_OPTIONS:Mssl) || !empty(PKG_OPTIONS:Mgnutls) 14.if !empty(PKG_OPTIONS:Mssl) || !empty(PKG_OPTIONS:Mgnutls)
16CONFIGURE_ARGS+= --enable-ssl 15CONFIGURE_ARGS+= --enable-ssl
17. if !empty(PKG_OPTIONS:Mssl) 16. if !empty(PKG_OPTIONS:Mssl)
18.include "../../security/openssl/buildlink3.mk" 17.include "../../security/openssl/buildlink3.mk"
19CONFIGURE_ARGS+= --enable-openssl 18CONFIGURE_ARGS+= --enable-openssl
20CONFIGURE_ARGS+= --with-openssl-libs=${SSLBASE:Q}/lib 19CONFIGURE_ARGS+= --with-openssl-libs=${SSLBASE:Q}/lib
21CONFIGURE_ARGS+= --with-openssl-includes=${SSLBASE:Q}/include 20CONFIGURE_ARGS+= --with-openssl-includes=${SSLBASE:Q}/include
22. else 21. else
23CONFIGURE_ARGS+= --disable-openssl 22CONFIGURE_ARGS+= --disable-openssl
24. endif 23. endif
25. if !empty(PKG_OPTIONS:Mgnutls) 24. if !empty(PKG_OPTIONS:Mgnutls)
26.include "../../security/gnutls/buildlink3.mk" 25.include "../../security/gnutls/buildlink3.mk"
27.include "../../security/gnutls/libgnutls-config.mk" 26.include "../../security/gnutls/libgnutls-config.mk"
28CONFIGURE_ARGS+= --enable-gnutls 27CONFIGURE_ARGS+= --enable-gnutls
29. else 28. else
30CONFIGURE_ARGS+= --disable-gnutls 29CONFIGURE_ARGS+= --disable-gnutls
31. endif 30. endif
32.else 31.else
33CONFIGURE_ARGS+= --disable-ssl 32CONFIGURE_ARGS+= --disable-ssl
34.endif 33.endif
35 
36### 
37### X11 GUI support 
38### 
39.if !empty(PKG_OPTIONS:Mx11) 
40. include "../../x11/fltk/buildlink3.mk" 
41. include "../../x11/libXpm/buildlink3.mk" 
42CONFIGURE_ARGS+= --with-gui --with-x 
43.else 
44CONFIGURE_ARGS+= --without-gui --without-x 
45.endif 
cvs diff -r1.19 -r1.20 pkgsrc/www/htmldoc-x11/Makefile (expand / switch to unified diff)

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