Attachment #105631 for bug #146130

Lines 8-15 Link Here

(-)b/www/apache22/Makefile (-3 / +2 lines)
8	#	8	#
9		9
10	PORTNAME= apache	10	PORTNAME= apache
11	PORTVERSION= 2.2.14	11	PORTVERSION= 2.2.15
12	PORTREVISION= 6
13	CATEGORIES= www	12	CATEGORIES= www
14	MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}	13	MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
15	DISTNAME= httpd-${PORTVERSION}	14	DISTNAME= httpd-${PORTVERSION}
Lines 58-64 APACHEDIR= ${MASTERDIR} Link Here
58		57
59	.if !defined(WITHOUT_APACHE_OPTIONS)	58	.if !defined(WITHOUT_APACHE_OPTIONS)
60	OPTIONS= \	59	OPTIONS= \
61	APR_FROM_PORTS "Use devel/apr as APR (preferred)" Off \	60	APR_FROM_PORTS "Use devel/apr (recommended)" On \
62	THREADS "Enable threads support in APR" Off \	61	THREADS "Enable threads support in APR" Off \
63	MYSQL "Enable MySQL support for apr-dbd" Off \	62	MYSQL "Enable MySQL support for apr-dbd" Off \
64	PGSQL "Enable PostgreSQL support for apr-dbd" Off \	63	PGSQL "Enable PostgreSQL support for apr-dbd" Off \

Lines 1-3 Link Here

(-)b/www/apache22/distinfo (-3 / +3 lines)
1	MD5 (apache22/httpd-2.2.14.tar.bz2) = a5226203aaf97e5b941c41a71c112704	1	MD5 (apache22/httpd-2.2.15.tar.bz2) = 016cec97337eccead2aad6a7c27f2e14
2	SHA256 (apache22/httpd-2.2.14.tar.bz2) = b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6	2	SHA256 (apache22/httpd-2.2.15.tar.bz2) = 5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7
3	SIZE (apache22/httpd-2.2.14.tar.bz2) = 5147171	3	SIZE (apache22/httpd-2.2.15.tar.bz2) = 4959582

Lines 170-176 include/apache22/util_xml.h Link Here

(-)b/www/apache22/pkg-plist (-2 / +1 lines)
170	%%APR_PORTS%%lib/libapr-1.a	170	%%APR_PORTS%%lib/libapr-1.a
171	%%APR_PORTS%%lib/libapr-1.la	171	%%APR_PORTS%%lib/libapr-1.la
172	%%APR_PORTS%%lib/libapr-1.so	172	%%APR_PORTS%%lib/libapr-1.so
173	%%APR_PORTS%%lib/libapr-1.so.3	173	%%APR_PORTS%%lib/libapr-1.so.4
174	%%APR_PORTS%%lib/libaprutil-1.a	174	%%APR_PORTS%%lib/libaprutil-1.a
175	%%APR_PORTS%%lib/libaprutil-1.la	175	%%APR_PORTS%%lib/libaprutil-1.la
176	%%APR_PORTS%%lib/libaprutil-1.so	176	%%APR_PORTS%%lib/libaprutil-1.so
177	-




--- srclib/apr/buildconf.orig	Tue Jun 14 14:11:15 2005
+++ srclib/apr/buildconf	Sun Sep 24 15:17:36 2006
@@ -23,7 +23,7 @@
 #
 build/buildcheck.sh || exit 1
 
-libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
+libtoolize="${LIBTOOLIZE}"
 if [ "x$libtoolize" = "x" ]; then
     echo "libtoolize not found in path"
     exit 1
@@ -60,7 +60,7 @@
    # Expecting the code above to be very portable, but just in case...
    if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
      ltpath=`dirname $libtoolize`
-     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+     ltfile=${LIBTOOL_M4}
    fi
 fi
   
@@ -95,8 +95,11 @@
 # Remove autoconf 2.5x's cache directory
 rm -rf autom4te*.cache
 
+
+if [ "x${FULLBUILD}" = "xon" ] ; then
 echo "Generating 'make' outputs ..."
 build/gen-build.py make
+fi
 
 # Create RPM Spec file
 if [ -f `which cut` ]; then




--- srclib/apr/buildconf.orig	2009-11-12 17:19:49.000000000 -0500
+++ srclib/apr/buildconf	2010-04-30 19:22:40.116834529 -0400
@@ -28,7 +28,7 @@
 #
 build/buildcheck.sh $verbose || exit 1
 
-libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
+libtoolize="${LIBTOOLIZE}"
 if [ "x$libtoolize" = "x" ]; then
     echo "libtoolize not found in path"
     exit 1
@@ -65,7 +65,7 @@
    # Expecting the code above to be very portable, but just in case...
    if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
      ltpath=`dirname $libtoolize`
-     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+     ltfile=${LIBTOOL_M4}
    fi
 fi
   
@@ -76,6 +76,7 @@
 
 echo "buildconf: Using libtool.m4 at ${ltfile}."
 

 cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
 
 # libtool.m4 from 1.6 requires ltsugar.m4
@@ -100,8 +101,10 @@
 # Remove autoconf 2.5x's cache directory
 rm -rf autom4te*.cache
 
-echo "Generating 'make' outputs ..."
-build/gen-build.py $verbose make
+if [ "x${FULLBUILD}" = "xon" ] ; then
+    echo "Generating 'make' outputs ..."
+    build/gen-build.py $verbose make
+fi
 
 # Create RPM Spec file
 if [ -f `which cut` ]; then

Return to bug 146130

Removed Link Here

(-)a/www/apache22/files/patch-srclib-apr-buildconf (-32 lines)
1	--- srclib/apr/buildconf.orig Tue Jun 14 14:11:15 2005
2	+++ srclib/apr/buildconf Sun Sep 24 15:17:36 2006
3	@@ -23,7 +23,7 @@
4	#
5	build/buildcheck.sh \|\| exit 1
6
7	-libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
8	+libtoolize="${LIBTOOLIZE}"
9	if [ "x$libtoolize" = "x" ]; then
10	echo "libtoolize not found in path"
11	exit 1
12	@@ -60,7 +60,7 @@
13	# Expecting the code above to be very portable, but just in case...
14	if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
15	ltpath=`dirname $libtoolize`
16	- ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
17	+ ltfile=${LIBTOOL_M4}
18	fi
19	fi
20
21	@@ -95,8 +95,11 @@
22	# Remove autoconf 2.5x's cache directory
23	rm -rf autom4te*.cache
24
25	+
26	+if [ "x${FULLBUILD}" = "xon" ] ; then
27	echo "Generating 'make' outputs ..."
28	build/gen-build.py make
29	+fi
30
31	# Create RPM Spec file
32	if [ -f `which cut` ]; then

Lines 1-6 Link Here

(-)b/www/apache22/files/patch-srclib__apr__buildconf (-4 / +34 lines)
1	--- ./srclib/apr/buildconf.orig 2009-12-12 00:36:35.693177242 +0000	1	--- srclib/apr/buildconf.orig 2009-11-12 17:19:49.000000000 -0500
2	+++ ./srclib/apr/buildconf 2009-12-12 00:37:00.222653819 +0000	2	+++ srclib/apr/buildconf 2010-04-30 19:22:40.116834529 -0400
3	@@ -71,6 +71,7 @@	3	@@ -28,7 +28,7 @@
		4	#
		5	build/buildcheck.sh $verbose \|\| exit 1
		6
		7	-libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
		8	+libtoolize="${LIBTOOLIZE}"
		9	if [ "x$libtoolize" = "x" ]; then
		10	echo "libtoolize not found in path"
		11	exit 1
		12	@@ -65,7 +65,7 @@
		13	# Expecting the code above to be very portable, but just in case...
		14	if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
		15	ltpath=`dirname $libtoolize`
		16	- ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
		17	+ ltfile=${LIBTOOL_M4}
		18	fi
		19	fi
		20
		21	@@ -76,6 +76,7 @@
4		22
5	echo "buildconf: Using libtool.m4 at ${ltfile}."	23	echo "buildconf: Using libtool.m4 at ${ltfile}."
6		24
Lines 8-10 Link Here
8	cat $ltfile \| sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4	26	cat $ltfile \| sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
9		27
10	# libtool.m4 from 1.6 requires ltsugar.m4	28	# libtool.m4 from 1.6 requires ltsugar.m4
11	-	29	@@ -100,8 +101,10 @@
		30	# Remove autoconf 2.5x's cache directory
		31	rm -rf autom4te*.cache
		32
		33	-echo "Generating 'make' outputs ..."
		34	-build/gen-build.py $verbose make
		35	+if [ "x${FULLBUILD}" = "xon" ] ; then
		36	+ echo "Generating 'make' outputs ..."
		37	+ build/gen-build.py $verbose make
		38	+fi
		39
		40	# Create RPM Spec file
		41	if [ -f `which cut` ]; then