Fix build with current png and gtk2. Fix patch-aa to not (inadvertently?)

disable optimization. No version bump since package wasn't buildable.

3 files changed, 26 insertions, 5 deletions

diff --git a/graphics/gfract/distinfo b/graphics/gfract/distinfo
index 074ce96ff6b..b7db40f54e6 100644
--- a/graphics/gfract/distinfo
+++ b/graphics/gfract/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/10/05 22:14:33 joerg Exp $
+$NetBSD: distinfo,v 1.8 2011/07/05 04:28:34 dholland Exp $
 
 SHA1 (gfract-0.32.tar.gz) = f603c067c9616ebde714b72b3bda801e9906d6c3
 RMD160 (gfract-0.32.tar.gz) = 6196bd3cc17c4c41bbd0b7df4cbe0691e52de521
@@ -6,4 +6,5 @@ Size (gfract-0.32.tar.gz) = 34166 bytes
 SHA1 (gfract-palettes-0.1.tar.gz) = f05e06e6012e1b1526e0c796ca7f6617fca8ab7d
 RMD160 (gfract-palettes-0.1.tar.gz) = 3430c31cb5cb2317a02b1e2cf506c5ffa9601a7c
 Size (gfract-palettes-0.1.tar.gz) = 223648 bytes
-SHA1 (patch-aa) = 9e15a3cb22101e895db398ad8dc703994bcadccf
+SHA1 (patch-aa) = 374c5fc29e3b3b07a5b0873ee1d042128b1ae5b8
+SHA1 (patch-my_png_cpp) = 3bfa0a24aa62e9b71f6bc6d7f2060b2a185a9daa
diff --git a/graphics/gfract/patches/patch-aa b/graphics/gfract/patches/patch-aa
index 21c430f4203..6d058bfba00 100644
--- a/graphics/gfract/patches/patch-aa
+++ b/graphics/gfract/patches/patch-aa
@@ -1,4 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2007/10/05 22:14:34 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2011/07/05 04:28:34 dholland Exp $
+
+Don't disable deprecated functions; more stuff has been deprecated
+since this package was shipped. Don't use -ansi -pedantic either.
+
+Configure for pkgsrc.
 
 --- Makefile.orig	2005-02-28 15:00:56.000000000 +0000
 +++ Makefile
@@ -8,12 +13,12 @@ $NetBSD: patch-aa,v 1.6 2007/10/05 22:14:34 joerg Exp $
  
 -DEFS := -Wall -ansi -pedantic -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATED \
 -	-DGTK_DISABLE_DEPRECATED
-+DEFS := -Wall -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATED
++DEFS := -Wall -D_GNU_SOURCE
  
  DEFS := $(shell pkg-config --cflags gtk+-2.0) $(DEFS)
  
 -CXXFLAGS := $(DEFS) -O2 -fomit-frame-pointer -ffast-math
-+CXXFLAGS := $(DEFS)
++CXXFLAGS += $(DEFS)
  #CXXFLAGS := $(DEFS) -g
  
  LDFLAGS := -lpng -lz
diff --git a/graphics/gfract/patches/patch-my_png_cpp b/graphics/gfract/patches/patch-my_png_cpp
new file mode 100644
index 00000000000..6ff0d7e7105
--- /dev/null
+++ b/graphics/gfract/patches/patch-my_png_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-my_png_cpp,v 1.1 2011/07/05 04:28:34 dholland Exp $
+
+Update for png 1.5.
+
+--- my_png.cpp~	2005-02-28 15:00:56.000000000 +0000
++++ my_png.cpp
+@@ -58,7 +58,7 @@ void save_file(image_info* img, char* fi
+         return;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         fprintf(stderr, "Internal error in libpng\n");
+         if (png_pal)
+             delete[] png_pal;