From 3707e5b7408ecadb0bda141dd82ec9bbca5d0267 Mon Sep 17 00:00:00 2001 From: Jeremy Lea Date: Thu, 5 Oct 2000 06:47:41 +0000 Subject: Implment WANT_GTK. --- www/asp2php/Makefile | 29 +++++++---------------------- www/asp2php/files/patch-aa | 10 ++++------ 2 files changed, 11 insertions(+), 28 deletions(-) (limited to 'www') diff --git a/www/asp2php/Makefile b/www/asp2php/Makefile index f3c4aa7e5ed9..1f05a8ad5e7b 100644 --- a/www/asp2php/Makefile +++ b/www/asp2php/Makefile @@ -13,17 +13,14 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org -.if defined(WANT_GTK) -LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}" -ALL_TARGET= all -INSTALL_TARGET= install -.if defined(WANT_GTK) +WANT_GTK= yes + +.include + +.if defined(HAVE_GTK) +USE_GTK= yes ALL_TARGET+= gtkasp2php INSTALL_TARGET+=install-gtk PLIST_SUB+= WANT_GTK="" @@ -31,16 +28,4 @@ PLIST_SUB+= WANT_GTK="" PLIST_SUB+= WANT_GTK="@comment " .endif -pre-fetch: - @${ECHO} -.if !defined(WANT_GTK) - @${ECHO} "If you want the GTK frontend, define the WANT_GTK variable" - @${ECHO} "in your make args. For example:" - @${ECHO} - @${ECHO} " make -DWANT_GTK" -.else - @${ECHO} "Building with GTK frontend." -.endif - @${ECHO} - -.include +.include diff --git a/www/asp2php/files/patch-aa b/www/asp2php/files/patch-aa index eb75b86c5b51..8fcc67d2700d 100644 --- a/www/asp2php/files/patch-aa +++ b/www/asp2php/files/patch-aa @@ -1,6 +1,6 @@ --- Makefile Fri Jun 30 12:30:49 2000 +++ Makefile.new Thu Jun 29 15:50:22 2000 -@@ -1,24 +1,25 @@ +@@ -1,24 +1,23 @@ - -default: - gcc -c general.c @@ -18,8 +18,6 @@ - gcc -c session.c - gcc -o asp2php asp2php.c conditionals.o database.o \ +CC ?= cc -+GTK_CONFIG ?= gtk12-config -+INSTALL_PROGRAM ?= install -c -s -o root -g wheel -m 755 + +all: + $(CC) -c general.c @@ -61,8 +59,8 @@ - @echo "gtk2asp2php: Use from current directory" - - -+ $(INSTALL_PROGRAM) asp2php $(PREFIX)/bin -+ $(INSTALL_PROGRAM) unipiss $(PREFIX)/bin ++ $(BSD_INSTALL_PROGRAM) asp2php $(PREFIX)/bin ++ $(BSD_INSTALL_PROGRAM) unipiss $(PREFIX)/bin +install-gtk: -+ $(INSTALL_PROGRAM) gtkasp2php $(PREFIX)/bin ++ $(BSD_INSTALL_PROGRAM) gtkasp2php $(PREFIX)/bin -- cgit v1.2.3