[pkgsrc/trunk]: pkgsrc/www/apache Fixed some easy pkglint warnings.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/84bfbd9d8143
branches:  trunk
changeset: 515409:84bfbd9d8143
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jul 02 10:43:18 2006 +0000

description:
Fixed some easy pkglint warnings.

diffstat:

 www/apache/Makefile      |  33 +++++++++++++++++----------------
 www/apache/buildlink3.mk |  12 ++++++------
 www/apache/module.mk     |   8 +++++---
 3 files changed, 28 insertions(+), 25 deletions(-)

diffs (167 lines):

diff -r 66bf5ac95214 -r 84bfbd9d8143 www/apache/Makefile
--- a/www/apache/Makefile       Sun Jul 02 10:40:13 2006 +0000
+++ b/www/apache/Makefile       Sun Jul 02 10:43:18 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.185 2006/04/23 00:12:42 jlam Exp $
+# $NetBSD: Makefile,v 1.186 2006/07/02 10:43:18 rillig Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -16,13 +16,13 @@
 COMMENT=               Apache HTTP (Web) server
 
 NETBSD_LOGO=           sitedrivenby.gif
-SITES_${NETBSD_LOGO}=  http://www.NetBSD.org/images/logos/
+SITES.${NETBSD_LOGO}=  http://www.NetBSD.org/images/logos/
 
 MODSSL_VERSION=                2.8.25
 MODSSL_DISTNAME=       mod_ssl-${MODSSL_VERSION}-1.3.34
 MODSSL_DIST=           ${MODSSL_DISTNAME}.tar.gz
 MODSSL_SRC=            ${WRKDIR}/${MODSSL_DISTNAME}
-SITES_${MODSSL_DIST}=  http://www.modssl.org/source/ \
+SITES.${MODSSL_DIST}=  http://www.modssl.org/source/ \
                        ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \
                        ftp://ftp.funet.fi/pub/crypt/cryptography/libs/modssl/source/
 
@@ -73,7 +73,7 @@
 APACHE_SUEXEC_PATH=    /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
 APACHE_SUEXEC_CONFIGURE_ARGS+=                                         \
                        --suexec-caller=${APACHE_USER}                  \
-                       --suexec-safepath='${APACHE_SUEXEC_PATH}'       \
+                       --suexec-safepath=${APACHE_SUEXEC_PATH:Q}       \
                        --suexec-docroot=${APACHE_SUEXEC_DOCROOT}
 CONFIGURE_ARGS+=       --enable-suexec                                 \
                        ${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*}
@@ -148,7 +148,7 @@
 #
 # Fix paths in the apache manpages.
 #
-SUBST_CLASSES+=                man paths
+SUBST_CLASSES+=                man
 SUBST_STAGE.man=       post-patch
 SUBST_FILES.man=       src/support/*.1 src/support/*.8
 SUBST_SED.man=         -e 's,/usr/local/apache/conf,${PKG_SYSCONFDIR},'
@@ -158,6 +158,7 @@
 SUBST_SED.man+=                -e 's,/usr/local/apache,${PREFIX}/share/httpd/htdocs,'
 SUBST_SED.man+=                -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
 
+SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     config.layout
 SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
@@ -176,34 +177,34 @@
 .include "../../mk/dlopen.buildlink3.mk"
 
 post-extract:
-       @${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include
-       @${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra
-       @${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod
-       @${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap
-       @${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include
-       @${CP} ${FILESDIR}/config.layout ${WRKSRC}
+       ${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include
+       ${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra
+       ${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod
+       ${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap
+       ${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include
+       ${CP} ${FILESDIR}/config.layout ${WRKSRC}
 
 pre-patch:
-       @cd ${WRKSRC} && ${CAT}                                         \
+       cd ${WRKSRC} && ${CAT}                                          \
                ${MODSSL_SRC}/pkg.addon/addon.patch                     \
                ${MODSSL_SRC}/pkg.eapi/eapi.patch                       \
                ${MODSSL_SRC}/pkg.sslcfg/sslcfg.patch                   \
                ${MODSSL_SRC}/pkg.sslmod/sslmod.patch                   \
                ${MODSSL_SRC}/pkg.sslsup/sslsup.patch                   \
                | ${PATCH} ${PATCH_ARGS}
-       @cd ${WRKSRC} && ${TAIL} +160                                   \
+       cd ${WRKSRC} && ${TAIL} +160                                    \
                ${MODSSL_SRC}/pkg.ssldoc/ssldoc.patch                   \
                | ${PATCH} ${PATCH_ARGS}
-       @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
+       ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 post-patch:
-       @cd ${WRKSRC}/src/support;                                      \
+       cd ${WRKSRC}/src/support;                                       \
        ${SED}  -e "s|@INSTALL@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \
                apxs.pl > apxs.pl.sed;                                  \
        ${MV} apxs.pl.sed apxs.pl
 
 pre-install:
-       @${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
+       ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
 
 post-install:
 .if !defined(NOPIC)
diff -r 66bf5ac95214 -r 84bfbd9d8143 www/apache/buildlink3.mk
--- a/www/apache/buildlink3.mk  Sun Jul 02 10:40:13 2006 +0000
+++ b/www/apache/buildlink3.mk  Sun Jul 02 10:43:18 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/06/04 12:21:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/02 10:43:18 rillig Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -15,18 +15,18 @@
 BUILDLINK_ABI_DEPENDS.apache?= apache>=1.3.34nb5
 BUILDLINK_PKGSRCDIR.apache?=   ../../www/apache
 
-.if defined(APACHE_MODULE)
+.  if defined(APACHE_MODULE)
 BUILDLINK_DEPMETHOD.apache+=   full
-.else
+.  else
 BUILDLINK_DEPMETHOD.apache?=   build
-.endif
+.  endif
 
 USE_TOOLS+=    perl    # for "apxs"
 APXS?=         ${BUILDLINK_PREFIX.apache}/sbin/apxs
 
-.if defined(GNU_CONFIGURE)
+.  if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=       --with-apxs=${APXS:Q}
-.endif
+.  endif
 
 # required because httpd/os.h includes <dlfcn.h> when it is found by
 # Apache's configure script.
diff -r 66bf5ac95214 -r 84bfbd9d8143 www/apache/module.mk
--- a/www/apache/module.mk      Sun Jul 02 10:40:13 2006 +0000
+++ b/www/apache/module.mk      Sun Jul 02 10:43:18 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.10 2005/03/24 22:42:59 jlam Exp $
+# $NetBSD: module.mk,v 1.11 2006/07/02 10:43:18 rillig Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install apache modules.
@@ -23,23 +23,25 @@
 .if !defined(_APACHE_MODULE_MK)
 _APACHE_MODULE_MK=     # defined
 
-APACHE_MODULE=         # defined
+APACHE_MODULE=         yes
 
 .include "../../www/apache/buildlink3.mk"
 
 APACHE_MODULE_SRCDIR?= ${WRKSRC}
 APACHE_MODULE_SRC?=    *.c
 
+.PHONY: apache-module-build
 apache-module-build:
        ${_PKG_SILENT}${_PKG_DEBUG} \
        cd ${APACHE_MODULE_SRCDIR} && \
-               ${SETENV} PATH=${PATH} \
+               ${SETENV} PATH=${PATH:Q} \
                ${APXS} ${CPPFLAGS} ${LDFLAGS} \
                        -c -o ${APACHE_MODULE_NAME} ${APACHE_MODULE_SRC}
 
 do-build: apache-module-build
        ${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA}
 
+.PHONY: apache-module-install
 apache-module-install:
        ${_PKG_SILENT}${PKG_DEBUG}                                      \
        cd ${APACHE_MODULE_SRCDIR} && ${APXS} -i ${APACHE_MODULE_NAME}