diff options
| author | adrianp <adrianp@pkgsrc.org> | 2007-06-08 12:29:53 +0000 |
|---|---|---|
| committer | adrianp <adrianp@pkgsrc.org> | 2007-06-08 12:29:53 +0000 |
| commit | 3e87827f34362ec161b7f8ca8d33858e7eaa03b8 (patch) | |
| tree | 78298f92a0cfbb8571d900a076443d77b333ac03 | |
| parent | c6c10bb8ec1cebdcd45cf6d6538602370a076486 (diff) | |
| download | pkgsrc-3e87827f34362ec161b7f8ca8d33858e7eaa03b8.tar.gz | |
Fix the install path for the CGI binary so it ends up where we want it.
Pointed out by schmonz@ and taca@
Bump PKGREVISION
| -rw-r--r-- | lang/php5/Makefile | 14 | ||||
| -rw-r--r-- | lang/php5/distinfo | 3 | ||||
| -rw-r--r-- | lang/php5/patches/patch-an | 13 |
3 files changed, 26 insertions, 4 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 410fa4db42d..ff99329f006 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2007/06/07 10:45:42 adrianp Exp $ +# $NetBSD: Makefile,v 1.54 2007/06/08 12:29:53 adrianp Exp $ PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang HOMEPAGE= http://www.php.net/ @@ -32,10 +32,18 @@ MESSAGE_SUBST+= CGIDIR=${CGIDIR:Q} CONF_FILES= ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR} +SUBST_CLASSES+= cgi +SUBST_MESSAGE.cgi= Fixing CGI path. +SUBST_STAGE.cgi= pre-configure +SUBST_FILES.cgi= configure +SUBST_SED.cgi= -e 's,@CGIDIR@,${CGIDIR},g' + +pre-install: + ${INSTALL_DATA_DIR} ${CGIDIR} + post-install: ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/${PKGMANDIR}/man1/php.1 - ${INSTALL_DATA_DIR} ${CGIDIR} ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${CGIDIR}/php ${INSTALL_DATA_DIR} ${EGDIR} cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended ${EGDIR} diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 34364de5ff3..fef6e4e2048 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.42 2007/06/07 10:45:42 adrianp Exp $ +$NetBSD: distinfo,v 1.43 2007/06/08 12:29:53 adrianp Exp $ SHA1 (php-5.2.3/php-5.2.3.tar.bz2) = 0a02e05e1c663c0d4ee0b253917c0e140e606261 RMD160 (php-5.2.3/php-5.2.3.tar.bz2) = 3c895cf7e513e5a3d7d9f742a9d56102cbb3a79b @@ -10,3 +10,4 @@ SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc SHA1 (patch-ak) = 0a6445b5cf390cb63de8474d75c6e8a4c058afab SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50 SHA1 (patch-am) = 430a79a913aa0885ff6ef9a8d7b938732747445a +SHA1 (patch-an) = eded26a213ec8623bfb30a3e1575605a1509756c diff --git a/lang/php5/patches/patch-an b/lang/php5/patches/patch-an new file mode 100644 index 00000000000..8db0193a63b --- /dev/null +++ b/lang/php5/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.3 2007/06/08 12:29:53 adrianp Exp $ + +--- configure.orig 2007-05-30 19:50:52.000000000 +0100 ++++ configure +@@ -11985,7 +11985,7 @@ EOF + + echo "$ac_t""$PHP_ENABLE_FASTCGI" 1>&6 + +- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" ++ INSTALL_IT="@echo \"Installing PHP CGI binary: @CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) @CGIDIR@/php" + + PHP_SAPI=cgi + |