- Honor NO* vars (noticed by ionbot)

- Silence some portlint warnings
- USE_RC_SUBR from the rc.d script
- Bump PORTREVISION

PR:		125131
Submitted by:	Philip M. Gollucci

4 files changed, 38 insertions, 19 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 8d61248a506e..6a388039305d 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	apache+ssl
 PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITES_APACHE_SSL:S/$/:ssl/}
@@ -17,10 +18,6 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-#PATCH_SITES=		${MASTER_SITE_APACHE_HTTPD}
-#PATCH_SITE_SUBDIR=	patches/apply_to_${APACHE_VERSION}
-#PATCHFILES=
-
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache secure webserver integrating OpenSSL
 
@@ -28,7 +25,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
 		apache+mod_ssl+mod_snmp+mod_accel-1.* \
 		apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \
-		caudium-devel-1.* caudium10-1.* caudium12-* \
+		caudium-devel-1.* caudium10-1.* caudium12-1.* \
 		ru-apache+mod_ssl-1.* ru-apache-1.*
 
 APACHE_VERSION=		1.3.41
@@ -36,12 +33,12 @@ APACHE_SSL_VERSION=	1.59
 USE_OPENSSL=		yes
 USE_PERL5=		yes
 HAS_CONFIGURE=		yes
-USE_RC_SUBR=		yes
-RC_SCRIPTS_SUB=		PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} WWWOWN=${WWWOWN}
+USE_RC_SUBR=		apache
+SUB_LIST+=		WWWOWN=${WWWOWN}
 MAKE_ENV+=		EXAMPLESDIR=${EXAMPLESDIR}
 USE_APACHE=		common13
 
-MASTER_SITES_APACHE_SSL= \
+MASTER_SITES_APACHE_SSL=	\
 		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
 		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
 		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/
@@ -100,10 +97,11 @@ post-extract:
 post-patch:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE}
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
 		${WRKSRC}/src/Configure
+.if defined(NOPORTDOCS)
+	(cd ${WRKSRC} ; ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-noportdocs)
+.endif
 
 post-install:
 	@${ECHO_CMD} ""
@@ -112,7 +110,6 @@ post-install:
 	@${ECHO_CMD} "  http://www.apache-ssl.org/docs.html"
 	@${ECHO_CMD} " to know how to configure correctly apache-ssl"
 	@${ECHO_CMD} ""
-	@${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d
 
 certificate:
 	-${MKDIR} ${PREFIX}/etc/apache/certs
diff --git a/www/apache13-ssl/files/apache.sh b/www/apache13-ssl/files/apache.in
index ff630bfe76ab..5e663ea070b7 100644
--- a/www/apache13-ssl/files/apache.sh
+++ b/www/apache13-ssl/files/apache.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
+# renamed from ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp
 #
 
 # PROVIDE: apache
diff --git a/www/apache13-ssl/files/extra-patch-noportdocs b/www/apache13-ssl/files/extra-patch-noportdocs
new file mode 100644
index 000000000000..629164bedbec
--- /dev/null
+++ b/www/apache13-ssl/files/extra-patch-noportdocs
@@ -0,0 +1,22 @@
+--- Makefile.tmpl.orig	2008-07-01 01:08:04.000000000 +0000
++++ Makefile.tmpl	2008-07-01 01:08:17.000000000 +0000
+@@ -228,7 +228,6 @@
+ 	$(MKDIR) $(root)$(mandir)/man8
+ 	$(MKDIR) $(root)$(sysconfdir)
+ 	$(MKDIR) $(root)$(htdocsdir)-dist
+-	$(MKDIR) $(root)$(manualdir)
+ 	$(MKDIR) $(root)$(iconsdir)
+ 	$(MKDIR) $(root)$(cgidir)-dist
+ 	$(MKDIR) $(root)$(includedir)
+@@ -422,11 +421,6 @@
+ 		(cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
+ 		find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
+-		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
+-		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
+-		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
+-		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
+ 	if [ ! -d $(root)$(htdocsdir)/ ]; then \
+ 		$(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
+ 	fi
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index 05338fa28690..2ab43b83add5 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -4,7 +4,6 @@ bin/dbmmanage
 bin/htdigest
 bin/htpasswd
 @exec mkdir -p %D/etc/apache 2> /dev/null
-etc/rc.d/apache.sh
 @unexec if cmp -s %D/etc/apache/access.conf% %D/%%EXAMPLESDIR%%/access.conf-dist; then rm -f %D/etc/apache/access.conf%; fi
 %%EXAMPLESDIR%%/access.conf-dist
 @exec [ -f %D/etc/apache/access.conf% ] || cp %D/%%EXAMPLESDIR%%/access.conf-dist %D/etc/apache/access.conf
@@ -660,13 +659,13 @@ www/icons/world2.png
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/howto
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/misc
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/mod
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/programs
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/vhosts
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/mod
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/programs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/vhosts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
 @dirrm www/cgi-bin-dist