kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- import buildconf patch in ports tree.

Browse source 
It has been living out the tree for historical reason.
This commit is contained in:
Clement Laforet 2004-05-18 11:58:56 +00:00
parent 9001aff353
commit 51b7685381
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=109429
10 changed files with 114 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/apache2/Makefile
View file

@ -34,8 +34,6 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
# 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

2
www/apache2/distinfo
View file

@ -2,7 +2,5 @@ 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

11
www/apache2/files/patch-src:apr:build:buildcheck.sh Normal file
View file

@ -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."

18
www/apache2/files/patch-srclib:apr-util:xml:expat:buildconf.sh Normal file
View file

@ -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

28
www/apache2/files/patch-srclib:apr:buildconf Normal file
View file

@ -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

2
www/apache20/Makefile
View file

@ -34,8 +34,6 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
# 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

2
www/apache20/distinfo
View file

@ -2,7 +2,5 @@ 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

11
www/apache20/files/patch-src:apr:build:buildcheck.sh Normal file
View file

@ -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."

18
www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh Normal file
View file

@ -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

28
www/apache20/files/patch-srclib:apr:buildconf Normal file
View file

@ -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