Updated to version 0.76.17, sync patches with the non-gtk version.

5 files changed, 53 insertions, 25 deletions

diff --git a/www/gtkasp2php/Makefile b/www/gtkasp2php/Makefile
index 72b88baeb4b..06e1f578143 100644
--- a/www/gtkasp2php/Makefile
+++ b/www/gtkasp2php/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/04/27 05:44:23 snj Exp $
+# $NetBSD: Makefile,v 1.10 2004/07/11 00:32:43 salo Exp $
+#
 
-DISTNAME=	asp2php-0.76.10
-PKGREVISION=	2
+DISTNAME=	asp2php-0.76.17
 PKGNAME=	gtk${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://65.108.58.129/asp2php/
@@ -15,4 +15,5 @@ USE_BUILDLINK3=	YES
 ALL_TARGET=	all gui
 
 .include "../../x11/gtk/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkasp2php/distinfo b/www/gtkasp2php/distinfo
index 12677ab2b34..8a6fcb26dc0 100644
--- a/www/gtkasp2php/distinfo
+++ b/www/gtkasp2php/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/06/10 02:16:23 shell Exp $
+$NetBSD: distinfo,v 1.4 2004/07/11 00:32:43 salo Exp $
 
-SHA1 (asp2php-0.76.10.tar.gz) = f36dcadb7c171b6b0dc9ce1908da7a705279101b
-Size (asp2php-0.76.10.tar.gz) = 49983 bytes
-SHA1 (patch-aa) = 3e82a4ee63ea0e3050ce7eac3ccc2f675aa701b8
+SHA1 (asp2php-0.76.17.tar.gz) = 9fe485f8f738c11a7104b935cbcadf365195bac4
+Size (asp2php-0.76.17.tar.gz) = 53793 bytes
+SHA1 (patch-aa) = 3a87acc4ebf3681bbb522b0695828967b7966e23
+SHA1 (patch-ab) = a95a8ffcac811b32bb467482c0e208e9f8ab0bdd
+SHA1 (patch-ac) = e833373ae539b142849b9f89755d391532155846
diff --git a/www/gtkasp2php/patches/patch-aa b/www/gtkasp2php/patches/patch-aa
index 9278f54eeb0..9515a3893cd 100644
--- a/www/gtkasp2php/patches/patch-aa
+++ b/www/gtkasp2php/patches/patch-aa
@@ -1,31 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2002/06/10 02:16:24 shell Exp $
+$NetBSD: patch-aa,v 1.3 2004/07/11 00:32:43 salo Exp $
 
---- Makefile.orig	Fri May 31 05:13:18 2002
-+++ Makefile
-@@ -1,6 +1,6 @@
- 
--CC=gcc
--LD=ld
-+CC+=${CFLAGS}
+--- Makefile.orig	2003-03-26 19:35:11.000000000 +0100
++++ Makefile	2004-07-11 02:22:19.000000000 +0200
+@@ -2,6 +2,7 @@
+ CC=gcc
+ LD=ld
+ CFLAGS=-Wall
 +BINDIR=${PREFIX}/bin
  
  default:
  	cd src && make
-@@ -16,14 +16,12 @@
+@@ -18,10 +19,7 @@
  	@mv src/gtkasp2php .
  
  install:
 -	@if [ -e asp2php ]; then install asp2php /usr/local/bin; fi;
 -	@if [ -e gtkasp2php ]; then install gtkasp2php /usr/local/bin; fi;
 -	@echo "Compiled programs have been installed in /usr/local/bin"
-+	@if [ -e gtkasp2php ]; then install gtkasp2php ${BINDIR}; fi;
-+	@echo "Compiled programs have been installed in ${BINDIR}"
- 	@echo ""
+-	@echo ""
++	${BSD_INSTALL_PROGRAM} gtkasp2php ${BINDIR}
  
  uninstall:
--	@if [ -e /usr/local/bin/asp2php ]; then rm /usr/local/bin/asp2php; fi;
--	@if [ -e /usr/local/bin/gtkasp2php ]; then rm /usr/local/bin/gtkasp2php; fi;
-+	@if [ -e ${BINDIR}/gtkasp2php ]; then rm ${BINDIR}/gtkasp2php; fi;
- 	@echo "asp2php has been uninstalled."
- 	@echo ""
- 
+ 	@if [ -e /usr/local/bin/asp2php ]; then rm /usr/local/bin/asp2php; fi;
diff --git a/www/gtkasp2php/patches/patch-ab b/www/gtkasp2php/patches/patch-ab
new file mode 100644
index 00000000000..48e6d7ec867
--- /dev/null
+++ b/www/gtkasp2php/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2004/07/11 00:32:43 salo Exp $
+
+--- src/Makefile.orig	2003-03-26 19:35:11.000000000 +0100
++++ src/Makefile	2004-07-11 02:08:45.000000000 +0200
+@@ -1,8 +1,8 @@
+ 
+-CC=gcc
+-LD=ld
++#CC=gcc
++#LD=ld
+ #FLAGS=-DDEBUG
+-CFLAGS=-Wall
++#CFLAGS=-Wall
+ 
+ default:
+ 	@cd jscript && make
diff --git a/www/gtkasp2php/patches/patch-ac b/www/gtkasp2php/patches/patch-ac
new file mode 100644
index 00000000000..e25761824ce
--- /dev/null
+++ b/www/gtkasp2php/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2004/07/11 00:32:43 salo Exp $
+
+--- src/jscript/Makefile.orig	2003-03-26 19:35:11.000000000 +0100
++++ src/jscript/Makefile	2004-07-11 02:14:17.000000000 +0200
+@@ -1,8 +1,8 @@
+ 
+-CC=gcc
+-LD=ld
++#CC=gcc
++#LD=ld
+ #FLAGS=-DDEBUG
+-CFLAGS=-Wall
++#CFLAGS=-Wall
+ 
+ default:
+ 	$(CC) -c conditionals_j.c $(CFLAGS) $(FLAGS)