Index: head/textproc/htmldoc/Makefile
===================================================================
--- head/textproc/htmldoc/Makefile (revision 478106)
+++ head/textproc/htmldoc/Makefile (revision 478107)
@@ -1,62 +1,62 @@
# Created by: Glenn Trewitt
# $FreeBSD$
PORTNAME= htmldoc
PORTVERSION= 1.8.28
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= https://github.com/michaelrsweet/htmldoc/releases/download/release-${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= jose@diasfernandes.pt
COMMENT= Converts HTML to PDF and/or PostScript
LICENSE= GPLv2
BROKEN_SSL= openssl-devel
LIB_DEPENDS= libpng.so:graphics/png
OPTIONS_DEFINE= HTMLDOCGUI
HTMLDOCGUI_DESC= Build GUI front-end
USES= jpeg tar:bzip2 ssl
GNU_CONFIGURE= yes
# Configure seems broken and ignores these ATM:
CONFIGURE_ARGS+=--disable-localjpeg --disable-localzlib --disable-localpng
# Explicitely disable gnutls as it fails to build if detected
CONFIGURE_ARGS+=--disable-gnutls
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
CPPFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${LOCALBASE}/lib
HTMLDOCGUI_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
HTMLDOCGUI_CONFIGURE_ON= --with-gui=yes
HTMLDOCGUI_CONFIGURE_OFF= --with-gui=no
post-patch:
${REINPLACE_CMD} -e 's,@JPEG@ @ZLIB@ @PNG@ ,,' ${WRKSRC}/Makefile.in
${REINPLACE_CMD} -e 's|@LDFLAGS@|-L${LOCALBASE}/lib @LDFLAGS@|' \
-e 's|@JPEGINC@ @PNGINC@ @ZLIBINC@|-I${LOCALBASE}/include|' \
${WRKSRC}/Makedefs.in
# 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
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc
.include
Index: head/textproc/htmldoc/files/patch-htmldoc__http.c
===================================================================
--- head/textproc/htmldoc/files/patch-htmldoc__http.c (revision 478106)
+++ head/textproc/htmldoc/files/patch-htmldoc__http.c (revision 478107)
@@ -1,11 +1,11 @@
--- ./htmldoc/http.c.orig 2014-01-05 21:41:32.000000000 +0100
+++ ./htmldoc/http.c 2014-01-28 04:47:07.000000000 +0100
@@ -1228,6 +1228,8 @@
* Using the current time is a dubious random seed, but on some systems
* it is the best we can do (on others, this seed isn't even used...)
*/
+#define CUPS_RAND() arc4random()
-+#define CUPS_SRAND(v) arc4random_stir()
++#define CUPS_SRAND(v)
CUPS_SRAND(time(NULL));