4 files changed, 26 insertions, 68 deletions

diff --git a/www/asp2php/Makefile b/www/asp2php/Makefile
index a2413fb52f60..ccb37e151902 100644
--- a/www/asp2php/Makefile
+++ b/www/asp2php/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	asp2php
-PORTVERSION=	0.75.1
-PORTREVISION=	1
+PORTVERSION=	0.75.11
 CATEGORIES=	www
 MASTER_SITES=	http://home.i1.net/~naken/asp2php/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 WANT_GTK=	yes
 
@@ -23,10 +22,12 @@ WANT_GTK=	yes
 .if defined(HAVE_GTK)
 USE_GTK=	yes
 ALL_TARGET=	all gtkasp2php
-INSTALL_TARGET=	install install-gtk
 PLIST_SUB+=	WANT_GTK=""
 .else
 PLIST_SUB+=	WANT_GTK="@comment "
 .endif
 
+pre-build:
+	${PERL} -pi -e "s:gtk-config:${GTK_CONFIG}:g" ${WRKSRC}/Makefile
+
 .include <bsd.port.post.mk>
diff --git a/www/asp2php/distinfo b/www/asp2php/distinfo
index 48d138dde5ef..bbbb6e32c2a0 100644
--- a/www/asp2php/distinfo
+++ b/www/asp2php/distinfo
@@ -1 +1 @@
-MD5 (asp2php0.75.1.tar.gz) = 3c947f298329672091cab4e8d1b7bdf0
+MD5 (asp2php-0.75.11.tar.gz) = 6ba4723621c5f7253f226a99f588a985
diff --git a/www/asp2php/files/patch-aa b/www/asp2php/files/patch-aa
index 8fcc67d2700d..783ad2fd88d4 100644
--- a/www/asp2php/files/patch-aa
+++ b/www/asp2php/files/patch-aa
@@ -1,66 +1,24 @@
---- Makefile	Fri Jun 30 12:30:49 2000
-+++ Makefile.new	Thu Jun 29 15:50:22 2000
-@@ -1,24 +1,23 @@
--
--default:
--	gcc -c general.c
--	gcc -c conditionals.c
--	gcc -c database.c
--	gcc -c mysql.c
--	gcc -c sybase.c
--	gcc -c odbc.c
--	gcc -c oracle.c
--	gcc -c postgres.c
--	gcc -c evalelement.c
--	gcc -c gettoken.c
--	gcc -c html.c
--	gcc -c loops.c
--	gcc -c session.c
--	gcc -o asp2php asp2php.c conditionals.o database.o \
-+CC		?= cc
-+
-+all:
-+	$(CC) -c general.c
-+	$(CC) -c conditionals.c
-+	$(CC) -c database.c
-+	$(CC) -c mysql.c
-+	$(CC) -c sybase.c
-+	$(CC) -c odbc.c
-+	$(CC) -c oracle.c
-+	$(CC) -c postgres.c
-+	$(CC) -c evalelement.c
-+	$(CC) -c gettoken.c
-+	$(CC) -c html.c
-+	$(CC) -c loops.c
-+	$(CC) -c session.c
-+	$(CC) -o asp2php asp2php.c conditionals.o database.o \
- 		evalelement.o gettoken.o html.o loops.o mysql.o\
- 		sybase.o odbc.o oracle.o postgres.o session.o general.o
--	gcc -o unipiss unipiss.c html.o
--	@echo ""
--	@echo "Done!  You may type: make gtkasp2php for the optional GUI now"
-+	$(CC) -o unipiss unipiss.c html.o
+--- Makefile.orig	Sat Dec 16 00:56:20 2000
++++ Makefile	Sat Dec 16 00:56:25 2000
+@@ -1,5 +1,5 @@
  
- clean:
- 	@if [ -e database.o ]; then rm *.o; fi;
-@@ -28,15 +29,11 @@
- 	@echo "Clean!"
+-CC=gcc
++CC=cc
  
- gtkasp2php: gtkasp2php.c
--	gcc -o gtkasp2php gtkasp2php.c `gtk-config --cflags` `gtk-config --libs`
-+	$(CC) -o gtkasp2php gtkasp2php.c `$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs`
+ default:
+ 	$(CC) -c general.c -Wall
+@@ -35,10 +35,10 @@
+ 	$(CC) -o unipiss unipiss.c html.o general.o -Wall
  
  install:
--	cp asp2php /usr/local/bin
--	cp unipiss /usr/local/bin
--
--	@echo "asp2php installed in /usr/local/bin"
--	@echo "unipiss installed in /usr/local/bin"
--	@echo "gtk2asp2php: Use from current directory"
--
--
-+	$(BSD_INSTALL_PROGRAM) asp2php $(PREFIX)/bin
-+	$(BSD_INSTALL_PROGRAM) unipiss $(PREFIX)/bin
+-	@if [ -e asp2php ]; then cp asp2php /usr/local/bin; fi;
+-	@if [ -e unipiss ]; then cp unipiss /usr/local/bin; fi;
+-	@if [ -e gtkasp2php ]; then cp gtkasp2php /usr/local/bin; fi;
+-	@echo "Compiled programs have been installed in /usr/local/bin"
++	@if [ -e asp2php ]; then $(BSD_INSTALL_PROGRAM) asp2php ${PREFIX}/bin; fi;
++	@if [ -e unipiss ]; then $(BSD_INSTALL_PROGRAM) unipiss ${PREFIX}/bin; fi;
++	@if [ -e gtkasp2php ]; then $(BSD_INSTALL_PROGRAM) gtkasp2php ${PREFIX}/bin; fi;
++	@echo "Compiled programs have been installed in ${PREFIX}/bin"
+ 	@echo ""
  
-+install-gtk:
-+	$(BSD_INSTALL_PROGRAM) gtkasp2php $(PREFIX)/bin
+ all: default
diff --git a/www/asp2php/pkg-plist b/www/asp2php/pkg-plist
index fd5f060c5499..9341a8016d13 100644
--- a/www/asp2php/pkg-plist
+++ b/www/asp2php/pkg-plist
@@ -1,3 +1,2 @@
 bin/asp2php
-bin/unipiss
 %%WANT_GTK%%bin/gtkasp2php