Date: Sun, 7 Apr 2002 09:10:02 -0700 (PDT) From: Hye-Shik Chang <perky@akaraka.yonsei.ac.kr> To: freebsd-ports@FreeBSD.org Subject: Re: ports/36834: Update port: www/apache2 (to the first general release) Message-ID: <200204071610.g37GA2524580@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/36834; it has been noted by GNATS. From: Hye-Shik Chang <perky@akaraka.yonsei.ac.kr> To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: Re: ports/36834: Update port: www/apache2 (to the first general release) Date: Mon, 8 Apr 2002 01:03:17 +0900 Here's additional patches for FreeBSD-current # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # files/patch-srclib:apr:build:ltmain.sh # files/patch-srclib:apr:include:apr_atomic.h # echo x - files/patch-srclib:apr:build:ltmain.sh sed 's/^X//' >files/patch-srclib:apr:build:ltmain.sh << 'END-of-files/patch-srclib:apr:build:ltmain.sh' X--- srclib/apr/build/ltmain.sh.orig Sun Apr 7 23:04:28 2002 X+++ srclib/apr/build/ltmain.sh Sun Apr 7 23:05:33 2002 X@@ -1959,14 +1959,14 @@ X if test $? -eq 0 ; then X ldd_output=`ldd conftest` X for i in $deplibs; do X- name="`expr $i : '-l\(.*\)'`" X+ name="`expr -- $i : '-l\(.*\)'`" X # If $name is empty we are operating on a -L argument. X if test "$name" != "" ; then X libname=`eval \\$echo \"$libname_spec\"` X deplib_matches=`eval \\$echo \"$library_names_spec\"` X set dummy $deplib_matches X deplib_match=$2 X- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then X+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then X newdeplibs="$newdeplibs $i" X else X droppeddeps=yes X@@ -1984,7 +1984,7 @@ X # Error occured in the first compile. Let's try to salvage the situation: X # Compile a seperate program for each library. X for i in $deplibs; do X- name="`expr $i : '-l\(.*\)'`" X+ name="`expr -- $i : '-l\(.*\)'`" X # If $name is empty we are operating on a -L argument. X if test "$name" != "" ; then X $rm conftest X@@ -1996,7 +1996,7 @@ X deplib_matches=`eval \\$echo \"$library_names_spec\"` X set dummy $deplib_matches X deplib_match=$2 X- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then X+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then X newdeplibs="$newdeplibs $i" X else X droppeddeps=yes X@@ -2022,9 +2022,9 @@ X ;; X file_magic*) X set dummy $deplibs_check_method X- file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`" X+ file_magic_regex="`expr -- \"$deplibs_check_method\" : \"$2 \(.*\)\"`" X for a_deplib in $deplibs; do X- name="`expr $a_deplib : '-l\(.*\)'`" X+ name="`expr -- $a_deplib : '-l\(.*\)'`" X # If $name is empty we are operating on a -L argument. X if test "$name" != "" ; then X libname=`eval \\$echo \"$libname_spec\"` END-of-files/patch-srclib:apr:build:ltmain.sh echo x - files/patch-srclib:apr:include:apr_atomic.h sed 's/^X//' >files/patch-srclib:apr:include:apr_atomic.h << 'END-of-files/patch-srclib:apr:include:apr_atomic.h' X--- srclib/apr/include/apr_atomic.h.orig Sun Apr 7 22:54:09 2002 X+++ srclib/apr/include/apr_atomic.h Sun Apr 7 22:55:03 2002 X@@ -191,10 +191,10 @@ X #include <machine/atomic.h> X X #define apr_atomic_t apr_uint32_t X-#define apr_atomic_add(mem, val) atomic_add_int(mem,val) X-#define apr_atomic_dec(mem) atomic_subtract_int(mem,1) X-#define apr_atomic_inc(mem) atomic_add_int(mem,1) X-#define apr_atomic_set(mem, val) atomic_set_int(mem, val) X+#define apr_atomic_add(mem, val) (atomic_add_int(mem,val),mem) X+#define apr_atomic_dec(mem) (atomic_subtract_int(mem,1),mem) X+#define apr_atomic_inc(mem) (atomic_add_int(mem,1),mem) X+#define apr_atomic_set(mem, val) (atomic_set_int(mem, val),mem) X #define apr_atomic_read(mem) *mem X X #define APR_ATOMIC_NEED_CAS_DEFAULT 1 END-of-files/patch-srclib:apr:include:apr_atomic.h exit To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204071610.g37GA2524580>