diff options
| author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2007-07-17 05:38:13 +0000 |
|---|---|---|
| committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2007-07-17 05:38:13 +0000 |
| commit | 74256ff6680ef17e981d8a3c5ea000e93d5e4b33 (patch) | |
| tree | 1d183ed721da8d1f9b3c4b72c2d92c90add077ed /www/apache13+ipv6 | |
| parent | e7c705ea7146ddedd131ab8290bd24ae92a5dcf2 (diff) | |
| download | ports-74256ff6680ef17e981d8a3c5ea000e93d5e4b33.tar.gz ports-74256ff6680ef17e981d8a3c5ea000e93d5e4b33.zip | |
Sync with www/apache13 to work on -CURRENT.
Reported by: marcus
Notes
Notes:
svn path=/head/; revision=195786
Diffstat (limited to 'www/apache13+ipv6')
| -rw-r--r-- | www/apache13+ipv6/Makefile | 4 | ||||
| -rw-r--r-- | www/apache13+ipv6/files/patch-ae | 32 |
2 files changed, 30 insertions, 6 deletions
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index e33c3484b3e7..10cd2c10d844 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -7,9 +7,9 @@ PORTNAME= apache+ipv6 PORTVERSION= 1.3.37 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} +MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= apache_${PORTVERSION} PATCH_SITES= http://www.don.to/arc/ diff --git a/www/apache13+ipv6/files/patch-ae b/www/apache13+ipv6/files/patch-ae index 5a34a8b90afc..ad11a7d2b3a1 100644 --- a/www/apache13+ipv6/files/patch-ae +++ b/www/apache13+ipv6/files/patch-ae @@ -1,11 +1,35 @@ ---- src/Configure.bak Thu Sep 16 03:45:17 2004 -+++ src/Configure Mon Oct 25 17:59:48 2004 -@@ -456,7 +456,7 @@ +--- src/Configure.orig Wed Jul 12 12:16:05 2006 ++++ src/Configure Thu May 31 15:03:01 2007 +@@ -26,7 +26,7 @@ + # fp2rp: + # slo.sh: + +-LANG=C; export LANG ++LC_ALL=C; export LC_ALL + exitcode=0 + trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $tmpconfig $awkfile; exit $exitcode' 0 1 2 3 15 + +@@ -457,7 +457,7 @@ PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'` OS="FreeBSD $PLATOSVERS" case "$PLATOSVERS" in - [2345]*) -+ [2-9]*) ++ *) DEF_WANTHSREGEX=no CFLAGS="$CFLAGS -funsigned-char" ;; +@@ -1083,14 +1083,8 @@ + CFLAGS_SHLIB="-fpic" + LDFLAGS_SHLIB="-shared" + LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB +- OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +- if [ "x$OBJFORMAT" = "xelf" ]; then + LDFLAGS_SHLIB_EXPORT="-Wl,-E" + SHLIB_SUFFIX_DEPTH=0 +- else +- LDFLAGS_SHLIB_EXPORT="" +- SHLIB_SUFFIX_DEPTH=2 +- fi + ;; + *-openbsd*) + PLATOSVERS=`echo $PLAT | sed 's/^.*openbsd//'` |