svn commit: r487012 - in head/textproc/htmldoc: . files
Steve Wills
swills at FreeBSD.org
Sun Dec 9 02:48:33 UTC 2018
Author: swills
Date: Sun Dec 9 02:48:31 2018
New Revision: 487012
URL: https://svnweb.freebsd.org/changeset/ports/487012
Log:
textproc/htmldoc: Update to 1.9.3
PR: 223721
Submitted by: Nathan <ndowens at yahoo.com>
Submitted by: delphij
Reported by: Zsolt Udvari <uzsolt at uzsolt.hu>
Deleted:
head/textproc/htmldoc/files/
Modified:
head/textproc/htmldoc/Makefile (contents, props changed)
head/textproc/htmldoc/distinfo (contents, props changed)
head/textproc/htmldoc/pkg-descr (contents, props changed)
Modified: head/textproc/htmldoc/Makefile
==============================================================================
--- head/textproc/htmldoc/Makefile Sun Dec 9 01:50:25 2018 (r487011)
+++ head/textproc/htmldoc/Makefile Sun Dec 9 02:48:31 2018 (r487012)
@@ -1,62 +1,49 @@
# Created by: Glenn Trewitt <glenn at trewitt.org>
# $FreeBSD$
-PORTNAME= htmldoc
-PORTVERSION= 1.8.28
-PORTREVISION= 4
-CATEGORIES= textproc
-MASTER_SITES= https://github.com/michaelrsweet/htmldoc/releases/download/release-${PORTVERSION}/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-source
+PORTNAME= htmldoc
+PORTVERSION= 1.9.3
+DISTVERSIONPREFIX= v
+CATEGORIES= textproc
MAINTAINER= jose at diasfernandes.pt
COMMENT= Converts HTML to PDF and/or PostScript
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN_SSL= openssl111
+BROKEN_mips= Complains of expecting ) before png_ptr
LIB_DEPENDS= libpng.so:graphics/png
-OPTIONS_DEFINE= HTMLDOCGUI
-HTMLDOCGUI_DESC= Build GUI front-end
+USE_GITHUB= yes
+GH_ACCOUNT= michaelrsweet
-USES= jpeg tar:bzip2 ssl
+HAS_CONFIGURE= yes
+MAKE_ARGS= mandir="${MANDIRS}"
-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
+OPTIONS_DEFINE= HTMLDOCGUI GNUTLS
+OPTIONS_DEFAULT= GNUTLS
-HTMLDOCGUI_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
-HTMLDOCGUI_CONFIGURE_ON= --with-gui=yes
-HTMLDOCGUI_CONFIGURE_OFF= --with-gui=no
+HTMLDOCGUI_DESC= Build GUI front-end
+HTMLDOCGUI_CONFIGURE_WITH= gui=yes
+HTMLDOCGUI_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \
+ libfontconfig.so:x11-fonts/fontconfig
+HTMLDOCGUI_USE= XORG=x11,xrender,xcursor,xfixes \
+ xext,xft,xinerama jpeg
+GNUTLS_CONFIGURE_ENABLE= gnutls
+GNUTLS_USES= pkgconfig
+GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
-post-patch:
- ${REINPLACE_CMD} -e 's, at 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
+.include <bsd.port.pre.mk>
-post-configure:
- ${REINPLACE_CMD} -e \
- 's|../png/libpng.a ../zlib/libz.a ../jpeg/libjpeg.a|-ljpeg -lpng -lz|' ${WRKSRC}/Makedefs
+# Fix arm64 build
+.if ${ARCH} == "aarch64"
+pre-build:
+ ${REINPLACE_CMD} -e '/PNG_FILTER_OPTIMIZATIONS(pp, bpp);/d' ${WRKSRC}/png/pngrutil.c
+.endif
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/textproc/htmldoc/distinfo
==============================================================================
--- head/textproc/htmldoc/distinfo Sun Dec 9 01:50:25 2018 (r487011)
+++ head/textproc/htmldoc/distinfo Sun Dec 9 02:48:31 2018 (r487012)
@@ -1,2 +1,3 @@
-SHA256 (htmldoc-1.8.28-source.tar.bz2) = 2a688bd820ad6f7bdebb274716102dafbf4d5fcfa20a5b8d87a56b030d184732
-SIZE (htmldoc-1.8.28-source.tar.bz2) = 4026568
+TIMESTAMP = 1535061183
+SHA256 (michaelrsweet-htmldoc-v1.9.3_GH0.tar.gz) = 601ad21f6aa7adf57a6fcfeab180dc39d6b99ec2f52f0e559df5bb57f087eb2e
+SIZE (michaelrsweet-htmldoc-v1.9.3_GH0.tar.gz) = 4482204
Modified: head/textproc/htmldoc/pkg-descr
==============================================================================
--- head/textproc/htmldoc/pkg-descr Sun Dec 9 01:50:25 2018 (r487011)
+++ head/textproc/htmldoc/pkg-descr Sun Dec 9 02:48:31 2018 (r487012)
@@ -14,4 +14,4 @@ In my opinion, HTMLDOC is *fast*, compared to the othe
HTMLDOC is available under the GPL.
Commercial support is available from the author.
-WWW: http://www.htmldoc.org/
+WWW: http://michaelrsweet.github.io/htmldoc
More information about the svn-ports-all
mailing list