[pkgsrc/trunk]: pkgsrc/www/apache22 Add DESTDIR support and fix PLIST(try to ...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdd05ae27644
branches:  trunk
changeset: 546114:cdd05ae27644
user:      obache <obache%pkgsrc.org@localhost>
date:      Fri Aug 22 04:36:00 2008 +0000

description:
Add DESTDIR support and fix PLIST(try to create two empty directories).

diffstat:

 www/apache22/Makefile   |  39 ++++++++++++++++++++-------------------
 www/apache22/PLIST      |   4 +++-
 www/apache22/options.mk |   4 +++-
 3 files changed, 26 insertions(+), 21 deletions(-)

diffs (126 lines):

diff -r ca7a96c04d52 -r cdd05ae27644 www/apache22/Makefile
--- a/www/apache22/Makefile     Thu Aug 21 20:35:36 2008 +0000
+++ b/www/apache22/Makefile     Fri Aug 22 04:36:00 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/08/09 22:16:44 tron Exp $
+# $NetBSD: Makefile,v 1.29 2008/08/22 04:36:00 obache Exp $
 
 .include "Makefile.common"
 
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://httpd.apache.org/
 COMMENT=       Apache HTTP (Web) server, version 2
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS=     apache-{,*ssl}-[0-9]* apache6-[0-9]*
 
 BUILD_DEFS+=   IPV6_READY
@@ -178,7 +180,7 @@
 # so we fix after install to reference the installed path
 SUBST_CLASSES+=                abs_srcdir
 SUBST_STAGE.abs_srcdir=        post-install
-SUBST_FILES.abs_srcdir=        ${PREFIX}/share/httpd/build/config_vars.mk
+SUBST_FILES.abs_srcdir=        ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk
 SUBST_SED.abs_srcdir=  -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|'
 SUBST_MESSAGE.abs_srcdir=      Fixing abs_srcdir
 
@@ -221,13 +223,12 @@
        ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g"                 \
                < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
 
-pre-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}                           \
-               ${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}"
+INSTALL_TARGET=                install-conf install
+INSTALL_MAKE_FLAGS+=   sysconfdir="${EGDIR}"
 
 post-install:
-       ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${PREFIX}/share/httpd/build
-       cd ${EGDIR} &&                                                  \
+       ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
+       cd ${DESTDIR}${EGDIR} &&                                        \
        for file in                                                     \
                httpd.conf                                              \
                extra/httpd-ssl.conf;                                   \
@@ -246,26 +247,26 @@
                ${MV} -f $${file}.new $${file};                         \
        done
 
-       ${LN} -sf ${SBINDIR}/envvars-std ${SBINDIR}/envvars
+       ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
 
-       ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${PREFIX}/sbin
+       ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin
 
        for file in ${FIX_PERMS}; do \
-               ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/sbin/$$file && \
-               ${CHMOD} ${BINMODE} ${PREFIX}/sbin/$$file; \
+               ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \
+               ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \
        done
 
-       ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/httpd
-       ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/include/httpd
-       ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/httpd
-       ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/libexec/cgi-bin/test-cgi
-       ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/libexec/cgi-bin/printenv
+       ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
+       ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
+       ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
+       ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
+       ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
 
        for file in ${FIX_MAN_PERMS}; do \
-               ${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/${PKGMANDIR}/$$file; \
+               ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \
        done
 
-       ${CHMOD} -x ${PREFIX}/sbin/envvars-std
-       ${TEST} ! -f ${PREFIX}/sbin/suexec || ${CHMOD} -w ${PREFIX}/sbin/suexec
+       ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std
+       ${TEST} ! -f ${DESTDIR}${PREFIX}/sbin/suexec || ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec
 
 .include "../../mk/bsd.pkg.mk"
diff -r ca7a96c04d52 -r cdd05ae27644 www/apache22/PLIST
--- a/www/apache22/PLIST        Thu Aug 21 20:35:36 2008 +0000
+++ b/www/apache22/PLIST        Fri Aug 22 04:36:00 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/06/18 21:38:01 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/08/22 04:36:00 obache Exp $
 ${PLIST.suexec}sbin/suexec
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
@@ -1053,7 +1053,9 @@
 share/httpd/manual/vhosts/name-based.html.tr.utf8
 @unexec ${RMDIR} %D/libexec/cgi-bin 2>/dev/null || ${TRUE}
 @dirrm share/httpd/manual/vhosts
+@exec ${MKDIR} %D/share/httpd/manual/style/xsl/util
 @dirrm share/httpd/manual/style/xsl/util
+@exec ${MKDIR} %D/share/httpd/manual/style/xsl
 @dirrm share/httpd/manual/style/xsl
 @dirrm share/httpd/manual/style/latex
 @exec ${MKDIR} %D/share/httpd/manual/style/lang
diff -r ca7a96c04d52 -r cdd05ae27644 www/apache22/options.mk
--- a/www/apache22/options.mk   Thu Aug 21 20:35:36 2008 +0000
+++ b/www/apache22/options.mk   Fri Aug 22 04:36:00 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:13 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2008/08/22 04:36:00 obache Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.apache
 PKG_SUPPORTED_OPTIONS= suexec
@@ -8,6 +8,7 @@
 PLIST_VARS+=           suexec
 .if !empty(PKG_OPTIONS:Msuexec)
 PKG_USERS_VARS+=       APACHE_USER
+PKG_GROUPS_VARS+=      APACHE_GROUP
 BUILD_DEFS+=           VARBASE APACHE_SUEXEC_PATH
 BUILD_DEFS+=           APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
 
@@ -25,4 +26,5 @@
 CONFIGURE_ARGS+=        ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
 BUILD_DEFS+=            APACHE_SUEXEC_CONFIGURE_ARGS
 PLIST.suexec=          yes
+SPECIAL_PERMS+=                sbin/suexec ${REAL_ROOT_USER} ${APACHE_GROUP} 4510
 .endif