- Update to 5.0.0RC3 release

- Remove PDFlib extension

8 files changed, 10 insertions, 28 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index d578c1f1a3c8..f717e77288ed 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -21,8 +21,7 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.0.r2
-PORTREVISION=	2
+PORTVERSION=	5.0.0.r3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,}
 MASTER_SITE_SUBDIR=	distributions/:release
@@ -126,7 +125,7 @@ PLIST_SUB+=	CLI=""
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \
 		DOM EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
 		INIFILE MBSTRING MCVE MCRYPT MHASH MING MNOGOSEARCH MSSQL \
-		MYSQL MYSQLI NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB \
+		MYSQL MYSQLI NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE \
 		POSIX POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP \
 		SIMPLEXML SNMP SOAP SOCKETS SPL SQLITE SYBASEDB SYBASECT \
 		SYSVMSG SYSVSEM SYSVSHM TIDY TOKENIZER UNIXODBC WDDX XML \
@@ -197,7 +196,7 @@ WITH_OPENSSL_DEP=	yes
 WITH_XML_DEP=	yes
 .endif
 
-.if defined(WITH_GD) || defined(WITH_MYSQL) || defined(WITH_PDFLIB)
+.if defined(WITH_GD) || defined(WITH_MYSQL)
 WITH_ZLIB_DEP=	yes
 .endif
 
@@ -291,7 +290,6 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=--with-gd \
 		--enable-gd-native-ttf \
-		--enable-gd-jis-conv \
 		--with-freetype-dir=${LOCALBASE} \
 		--with-t1lib=${LOCALBASE} \
 		--with-jpeg-dir=${LOCALBASE} \
@@ -414,11 +412,6 @@ CONFIGURE_ARGS+=--enable-pcntl
 CONFIGURE_ARGS+=--with-pcre-regex
 .endif
 
-.if defined(WITH_PDFLIB)
-LIB_DEPENDS+=	pdf.6:${PORTSDIR}/print/pdflib
-CONFIGURE_ARGS+=--with-pdflib=${LOCALBASE}
-.endif
-
 .if defined(WITH_POSIX)
 CONFIGURE_ARGS+=--enable-posix
 .endif
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index efe9823a6a17..05688432e927 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-5.0.0RC2.tar.bz2) = 99e056269c2e3eac7e934755c60c44b7
-SIZE (php-5.0.0RC2.tar.bz2) = 4498965
+MD5 (php-5.0.0RC3.tar.bz2) = aa24589d3c173052998792e4a6d255fa
+SIZE (php-5.0.0RC3.tar.bz2) = 4535975
diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php
index 12c146a7862a..ddaf65c74666 100644
--- a/lang/php5/scripts/configure.php
+++ b/lang/php5/scripts/configure.php
@@ -56,7 +56,6 @@ OPENSSL		"OpenSSL support" ${WITH_OPENSSL:-OFF} \
 ORACLE		"Oracle support" ${WITH_ORACLE:-OFF} \
 PCNTL		"pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \
 PCRE		"Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \
-PDFLIB		"PDFlib support" ${WITH_PDFLIB:-OFF} \
 POSIX		"POSIX-like functions" ${WITH_POSIX:-OFF} \
 POSTGRESQL	"PostgreSQL database support" ${WITH_POSTGRESQL:-OFF} \
 PSPELL		"pspell support" ${WITH_PSPELL:-OFF} \
diff --git a/lang/php5/scripts/php5_options b/lang/php5/scripts/php5_options
index b69ded811033..bc8497668499 100644
--- a/lang/php5/scripts/php5_options
+++ b/lang/php5/scripts/php5_options
@@ -36,7 +36,6 @@ WITH_OPENSSL=OFF
 WITH_ORACLE=OFF
 WITH_PCNTL=OFF
 WITH_PCRE=ON
-WITH_PDFLIB=OFF
 WITH_POSIX=ON
 WITH_POSTGRESQL=OFF
 WITH_PSPELL=OFF
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index d578c1f1a3c8..f717e77288ed 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -21,8 +21,7 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.0.r2
-PORTREVISION=	2
+PORTVERSION=	5.0.0.r3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,}
 MASTER_SITE_SUBDIR=	distributions/:release
@@ -126,7 +125,7 @@ PLIST_SUB+=	CLI=""
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \
 		DOM EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
 		INIFILE MBSTRING MCVE MCRYPT MHASH MING MNOGOSEARCH MSSQL \
-		MYSQL MYSQLI NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB \
+		MYSQL MYSQLI NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE \
 		POSIX POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP \
 		SIMPLEXML SNMP SOAP SOCKETS SPL SQLITE SYBASEDB SYBASECT \
 		SYSVMSG SYSVSEM SYSVSHM TIDY TOKENIZER UNIXODBC WDDX XML \
@@ -197,7 +196,7 @@ WITH_OPENSSL_DEP=	yes
 WITH_XML_DEP=	yes
 .endif
 
-.if defined(WITH_GD) || defined(WITH_MYSQL) || defined(WITH_PDFLIB)
+.if defined(WITH_GD) || defined(WITH_MYSQL)
 WITH_ZLIB_DEP=	yes
 .endif
 
@@ -291,7 +290,6 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=--with-gd \
 		--enable-gd-native-ttf \
-		--enable-gd-jis-conv \
 		--with-freetype-dir=${LOCALBASE} \
 		--with-t1lib=${LOCALBASE} \
 		--with-jpeg-dir=${LOCALBASE} \
@@ -414,11 +412,6 @@ CONFIGURE_ARGS+=--enable-pcntl
 CONFIGURE_ARGS+=--with-pcre-regex
 .endif
 
-.if defined(WITH_PDFLIB)
-LIB_DEPENDS+=	pdf.6:${PORTSDIR}/print/pdflib
-CONFIGURE_ARGS+=--with-pdflib=${LOCALBASE}
-.endif
-
 .if defined(WITH_POSIX)
 CONFIGURE_ARGS+=--enable-posix
 .endif
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index efe9823a6a17..05688432e927 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-5.0.0RC2.tar.bz2) = 99e056269c2e3eac7e934755c60c44b7
-SIZE (php-5.0.0RC2.tar.bz2) = 4498965
+MD5 (php-5.0.0RC3.tar.bz2) = aa24589d3c173052998792e4a6d255fa
+SIZE (php-5.0.0RC3.tar.bz2) = 4535975
diff --git a/lang/php53/scripts/configure.php b/lang/php53/scripts/configure.php
index 12c146a7862a..ddaf65c74666 100644
--- a/lang/php53/scripts/configure.php
+++ b/lang/php53/scripts/configure.php
@@ -56,7 +56,6 @@ OPENSSL		"OpenSSL support" ${WITH_OPENSSL:-OFF} \
 ORACLE		"Oracle support" ${WITH_ORACLE:-OFF} \
 PCNTL		"pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \
 PCRE		"Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \
-PDFLIB		"PDFlib support" ${WITH_PDFLIB:-OFF} \
 POSIX		"POSIX-like functions" ${WITH_POSIX:-OFF} \
 POSTGRESQL	"PostgreSQL database support" ${WITH_POSTGRESQL:-OFF} \
 PSPELL		"pspell support" ${WITH_PSPELL:-OFF} \
diff --git a/lang/php53/scripts/php5_options b/lang/php53/scripts/php5_options
index b69ded811033..bc8497668499 100644
--- a/lang/php53/scripts/php5_options
+++ b/lang/php53/scripts/php5_options
@@ -36,7 +36,6 @@ WITH_OPENSSL=OFF
 WITH_ORACLE=OFF
 WITH_PCNTL=OFF
 WITH_PCRE=ON
-WITH_PDFLIB=OFF
 WITH_POSIX=ON
 WITH_POSTGRESQL=OFF
 WITH_PSPELL=OFF