[53797] trunk/dports/lang
ryandesign at macports.org
ryandesign at macports.org
Mon Jul 13 23:05:38 PDT 2009
Revision: 53797
http://trac.macports.org/changeset/53797
Author: ryandesign at macports.org
Date: 2009-07-13 23:05:37 -0700 (Mon, 13 Jul 2009)
Log Message:
-----------
php5, php5-devel: remove some variants (gmp, imap, pspell, tidy, readline) and default features (xslt, zlib, mcrypt, curl, gd) now offered in separate ports; see #19091
Modified Paths:
--------------
trunk/dports/lang/php5/Portfile
trunk/dports/lang/php5-devel/Portfile
Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile 2009-07-14 06:00:50 UTC (rev 53796)
+++ trunk/dports/lang/php5/Portfile 2009-07-14 06:05:37 UTC (rev 53797)
@@ -5,6 +5,7 @@
name php5
epoch 1
version 5.3.0
+revision 1
set major [lindex [split ${version} .] 0]
set my_name php${major}
dist_subdir ${my_name}
@@ -47,21 +48,14 @@
path:bin/gsed:gsed \
port:libtool \
port:libxml2 \
- port:libxslt \
port:openssl \
- port:zlib \
port:bzip2 \
port:libiconv \
port:expat \
port:gettext \
port:tiff \
port:mhash \
- port:libmcrypt \
- port:curl \
- port:pcre \
- port:jpeg \
- port:libpng \
- port:freetype
+ port:pcre
patchfiles \
patch-bind.diff
@@ -84,7 +78,6 @@
--enable-exif \
--enable-ftp \
--enable-wddx\
- --with-zlib=${prefix} \
--with-bz2=${prefix} \
--without-mysql \
--without-sqlite \
@@ -100,17 +93,9 @@
--enable-zip \
--with-openssl=${prefix} \
--with-mhash=${prefix} \
- --with-mcrypt=${prefix} \
- --with-xsl=${prefix} \
- --with-curl=${prefix} \
--with-pcre-regex=${prefix} \
- --with-gd \
- --with-jpeg-dir=${prefix} \
- --with-png-dir=${prefix} \
- --enable-gd-native-ttf \
--without-pear \
- --disable-cgi \
- --with-freetype-dir=${prefix}
+ --disable-cgi
platform darwin 6 {
depends_lib-append \
@@ -135,8 +120,7 @@
platform macosx {
configure.args-append \
- --with-ldap=/usr \
- --with-kerberos=/usr
+ --with-ldap=/usr
if {${os.major} > 7} {
configure.args-append \
--with-iodbc=/usr
@@ -187,11 +171,14 @@
}
}
-variant gmp description {Add GNU MP multiprocessing functions} {
- depends_lib-append \
- port:gmp
- configure.args-append \
- --with-gmp=${prefix}
+foreach feature {imap gmp pspell readline tidy} {
+ eval [subst {
+ variant ${feature} description "Obsolete; install ${my_name}-${feature} port instead" {
+ pre-configure {
+ ui_msg "The +${feature} variant has been replaced by the ${my_name}-${feature} port"
+ }
+ }
+ }]
}
variant dbase description {Add dBase file format support} {
@@ -199,28 +186,6 @@
--enable-dbase
}
-variant imap description {Add IMAP protocol support} {
- depends_build-append \
- port:cclient
- configure.args-append \
- --with-imap=${prefix} \
- --with-imap-ssl=${prefix}
-}
-
-variant pspell description {Add pspell spell-checking functions} {
- depends_lib-append \
- port:aspell
- configure.args-append \
- --with-pspell=${prefix}
-}
-
-variant tidy description {Add Tidy support} {
- depends_lib-append \
- port:tidy
- configure.args-append \
- --with-tidy=${prefix}
-}
-
variant mssql description {Add MS-SQL server support} {
depends_lib-append \
port:freetds
@@ -367,25 +332,11 @@
}
}
-variant readline description {Add GNU readline functions} {
- depends_lib-append \
- port:readline
- configure.args-append \
- --with-readline=${prefix}
-}
-
variant sockets description {Add socket communication functions} {
configure.args-append \
--enable-sockets
}
-variant t1lib description {Add PostScript Type 1 font support with t1lib} {
- depends_lib-append \
- port:t1lib
- configure.args-append \
- --with-t1lib=${prefix} \
-}
-
destroot.args \
INSTALL_ROOT=${destroot}
Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile 2009-07-14 06:00:50 UTC (rev 53796)
+++ trunk/dports/lang/php5-devel/Portfile 2009-07-14 06:05:37 UTC (rev 53797)
@@ -5,7 +5,7 @@
name php5-devel
epoch 1
version 5.3.0RC4
-revision 2
+revision 3
set major [lindex [split ${version} .] 0]
set my_name php${major}
dist_subdir ${my_name}
@@ -42,21 +42,14 @@
path:bin/gsed:gsed \
port:libtool \
port:libxml2 \
- port:libxslt \
port:openssl \
- port:zlib \
port:bzip2 \
port:libiconv \
port:expat \
port:gettext \
port:tiff \
port:mhash \
- port:libmcrypt \
- port:curl \
- port:pcre \
- port:jpeg \
- port:libpng \
- port:freetype
+ port:pcre
patchfiles \
patch-ext-date-php_date.c.diff \
@@ -80,7 +73,6 @@
--enable-exif \
--enable-ftp \
--enable-wddx\
- --with-zlib=${prefix} \
--with-bz2=${prefix} \
--without-mysql \
--without-sqlite \
@@ -96,17 +88,9 @@
--enable-zip \
--with-openssl=${prefix} \
--with-mhash=${prefix} \
- --with-mcrypt=${prefix} \
- --with-xsl=${prefix} \
- --with-curl=${prefix} \
--with-pcre-regex=${prefix} \
- --with-gd \
- --with-jpeg-dir=${prefix} \
- --with-png-dir=${prefix} \
- --enable-gd-native-ttf \
--without-pear \
- --disable-cgi \
- --with-freetype-dir=${prefix}
+ --disable-cgi
platform darwin 6 {
depends_lib-append \
@@ -131,8 +115,7 @@
platform macosx {
configure.args-append \
- --with-ldap=/usr \
- --with-kerberos=/usr
+ --with-ldap=/usr
if {${os.major} > 7} {
configure.args-append \
--with-iodbc=/usr
@@ -183,11 +166,14 @@
}
}
-variant gmp description {Add GNU MP multiprocessing functions} {
- depends_lib-append \
- port:gmp
- configure.args-append \
- --with-gmp=${prefix}
+foreach feature {imap gmp pspell readline tidy} {
+ eval [subst {
+ variant ${feature} description "Obsolete; install ${my_name}-${feature} port instead" {
+ pre-configure {
+ ui_msg "The +${feature} variant has been replaced by the ${my_name}-${feature} port"
+ }
+ }
+ }]
}
variant dbase description {Add dBase file format support} {
@@ -195,28 +181,6 @@
--enable-dbase
}
-variant imap description {Add IMAP protocol support} {
- depends_build-append \
- port:cclient
- configure.args-append \
- --with-imap=${prefix} \
- --with-imap-ssl=${prefix}
-}
-
-variant pspell description {Add pspell spell-checking functions} {
- depends_lib-append \
- port:aspell
- configure.args-append \
- --with-pspell=${prefix}
-}
-
-variant tidy description {Add Tidy support} {
- depends_lib-append \
- port:tidy
- configure.args-append \
- --with-tidy=${prefix}
-}
-
variant mssql description {Add MS-SQL server support} {
depends_lib-append \
port:freetds
@@ -363,25 +327,11 @@
}
}
-variant readline description {Add GNU readline functions} {
- depends_lib-append \
- port:readline
- configure.args-append \
- --with-readline=${prefix}
-}
-
variant sockets description {Add socket communication functions} {
configure.args-append \
--enable-sockets
}
-variant t1lib description {Add PostScript Type 1 font support with t1lib} {
- depends_lib-append \
- port:t1lib
- configure.args-append \
- --with-t1lib=${prefix} \
-}
-
destroot.args \
INSTALL_ROOT=${destroot}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090713/5c2e27ce/attachment-0001.html>
More information about the macports-changes
mailing list