diff options
-rw-r--r-- | Mk/bsd.php.mk | 4 | ||||
-rw-r--r-- | databases/Makefile | 2 | ||||
-rw-r--r-- | databases/pear-Doctrine/Makefile | 4 | ||||
-rw-r--r-- | databases/pear-Doctrine12/Makefile | 4 | ||||
-rw-r--r-- | databases/php5-oci8/Makefile | 13 | ||||
-rw-r--r-- | databases/php5-oci8/files/patch-config.m4 | 12 | ||||
-rw-r--r-- | databases/php5-pdo_oci/Makefile | 14 | ||||
-rw-r--r-- | databases/php5-pdo_oci/files/patch-config.m4 | 19 | ||||
-rw-r--r-- | lang/php5/Makefile.ext | 28 | ||||
-rw-r--r-- | lang/php53/Makefile.ext | 28 | ||||
-rw-r--r-- | sysutils/loganalyzer/Makefile | 5 | ||||
-rw-r--r-- | www/codeigniter-devel/Makefile | 5 | ||||
-rw-r--r-- | www/codeigniter/Makefile | 5 | ||||
-rw-r--r-- | www/codeigniter17/Makefile | 5 | ||||
-rw-r--r-- | www/zend-framework/Makefile | 5 |
15 files changed, 2 insertions, 151 deletions
diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk index f62f60352cff..19b96f47f249 100644 --- a/Mk/bsd.php.mk +++ b/Mk/bsd.php.mk @@ -41,6 +41,7 @@ PHPBASE?= ${LOCALBASE} .if exists(${PHPBASE}/etc/php.conf) .include "${PHPBASE}/etc/php.conf" PHP_EXT_DIR!= ${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p' +# The following block should be eventually removed from here or php5 port .if ${PHP_VER} == 5 PHP_EXT_INC= pcre spl .endif @@ -250,7 +251,7 @@ _USE_PHP_ALL= apc bcmath bitset bz2 calendar ctype curl dba \ # version specific components _USE_PHP_VER4= ${_USE_PHP_ALL} crack dbase dbx dio domxml filepro mcal mcve \ mhash ncurses oracle overload pfpro xslt yp -_USE_PHP_VER5= ${_USE_PHP_ALL} dom filter mysqli oci8 pdo \ +_USE_PHP_VER5= ${_USE_PHP_ALL} dom filter mysqli pdo \ pdo_mysql pdo_pgsql pdo_sqlite \ simplexml soap spl sqlite tidy xmlreader xmlwriter xsl @@ -291,7 +292,6 @@ mssql_DEPENDS= databases/php${PHP_VER}-mssql mysql_DEPENDS= databases/php${PHP_VER}-mysql mysqli_DEPENDS= databases/php${PHP_VER}-mysqli ncurses_DEPENDS=devel/php${PHP_VER}-ncurses -oci8_DEPENDS= databases/php${PHP_VER}-oci8 odbc_DEPENDS= databases/php${PHP_VER}-odbc openssl_DEPENDS=security/php${PHP_VER}-openssl oracle_DEPENDS= databases/php${PHP_VER}-oracle diff --git a/databases/Makefile b/databases/Makefile index ea088185a59a..b325b10ec370 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -502,13 +502,11 @@ SUBDIR += php5-mssql SUBDIR += php5-mysql SUBDIR += php5-mysqli - SUBDIR += php5-oci8 SUBDIR += php5-odbc SUBDIR += php5-pdo SUBDIR += php5-pdo_dblib SUBDIR += php5-pdo_firebird SUBDIR += php5-pdo_mysql - SUBDIR += php5-pdo_oci SUBDIR += php5-pdo_odbc SUBDIR += php5-pdo_pgsql SUBDIR += php5-pdo_sqlite diff --git a/databases/pear-Doctrine/Makefile b/databases/pear-Doctrine/Makefile index 0282f335b32e..2782b747b30d 100644 --- a/databases/pear-Doctrine/Makefile +++ b/databases/pear-Doctrine/Makefile @@ -19,7 +19,6 @@ OPTIONS= DBLIB "Install PHP DBO driver for DBLIB" Off \ FIREBIRD "Install PHP DBO driver for Firebird" Off \ MYSQL "Install PHP DBO driver for MySQL" On \ ODBC "Install PHP DBO driver for ODBC" Off \ - OCI "Install PHP DBO driver for OCI" Off \ PGSQL "Install PHP DBO driver for PostgreSQL" Off \ SQLITE "Install PHP DBO driver for SQLite" Off @@ -52,9 +51,6 @@ USE_PHP+= pdo_mysql .if defined(WITH_ODBC) RUN_DEPENDS+= databases/php${PHP_VER}-pdo_odbc .endif -.if defined(WITH_OCI) -RUN_DEPENDS+= databases/php${PHP_VER}-pdo_oci -.endif .if defined(WITH_PGSQL) RUN_DEPENDS+= databases/php${PHP_VER}-pdo_pgsql .endif diff --git a/databases/pear-Doctrine12/Makefile b/databases/pear-Doctrine12/Makefile index 7d5807410c2e..30b00c133682 100644 --- a/databases/pear-Doctrine12/Makefile +++ b/databases/pear-Doctrine12/Makefile @@ -18,7 +18,6 @@ COMMENT= Doctrine is a PHP object relational mapper OPTIONS= DBLIB "Install PHP DBO driver for DBLIB" Off \ MYSQL "Install PHP DBO driver for MySQL" On \ ODBC "Install PHP DBO driver for ODBC" Off \ - OCI "Install PHP DBO driver for OCI" Off \ PGSQL "Install PHP DBO driver for PostgreSQL" Off \ SQLITE "Install PHP DBO driver for SQLite" Off @@ -49,9 +48,6 @@ USE_PHP+= pdo_mysql .if defined(WITH_ODBC) RUN_DEPENDS+= databases/php${PHP_VER}-pdo_odbc .endif -.if defined(WITH_OCI) -RUN_DEPENDS+= databases/php${PHP_VER}-pdo_oci -.endif .if defined(WITH_PGSQL) RUN_DEPENDS+= databases/php${PHP_VER}-pdo_pgsql .endif diff --git a/databases/php5-oci8/Makefile b/databases/php5-oci8/Makefile deleted file mode 100644 index e60a802b9757..000000000000 --- a/databases/php5-oci8/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# New ports collection makefile for: php5-oci8 -# Date created: 24 Sep 2004 -# Whom: Simun Mikecin <numisemis@yahoo.com> -# -# $FreeBSD$ -# - -CATEGORIES= databases -PKGNAMESUFFIX= -oci8 - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php5-oci8/files/patch-config.m4 b/databases/php5-oci8/files/patch-config.m4 deleted file mode 100644 index d504cdf1c1bb..000000000000 --- a/databases/php5-oci8/files/patch-config.m4 +++ /dev/null @@ -1,12 +0,0 @@ ---- config.m4.orig Wed Apr 5 11:06:00 2006 -+++ config.m4 Tue Jul 11 08:20:27 2006 -@@ -177,8 +177,7 @@ - ;; - - 8.1) -- PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) -- PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(oci8, ., OCI8_SHARED_LIBADD) - - PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate, - [ diff --git a/databases/php5-pdo_oci/Makefile b/databases/php5-pdo_oci/Makefile deleted file mode 100644 index c65accb56561..000000000000 --- a/databases/php5-pdo_oci/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# New ports collection makefile for: php5-pdo_oci -# Date created: 7 Feb 2007 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -PKGNAMESUFFIX= -pdo_oci - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php5-pdo_oci/files/patch-config.m4 b/databases/php5-pdo_oci/files/patch-config.m4 deleted file mode 100644 index bcc94e0961ec..000000000000 --- a/databases/php5-pdo_oci/files/patch-config.m4 +++ /dev/null @@ -1,19 +0,0 @@ ---- config.m4.orig Thu Feb 16 03:03:13 2006 -+++ config.m4 Wed Feb 7 15:00:58 2007 -@@ -145,7 +145,6 @@ - ;; - - 8.1) -- PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) - ;; - - 9.0) -@@ -163,7 +162,7 @@ - ;; - esac - -- PHP_ADD_LIBPATH($PDO_OCI_LIB_DIR, PDO_OCI_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(oci8, ., PDO_OCI_SHARED_LIBADD) - - PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate, - [ diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index f5915d4b8018..074baf86071d 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -193,14 +193,6 @@ USE_MYSQL= yes BROKEN_WITH_MYSQL= 323 40 .endif -.if ${PHP_MODNAME} == "oci8" -BUILD_DEPENDS+= ${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client - -RUN_DEPENDS+= ${BUILD_DEPENDS} - -CONFIGURE_ARGS+=--with-oci8=${LOCALBASE}/oracle8-client -.endif - .if ${PHP_MODNAME} == "odbc" LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC @@ -250,17 +242,6 @@ USE_PHP= pdo USE_PHP_BUILD= yes .endif -.if ${PHP_MODNAME} == "pdo_oci" -BUILD_DEPENDS+= ${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client - -RUN_DEPENDS+= ${BUILD_DEPENDS} - -CONFIGURE_ARGS+=--with-pdo-oci=${LOCALBASE}/oracle8-client - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - .if ${PHP_MODNAME} == "pdo_odbc" LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC @@ -515,15 +496,6 @@ post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 .endif -.if ${PHP_MODNAME} == "oci8" || ${PHP_MODNAME} == "pdo_oci" -pre-configure: - @cd ${WRKSRC}; \ - for lib in ${LOCALBASE}/oracle8-client/lib/libclntsh /usr/lib/libpthread; do \ - /usr/bin/ar x $${lib}.a; \ - done; \ - /usr/bin/ar rcs liboci8.a *.o -.endif - .if ${PHP_MODNAME} == "pdo_dblib" .if defined(WITH_MSSQL) LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index f5915d4b8018..074baf86071d 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -193,14 +193,6 @@ USE_MYSQL= yes BROKEN_WITH_MYSQL= 323 40 .endif -.if ${PHP_MODNAME} == "oci8" -BUILD_DEPENDS+= ${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client - -RUN_DEPENDS+= ${BUILD_DEPENDS} - -CONFIGURE_ARGS+=--with-oci8=${LOCALBASE}/oracle8-client -.endif - .if ${PHP_MODNAME} == "odbc" LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC @@ -250,17 +242,6 @@ USE_PHP= pdo USE_PHP_BUILD= yes .endif -.if ${PHP_MODNAME} == "pdo_oci" -BUILD_DEPENDS+= ${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client - -RUN_DEPENDS+= ${BUILD_DEPENDS} - -CONFIGURE_ARGS+=--with-pdo-oci=${LOCALBASE}/oracle8-client - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - .if ${PHP_MODNAME} == "pdo_odbc" LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC @@ -515,15 +496,6 @@ post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 .endif -.if ${PHP_MODNAME} == "oci8" || ${PHP_MODNAME} == "pdo_oci" -pre-configure: - @cd ${WRKSRC}; \ - for lib in ${LOCALBASE}/oracle8-client/lib/libclntsh /usr/lib/libpthread; do \ - /usr/bin/ar x $${lib}.a; \ - done; \ - /usr/bin/ar rcs liboci8.a *.o -.endif - .if ${PHP_MODNAME} == "pdo_dblib" .if defined(WITH_MSSQL) LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib diff --git a/sysutils/loganalyzer/Makefile b/sysutils/loganalyzer/Makefile index 821bd1231ad0..ea1bcdcada0c 100644 --- a/sysutils/loganalyzer/Makefile +++ b/sysutils/loganalyzer/Makefile @@ -25,7 +25,6 @@ OPTIONS= PHP_MYSQL "MySQL database support (PHP extension)" Off \ PDO_DBLIB "Microsoft SQL Server and Sybase PDO driver" Off \ PDO_FIREBIRD "Firebird/Interbase PDO driver" Off \ PDO_MYSQL "MySQL Server PDO driver" Off \ - PDO_OCI "Oracle PDO driver (i386 onnly)" Off \ PDO_ODBC "ODBC and DB2 PDO driver" Off \ PDO_PGSQL "PostgreSQL PDO driver" Off \ PDO_SQLITE "SQLite PDO driver" Off @@ -54,10 +53,6 @@ RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_firebird.so:${PORTSDIR}/data USE_PHP+= pdo_mysql .endif -.if defined(WITH_PDO_OCI) && ${ARCH} == "i386" -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_oci.so:${PORTSDIR}/databases/php5-pdo_oci -.endif - .if defined(WITH_PDO_ODBC) RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php5-pdo_odbc .endif diff --git a/www/codeigniter-devel/Makefile b/www/codeigniter-devel/Makefile index bac45549d9e9..2d78d7c1ffee 100644 --- a/www/codeigniter-devel/Makefile +++ b/www/codeigniter-devel/Makefile @@ -60,7 +60,6 @@ OPTIONS= APACHE "Configure for Apache-2.x" off \ MSSQL "Install MSSQL support for PHP" Off \ MYSQL "Install MySQL support for PHP" Off \ MYSQLI "Install MySQLi support for PHP" Off \ - OCI8 "Install OCI8 support for PHP" Off \ ODBC "Install ODBC support for PHP" Off \ PGSQL "Install PostgreSQL support for PHP" Off \ SQLITE "Install SQLite support for PHP" Off @@ -113,10 +112,6 @@ USE_PHP+= mysql USE_PHP+= mysqli .endif -.if defined(WITH_OCI8) -USE_PHP+= oci8 -.endif - .if defined(WITH_ODBC) USE_PHP+= odbc .endif diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile index bac45549d9e9..2d78d7c1ffee 100644 --- a/www/codeigniter/Makefile +++ b/www/codeigniter/Makefile @@ -60,7 +60,6 @@ OPTIONS= APACHE "Configure for Apache-2.x" off \ MSSQL "Install MSSQL support for PHP" Off \ MYSQL "Install MySQL support for PHP" Off \ MYSQLI "Install MySQLi support for PHP" Off \ - OCI8 "Install OCI8 support for PHP" Off \ ODBC "Install ODBC support for PHP" Off \ PGSQL "Install PostgreSQL support for PHP" Off \ SQLITE "Install SQLite support for PHP" Off @@ -113,10 +112,6 @@ USE_PHP+= mysql USE_PHP+= mysqli .endif -.if defined(WITH_OCI8) -USE_PHP+= oci8 -.endif - .if defined(WITH_ODBC) USE_PHP+= odbc .endif diff --git a/www/codeigniter17/Makefile b/www/codeigniter17/Makefile index bac45549d9e9..2d78d7c1ffee 100644 --- a/www/codeigniter17/Makefile +++ b/www/codeigniter17/Makefile @@ -60,7 +60,6 @@ OPTIONS= APACHE "Configure for Apache-2.x" off \ MSSQL "Install MSSQL support for PHP" Off \ MYSQL "Install MySQL support for PHP" Off \ MYSQLI "Install MySQLi support for PHP" Off \ - OCI8 "Install OCI8 support for PHP" Off \ ODBC "Install ODBC support for PHP" Off \ PGSQL "Install PostgreSQL support for PHP" Off \ SQLITE "Install SQLite support for PHP" Off @@ -113,10 +112,6 @@ USE_PHP+= mysql USE_PHP+= mysqli .endif -.if defined(WITH_OCI8) -USE_PHP+= oci8 -.endif - .if defined(WITH_ODBC) USE_PHP+= odbc .endif diff --git a/www/zend-framework/Makefile b/www/zend-framework/Makefile index b81843127f77..95965beb57bb 100644 --- a/www/zend-framework/Makefile +++ b/www/zend-framework/Makefile @@ -33,7 +33,6 @@ OPTIONS= \ MYSQLI "Install MySQLi support" Off \ DBLIB "Install DBLIB PDO support" Off \ PGSQL "Install PostgreSQL PDO support" Off \ - OCI "Install Oracle OCI 8 PDO support" Off \ ODBC "Install ODBC PDO support" Off \ SQLITE "Install SQLite v3 PDO support" Off \ REQPHP "Install required PHP dependencies" On \ @@ -93,10 +92,6 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_dblib.so:${PORTSDIR}/datab RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql .endif -.if defined(WITH_OCI) -RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_oci.so:${PORTSDIR}/databases/php5-pdo_oci -.endif - .if defined(WITH_ODBC) RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php5-pdo_odbc .endif |