svn commit: r375383 - in head/textproc/htmldoc: . files
Antoine Brodin
antoine at FreeBSD.org
Wed Dec 24 01:36:26 UTC 2014
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, at 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 <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
More information about the svn-ports-head
mailing list