diff options
| author | Will Andrews <will@FreeBSD.org> | 2000-12-21 22:55:58 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2000-12-21 22:55:58 +0000 |
| commit | 00fea878011086261c946fc2732f8ecea6b9e719 (patch) | |
| tree | aec095d1174e1a852ee135610451cd563bf879fe /www | |
| parent | One more patch is needed to ensure the X11 build uses centrally (diff) | |
Fix broken MASTER_SITES. While I'm here, take pity on asp2php's Makefile
and infuse new blood into it using the magic of bsd.prog.mk. Also make a
separate install-gtk target as David Chapman tried to do in his PR (which
I committed recently).
PR: 23721
Submitted by: George Reid <greid@dogma.freebsd-uk.eu.org>
Notes
Notes:
svn path=/head/; revision=36212
Diffstat (limited to 'www')
| -rw-r--r-- | www/asp2php/Makefile | 3 | ||||
| -rw-r--r-- | www/asp2php/files/patch-aa | 66 |
2 files changed, 54 insertions, 15 deletions
diff --git a/www/asp2php/Makefile b/www/asp2php/Makefile index ccb37e151902..09f547981268 100644 --- a/www/asp2php/Makefile +++ b/www/asp2php/Makefile @@ -8,7 +8,7 @@ PORTNAME= asp2php PORTVERSION= 0.75.11 CATEGORIES= www -MASTER_SITES= http://home.i1.net/~naken/asp2php/ +MASTER_SITES= http://www.naken.cc/asp2php/ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -22,6 +22,7 @@ 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 " diff --git a/www/asp2php/files/patch-aa b/www/asp2php/files/patch-aa index 783ad2fd88d4..b760c395b09c 100644 --- a/www/asp2php/files/patch-aa +++ b/www/asp2php/files/patch-aa @@ -1,24 +1,62 @@ ---- Makefile.orig Sat Dec 16 00:56:20 2000 -+++ Makefile Sat Dec 16 00:56:25 2000 -@@ -1,5 +1,5 @@ - +--- Makefile Mon Nov 27 07:43:28 2000 ++++ Makefile.new Thu Dec 21 17:51:49 2000 +@@ -1,46 +1,21 @@ +- -CC=gcc -+CC=cc +- +-default: +- $(CC) -c general.c -Wall +- $(CC) -c conditionals.c -Wall +- $(CC) -c database.c -Wall +- $(CC) -c mysql.c -Wall +- $(CC) -c sybase.c -Wall +- $(CC) -c odbc.c -Wall +- $(CC) -c oracle.c -Wall +- $(CC) -c postgres.c -Wall +- $(CC) -c evalelement.c -Wall +- $(CC) -c gettoken.c -Wall +- $(CC) -c html.c -Wall +- $(CC) -c loops.c -Wall +- $(CC) -c session.c -Wall +- $(CC) -o asp2php asp2php.c general.o conditionals.o database.o \ +- evalelement.o gettoken.o html.o loops.o mysql.o\ +- sybase.o odbc.o oracle.o postgres.o session.o -Wall +- @echo "" +-# @echo "Done! You may type: make gtkasp2php for the optional GUI now" +- +-clean: +- @if [ -e database.o ]; then rm *.o; fi; +- @if [ -e asp2php ]; then rm asp2php; fi; +- @if [ -e gtkasp2php ]; then rm gtkasp2php; fi; +- @if [ -e unipiss ]; then rm unipiss; fi; +- @echo "Clean!" ++PROG= asp2php ++NOMAN= true ++CC?= cc ++CFLAGS?=-O -pipe ++CFLAGS+=-Wall ++SRCS= general.c conditionals.c database.c mysql.c sybase.c odbc.c oracle.c \ ++ postgres.c evalelement.c gettoken.c html.c loops.c session.c asp2php.c ++CLEANFILES+= gtkasp2php.o gtkasp2php - default: - $(CC) -c general.c -Wall -@@ -35,10 +35,10 @@ - $(CC) -o unipiss unipiss.c html.o general.o -Wall + gtkasp2php: gtkasp2php.c + $(CC) -o gtkasp2php gtkasp2php.c `gtk-config --cflags` `gtk-config --libs` +-unipiss: +- $(CC) -o unipiss unipiss.c html.o general.o -Wall +- install: - @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" ++ @if [ -e asp2php ]; then $(BSD_INSTALL_PROGRAM) asp2php $(PREFIX)/bin; fi; ++ @echo "Compiled programs have been installed in $(PREFIX)/bin" @echo "" - all: default +-all: default +- ++install-gtk: ++ @if [ -e gtkasp2php ]; then $(BSD_INSTALL_PROGRAM) gtkasp2php $(PREFIX)/bin; fi; + ++.include <bsd.prog.mk> |