diff options
author | heinz <heinz> | 2007-06-11 17:45:30 +0000 |
---|---|---|
committer | heinz <heinz> | 2007-06-11 17:45:30 +0000 |
commit | 97162ff75b2b1b464f9dbd0fb79a24f63cc10634 (patch) | |
tree | 4a22b32beb9a928236f7ded95e1b97c99100d269 /lang | |
parent | 123eac7b1ecd9100f60d11d454aad881142b83f2 (diff) | |
download | pkgsrc-97162ff75b2b1b464f9dbd0fb79a24f63cc10634.tar.gz |
Added support for installation to DESTDIR. patch-an had removed correct
support for this before, probably unintentionally.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/php5/Makefile | 26 | ||||
-rw-r--r-- | lang/php5/distinfo | 4 | ||||
-rw-r--r-- | lang/php5/patches/patch-an | 6 |
3 files changed, 22 insertions, 14 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index ff99329f006..d63c490d2f6 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2007/06/08 12:29:53 adrianp Exp $ +# $NetBSD: Makefile,v 1.55 2007/06/11 17:45:30 heinz Exp $ PKGNAME= php-${PHP_BASE_VERS} PKGREVISION= 2 @@ -7,6 +7,8 @@ CATEGORIES= lang HOMEPAGE= http://www.php.net/ COMMENT= PHP Hypertext Preprocessor version 5 +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gmake lex LIBTOOL_OVERRIDE= # empty @@ -29,6 +31,8 @@ CGIDIR= ${PREFIX}/libexec/cgi-bin EGDIR= ${PREFIX}/share/examples/php MESSAGE_SUBST+= CGIDIR=${CGIDIR:Q} +MAKE_ENV+= INSTALL_ROOT=${DESTDIR:Q} + CONF_FILES= ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR} @@ -39,15 +43,19 @@ SUBST_FILES.cgi= configure SUBST_SED.cgi= -e 's,@CGIDIR@,${CGIDIR},g' pre-install: - ${INSTALL_DATA_DIR} ${CGIDIR} + ${INSTALL_DATA_DIR} ${DESTDIR:Q}${CGIDIR:Q} post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php - ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/${PKGMANDIR}/man1/php.1 - ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${CGIDIR}/php - ${INSTALL_DATA_DIR} ${EGDIR} - cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended ${EGDIR} - ${INSTALL_DATA_DIR} ${PREFIX}/share/php - ${INSTALL_DATA} ${WRKSRC}/php.gif ${PREFIX}/share/php + ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php \ + ${DESTDIR:Q}${PREFIX:Q}/bin/php + ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ + ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/php.1 + ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi \ + ${DESTDIR:Q}${CGIDIR:Q}/php + ${INSTALL_DATA_DIR} ${DESTDIR:Q}${EGDIR:Q} + cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended \ + ${DESTDIR:Q}${EGDIR:Q} + ${INSTALL_DATA_DIR} ${DESTDIR:Q}${PREFIX:Q}/share/php + ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR:Q}${PREFIX:Q}/share/php .include "../../mk/bsd.pkg.mk" diff --git a/lang/php5/distinfo b/lang/php5/distinfo index fef6e4e2048..37d165bcde7 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.43 2007/06/08 12:29:53 adrianp Exp $ +$NetBSD: distinfo,v 1.44 2007/06/11 17:45:30 heinz 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,4 +10,4 @@ SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc SHA1 (patch-ak) = 0a6445b5cf390cb63de8474d75c6e8a4c058afab SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50 SHA1 (patch-am) = 430a79a913aa0885ff6ef9a8d7b938732747445a -SHA1 (patch-an) = eded26a213ec8623bfb30a3e1575605a1509756c +SHA1 (patch-an) = 8e33ce700049bdb05e5f56f0a8132b55e357abeb diff --git a/lang/php5/patches/patch-an b/lang/php5/patches/patch-an index 8db0193a63b..7cf706f22f2 100644 --- a/lang/php5/patches/patch-an +++ b/lang/php5/patches/patch-an @@ -1,13 +1,13 @@ -$NetBSD: patch-an,v 1.3 2007/06/08 12:29:53 adrianp Exp $ +$NetBSD: patch-an,v 1.4 2007/06/11 17:45:30 heinz Exp $ ---- configure.orig 2007-05-30 19:50:52.000000000 +0100 +--- configure.orig 2007-05-30 20:50:52.000000000 +0200 +++ 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" ++ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php" PHP_SAPI=cgi |