Fix previous commit:

- owner/group was undefined when installing from package
- substitute %%APXS%% in pkg-install

Noted by: eik

2 files changed, 7 insertions, 5 deletions

diff --git a/www/mod_dav/Makefile b/www/mod_dav/Makefile
index 92dd87df2534..f91c2e4e5bb4 100644
--- a/www/mod_dav/Makefile
+++ b/www/mod_dav/Makefile
@@ -18,6 +18,7 @@ COMMENT=	An Apache module that provides DAV capabilities
 # This port will work with the following version of Apache and anything newer.
 APACHE_VERSION=	1.3.6
 
+PKGINSTALL=	${WRKSRC}/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 PKGMESSAGE=	${WRKSRC}/pkg-message
 PLIST_FILES=	etc/apache/apache.conf.mod_dav libexec/apache/libdav.so
@@ -52,9 +53,10 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/apache.conf.mod_dav ${PREFIX}/etc/apache
 
 post-install:
+	@${SED} -e 's+%%APXS%%+${APXS}+ ; s+%%WWWOWN%%+${WWWOWN}+ ; s+%%WWWGRP%%+${WWWGRP}+' \
+	 ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 .if !defined(PACKAGE_BUILDING)
-	@${SETENV} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} PKG_PREFIX=${PREFIX} \
-	 ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} -e 's+%%PREFIX%%+${PREFIX}+' ${FILESDIR}/pkg-message.in \
 	 > ${PKGMESSAGE}
diff --git a/www/mod_dav/pkg-install b/www/mod_dav/files/pkg-install.in
index 1ace7c99302b..e6e1d475e35d 100644
--- a/www/mod_dav/pkg-install
+++ b/www/mod_dav/files/pkg-install.in
@@ -6,15 +6,15 @@ TOUCH=/usr/bin/touch
 
 case $2 in
 POST-INSTALL)
-	${PKG_PREFIX}/sbin/apxs -e -a -n dav libdav.so
+	%%APXS%% -e -a -n dav libdav.so
 	for i in DAVLock.dir DAVLock.pag ; do
 	  ${TOUCH} /var/db/$i
-	  ${CHOWN} ${WWWOWN}:${WWWGRP} /var/db/$i
+	  ${CHOWN} %%WWWOWN%%:%%WWWGRP%% /var/db/$i
 	  ${CHMOD} 640 /var/db/$i
 	done
 	;;
 POST-DEINSTALL)
-	${PKG_PREFIX}/sbin/apxs -e -A -n dav libdav.so
+	%%APXS%% -e -A -n dav libdav.so
 	for i in DAVLock.dir DAVLock.pag ; do
 	  rm -f /var/db/$i
 	done