From c1a9cd939f09a23f0dc6572013b34c69f42419a3 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Sun, 11 Mar 2001 15:53:24 +0000 Subject: [PATCH] Use latest jstring module (php4_jstring-20010205.tar.gz) and add support for mbregex (Multibyte Regular Expressions). Submitted by: KANAI Yasunori --- www/mod_php4/distinfo | 3 ++- www/mod_php4/scripts/configure.php | 15 ++++++++------- www/mod_php5/distinfo | 3 ++- www/mod_php5/scripts/configure.php | 15 ++++++++------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo index 83acc46d7d5b..770a3a662249 100644 --- a/www/mod_php4/distinfo +++ b/www/mod_php4/distinfo @@ -1,2 +1,3 @@ MD5 (php-4.0.4pl1.tar.gz) = ae3ab0105154dddea1fa2ca18a902f85 -MD5 (php-4.0RC2_jstring-1.0.tar.gz) = 9a159030cf6cab58b1131c70780f0eb0 +MD5 (php4_jstring-20010205.tar.gz) = 8b1f1b93fb7455096bc7c3c3839ddca2 +MD5 (php4_mbregex-1.2.tar.gz) = 5dee7665737a643ee5ac294423bd0894 diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index 664c7de99291..816f7a759d17 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -28,7 +28,7 @@ SNMP "SNMP support" OFF \ XML "XML support" OFF \ FTP "File Transfer Protocol support" OFF \ gettext "gettext library support" OFF \ -jstring "jstring module" OFF \ +japanese "jstring and mbregex module" OFF \ YP "YP/NIS support" OFF \ BCMath "BCMath support" OFF \ ming "ming library support" OFF \ @@ -162,19 +162,20 @@ while [ "$1" ]; do echo "LIB_DEPENDS+= intl.1:\${PORTSDIR}/devel/gettext" echo "CONFIGURE_ARGS+=--with-gettext=\${PREFIX}" ;; - \"jstring\") + \"japanese\") ${CAT} << EOF MASTER_SITES+= ftp://night.fminn.nagano.nagano.jp/php4/ -DISTFILES= \${DISTNAME}\${EXTRACT_SUFX} php-4.0RC2_jstring-1.0.tar.gz -CONFIGURE_ARGS+=--enable-jstring +DISTFILES= \${DISTNAME}\${EXTRACT_SUFX} php4_jstring-20010205.tar.gz php4_mbregex-1.2.tar.gz +CONFIGURE_ARGS+=--enable-jstring --enable-mbregex BUILD_DEPENDS+= automake:\${PORTSDIR}/devel/automake BUILD_DEPENDS+= autoconf:\${PORTSDIR}/devel/autoconf -POSTEXTRACT+= post-extract-jstring +POSTEXTRACT+= post-extract-japanese -post-extract-jstring: - [ -d \${WRKDIR}/jstring ] && \\ +post-extract-japanese: + [ -d \${WRKDIR}/jstring -a \${WRKDIR}/mbregex ] && \\ (cd \${WRKSRC}; \\ \${MV} ${WRKDIR}/jstring ext; \\ + \${MV} ${WRKDIR}/mbregex ext; \\ \${RM} configure; \\ ./buildconf) diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo index 83acc46d7d5b..770a3a662249 100644 --- a/www/mod_php5/distinfo +++ b/www/mod_php5/distinfo @@ -1,2 +1,3 @@ MD5 (php-4.0.4pl1.tar.gz) = ae3ab0105154dddea1fa2ca18a902f85 -MD5 (php-4.0RC2_jstring-1.0.tar.gz) = 9a159030cf6cab58b1131c70780f0eb0 +MD5 (php4_jstring-20010205.tar.gz) = 8b1f1b93fb7455096bc7c3c3839ddca2 +MD5 (php4_mbregex-1.2.tar.gz) = 5dee7665737a643ee5ac294423bd0894 diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index 664c7de99291..816f7a759d17 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -28,7 +28,7 @@ SNMP "SNMP support" OFF \ XML "XML support" OFF \ FTP "File Transfer Protocol support" OFF \ gettext "gettext library support" OFF \ -jstring "jstring module" OFF \ +japanese "jstring and mbregex module" OFF \ YP "YP/NIS support" OFF \ BCMath "BCMath support" OFF \ ming "ming library support" OFF \ @@ -162,19 +162,20 @@ while [ "$1" ]; do echo "LIB_DEPENDS+= intl.1:\${PORTSDIR}/devel/gettext" echo "CONFIGURE_ARGS+=--with-gettext=\${PREFIX}" ;; - \"jstring\") + \"japanese\") ${CAT} << EOF MASTER_SITES+= ftp://night.fminn.nagano.nagano.jp/php4/ -DISTFILES= \${DISTNAME}\${EXTRACT_SUFX} php-4.0RC2_jstring-1.0.tar.gz -CONFIGURE_ARGS+=--enable-jstring +DISTFILES= \${DISTNAME}\${EXTRACT_SUFX} php4_jstring-20010205.tar.gz php4_mbregex-1.2.tar.gz +CONFIGURE_ARGS+=--enable-jstring --enable-mbregex BUILD_DEPENDS+= automake:\${PORTSDIR}/devel/automake BUILD_DEPENDS+= autoconf:\${PORTSDIR}/devel/autoconf -POSTEXTRACT+= post-extract-jstring +POSTEXTRACT+= post-extract-japanese -post-extract-jstring: - [ -d \${WRKDIR}/jstring ] && \\ +post-extract-japanese: + [ -d \${WRKDIR}/jstring -a \${WRKDIR}/mbregex ] && \\ (cd \${WRKSRC}; \\ \${MV} ${WRKDIR}/jstring ext; \\ + \${MV} ${WRKDIR}/mbregex ext; \\ \${RM} configure; \\ ./buildconf)