cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to php4-4.2.3

Browse Source 
- include the domxml extension as a subpackage
- include some extra modules with PEAR which also disappeared
- only link against freetype1, not freetype2
This commit is contained in:
avsm 2002-09-11 23:16:48 +00:00
parent f815a5dd63
commit f3da1d65db
19 changed files with 111 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/php4/Makefile.inc
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.6 2002/08/20 02:56:48 avsm Exp $
# $OpenBSD: Makefile.inc,v 1.7 2002/09/11 23:16:48 avsm Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
ONLY_FOR_ARCHS= alpha i386 m68k powerpc sparc sparc64
V= 4.2.2
V= 4.2.3
DISTNAME= php-${V}
CATEGORIES= www lang

3
www/php4/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2002/08/12 04:27:41 avsm Exp $
# $OpenBSD: Makefile,v 1.6 2002/09/11 23:16:48 avsm Exp $
COMMENT= "server-side HTML-embedded scripting language"
PKGNAME= php4-core-${V}
@ -56,4 +56,3 @@ CONFIGURE_ARGS+= --with-recode=${LOCALBASE}
.endif
.include <bsd.port.mk>

6
www/php4/core/distinfo
View File

@ -1,3 +1,3 @@
MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b
RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb
SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5
MD5 (php-4.2.3.tar.gz) = 2a4a963d79d97ea2725c860c77e908a2
RMD160 (php-4.2.3.tar.gz) = 37a2ede463cd9af1874fec4a5cfc874dead865ca
SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc

17
www/php4/core/patches/patch-php_ini-dist
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-dist,v 1.5 2002/08/17 01:39:26 avsm Exp $
--- php.ini-dist.orig Mon Apr 8 02:15:16 2002
+++ php.ini-dist Sat Aug 17 02:33:38 2002
$OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
--- php.ini-dist.orig Wed Aug 14 23:35:36 2002
+++ php.ini-dist Sat Aug 24 12:54:49 2002
@@ -356,9 +356,6 @@ default_mimetype = "text/html"
; UNIX: "/path1:/path2"
;include_path = ".:/php/includes"
@ -119,16 +119,7 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2002/08/17 01:39:26 avsm Exp $
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -746,7 +664,7 @@ session.cache_limiter = nocache
session.cache_expire = 180
; use transient sid support if enabled by compiling with --enable-trans-sid.
-session.use_trans_sid = 1
+session.use_trans_sid = 0
url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
@@ -877,6 +795,41 @@ sockets.use_system_read = On
@@ -885,6 +803,41 @@ sockets.use_system_read = On
;fbsql.max_results = 128
;fbsql.batchSize = 1000

17
www/php4/core/patches/patch-php_ini-recommended
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-recommended,v 1.5 2002/08/17 01:39:26 avsm Exp $
--- php.ini-recommended.orig Wed Apr 24 02:51:50 2002
+++ php.ini-recommended Sat Aug 17 02:34:55 2002
$OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
--- php.ini-recommended.orig Wed Aug 14 23:35:36 2002
+++ php.ini-recommended Sat Aug 24 12:54:49 2002
@@ -361,9 +361,6 @@ default_mimetype = "text/html"
; UNIX: "/path1:/path2"
;include_path = ".:/php/includes"
@ -119,16 +119,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2002/08/17 01:39:26 avsm Exp $
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -753,7 +671,7 @@ session.cache_limiter = nocache
session.cache_expire = 180
; use transient sid support if enabled by compiling with --enable-trans-sid.
-session.use_trans_sid = 1
+session.use_trans_sid = 0
url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
@@ -884,6 +802,41 @@ sockets.use_system_read = On
@@ -892,6 +810,41 @@ sockets.use_system_read = On
;fbsql.max_results = 128
;fbsql.batchSize = 1000

37
www/php4/extensions/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2002/08/17 01:33:57 avsm Exp $
# $OpenBSD: Makefile,v 1.14 2002/09/11 23:16:48 avsm Exp $
PKGNAME= php4-extensions-${V}
COMMENT= "informational package about PHP4 extensions"
@ -64,6 +64,17 @@ COMMENT-dbase= "dBase database access extensions for php4"
CONFIGURE_ARGS+= --enable-dbase=shared
.endif
# domxml
PSEUDO_FLAVORS+= no_domxml
.if ${FLAVOR:L:Mno_domxml}
CONFIGURE_ARGS+= --disable-dom
.else
MULTI_PACKAGES+= -domxml
COMMENT-domxml= "manipulate XML via the DOM API in php4"
CONFIGURE_ARGS+= --with-dom=shared,${LOCALBASE}
DOMXML_DEPENDS= xml2.6::textproc/libxml
.endif
# filepro
PSEUDO_FLAVORS+= no_filepro
.if ${FLAVOR:L:Mno_filepro}
@ -82,13 +93,15 @@ CONFIGURE_ARGS+= --without-gd --without-xpm-dir --without-ttf \
.else
MULTI_PACKAGES+= -gd
COMMENT-gd= "image manipulation extensions for php4"
GD_DEPENDS= gd.18::graphics/gd ${GRAPHIC_DEPENDS}
CONFIGURE_ARGS+= --with-gd=shared,${LOCALBASE} ${GRAPHIC_CONFIG}
GD_DEPENDS= gd.18::graphics/gd ${GRAPHIC_DEPENDS} \
ttf.1::print/freetype
CONFIGURE_ARGS+= --with-gd=shared,${LOCALBASE} ${GRAPHIC_CONFIG} \
--with-ttf=shared,${LOCALBASE} --without-freetype-dir
.if !${FLAVOR:L:Mno_x11}
USE_X11= yes
CONFIGURE_ARGS+= --with-xpm-dir=${X11BASE} --with-ttf=shared,${LOCALBASE} --without-freetype-dir
CONFIGURE_ARGS+= --with-xpm-dir=${X11BASE}
.else
CONFIGURE_ARGS+= --without-xpm-dir --without-freetype-dir --without-ttf
CONFIGURE_ARGS+= --without-xpm-dir
.endif
.endif
@ -223,6 +236,18 @@ CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack
LIB_DEPENDS+= snmp.42::net/ucd-snmp
.endif
# pspell
#PSEUDO_FLAVORS+= no_pspell
#.if ${FLAVOR:L:Mno_pspell}
#CONFIGURE_ARGS+= --without-pspell
#.else
#MULTI_PACKAGES+= -pspell
#COMMENT-pspell= "spell checking extensions for php4"
#CONFIGURE_ARGS+= --with-pspell=shared,${LOCALBASE}
#LIB_DEPENDS+= pspell-modules::textproc/pspell \
# aspell.11::textproc/aspell
#.endif
# sybase-ct
PSEUDO_FLAVORS+= no_sybase_ct
.if ${FLAVOR:L:Mno_sybase_ct}
@ -255,7 +280,7 @@ MULTI_PACKAGES+= -xslt
COMMENT-xslt= "xslt transformation extensions for php4"
CONFIGURE_ARGS+= --enable-xslt=shared --with-xslt-sablot=shared=${LOCALBASE} \
--with-expat-dir=shared,${LOCALBASE}
XSLT_DEPENDS= sablot.95::textproc/sablotron expat.2::textproc/expat
XSLT_DEPENDS= sablot.96::textproc/sablotron expat.2::textproc/expat
.endif
.for i in ${MULTI_PACKAGES}

6
www/php4/extensions/distinfo
View File

@ -1,3 +1,3 @@
MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b
RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb
SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5
MD5 (php-4.2.3.tar.gz) = 2a4a963d79d97ea2725c860c77e908a2
RMD160 (php-4.2.3.tar.gz) = 37a2ede463cd9af1874fec4a5cfc874dead865ca
SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc

8
www/php4/extensions/patches/patch-aclocal_m4
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2002/08/12 04:30:21 avsm Exp $
--- aclocal.m4.orig Thu Aug 8 00:42:18 2002
+++ aclocal.m4 Thu Aug 8 00:42:41 2002
@@ -4087,7 +4087,7 @@ openbsd*)
$OpenBSD: patch-aclocal_m4,v 1.2 2002/09/11 23:16:48 avsm Exp $
--- aclocal.m4.orig Sat Aug 24 02:08:12 2002
+++ aclocal.m4 Sat Aug 24 13:34:25 2002
@@ -3683,7 +3683,7 @@ openbsd*)
shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'

10
www/php4/extensions/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.2 2002/07/22 16:47:33 avsm Exp $
--- configure.in.orig Sun Jul 21 08:49:33 2002
+++ configure.in Mon Jul 22 10:50:23 2002
@@ -791,7 +791,7 @@ unset with_pic
$OpenBSD: patch-configure_in,v 1.3 2002/09/11 23:16:48 avsm Exp $
--- configure.in.orig Fri Sep 6 00:20:49 2002
+++ configure.in Sat Sep 7 19:21:34 2002
@@ -787,7 +787,7 @@ unset with_pic
case $php_build_target in
program|static)
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/07/22 16:47:33 avsm Exp $
if test "$lib_build_shared" != "yes"; then
enable_shared=no
fi
@@ -800,7 +800,7 @@ program|static)
@@ -796,7 +796,7 @@ program|static)
;;
shared)
enable_static=no

21
www/php4/extensions/patches/patch-ext_gd_config_m4
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-ext_gd_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
--- ext/gd/config.m4.orig Wed Apr 24 01:18:06 2002
+++ ext/gd/config.m4 Wed Jun 19 12:39:19 2002
@@ -209,6 +209,7 @@ PHP_ARG_WITH(gd, for GD support,
$OpenBSD: patch-ext_gd_config_m4,v 1.2 2002/09/11 23:16:48 avsm Exp $
--- ext/gd/config.m4.orig Wed Apr 24 00:18:06 2002
+++ ext/gd/config.m4 Sun Sep 8 00:28:41 2002
@@ -135,6 +135,8 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
done
if test -n "$FREETYPE2_DIR" ; then
+ PHP_ADD_LIBRARY_WITH_PATH(Xfont, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(fntstubs, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
@@ -209,6 +211,7 @@ PHP_ARG_WITH(gd, for GD support,
[ --with-gd[=DIR] Include GD support (DIR is GD's install dir).])
if test "$PHP_GD" != "no"; then
@ -9,7 +18,7 @@ $OpenBSD: patch-ext_gd_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
PHP_EXTENSION(gd, $ext_shared)
PHP_SUBST(GD_SHARED_LIBADD)
@@ -239,6 +240,7 @@ dnl Various checks for GD features
@@ -239,6 +242,7 @@ dnl Various checks for GD features
done
done
@ -17,7 +26,7 @@ $OpenBSD: patch-ext_gd_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
if test -n "$GD_INCLUDE" -a -n "$GD_LIB" ; then
PHP_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB, GD_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBGD,1,[ ])
@@ -246,16 +248,6 @@ dnl Various checks for GD features
@@ -246,16 +250,6 @@ dnl Various checks for GD features
else
AC_MSG_ERROR([Unable to find libgd.(a|so) anywhere under $GD_SEARCH_PATHS])
fi

11
www/php4/extensions/patches/patch-ext_gmp_config_m4
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-ext_gmp_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
--- ext/gmp/config.m4.orig Fri Nov 30 18:59:37 2001
+++ ext/gmp/config.m4 Wed Jun 19 22:18:14 2002
@@ -21,5 +21,6 @@ if test "$PHP_GMP" != "no"; then
PHP_EXTENSION(gmp, $ext_shared)
AC_DEFINE(HAVE_GMP, 1, [ ])
- PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib)
+ PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD)
+ PHP_SUBST(GMP_SHARED_LIBADD)
fi

8
www/php4/extensions/patches/patch-ext_imap_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_imap_config_m4,v 1.2 2002/07/09 18:14:17 avsm Exp $
--- ext/imap/config.m4.orig Tue Aug 7 12:18:04 2001
+++ ext/imap/config.m4 Sat Apr 6 17:40:25 2002
$OpenBSD: patch-ext_imap_config_m4,v 1.3 2002/09/11 23:16:48 avsm Exp $
--- ext/imap/config.m4.orig Wed Aug 21 00:09:01 2002
+++ ext/imap/config.m4 Sat Aug 24 13:34:25 2002
@@ -36,10 +36,12 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
if test "$PHP_KERBEROS" != "no"; then
AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
@ -16,7 +16,7 @@ $OpenBSD: patch-ext_imap_config_m4,v 1.2 2002/07/09 18:14:17 avsm Exp $
+ PHP_ADD_LIBRARY(kafs, 1, IMAP_SHARED_LIBADD)
else
AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
AC_MSG_ERROR(This c-client library is build with Kerberos support.
AC_MSG_ERROR(This c-client library is built with Kerberos support.
@@ -71,7 +73,7 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [
old_LIBS=$LIBS
LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB"

10
www/php4/extensions/patches/patch-ext_pgsql_config_m4
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-ext_pgsql_config_m4,v 1.2 2002/07/09 18:14:17 avsm Exp $
--- ext/pgsql/config.m4.orig Mon Apr 1 12:44:52 2002
+++ ext/pgsql/config.m4 Tue Jul 9 18:17:23 2002
$OpenBSD: patch-ext_pgsql_config_m4,v 1.3 2002/09/11 23:16:48 avsm Exp $
--- ext/pgsql/config.m4.orig Thu Aug 1 11:19:17 2002
+++ ext/pgsql/config.m4 Sat Aug 24 13:35:19 2002
@@ -27,7 +27,7 @@ if test "$PHP_PGSQL" != "no"; then
done
for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
- if test -f "$i/$j/libpq.so"; then
+ if test -f $i/$j/libpq.so*; then
- if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
+ if test -f "$i/$j/libpq.so*" || test -f "$i/$j/libpq.a"; then
PGSQL_LIBDIR=$i/$j
fi
done

12
www/php4/extensions/patches/patch-main_php_config_h_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-main_php_config_h_in,v 1.3 2002/09/11 23:16:48 avsm Exp $
--- main/php_config.h.in.orig Sat Sep 7 19:56:37 2002
+++ main/php_config.h.in Sat Sep 7 19:56:45 2002
@@ -996,7 +996,7 @@
#undef HAVE_BZ2
/* Whether to build bz2 as dynamic module */
-#undef COMPILE_DL_BZ
+#undef COMPILE_DL_BZ2
/* */
#undef HAVE_CALENDAR

4
www/php4/extensions/pkg/DESCR-domxml Normal file
View File

@ -0,0 +1,4 @@
This PHP extension allows the parsing of XML formatted files using
the DOM API.
WWW: ${HOMEPAGE}

2
www/php4/extensions/pkg/PLIST-domxml Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PLIST-domxml,v 1.1 2002/09/11 23:16:48 avsm Exp $
lib/php/modules/domxml.so

6
www/php4/pear/distinfo
View File

@ -1,3 +1,3 @@
MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b
RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb
SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5
MD5 (php-4.2.3.tar.gz) = 2a4a963d79d97ea2725c860c77e908a2
RMD160 (php-4.2.3.tar.gz) = 37a2ede463cd9af1874fec4a5cfc874dead865ca
SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc

BIN
www/php4/pear/files/pear-412-421.tgz
View File

Binary file not shown.

10
www/php4/pear/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/06/24 19:30:31 avsm Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/09/11 23:16:48 avsm Exp $
bin/pear
bin/pearize
bin/php-config
@ -84,6 +84,7 @@ include/php/ext/standard/md5.h
include/php/ext/standard/microtime.h
include/php/ext/standard/pack.h
include/php/ext/standard/pageinfo.h
include/php/ext/standard/parsedate.h
include/php/ext/standard/php_array.h
include/php/ext/standard/php_assert.h
include/php/ext/standard/php_browscap.h
@ -184,6 +185,8 @@ lib/php/DB/storage.php
lib/php/DB/sybase.php
lib/php/Date/Calc.php
lib/php/Date/Human.php
lib/php/File.php
lib/php/File/CSV.php
lib/php/File/Find.php
lib/php/File/Passwd.php
lib/php/File/SearchReplace.php
@ -208,8 +211,13 @@ lib/php/Log/sql.php
lib/php/Log/syslog.php
lib/php/Mail.php
lib/php/Mail/RFC822.php
lib/php/Mail/mime.php
lib/php/Mail/mimeDecode.php
lib/php/Mail/mimePart.php
lib/php/Mail/sendmail.php
lib/php/Mail/smtp.php
lib/php/Mail/xmail.dtd
lib/php/Mail/xmail.xsl
lib/php/Net/Curl.php
lib/php/Net/Dig.php
lib/php/Net/SMTP.php