PERFORCE change 123942 for review

[Gabor Kovesdan]

http://perforce.freebsd.org/chv.cgi?CH=123942

Change 123942 by gabor at gabor_server on 2007/07/23 07:58:57

	IFC

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/LEGAL#7 integrate
.. //depot/projects/soc2006/gabor_destdir/MOVED#12 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.apache.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dopackagestats#4 integrate

Differences ...

==== //depot/projects/soc2006/gabor_destdir/LEGAL#7 (text+ko) ====

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.542 2007/06/07 08:59:34 miwi Exp $
+# $FreeBSD: ports/LEGAL,v 1.543 2007/07/23 02:09:24 rafan Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -226,7 +226,7 @@
 						distribution without permission
 fp-freebsd-ws-*		security/f-prot		Free for personal use only
 freefem++-*		math/freefem++		No resale, not for commercial usage
-framework-*		security/metasploit-devel	May not be re-sold
+framework-*		security/metasploit	May not be re-sold
 freefonts-*		x11-fonts/freefonts	Some of the fonts are
 						shareware.  Some are freeware.
 						Permission must be obtained

==== //depot/projects/soc2006/gabor_destdir/MOVED#12 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1426 2007/07/16 17:04:58 nobutaka Exp $
+# $FreeBSD: ports/MOVED,v 1.1429 2007/07/23 02:11:21 rafan Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3101,3 +3101,6 @@
 devel/libslang2-devel||2007-07-11|Non-devel port have newer version
 graphics/hpoj||2007-07-14|Expired: project discontinued, please switch to print/hplip
 net/jffnms|net-mgmt/jffnms|2007-07-14|move to net-mgmt/jffnms
+java/linux-blackdown-jdk13||2007-07-22|Expired: unfixed security vulnerability
+devel/rx||2007-07-22|Expired: has been decommissioned and is no longer developed
+security/metasploit-devel|security/metasploit|2007-07-23|move to security/metasploit

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.apache.mk#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.14 2007/06/28 15:50:53 pav Exp $
+# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.16 2007/07/22 12:43:00 clement Exp $
 #
 # bsd.apache.mk - Apache related macros.
 # Author: Clement Laforet <clement at FreeBSD.org>
@@ -15,8 +15,15 @@
 #		<version>: 1.3/13/2.0/20/2.1/2.2/1.3+/2.0+/2.1+/2.2+
 #		common*: common13, common20, common21 and common22
 #
+# Note: Setting USE_APACHE to "yes" is deprecated. It will set 
+# APACHE_PORT to www/apache13 and if WITH_APACHE2 (deprecated too)
+# is defined, APACHE_PORT will be set to www/apache20
 #
-#
+
+#.if !defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include)
+
+Apache_Pre_Include=		bsd.apache.mk
+
 .if defined(APACHE_COMPAT)
 USE_APACHE=yes
 .endif
@@ -303,13 +310,13 @@
 APACHEMODDIR=	libexec/apache2
 APACHEINCLUDEDIR=include/apache2
 APACHEETCDIR=	etc/apache2
-APACHE_PORT=	www/apache${APACHE_VERSION}
+APACHE_PORT?=	www/apache${APACHE_VERSION}
 .elif ${APACHE_VERSION} >= 21
 AP_BUILDEXT=	la
 APACHEMODDIR=	libexec/apache${APACHE_VERSION}
 APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
 APACHEETCDIR=	etc/apache${APACHE_VERSION}
-APACHE_PORT=	www/apache${APACHE_VERSION}
+APACHE_PORT?=	www/apache${APACHE_VERSION}
 .else
 AP_BUILDEXT=	so
 APACHEMODDIR=	libexec/apache
@@ -346,6 +353,10 @@
 
 .endif
 
+#.endif #!defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include)
+#.if defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)
+Apache_Post_Include=                    bsd.apache.mk
+
 .if defined(AP_PORT_IS_SERVER)
 .if !target(print-closest-mirrors)
 print-closest-mirrors:
@@ -412,7 +423,6 @@
 do-install:
 	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
 .endif
-
 .endif
-
 .endif
+#.endif          # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)

==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dopackagestats#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/Tools/portbuild/scripts/dopackagestats,v 1.17 2007/03/23 05:49:49 linimon Exp $
+# $FreeBSD: ports/Tools/portbuild/scripts/dopackagestats,v 1.18 2007/07/22 04:36:49 linimon Exp $
 #
 # create HTML showing numbers of packages vs errors.  Run this in a directory
 # accessible to the web server.
@@ -228,7 +228,8 @@
 # display all the mainstream builds first
 for arch in ${SUPPORTED_ARCHS}; do
 
-  builds=`ls ${ROOT_DIRECTORY}/${arch} | grep '^[1-9]$' | sort`
+  # drop 4 as obsolete
+  builds=`ls ${ROOT_DIRECTORY}/${arch} | grep '^[5-9]$' | sort`
   if [ ! -z "$builds" ]; then
     write_table_begin