From owner-svn-ports-all@freebsd.org Sun Dec 9 02:48:33 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0747C1333DE2; Sun, 9 Dec 2018 02:48:33 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9FDB174729; Sun, 9 Dec 2018 02:48:32 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B3EA2FFB; Sun, 9 Dec 2018 02:48:32 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB92mW4X041782; Sun, 9 Dec 2018 02:48:32 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB92mVjO041779; Sun, 9 Dec 2018 02:48:31 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201812090248.wB92mVjO041779@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 9 Dec 2018 02:48:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487012 - in head/textproc/htmldoc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/textproc/htmldoc: . files X-SVN-Commit-Revision: 487012 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9FDB174729 X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.99)[-0.991,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2018 02:48:33 -0000 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 Submitted by: delphij Reported by: Zsolt Udvari 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 # $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@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,@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 -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 +.include 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