diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /textproc/htmldoc | |
| parent | - Allow for larger database UIDs (diff) | |
- update png to 1.5.10
Diffstat (limited to 'textproc/htmldoc')
| -rw-r--r-- | textproc/htmldoc/Makefile | 6 | ||||
| -rw-r--r-- | textproc/htmldoc/files/patch-image.cxx | 19 |
2 files changed, 22 insertions, 3 deletions
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile index a31606f1687a..2df6b492d83f 100644 --- a/textproc/htmldoc/Makefile +++ b/textproc/htmldoc/Makefile @@ -7,7 +7,7 @@ PORTNAME= htmldoc PORTVERSION= 1.8.27 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} @@ -17,7 +17,7 @@ MAINTAINER= jose@diasfernandes.pt COMMENT= Converts HTML to PDF and/or PostScript LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png OPTIONS= HTMLDOCGUI "Build GUI front-end" off # .bz2 file is available since Aug 2, but we don't want to @@ -36,7 +36,7 @@ MAN1= htmldoc.1 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|' \ + -e 's|@JPEGINC@ @PNGINC@ @ZLIBINC@|-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15|' \ ${WRKSRC}/Makedefs.in # Remove redundant code: ${REINPLACE_CMD} -Ee 's,(md5|snprintf|rc4)\.o,,g' \ diff --git a/textproc/htmldoc/files/patch-image.cxx b/textproc/htmldoc/files/patch-image.cxx new file mode 100644 index 000000000000..7aba1dfbf53b --- /dev/null +++ b/textproc/htmldoc/files/patch-image.cxx @@ -0,0 +1,19 @@ +--- htmldoc/image.cxx.orig 2006-05-31 21:00:02.000000000 +0200 ++++ htmldoc/image.cxx 2012-05-06 15:44:04.000000000 +0200 +@@ -56,6 +56,7 @@ + } + + #include <png.h> /* Portable Network Graphics (PNG) definitions */ ++#include <pngpriv.h> + + + /* +@@ -1499,7 +1500,7 @@ + + rows = NULL; + +- if (setjmp(pp->jmpbuf)) ++ if (setjmp(png_jmpbuf(pp))) + { + progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!"); + |