From afe77873e50d1e4db9bd8b148d4629ccf93f2b31 Mon Sep 17 00:00:00 2001
From: marino <marino@pkgsrc.org>
Date: Thu, 17 May 2012 19:01:43 +0000
Subject: lang/php5: Fix unwanted directory removal

Replace OWN_DIRS with @pkgdir to avoid unwanted deletion of PHP extension
directory when the only extension is deinstalled.
---
 lang/php5/Makefile | 6 +++---
 lang/php5/PLIST    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lang')

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index ae9554d7978..eab774b2d50 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2012/05/13 16:09:52 taca Exp $
+# $NetBSD: Makefile,v 1.89 2012/05/17 19:01:43 marino Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 PKGREVISION=		5
@@ -37,7 +37,7 @@ CONFIGURE_ENV+=		lt_cv_path_SED=${SED:Q}
 MAKE_ENV+=		INSTALL_ROOT=${DESTDIR:Q}
 
 CONF_FILES=		${EGDIR}/php.ini-recommended ${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.
@@ -46,7 +46,7 @@ SUBST_FILES.path=	configure php.ini-dist php.ini-recommended
 SUBST_SED.path=		-e 's,@CGIDIR@,${CGIDIR},g'
 SUBST_SED.path+=	-e 's,@PREFIX@,${PREFIX},g'
 
-INSTALLATION_DIRS+=	${CGIDIR}
+INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR}
 
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
diff --git a/lang/php5/PLIST b/lang/php5/PLIST
index 03f67ea8a9d..b1bc84f233e 100644
--- a/lang/php5/PLIST
+++ b/lang/php5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2009/12/23 07:07:34 taca Exp $
+@comment $NetBSD: PLIST,v 1.26 2012/05/17 19:01:43 marino Exp $
 bin/php
 bin/php-config
 bin/phpize
@@ -226,3 +226,4 @@ share/examples/php/php.ini-dist
 share/examples/php/php.ini-recommended
 share/php/php.gif
 @pkgdir include/php/include
+@pkgdir ${PHPEXTDIR}
-- 
cgit v1.2.3