diff options
| author | jlam <jlam@pkgsrc.org> | 2001-05-01 17:56:45 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-05-01 17:56:45 +0000 |
| commit | d28621d5b88da8bb7a754a2a76b768b0d2f4586a (patch) | |
| tree | 92d134c63fa527b9f9678ec1195e60ea510927f0 /www | |
| parent | b73958a86e1f53a036e7b47749c2ddceae798a41 (diff) | |
| download | pkgsrc-d28621d5b88da8bb7a754a2a76b768b0d2f4586a.tar.gz | |
Add support for building the mcrypt module as a separate package.
Diffstat (limited to 'www')
| -rw-r--r-- | www/php4/distinfo | 5 | ||||
| -rw-r--r-- | www/php4/patches/patch-ab | 28 | ||||
| -rw-r--r-- | www/php4/patches/patch-ah | 20 |
3 files changed, 50 insertions, 3 deletions
diff --git a/www/php4/distinfo b/www/php4/distinfo index 03eda5d5d4d..86a3e2540c2 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:02:43 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/05/01 17:56:45 jlam Exp $ SHA1 (php-4.0.4pl1.tar.gz) = 15570c0d59277588ff825d4e09ea615205e1b852 Size (php-4.0.4pl1.tar.gz) = 2439189 bytes SHA1 (patch-aa) = edbfea1d308910442c11e84a5bd04c00144170e7 -SHA1 (patch-ab) = a0d4fd0ec05ec70467c5a65b63e1beeb94a935ca +SHA1 (patch-ab) = b8b04c16ae8e8c0c1d78adb16ffbbcfb5fc0a75c SHA1 (patch-ad) = 04b6123920c1c24dedcb032f785217ca193b7f36 SHA1 (patch-ae) = e8a2ed7a684faf0f439ff3c26cce88c2d9b9aebc SHA1 (patch-af) = e6b2995d5ede074f73d69a93ab361519811268df SHA1 (patch-ag) = c5f04ef52b9d44cd0a4251d3074e4dbc668987e7 +SHA1 (patch-ah) = 7abe1f61ead385534e76386e5b75f674416231d8 diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index 6e613cc0764..613a7726326 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2001/03/13 21:34:03 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2001/05/01 17:56:46 jlam Exp $ --- configure.orig Thu Jan 11 13:39:29 2001 +++ configure @@ -10,6 +10,32 @@ $NetBSD: patch-ab,v 1.5 2001/03/13 21:34:03 jlam Exp $ #include <sys/socket.h> #include <netinet/in.h> int main() { +@@ -23088,12 +23089,7 @@ + + LIBS=$old_LIBS + LDFLAGS="$old_LDFLAGS" +- if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBMCRYPT22 1 +-EOF +- +- elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then ++ if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then + + case "ltdl" in + c|c_r|pthread*) ;; +@@ -23110,6 +23106,11 @@ + #define HAVE_LIBMCRYPT24 1 + EOF + ++ elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBMCRYPT22 1 ++EOF ++ + else + { echo "configure: error: Sorry" 1>&2; exit 1; } + fi @@ -40176,6 +40177,7 @@ fi diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah new file mode 100644 index 00000000000..e7c7a8d78cd --- /dev/null +++ b/www/php4/patches/patch-ah @@ -0,0 +1,20 @@ +$NetBSD: patch-ah,v 1.1 2001/05/01 17:56:46 jlam Exp $ + +--- ext/mcrypt/config.m4.orig Sat Sep 9 08:24:20 2000 ++++ ext/mcrypt/config.m4 +@@ -27,11 +27,11 @@ + AC_CHECK_LIB(mcrypt, mcrypt_module_open, [LIBS="$LIBS -lltdl"],[ ],) + LIBS=$old_LIBS + LDFLAGS="$old_LDFLAGS" +- if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then +- AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) +- elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then ++ if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then + AC_ADD_LIBRARY(ltdl) +- AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) ++ AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) ++ elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then ++ AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) + else + AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.) + fi |