Index: head/www/apache2/Makefile
===================================================================
--- head/www/apache2/Makefile	(revision 109428)
+++ head/www/apache2/Makefile	(revision 109429)
@@ -1,183 +1,181 @@
 # New ports collection makefile for:	apache2
 # Date created:				7 April 2001
 # Whom:					Hye-Shik Chang <perky@fallin.lv>
 #
 # $FreeBSD$
 #
 # For more information, please read Makefile.doc
 #
 
 PORTNAME=	apache
 PORTVERSION=	2.0.49
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
 DISTNAME=	httpd-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif:powerlogo
 DIST_SUBDIR=	apache2
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER?=	clement@FreeBSD.org
 COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 LATEST_LINK=	apache2
 
 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.*
 
 # patch files
 PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:clement/}
 PATCH_SITE_SUBDIR=	clement/:clement
-PATCHFILES+=		httpd-${PORTVERSION}-buildconf.patch:clement
-PATCH_DIST_STRIP+=	-p1:clement
 .if defined (WITH_WINDOWSUPDATEFIX)
 PATCHFILES+=		httpd-${PORTVERSION}-windowsupdate.patch:clement
 .endif
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
 			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
 			AUTOHEADER=${AUTOHEADER}
 
 USE_AUTOCONF_VER=	257
 USE_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_REINPLACE=		yes
 LIBTOOLFILES=		configure
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL5} \
 		--with-port=${WITH_HTTP_PORT} \
 		--with-expat=${LOCALBASE} \
 		--libdir=${PREFIX_RELDEST}/lib/apache2 \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
 		LOCALBASE="${LOCALBASE}"
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 
 WITH_MPM?=	prefork # or worker, perchild
 
 WITH_HTTP_PORT?=	80
 
 .if !defined(WITH_IPV6_V6ONLY)
 CONFIGURE_ARGS+=	--enable-v4-mapped
 .endif
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 .endif
 
 .if defined(WITH_STATIC_SUPPORT)
 CONFIGURE_ARGS+=	--enable-static-support
 .endif
 
 .if defined(WITH_SSL_EXPERIMENTAL_ENGINE)
 CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
 .endif
 
 # for slave ports
 .if !defined(MASTERDIR)
 APACHEDIR=	${.CURDIR}
 .else
 APACHEDIR=	${MASTERDIR}
 .endif
 
 .if defined (WITH_LDAP)
 USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--with-ldap \
 			--with-ldap-lib="${LOCALBASE}/lib" \
 			--with-ldap-include="${LOCALBASE}/include"
 .endif
 
 .include <bsd.port.pre.mk>
 
 # Untested and may fail !
 .if defined(WITH_APR_FROM_PORTS)
 .    if defined (WITH_BDB) || defined(WITH_BERKELEYDB)
 BROKEN=			"You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined"
 .    endif
 LIB_DEPENDS+=		apr-0.9:${PORTSDIR}/devel/apr
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-config
 PLIST_SUB+=	PORTS_APR="@comment "
 .else
 .   if exists(${LOCALBASE}/lib/libapr-0.so)
 BROKEN=				"apr is installed and may conflict with apache one\
 					(if you want to use apr port define WITH_APR_FROM_PORTS,\
 					at your own risk)"
 .   endif
 PLIST_SUB+=	PORTS_APR=""
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
 WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
 
 show-options:
 	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
 
 show-modules:
 	@for module in ${AVAILABLE_MODULES} ; do \
 	${ECHO_MSG} -n "$${module}: ";\
 	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
 			${ECHO_CMD} -n "enabled "; \
 				if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
 					${ECHO_CMD} "(static)" ; \
 				else \
 					${ECHO_CMD} "(shared)" ;\
 				fi;\
 			else\
 			${ECHO_CMD} disabled ;\
 		fi;\
 	done
 
 pre-everything::
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"  To see all available knobs, type make show-options"
 	@${ECHO_MSG}    "  You can check your modules configuration by using show-modules"
 	@${ECHO_MSG}	""
 
 post-extract:
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
 
 pre-configure:
 	@cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
 
 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_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
 	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
 	fi
 
 .include <bsd.port.post.mk>

Property changes on: head/www/apache2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.176
\ No newline at end of property
+1.177
\ No newline at end of property
Index: head/www/apache2/distinfo
===================================================================
--- head/www/apache2/distinfo	(revision 109428)
+++ head/www/apache2/distinfo	(revision 109429)
@@ -1,8 +1,6 @@
 MD5 (apache2/httpd-2.0.49.tar.gz) = 275d3d37eed1b070f333d3618f7d1954
 SIZE (apache2/httpd-2.0.49.tar.gz) = 5919279
 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 SIZE (apache2/powerlogo.gif) = 5279
-MD5 (apache2/httpd-2.0.49-buildconf.patch) = cb42cea62242388b648ff66be21f220a
-SIZE (apache2/httpd-2.0.49-buildconf.patch) = 2476
 MD5 (apache2/httpd-2.0.49-windowsupdate.patch) = a96fe94b28094483a112705d0428e6f5
 SIZE (apache2/httpd-2.0.49-windowsupdate.patch) = 464

Property changes on: head/www/apache2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.62
\ No newline at end of property
+1.63
\ No newline at end of property
Index: head/www/apache2/files/patch-src:apr:build:buildcheck.sh
===================================================================
--- head/www/apache2/files/patch-src:apr:build:buildcheck.sh	(nonexistent)
+++ head/www/apache2/files/patch-src:apr:build:buildcheck.sh	(revision 109429)
@@ -0,0 +1,11 @@
+--- srclib/apr/build/buildcheck.sh	Sun Jan 25 16:41:56 2004
++++ srclib/apr/build/buildcheck.sh	Tue Mar  9 07:49:42 2004
+@@ -26,7 +26,7 @@
+ # output is multiline from 1.5 onwards
+ 
+ # Require libtool 1.3.3 or newer
+-libtool=`build/PrintPath glibtool libtool`
++libtool=${LIBTOOL}
+ lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+ if test -z "$lt_pversion"; then
+ echo "buildconf: libtool not found."

Property changes on: head/www/apache2/files/patch-src:apr:build:buildcheck.sh
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/apache2/files/patch-srclib:apr-util:xml:expat:buildconf.sh
===================================================================
--- head/www/apache2/files/patch-srclib:apr-util:xml:expat:buildconf.sh	(nonexistent)
+++ head/www/apache2/files/patch-srclib:apr-util:xml:expat:buildconf.sh	(revision 109429)
@@ -0,0 +1,18 @@
+--- srclib/apr-util/xml/expat/buildconf.sh	Tue Jun 17 20:51:47 2003
++++ srclib/apr-util/xml/expat/buildconf.sh	Tue Mar  9 07:52:57 2004
+@@ -3,13 +3,13 @@
+ #
+ # Build aclocal.m4 from libtool's libtool.m4
+ #
+-libtoolize=`conftools/PrintPath glibtoolize libtoolize`
++libtoolize=${LIBTOOLIZE}
+ if [ "x$libtoolize" = "x" ]; then
+     echo "libtoolize not found in path"
+     exit 1
+ fi
+ ltpath=`dirname $libtoolize`
+-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
++ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4}
+ echo "Incorporating $ltfile into aclocal.m4 ..."
+ echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
+ echo "dnl edits here will be lost" >> aclocal.m4

Property changes on: head/www/apache2/files/patch-srclib:apr-util:xml:expat:buildconf.sh
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/apache2/files/patch-srclib:apr:buildconf
===================================================================
--- head/www/apache2/files/patch-srclib:apr:buildconf	(nonexistent)
+++ head/www/apache2/files/patch-srclib:apr:buildconf	(revision 109429)
@@ -0,0 +1,28 @@
+--- srclib/apr/buildconf	Tue Jun 17 20:44:25 2003
++++ srclib/apr/buildconf	Tue Mar  9 07:53:27 2004
+@@ -60,7 +60,7 @@
+ #
+ build/buildcheck.sh || exit 1
+ 
+-libtoolize=`build/PrintPath glibtoolize libtoolize`
++libtoolize=${LIBTOOLIZE}
+ if [ "x$libtoolize" = "x" ]; then
+     echo "libtoolize not found in path"
+     exit 1
+@@ -81,14 +81,14 @@
+ $libtoolize --copy --automake
+ 
+ ltpath=`dirname $libtoolize`
+-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
++ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
+ 
+ if [ ! -f $ltfile ]; then
+     echo "$ltfile not found"
+     exit 1
+ fi
+ 
+-echo "buildconf: Using libtool.m4 at ${ltfile}."
++echo "buildconf: Using ${LIBTOOL_VERSION}.m4 at ${ltfile}."
+ 
+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ 

Property changes on: head/www/apache2/files/patch-srclib:apr:buildconf
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/apache20/Makefile
===================================================================
--- head/www/apache20/Makefile	(revision 109428)
+++ head/www/apache20/Makefile	(revision 109429)
@@ -1,183 +1,181 @@
 # New ports collection makefile for:	apache2
 # Date created:				7 April 2001
 # Whom:					Hye-Shik Chang <perky@fallin.lv>
 #
 # $FreeBSD$
 #
 # For more information, please read Makefile.doc
 #
 
 PORTNAME=	apache
 PORTVERSION=	2.0.49
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
 DISTNAME=	httpd-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif:powerlogo
 DIST_SUBDIR=	apache2
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER?=	clement@FreeBSD.org
 COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 LATEST_LINK=	apache2
 
 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.*
 
 # patch files
 PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:clement/}
 PATCH_SITE_SUBDIR=	clement/:clement
-PATCHFILES+=		httpd-${PORTVERSION}-buildconf.patch:clement
-PATCH_DIST_STRIP+=	-p1:clement
 .if defined (WITH_WINDOWSUPDATEFIX)
 PATCHFILES+=		httpd-${PORTVERSION}-windowsupdate.patch:clement
 .endif
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
 			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
 			AUTOHEADER=${AUTOHEADER}
 
 USE_AUTOCONF_VER=	257
 USE_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_REINPLACE=		yes
 LIBTOOLFILES=		configure
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL5} \
 		--with-port=${WITH_HTTP_PORT} \
 		--with-expat=${LOCALBASE} \
 		--libdir=${PREFIX_RELDEST}/lib/apache2 \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
 		LOCALBASE="${LOCALBASE}"
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 
 WITH_MPM?=	prefork # or worker, perchild
 
 WITH_HTTP_PORT?=	80
 
 .if !defined(WITH_IPV6_V6ONLY)
 CONFIGURE_ARGS+=	--enable-v4-mapped
 .endif
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 .endif
 
 .if defined(WITH_STATIC_SUPPORT)
 CONFIGURE_ARGS+=	--enable-static-support
 .endif
 
 .if defined(WITH_SSL_EXPERIMENTAL_ENGINE)
 CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
 .endif
 
 # for slave ports
 .if !defined(MASTERDIR)
 APACHEDIR=	${.CURDIR}
 .else
 APACHEDIR=	${MASTERDIR}
 .endif
 
 .if defined (WITH_LDAP)
 USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--with-ldap \
 			--with-ldap-lib="${LOCALBASE}/lib" \
 			--with-ldap-include="${LOCALBASE}/include"
 .endif
 
 .include <bsd.port.pre.mk>
 
 # Untested and may fail !
 .if defined(WITH_APR_FROM_PORTS)
 .    if defined (WITH_BDB) || defined(WITH_BERKELEYDB)
 BROKEN=			"You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined"
 .    endif
 LIB_DEPENDS+=		apr-0.9:${PORTSDIR}/devel/apr
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-config
 PLIST_SUB+=	PORTS_APR="@comment "
 .else
 .   if exists(${LOCALBASE}/lib/libapr-0.so)
 BROKEN=				"apr is installed and may conflict with apache one\
 					(if you want to use apr port define WITH_APR_FROM_PORTS,\
 					at your own risk)"
 .   endif
 PLIST_SUB+=	PORTS_APR=""
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
 WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
 
 show-options:
 	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
 
 show-modules:
 	@for module in ${AVAILABLE_MODULES} ; do \
 	${ECHO_MSG} -n "$${module}: ";\
 	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
 			${ECHO_CMD} -n "enabled "; \
 				if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
 					${ECHO_CMD} "(static)" ; \
 				else \
 					${ECHO_CMD} "(shared)" ;\
 				fi;\
 			else\
 			${ECHO_CMD} disabled ;\
 		fi;\
 	done
 
 pre-everything::
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"  To see all available knobs, type make show-options"
 	@${ECHO_MSG}    "  You can check your modules configuration by using show-modules"
 	@${ECHO_MSG}	""
 
 post-extract:
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
 
 pre-configure:
 	@cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
 
 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_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
 	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
 	fi
 
 .include <bsd.port.post.mk>

Property changes on: head/www/apache20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.176
\ No newline at end of property
+1.177
\ No newline at end of property
Index: head/www/apache20/distinfo
===================================================================
--- head/www/apache20/distinfo	(revision 109428)
+++ head/www/apache20/distinfo	(revision 109429)
@@ -1,8 +1,6 @@
 MD5 (apache2/httpd-2.0.49.tar.gz) = 275d3d37eed1b070f333d3618f7d1954
 SIZE (apache2/httpd-2.0.49.tar.gz) = 5919279
 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 SIZE (apache2/powerlogo.gif) = 5279
-MD5 (apache2/httpd-2.0.49-buildconf.patch) = cb42cea62242388b648ff66be21f220a
-SIZE (apache2/httpd-2.0.49-buildconf.patch) = 2476
 MD5 (apache2/httpd-2.0.49-windowsupdate.patch) = a96fe94b28094483a112705d0428e6f5
 SIZE (apache2/httpd-2.0.49-windowsupdate.patch) = 464

Property changes on: head/www/apache20/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.62
\ No newline at end of property
+1.63
\ No newline at end of property
Index: head/www/apache20/files/patch-src:apr:build:buildcheck.sh
===================================================================
--- head/www/apache20/files/patch-src:apr:build:buildcheck.sh	(nonexistent)
+++ head/www/apache20/files/patch-src:apr:build:buildcheck.sh	(revision 109429)
@@ -0,0 +1,11 @@
+--- srclib/apr/build/buildcheck.sh	Sun Jan 25 16:41:56 2004
++++ srclib/apr/build/buildcheck.sh	Tue Mar  9 07:49:42 2004
+@@ -26,7 +26,7 @@
+ # output is multiline from 1.5 onwards
+ 
+ # Require libtool 1.3.3 or newer
+-libtool=`build/PrintPath glibtool libtool`
++libtool=${LIBTOOL}
+ lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+ if test -z "$lt_pversion"; then
+ echo "buildconf: libtool not found."

Property changes on: head/www/apache20/files/patch-src:apr:build:buildcheck.sh
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh
===================================================================
--- head/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh	(nonexistent)
+++ head/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh	(revision 109429)
@@ -0,0 +1,18 @@
+--- srclib/apr-util/xml/expat/buildconf.sh	Tue Jun 17 20:51:47 2003
++++ srclib/apr-util/xml/expat/buildconf.sh	Tue Mar  9 07:52:57 2004
+@@ -3,13 +3,13 @@
+ #
+ # Build aclocal.m4 from libtool's libtool.m4
+ #
+-libtoolize=`conftools/PrintPath glibtoolize libtoolize`
++libtoolize=${LIBTOOLIZE}
+ if [ "x$libtoolize" = "x" ]; then
+     echo "libtoolize not found in path"
+     exit 1
+ fi
+ ltpath=`dirname $libtoolize`
+-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
++ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4}
+ echo "Incorporating $ltfile into aclocal.m4 ..."
+ echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
+ echo "dnl edits here will be lost" >> aclocal.m4

Property changes on: head/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/apache20/files/patch-srclib:apr:buildconf
===================================================================
--- head/www/apache20/files/patch-srclib:apr:buildconf	(nonexistent)
+++ head/www/apache20/files/patch-srclib:apr:buildconf	(revision 109429)
@@ -0,0 +1,28 @@
+--- srclib/apr/buildconf	Tue Jun 17 20:44:25 2003
++++ srclib/apr/buildconf	Tue Mar  9 07:53:27 2004
+@@ -60,7 +60,7 @@
+ #
+ build/buildcheck.sh || exit 1
+ 
+-libtoolize=`build/PrintPath glibtoolize libtoolize`
++libtoolize=${LIBTOOLIZE}
+ if [ "x$libtoolize" = "x" ]; then
+     echo "libtoolize not found in path"
+     exit 1
+@@ -81,14 +81,14 @@
+ $libtoolize --copy --automake
+ 
+ ltpath=`dirname $libtoolize`
+-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
++ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
+ 
+ if [ ! -f $ltfile ]; then
+     echo "$ltfile not found"
+     exit 1
+ fi
+ 
+-echo "buildconf: Using libtool.m4 at ${ltfile}."
++echo "buildconf: Using ${LIBTOOL_VERSION}.m4 at ${ltfile}."
+ 
+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ 

Property changes on: head/www/apache20/files/patch-srclib:apr:buildconf
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property