pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/php53 lang/php53: Fix unwanted directory removal
details: https://anonhg.NetBSD.org/pkgsrc/rev/cb61d0428a00
branches: trunk
changeset: 603973:cb61d0428a00
user: marino <marino%pkgsrc.org@localhost>
date: Sat May 19 09:51:34 2012 +0000
description:
lang/php53: Fix unwanted directory removal
Replace OWN_DIRS with @pkgdir to avoid unwanted deletion of PHP extension
directory when the only extension is deinstalled.
diffstat:
lang/php53/Makefile | 6 +++---
lang/php53/PLIST | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diffs (41 lines):
diff -r 3c53e225ddb9 -r cb61d0428a00 lang/php53/Makefile
--- a/lang/php53/Makefile Sat May 19 06:55:03 2012 +0000
+++ b/lang/php53/Makefile Sat May 19 09:51:34 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/05/09 06:52:51 taca Exp $
+# $NetBSD: Makefile,v 1.28 2012/05/19 09:51:34 marino Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -26,7 +26,7 @@
MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
-OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR}
+PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
SUBST_CLASSES+= path
SUBST_MESSAGE.path= Fixing common paths.
@@ -36,7 +36,7 @@
SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
-INSTALLATION_DIRS+= ${CGIDIR} ${EGDIR} share/php
+INSTALLATION_DIRS+= ${CGIDIR} ${EGDIR} share/php ${PHP_EXTENSION_DIR}
# Make sure modules can link correctly
.if ${OPSYS} == "Darwin"
diff -r 3c53e225ddb9 -r cb61d0428a00 lang/php53/PLIST
--- a/lang/php53/PLIST Sat May 19 06:55:03 2012 +0000
+++ b/lang/php53/PLIST Sat May 19 09:51:34 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/08/20 13:55:09 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/05/19 09:51:34 marino Exp $
bin/phar
bin/phar.phar
bin/php
@@ -236,3 +236,4 @@
share/examples/php/php.ini-production
share/php/php.gif
@pkgdir include/php/include
+@pkgdir ${PHPEXTDIR}
Home |
Main Index |
Thread Index |
Old Index