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

Update patches for 4.4.5 release.

Browse source
This commit is contained in:
Alex Dupre 2007-02-17 10:19:18 +00:00
parent bea3954d7b
commit 0b08c68474
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=185364
3 changed files with 10 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
databases/php4-dba/files/patch-config.m4
View file

@ -1,9 +1,13 @@
--- config.m4.orig Sat Sep 25 23:32:20 2004
+++ config.m4 Wed Jan 12 23:42:24 2005
@@ -206,6 +206,18 @@
--- config.m4.orig Tue Nov 28 12:41:35 2006
+++ config.m4 Sat Feb 17 11:13:51 2007
@@ -205,6 +205,22 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h
break
+ elif test -f "$i/include/db44/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db44/db.h
+ break
+ elif test -f "$i/include/db43/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db43/db.h
@ -19,12 +23,12 @@
elif test -f "$i/include/db4/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db4/db.h
@@ -224,7 +236,7 @@
@@ -223,7 +239,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db-4.3 db-4.2 db-4.1 db-4.0 db-4 db41 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
- PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db41 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
])
AC_DBA_STD_RESULT(db4,Berkeley DB4)

2
ftp/php4-curl/Makefile
View file

@ -11,6 +11,4 @@ MASTERDIR= ${.CURDIR}/../../lang/php4
PKGNAMESUFFIX= -curl
PORTREVISION= 2
.include "${MASTERDIR}/Makefile"

22
ftp/php4-curl/files/patch-curl.c
View file

@ -1,22 +0,0 @@
--- curl.c.orig Wed Dec 6 11:12:37 2006
+++ curl.c Wed Dec 6 11:13:27 2006
@@ -258,7 +258,9 @@
REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
+#if CURLOPT_FTPASCII != 0
REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
+#endif
REGISTER_CURL_CONSTANT(CURLOPT_PUT);
#if CURLOPT_MUTE != 0
REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
@@ -296,7 +298,9 @@
REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
+#if CURLOPT_PASSWDFUNCTION != 0
REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
+#endif
REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);