[pkgsrc/trunk]: pkgsrc/www/asp2php Convert to bl3, obey CFLAGS et al., rework...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4122d52fdf1
branches:  trunk
changeset: 477898:b4122d52fdf1
user:      salo <salo%pkgsrc.org@localhost>
date:      Sun Jul 11 00:31:25 2004 +0000

description:
Convert to bl3, obey CFLAGS et al., rework install target.

diffstat:

 www/asp2php/Makefile         |   5 ++++-
 www/asp2php/distinfo         |   6 ++++--
 www/asp2php/patches/patch-aa |  28 +++++++++-------------------
 www/asp2php/patches/patch-ab |  16 ++++++++++++++++
 www/asp2php/patches/patch-ac |  16 ++++++++++++++++
 5 files changed, 49 insertions(+), 22 deletions(-)

diffs (117 lines):

diff -r 26f90ed1a9a8 -r b4122d52fdf1 www/asp2php/Makefile
--- a/www/asp2php/Makefile      Sun Jul 11 00:30:10 2004 +0000
+++ b/www/asp2php/Makefile      Sun Jul 11 00:31:25 2004 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.8 2003/07/22 04:14:20 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/11 00:31:25 salo Exp $
+#
 
 DISTNAME=      asp2php-0.76.17
 CATEGORIES=    www
@@ -8,4 +9,6 @@
 HOMEPAGE=      http://asp2php.naken.cc/
 COMMENT=       Converts asp pages to php pages
 
+USE_BUILDLINK3=        YES
+
 .include "../../mk/bsd.pkg.mk"
diff -r 26f90ed1a9a8 -r b4122d52fdf1 www/asp2php/distinfo
--- a/www/asp2php/distinfo      Sun Jul 11 00:30:10 2004 +0000
+++ b/www/asp2php/distinfo      Sun Jul 11 00:31:25 2004 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2003/06/10 06:55:15 wiz Exp $
+$NetBSD: distinfo,v 1.7 2004/07/11 00:31:25 salo Exp $
 
 SHA1 (asp2php-0.76.17.tar.gz) = 9fe485f8f738c11a7104b935cbcadf365195bac4
 Size (asp2php-0.76.17.tar.gz) = 53793 bytes
-SHA1 (patch-aa) = ed0ca8c9925a9ac90dde14a843a71990617eb987
+SHA1 (patch-aa) = d9dea1ccabce8e79d032c3462cf59d3fb2303a8c
+SHA1 (patch-ab) = a95a8ffcac811b32bb467482c0e208e9f8ab0bdd
+SHA1 (patch-ac) = e833373ae539b142849b9f89755d391532155846
diff -r 26f90ed1a9a8 -r b4122d52fdf1 www/asp2php/patches/patch-aa
--- a/www/asp2php/patches/patch-aa      Sun Jul 11 00:30:10 2004 +0000
+++ b/www/asp2php/patches/patch-aa      Sun Jul 11 00:31:25 2004 +0000
@@ -1,34 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2003/06/10 06:55:16 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2004/07/11 00:31:25 salo Exp $
 
---- Makefile.orig      Wed Mar 26 19:35:11 2003
-+++ Makefile
-@@ -1,7 +1,8 @@
- 
--CC=gcc
-+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
-@@ -18,14 +19,14 @@ gui:
+@@ -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 asp2php ]; then install -c asp2php ${BINDIR}; fi;
-+      @if [ -e gtkasp2php ]; then install -c gtkasp2php ${BINDIR}; fi;
-+      @echo "Compiled programs have been installed in ${BINDIR}"
-       @echo ""
+-      @echo ""
++      ${BSD_INSTALL_PROGRAM} asp2php ${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}/asp2php ]; then rm ${BINDIR}/asp2php; 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 -r 26f90ed1a9a8 -r b4122d52fdf1 www/asp2php/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/asp2php/patches/patch-ab      Sun Jul 11 00:31:25 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2004/07/11 00:31:25 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 -r 26f90ed1a9a8 -r b4122d52fdf1 www/asp2php/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/asp2php/patches/patch-ac      Sun Jul 11 00:31:25 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2004/07/11 00:31:25 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)