From owner-svn-ports-all@FreeBSD.ORG Wed Dec 24 01:36:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C16FFBCA; Wed, 24 Dec 2014 01:36:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 935C61B61; Wed, 24 Dec 2014 01:36:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBO1aQCq086609; Wed, 24 Dec 2014 01:36:26 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBO1aQed086608; Wed, 24 Dec 2014 01:36:26 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412240136.sBO1aQed086608@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 24 Dec 2014 01:36:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375383 - in head/textproc/htmldoc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Wed, 24 Dec 2014 01:36:26 -0000 Author: antoine Date: Wed Dec 24 01:36:25 2014 New Revision: 375383 URL: https://svnweb.freebsd.org/changeset/ports/375383 QAT: https://qat.redports.org/buildarchive/r375383/ Log: - Properly support png15, remove useless patch - Allow building with openssl from ports Deleted: head/textproc/htmldoc/files/patch-htmldoc__image.cxx Modified: head/textproc/htmldoc/Makefile Modified: head/textproc/htmldoc/Makefile ============================================================================== --- head/textproc/htmldoc/Makefile Wed Dec 24 01:30:48 2014 (r375382) +++ head/textproc/htmldoc/Makefile Wed Dec 24 01:36:25 2014 (r375383) @@ -3,6 +3,7 @@ PORTNAME= htmldoc PORTVERSION= 1.8.28 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.msweet.org/files/project1/ \ ${MASTER_SITE_EASYSW} @@ -15,12 +16,13 @@ COMMENT= Converts HTML to PDF and/or Pos LICENSE= GPLv2 LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng15.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png OPTIONS_DEFINE= HTMLDOCGUI HTMLDOCGUI_DESC= Build GUI front-end -USES= tar:bzip2 +USES= tar:bzip2 +USE_OPENSSL= yes GNU_CONFIGURE= yes # Configure seems broken and ignores these ATM: @@ -32,12 +34,17 @@ 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:${PORTSDIR}/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 -I${LOCALBASE}/include/libpng15|' \ + -e 's|@JPEGINC@ @PNGINC@ @ZLIBINC@|-I${LOCALBASE}/include|' \ ${WRKSRC}/Makedefs.in # Remove redundant code: ${REINPLACE_CMD} -Ee 's,(md5|snprintf|rc4)\.o,,g' \ @@ -52,13 +59,4 @@ post-configure: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc -.include -.include - -.if ${PORT_OPTIONS:MHTMLDOCGUI} -LIB_DEPENDS+= libfltk.so:${PORTSDIR}/x11-toolkits/fltk -CONFIGURE_ARGS+=--with-gui=yes -.else -CONFIGURE_ARGS+=--with-gui=no -.endif -.include +.include