[Midnightbsd-cvs] CVS Commit: www/apache22: $MidnightBSD$ Brand as MidnightBSD in OS

[laffer1 at midnightbsd.org]

Log Message:
-----------
$MidnightBSD$

Brand as MidnightBSD in OS output.

stop cat'ing the pkg-message.  This is done automatically.

Modified Files:
--------------
    mports/www/apache22:
        Makefile (r1.3 -> r1.4)
    mports/www/apache22/files:
        apache22.sh.in (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/apache22/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lwww/apache22/Makefile -Lwww/apache22/Makefile -u -r1.3 -r1.4
--- www/apache22/Makefile
+++ www/apache22/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.2.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%\//clement\/:aprmysql/}
@@ -32,7 +33,7 @@
 
 LATEST_LINK=	apache22
 
-CONFLICTS=	thttpd-2.* apache-2.0.* apache-*-2.0.*
+CONFLICTS=	apache-2.0.* apache-*-2.0.*
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
@@ -166,7 +167,7 @@
 
 post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
-	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
+	@${REINPLACE_CMD} -e 's," PLATFORM ",MidnightBSD,' \
 			${WRKSRC}/server/core.c
 	@${REINPLACE_CMD} -e "s,%%OSVERSION%%,${OSVERSION}," \
 			${WRKSRC}/srclib/apr/build/apr_hints.m4
@@ -195,6 +196,5 @@
 .if !defined(NOPORTDOCS)
 	@[ -d ${DOCSDIR}/style/lang/ ] && ${TOUCH} ${DOCSDIR}/style/lang/.keepme
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: apache22.sh.in
===================================================================
RCS file: /home/cvs/mports/www/apache22/files/apache22.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwww/apache22/files/apache22.sh.in -Lwww/apache22/files/apache22.sh.in -u -r1.2 -r1.3
--- www/apache22/files/apache22.sh.in
+++ www/apache22/files/apache22.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# $MidnightBSD$
 # $FreeBSD: ports/www/apache22/files/apache22.sh.in,v 1.2 2007/01/13 12:13:12 clement Exp $
 #