- Restore png support

PR:		ports/94768
Submitted by:	Soeren Straarup <xride@x12.dk> (maintainer)

4 files changed, 16 insertions, 7 deletions

diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile
index 99ec40609568..06f618e33618 100644
--- a/comms/xnecview/Makefile
+++ b/comms/xnecview/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xnecview
 PORTVERSION=	1.34
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wwwhome.cs.utwente.nl/%7Eptdeboer/ham/xnecview/
 EXTRACT_SUFX=	.tgz
diff --git a/comms/xnecview/files/patch-Makefile b/comms/xnecview/files/patch-Makefile
index f9ec5eff786c..85c6b11c1fa7 100644
--- a/comms/xnecview/files/patch-Makefile
+++ b/comms/xnecview/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	Fri Dec 27 23:23:23 2002
-+++ Makefile	Fri Mar 17 17:59:24 2006
-@@ -4,14 +4,14 @@
++++ Makefile	Sun Mar 19 06:56:59 2006
+@@ -4,14 +4,15 @@
  
  
  CC	= gcc
@@ -12,7 +12,7 @@
 +LDFLAGS	= `pkg-config --libs gtk+-2.0` -lm
  
  ifeq ($(PNG),yes)
--CFLAGS	+= -DHAVE_LIBPNG
+ CFLAGS	+= -DHAVE_LIBPNG
 -LDFLAGS	+= -lpng
 +CFLAGS	+= `pkg-config --cflags ${LOCALBASE}/libdata/pkgconfig/libpng12.pc`
 +LDFLAGS	+= `pkg-config --libs ${LOCALBASE}/libdata/pkgconfig/libpng12.pc`
diff --git a/comms/xnecview/files/patch-parse_output.c b/comms/xnecview/files/patch-parse_output.c
index 44962cab24bb..627330f4eab3 100644
--- a/comms/xnecview/files/patch-parse_output.c
+++ b/comms/xnecview/files/patch-parse_output.c
@@ -1,6 +1,6 @@
 --- parse_output.c.orig	Fri Mar 17 20:32:22 2006
 +++ parse_output.c	Fri Mar 17 20:30:42 2006
-@@ -749,9 +749,10 @@
+@@ -749,9 +749,9 @@
        EXPAND_IF_NECESSARY(numneco,maxfreqs,neco)
     
        /* search for the frequency and read it */
@@ -8,7 +8,6 @@
 +      do fgets(s,200,f);  while (!feof(f) && !strstr(s,"FREQUENCY : "));
        if (feof(f)) break;
 -      p = strchr(s,'=');
-+printf("XXX\n");
 +      p = strchr(s,':');
        freq = atof(p+1);
  
diff --git a/comms/xnecview/files/patch-xwin.c b/comms/xnecview/files/patch-xwin.c
index e1ee2fccbde4..ac537c6b581c 100644
--- a/comms/xnecview/files/patch-xwin.c
+++ b/comms/xnecview/files/patch-xwin.c
@@ -1,5 +1,5 @@
---- xwin.c.orig	Fri Mar 17 20:50:07 2006
-+++ xwin.c	Fri Mar 17 20:50:52 2006
+--- xwin.c.orig	Wed Sep 10 22:55:30 2003
++++ xwin.c	Tue Mar 21 07:05:23 2006
 @@ -13,6 +13,7 @@
  #include <math.h>
  #include <stdio.h>
@@ -8,6 +8,15 @@
  #include <gtk/gtk.h>
  #include <gdk/gdkx.h>
  #include <gdk/gdkkeysyms.h>
+@@ -261,7 +262,7 @@
+    f=fopen(filename,"w");
+    if (!f) return 1;
+ 
+-   image = gdk_image_get(gbackg, 0, 0, width, height);
++   image = gdk_image_get(w, 0, 0, width, height);
+    if (!image) {
+       fclose(f);
+       return 1;
 @@ -1378,7 +1379,7 @@
  
        gtk_widget_grab_focus(gdraw1);