[Midnightbsd-cvs] CVS Commit: www/apache20: Apache now reports MidnightBSD as it's OS in

[laffer1 at midnightbsd.org]

Log Message:
-----------
Apache now reports MidnightBSD as it's OS in HTTP headers, etc.

FreeBSD icons are no longer used on the Powered By  logo.  (in fact none are used)

The port no longer has to fetch local distfiles from freebsd.org.  

$MidnightBSD$

This has also been tested with the recent bsd.apache.mk change.

Modified Files:
--------------
    mports/www/apache20:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/www/apache20/files:
        apache.sh (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/apache20/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/apache20/pkg-plist -Lwww/apache20/pkg-plist -u -r1.1 -r1.2
--- www/apache20/pkg-plist
+++ www/apache20/pkg-plist
@@ -354,7 +354,6 @@
 %%ICONS%%www/icons-dist/folder.sec.png
 %%ICONS%%www/icons-dist/forward.gif
 %%ICONS%%www/icons-dist/forward.png
-%%ICONS%%www/icons-dist/freebsd.gif
 %%ICONS%%www/icons-dist/generic.gif
 %%ICONS%%www/icons-dist/generic.png
 %%ICONS%%www/icons-dist/generic.red.gif
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/apache20/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwww/apache20/Makefile -Lwww/apache20/Makefile -u -r1.2 -r1.3
--- www/apache20/Makefile
+++ www/apache20/Makefile
@@ -10,14 +10,12 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.59
+PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
-		${MASTER_SITE_LOCAL:S/$/:powerlogo/}
-MASTER_SITE_SUBDIR=	clement/:powerlogo
+MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.bz2 powerlogo.gif:powerlogo
+DISTFILES=	${DISTNAME}.tar.bz2
 DIST_SUBDIR=	apache2
-EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	Version 2 of Apache web server with ${WITH_MPM:L} MPM.
@@ -26,12 +24,8 @@
 
 LATEST_LINK=	apache20
 
-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+ssl-1.* apache-1.* apache_fp-1.* \
-		caudium-devel-1.* caudium10-1.* caudium12-* \
-		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
+CONFLICTS=	caudium-devel-1.* caudium10-1.* caudium12-* \
+		thttpd-2.*
 
 # patch files
 EXTRA_PATCHES+=		${FILESDIR}/build-fix-openssl_beta
@@ -176,15 +170,7 @@
 	@${ECHO_MSG}	"make print-closest-mirrors >> /etc/make.conf"
 	@${ECHO_MSG}	""
 
-post-extract:
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
-
 post-patch:
-	@cd ${WRKSRC}/docs/docroot && \
-	 for f in index.html.*; do (\
-	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
-		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
-	 ); done
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
@@ -192,7 +178,7 @@
 		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
-	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
+	@${REINPLACE_CMD} -e 's," PLATFORM ",MidnightBSD,' \
 			${WRKSRC}/server/core.c
 	@${REINPLACE_CMD} -e 's,freebsd\[2345\],freebsd\[23456\],' \
 			${WRKSRC}/srclib/apr/build/apr_hints.m4
@@ -231,7 +217,6 @@
 	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
 	@${MKDIR} ${PREFIX}/etc/apache2/Includes
 	@${ECHO_CMD} ""
-	@${CAT} ${PKGMESSAGE}
 .if !defined(NOPORTDOCS)
 	@[ -d ${DOCSDIR}/style/lang/ ] && ${TOUCH} ${DOCSDIR}/style/lang/.keepme
 .endif
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/apache20/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/apache20/distinfo -Lwww/apache20/distinfo -u -r1.1 -r1.2
--- www/apache20/distinfo
+++ www/apache20/distinfo
@@ -1,6 +1,3 @@
 MD5 (apache2/httpd-2.0.59.tar.bz2) = b0200a497d1c89daad680c676d32a6df
 SHA256 (apache2/httpd-2.0.59.tar.bz2) = bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d
 SIZE (apache2/httpd-2.0.59.tar.bz2) = 4743549
-MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
-SHA256 (apache2/powerlogo.gif) = 0144675a80761b9660bdb652d331d9ba3bebdff89c0fa35a56aa463662a53254
-SIZE (apache2/powerlogo.gif) = 5279
Index: apache.sh
===================================================================
RCS file: /home/cvs/mports/www/apache20/files/apache.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/apache20/files/apache.sh -Lwww/apache20/files/apache.sh -u -r1.1 -r1.2
--- www/apache20/files/apache.sh
+++ www/apache20/files/apache.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# $MidnightBSD$
 # $FreeBSD: ports/www/apache20/files/apache.sh,v 1.17 2006/02/20 20:47:47 dougb Exp $
 #