diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2014-01-29 20:18:52 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2014-01-29 20:18:52 +0000 |
| commit | 01abf783d2fc93e5ebc4c473b9680bb445b2aafd (patch) | |
| tree | b79f92667f13a655fa2a0ae2ae1ff9b79c413481 /textproc/htmldoc/Makefile | |
| parent | - Update to 1.10.7 (diff) | |
Upgrade to HTMLDOC 1.8.28, fixing security-relevant bugs.
Support staging, and modernize LIB_DEPENDS.
Tweak build environment to get proper detection of png/jpeg libs.
Switch to using BZIP2 tarballs.
PR: ports/186024
Approved by: jose@diasfernandes.pt (maintainer)
Security: 6d08fa63-83bf-11e3-bdba-080027ef73ec
Diffstat (limited to 'textproc/htmldoc/Makefile')
| -rw-r--r-- | textproc/htmldoc/Makefile | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile index 51c7b3682336..79ffdb62e933 100644 --- a/textproc/htmldoc/Makefile +++ b/textproc/htmldoc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= htmldoc -PORTVERSION= 1.8.27 -PORTREVISION= 7 +PORTVERSION= 1.8.28 CATEGORIES= textproc MASTER_SITES= http://www.msweet.org/files/project1/ \ ${MASTER_SITE_EASYSW} @@ -13,25 +12,27 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= jose@diasfernandes.pt COMMENT= Converts HTML to PDF and/or PostScript -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png +LICENSE= GPLv2 + +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png OPTIONS_DEFINE= HTMLDOCGUI HTMLDOCGUI_DESC= Build GUI front-end -# .bz2 file is available since Aug 2, but we don't want to -# start mirroring _in addition to_ the .gz variant. When the -# vendor's release is updated again, we should switch to .bz2 -#USE_BZIP2= yes +USE_BZIP2= yes GNU_CONFIGURE= yes -NO_STAGE= yes # Configure seems broken and ignores these ATM: -CONFIGURE_ARGS+=--enable-localjpeg --enable-localzlib --enable-localpng +CONFIGURE_ARGS+=--disable-localjpeg --disable-localzlib --disable-localpng WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} EXCLUDE= png jpeg zlib htmldoc/md5* htmldoc/rc4* htmldoc/snprintf* EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} +INSTALL_TARGET= install \ + bindir=${STAGEDIR}${PREFIX}/bin \ + datadir=${STAGEDIR}${PREFIX}/share \ + mandir=${STAGEDIR}${MANPREFIX}/man +LDFLAGS+= -L${LOCALBASE}/lib -MAN1= htmldoc.1 post-patch: ${REINPLACE_CMD} -e 's,@JPEG@ @ZLIB@ @PNG@ ,,' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|@LDFLAGS@|-L${LOCALBASE}/lib @LDFLAGS@|' \ @@ -40,13 +41,18 @@ post-patch: # Remove redundant code: ${REINPLACE_CMD} -Ee 's,(md5|snprintf|rc4)\.o,,g' \ ${WRKSRC}/htmldoc/Makefile + ${REINPLACE_CMD} -Ee 's,md5-private\.h,,;s,rc4\.h,,' \ + ${WRKSRC}/htmldoc/Dependencies post-configure: ${REINPLACE_CMD} -e \ 's|../png/libpng.a ../zlib/libz.a ../jpeg/libjpeg.a|-ljpeg -lpng -lz|' ${WRKSRC}/Makedefs -.include <bsd.port.pre.mk> +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc + .include <bsd.port.options.mk> +.include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MHTMLDOCGUI} LIB_DEPENDS+= fltk:${PORTSDIR}/x11-toolkits/fltk |