diff options
author | jlam <jlam> | 2002-10-23 05:47:28 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-10-23 05:47:28 +0000 |
commit | ee841276a9555c23831df161ee1bd18db7255d25 (patch) | |
tree | 1b271cbff0ca47e77326b7aafcfa8e960b53ff6a /www | |
parent | 96a2dba4f81996fc95888b2616ea3c3408b1750b (diff) | |
download | pkgsrc-ee841276a9555c23831df161ee1bd18db7255d25.tar.gz |
* Move the LIBS+= setting out from below bsd.pkg.mk as there's no reason
it has to be there.
* Use BUILD_DIRS instead of manually invoking "make all" from another
subdirectory of WRKSRC during post-build.
* Install the actual binary in ${PREFIX}/libexec/cgi-bin/php and symlink
into ${PREFIX}/bin/php. This allows the php binary to function in a
secure Apache setup. This fixes part of pkg/18783 by Chris Baird.
Diffstat (limited to 'www')
-rw-r--r-- | www/php3/Makefile | 19 | ||||
-rw-r--r-- | www/php3/distinfo | 4 | ||||
-rw-r--r-- | www/php3/patches/patch-af | 14 |
3 files changed, 18 insertions, 19 deletions
diff --git a/www/php3/Makefile b/www/php3/Makefile index d305dff41fa..c28cb75a96a 100644 --- a/www/php3/Makefile +++ b/www/php3/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.36 2002/10/09 11:55:54 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2002/10/23 05:47:28 jlam Exp $ PKGNAME= php-${BASE_VERS} PKGREVISION?= 1 CATEGORIES+= lang COMMENT= HTML-embedded programming language -USE_BUILDLINK2= yes - .include "Makefile.common" USE_PERL5= build @@ -14,6 +12,10 @@ USE_PERL5= build CPPFLAGS+= -DPHP_INTERNAL_FUNCS FILES_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} +.if ${OPSYS} == Linux +LIBS+= -lnsl +.endif + CGIDIR= ${PREFIX}/libexec/cgi-bin EGDIR= ${PREFIX}/share/examples/php3 DATADIR= ${PREFIX}/share/php3 @@ -21,18 +23,17 @@ DATADIR= ${PREFIX}/share/php3 OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR} CONF_FILES= ${EGDIR}/php3.ini.example ${PKG_SYSCONFDIR}/php3.ini -post-build: - cd ${WRKSRC}/convertor; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} +BUILD_DIRS= ${WRKSRC} ${WRKSRC}/convertor pre-install: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/php3.ini.example \ > ${WRKDIR}/php3.ini.example do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/php ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/php ${CGIDIR}/php ${INSTALL_PROGRAM} ${WRKSRC}/convertor/convertor \ ${PREFIX}/bin/php2convert - ${LN} -sf ../../bin/php ${CGIDIR}/php + ${LN} -sf ${CGIDIR}/php ${PREFIX}/bin/php ${INSTALL_DATA_DIR} ${DATADIR} ${EGDIR} cd ${WRKSRC}/extra/icons; ${INSTALL_DATA} * ${DATADIR} cd ${WRKSRC}/examples; ${INSTALL_DATA} README* *.php3 ${EGDIR} @@ -40,7 +41,3 @@ do-install: .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" - -.if ${OPSYS} == Linux -LIBS+= -lnsl -.endif diff --git a/www/php3/distinfo b/www/php3/distinfo index e9902839eb2..3f16086d90c 100644 --- a/www/php3/distinfo +++ b/www/php3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 15:07:17 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/10/23 05:47:28 jlam Exp $ SHA1 (php-3.0.18.tar.gz) = 49550006e1dbf8f792bc0b9499b3f0bd7b14427c Size (php-3.0.18.tar.gz) = 2219410 bytes @@ -6,7 +6,7 @@ SHA1 (patch-aa) = d094c6ed8c59765c30559be4f7ca2150e381fbfc SHA1 (patch-ab) = 3a186689ee39833b1748e8051f7615ba5cbd8719 SHA1 (patch-ac) = 7f021f57c7c45b0ca7c41aa2c82a386372d6dbe3 SHA1 (patch-ad) = ef3b13a0b7e75ab5cef39fdbd9ebdfbde1b484cf -SHA1 (patch-af) = b7a88669ab4dac0537afe0d6f8c18946da0cefbd +SHA1 (patch-af) = 96f39a63ae55daa1d1da0187868d7d4c9d94ec1c SHA1 (patch-ag) = 8a3c71c9ba82fd0dbb08f6e7727b626810eca7f4 SHA1 (patch-ah) = f88ea107135580574777ed1dc2127c2b4efad6ba SHA1 (patch-ai) = ba18ee38a99475caa076e465049ea22c4f3dcc1e diff --git a/www/php3/patches/patch-af b/www/php3/patches/patch-af index 0c5b70a3ea6..e1fc21242d1 100644 --- a/www/php3/patches/patch-af +++ b/www/php3/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.1 1999/05/03 19:45:44 tv Exp $ +$NetBSD: patch-af,v 1.2 2002/10/23 05:47:29 jlam Exp $ ---- convertor/Makefile.orig Mon May 3 12:05:58 1999 -+++ convertor/Makefile Mon May 3 12:06:35 1999 -@@ -1,27 +1,15 @@ - convertor: language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o +--- convertor/Makefile.orig Mon Dec 15 16:56:47 1997 ++++ convertor/Makefile +@@ -1,27 +1,17 @@ +-convertor: language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o - gcc -o convertor language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o - -language-parser.tab.c language-parser.tab.h: language-parser.y token_cache.h @@ -11,7 +11,9 @@ $NetBSD: patch-af,v 1.1 1999/05/03 19:45:44 tv Exp $ - -language-scanner.c: language-scanner.lex token_cache.h - flex -i -Pphp -olanguage-scanner.c language-scanner.lex -- ++all: convertor + ++convertor: language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o + ${LINK.c} -o convertor language-scanner.o language-parser.tab.o token_cache.o main.o alloc.o language-parser.tab.o: language-parser.tab.c token_cache.h |