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 /graphics/geomorph | |
| parent | - Allow for larger database UIDs (diff) | |
- update png to 1.5.10
Notes
Notes:
svn path=/head/; revision=297915
Diffstat (limited to 'graphics/geomorph')
| -rw-r--r-- | graphics/geomorph/Makefile | 7 | ||||
| -rw-r--r-- | graphics/geomorph/files/patch-src-utils-writepng.c | 19 |
2 files changed, 23 insertions, 3 deletions
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile index 65cea0b6f9ac..7f7935c725c1 100644 --- a/graphics/geomorph/Makefile +++ b/graphics/geomorph/Makefile @@ -7,7 +7,7 @@ PORTNAME= geomorph PORTVERSION= 0.50 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF EXTRACT_SUFX= .tgz @@ -15,7 +15,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= amdmi3@FreeBSD.org COMMENT= Height field generator and editor -LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext +LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \ + png15:${PORTSDIR}/graphics/png USE_GL= yes USE_GMAKE= yes @@ -39,7 +40,7 @@ CFLAGS+= -O0 .endif post-patch: - @${REINPLACE_CMD} -e 's|libpng|libpng14|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local/share/geomorph/GeoMorph.xpm|geomorph.xpm|' \ ${WRKSRC}/geomorph.desktop @${FIND} ${WRKSRC} -exec ${GREP} -q /usr/local/share/geomorph {} \; -print | \ diff --git a/graphics/geomorph/files/patch-src-utils-writepng.c b/graphics/geomorph/files/patch-src-utils-writepng.c new file mode 100644 index 000000000000..b4a0e142681a --- /dev/null +++ b/graphics/geomorph/files/patch-src-utils-writepng.c @@ -0,0 +1,19 @@ +--- src/utils/writepng.c.orig 2008-01-23 03:14:22.000000000 +0100 ++++ src/utils/writepng.c 2012-05-04 12:28:50.000000000 +0200 +@@ -20,6 +20,7 @@ + */ + + #include <png.h> ++#include <zlib.h> + #include <stdlib.h> + #include "./utils.h" + +@@ -75,7 +76,7 @@ + + /* Set error handling. */ + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem writing the file */ + fclose(fp); |