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 /x11-toolkits/gnustep-gui | |
| parent | - Allow for larger database UIDs (diff) | |
- update png to 1.5.10
Notes
Notes:
svn path=/head/; revision=297915
Diffstat (limited to 'x11-toolkits/gnustep-gui')
| -rw-r--r-- | x11-toolkits/gnustep-gui/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m | 15 |
2 files changed, 22 insertions, 2 deletions
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index e505dc5f8d5e..a9918cdfbf8b 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -10,7 +10,7 @@ PORTNAME= gnustep-gui PORTVERSION= 0.20.0 .else PORTVERSION= 0.17.1 -PORTREVISION= 2 +PORTREVISION= 3 .endif CATEGORIES= x11-toolkits gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} @@ -21,7 +21,7 @@ COMMENT= GNUstep GUI library LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib .if defined(WITH_GNUSTEP_DEVEL) LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile @@ -56,6 +56,8 @@ MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM BREAKS_IF_PEDANTIC= yes PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} +ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include/libpng15 + .if defined(WITH_GNUSTEP_DEVEL) EXTRA_PATCHES+= ${FILESDIR}/AudioOutputSink.m.patch .endif @@ -93,6 +95,9 @@ PLIST_SUB+= WITH_ASPELL="" PLIST_SUB+= WITH_ASPELL="@comment " .endif +post-patch: + ${REINPLACE_CMD} -e "s|libpng/png.h|png.h|" ${WRKSRC}/configure + pre-configure: .for file in config.guess config.sub install-sh @${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC} diff --git a/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m b/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m new file mode 100644 index 000000000000..8432441cfac2 --- /dev/null +++ b/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m @@ -0,0 +1,15 @@ +--- Source/NSBitmapImageRep+PNG.m.orig 2009-02-17 00:23:41.000000000 +0100 ++++ Source/NSBitmapImageRep+PNG.m 2012-04-27 18:54:35.000000000 +0200 +@@ -33,9 +33,11 @@ + #if HAVE_LIBPNG + + #ifdef HAVE_LIBPNG_PNG_H +-#include <libpng/png.h> ++#include <png.h> ++#include <pngpriv.h> + #else + #include <png.h> ++#include <pngpriv.h> + #endif + + #include <Foundation/NSData.h> |