FreeBSD Bugzilla – Attachment 39723 Details for
Bug 62557
[patch] WITH_POSTGRES -> WITH_POSTGRESQL across the ports tree
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
patch (text/plain), 11.52 KB, created by
Ulrich Spoerlein
on 2004-02-09 00:00:37 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Ulrich Spoerlein
Created:
2004-02-09 00:00:37 UTC
Size:
11.52 KB
patch
obsolete
>Index: databases/libgda2/Makefile >=================================================================== >RCS file: /home/ncvs/ports/databases/libgda2/Makefile,v >retrieving revision 1.56 >diff -u -r1.56 Makefile >--- databases/libgda2/Makefile 4 Feb 2004 05:19:03 -0000 1.56 >+++ databases/libgda2/Makefile 8 Feb 2004 23:45:28 -0000 >@@ -47,11 +47,11 @@ > .endif > > .if exists(${LOCALBASE}/lib/libpq.so.3) >-WITH_POSTGRES7= yes >+WITH_POSTGRESQL=yes > .endif > > .if exists(${LOCALBASE}/lib/libpgeasy.so.2) >-WITH_POSTGRES72=yes >+WITH_POSTGRESQL72=yes > .endif > > .if exists(${LOCALBASE}/lib/libldap.so.2) >@@ -91,22 +91,22 @@ > PLIST_SUB+= MYSQL:="" > .endif > >-.if !defined(WITHOUT_POSTGRES7) && defined(WITH_POSTGRES7) >+.if !defined(WITHOUT_POSTGRESQL) && defined(WITH_POSTGRESQL) > POSTGRESQL_PORT?= databases/postgresql7 > LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} > CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} >-PLIST_SUB+= POSTGRES:="" >+PLIST_SUB+= POSTGRESQL:="" > .endif > >-.if !defined(WITHOUT_POSTGRES72) && defined(WITH_POSTGRES72) >+.if !defined(WITHOUT_POSTGRESQL72) && defined(WITH_POSTGRESQL72) > POSTGRESQL_PORT?= databases/postgresql72 > LIB_DEPENDS+= pgeasy.2:${PORTSDIR}/${POSTGRESQL_PORT} > CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} >-PLIST_SUB+= POSTGRES:="" >+PLIST_SUB+= POSTGRESQL:="" > .endif > >-.if !defined(WITH_POSTGRES7) && !defined(WITH_POSTGRES72) >-PLIST_SUB+= POSTGRES:="@comment " >+.if !defined(WITH_POSTGRESQL) && !defined(WITH_POSTGRESQL72) >+PLIST_SUB+= POSTGRESQL:="@comment " > CONFIGURE_ARGS+= --without-postgres > .endif > >@@ -177,11 +177,11 @@ > .if !defined(WITH_MYSQL) > @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." > .endif >-.if !defined(WITH_POSTGRES7) >- @${ECHO_MSG} "You can enable support for Postgres 7.0 databases by defining WITH_POSTGRES7." >+.if !defined(WITH_POSTGRESQL) >+ @${ECHO_MSG} "You can enable support for Postgres 7.4+ databases by defining WITH_POSTGRESQL." > .endif >-.if !defined(WITH_POSTGRES72) >- @${ECHO_MSG} "You can enable support for Postgres 7.2 databases by defining WITH_POSTGRES72." >+.if !defined(WITH_POSTGRESQL72) >+ @${ECHO_MSG} "You can enable support for Postgres 7.2 databases by defining WITH_POSTGRESQL72." > .endif > .if !defined(WITH_LDAP) > @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." >Index: databases/libgda2/pkg-plist >=================================================================== >RCS file: /home/ncvs/ports/databases/libgda2/pkg-plist,v >retrieving revision 1.29 >diff -u -r1.29 pkg-plist >--- databases/libgda2/pkg-plist 12 Oct 2003 18:48:14 -0000 1.29 >+++ databases/libgda2/pkg-plist 8 Feb 2004 23:45:28 -0000 >@@ -81,7 +81,7 @@ > %%MDB:%%lib/libgda/providers/libgda-mdb.so > %%MYSQL:%%lib/libgda/providers/libgda-mysql.so > %%ODBC:%%lib/libgda/providers/libgda-odbc.so >-%%POSTGRES:%%lib/libgda/providers/libgda-postgres.so >+%%POSTGRESQL:%%lib/libgda/providers/libgda-postgres.so > %%SYBASE:%%lib/libgda/providers/libgda-sybase.so > %%SQLITE:%%lib/libgda/providers/libgda-sqlite.so > lib/libgda/providers/libgda-xml.so >Index: ftp/proftpd/Makefile >=================================================================== >RCS file: /home/ncvs/ports/ftp/proftpd/Makefile,v >retrieving revision 1.60 >diff -u -r1.60 Makefile >--- ftp/proftpd/Makefile 4 Feb 2004 05:20:14 -0000 1.60 >+++ ftp/proftpd/Makefile 8 Feb 2004 23:45:28 -0000 >@@ -85,7 +85,7 @@ > LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql > .endif > >-.if defined(WITH_POSTGRES) >+.if defined(WITH_POSTGRESQL) > POSTGRESQL_PORT?= databases/postgresql7 > LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} > MODULES:=${MODULES}:mod_sql:mod_sql_postgres >Index: lang/pike72/Makefile >=================================================================== >RCS file: /home/ncvs/ports/lang/pike72/Makefile,v >retrieving revision 1.20 >diff -u -r1.20 Makefile >--- lang/pike72/Makefile 4 Feb 2004 05:21:42 -0000 1.20 >+++ lang/pike72/Makefile 8 Feb 2004 23:45:28 -0000 >@@ -86,8 +86,8 @@ > WITH_MYSQL= yes > .endif > >-.if exists(${LOCALBASE}/lib/libpq.so.2) >-WITH_POSTGRES= yes >+.if exists(${LOCALBASE}/lib/libpq.so.3) >+WITH_POSTGRESQL=yes > .endif > > .if exists(${LOCALBASE}/lib/libodbc.so.1) >@@ -144,7 +144,7 @@ > CONFIGURE_ARGS+= --without-mysql > .endif > >-.if defined(WITH_POSTGRES) >+.if defined(WITH_POSTGRESQL) > LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 > CONFIGURE_ARGS+= --with-pgsql=${PREFIX} > .else >@@ -228,8 +228,8 @@ > .if !defined(WITH_MYSQL) > @${ECHO_MSG} "You can enable MySQL support by defining WITH_MYSQL." > .endif >-.if !defined(WITH_POSTGRES) >- @${ECHO_MSG} "You can enable PostGres support by defining WITH_POSTGRES." >+.if !defined(WITH_POSTGRESQL) >+ @${ECHO_MSG} "You can enable PostGres support by defining WITH_POSTGRESQL." > .endif > .if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) > @${ECHO_MSG} "You can enable unixODBC support by defining WITH_UNIXODBC." >Index: lang/pike74/Makefile >=================================================================== >RCS file: /home/ncvs/ports/lang/pike74/Makefile,v >retrieving revision 1.20 >diff -u -r1.20 Makefile >--- lang/pike74/Makefile 4 Feb 2004 05:21:42 -0000 1.20 >+++ lang/pike74/Makefile 8 Feb 2004 23:45:30 -0000 >@@ -109,7 +109,7 @@ > .endif > > .if exists(${LOCALBASE}/lib/libpq.so.3) >-WITH_POSTGRES= yes >+WITH_POSTGRESQL=yes > .endif > > .if exists(${LOCALBASE}/lib/libodbc.so.1) >@@ -212,7 +212,7 @@ > CONFIGURE_ARGS+= --without-mysql > .endif > >-.if defined(WITH_POSTGRES) >+.if defined(WITH_POSTGRESQL) > LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 > CONFIGURE_ARGS+= --with-pgsql=${PREFIX} > .else >@@ -311,8 +311,8 @@ > .if !defined(WITH_MYSQL41) > @${ECHO_MSG} "You can enable MySQL 4.1 support by defining WITH_MYSQL41." > .endif >-.if !defined(WITH_POSTGRES) >- @${ECHO_MSG} "You can enable PostGres support by defining WITH_POSTGRES." >+.if !defined(WITH_POSTGRESQL) >+ @${ECHO_MSG} "You can enable PostGres support by defining WITH_POSTGRESQL." > .endif > .if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) > @${ECHO_MSG} "You can enable unixODBC support by defining WITH_UNIXODBC." >Index: net/nagios/Makefile >=================================================================== >RCS file: /home/ncvs/ports/net/nagios/Makefile,v >retrieving revision 1.34 >diff -u -r1.34 Makefile >--- net/nagios/Makefile 4 Dec 2003 13:53:29 -0000 1.34 >+++ net/nagios/Makefile 8 Feb 2004 23:45:30 -0000 >@@ -71,7 +71,7 @@ > CONFIGURE_ARGS+=--with-file-perfdata > .endif > >-.if defined(WITH_POSTGRES) >+.if defined(WITH_POSTGRESQL) > LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 > CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ > --with-pgsql-inc=${LOCALBASE}/pgsql \ >Index: net/netams/scripts/configure.netams >=================================================================== >RCS file: /home/ncvs/ports/net/netams/scripts/configure.netams,v >retrieving revision 1.2 >diff -u -r1.2 configure.netams >--- net/netams/scripts/configure.netams 26 Dec 2003 17:12:31 -0000 1.2 >+++ net/netams/scripts/configure.netams 8 Feb 2004 23:45:30 -0000 >@@ -14,7 +14,7 @@ > elif [ "${WITH_MYSQL}" ]; then > OPTIONS="${OPTIONS} \"MySQL\"" > fi >- if [ "${WITH_POSTGRES}" ]; then >+ if [ "${WITH_POSTGRESQL}" ]; then > OPTIONS="${OPTIONS} \"PgSQL\"" > fi > if [ "${WITH_HASH}" ]; then >@@ -35,9 +35,9 @@ > elif [ "${WITH_MYSQL}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so ] ; then > SET_MYSQL="ON" > fi >- SET_POSTGRES="OFF" >- if [ "${WITH_POSTGRES}" -o -f ${PREFIX}/lib/pq.3 ] ; then >- SET_POSTGRES="ON" >+ SET_POSTGRESQL="OFF" >+ if [ "${WITH_POSTGRESQL}" -o -f ${PREFIX}/lib/pq.3 ] ; then >+ SET_POSTGRESQL="ON" > fi > SET_HASH="OFF" > if [ "${WITH_HASH}" ] ; then >@@ -58,7 +58,7 @@ > MySQL "MySQL 3.23 support" ${SET_MYSQL} \ > MySQL40 "MySQL 4.0 support" ${SET_MYSQL40} \ > MySQL41 "MySQL 4.1 support" ${SET_MYSQL41} \ >-PgSQL "PostgreSQL support" ${SET_POSTGRES} \ >+PgSQL "PostgreSQL support" ${SET_POSTGRESQL} \ > HASH "Unix HASH support" ${SET_HASH} \ > DEBUG "Debugging support" ${SET_DEBUG} \ > OPTIMIZED "Enable optimization" ${SET_OPT} \ >Index: net/netsaint/Makefile >=================================================================== >RCS file: /home/ncvs/ports/net/netsaint/Makefile,v >retrieving revision 1.26 >diff -u -r1.26 Makefile >--- net/netsaint/Makefile 28 Aug 2003 12:57:51 -0000 1.26 >+++ net/netsaint/Makefile 8 Feb 2004 23:45:30 -0000 >@@ -44,7 +44,7 @@ > --with-mysql-xdata > .endif > >-.if defined(WITH_POSTGRES) >+.if defined(WITH_POSTGRESQL) > POSTGRESQL_PORT?= databases/postgresql7 > LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} > CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ >Index: security/prelude-manager/Makefile >=================================================================== >RCS file: /home/ncvs/ports/security/prelude-manager/Makefile,v >retrieving revision 1.8 >diff -u -r1.8 Makefile >--- security/prelude-manager/Makefile 4 Feb 2004 05:08:51 -0000 1.8 >+++ security/prelude-manager/Makefile 8 Feb 2004 23:45:30 -0000 >@@ -37,7 +37,7 @@ > PLIST_SUB+= MYSQL="@comment " > .endif > >-.if defined(WITH_POSTGRES) >+.if defined(WITH_POSTGRESQL) > LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql-client > CONFIGURE_ARGS+= --enable-pgsql > PLIST_SUB+= PGSQL="" >@@ -53,7 +53,7 @@ > @${ECHO} "" > @${ECHO} " WITHOUT_SSL=yes Disable SSL support" > @${ECHO} " WITH_MYSQL=yes Enable MySQL support" >- @${ECHO} " WITH_POSTGRES=yes Enable PostreSQL support" >+ @${ECHO} " WITH_POSTGRESQL=yes Enable PostreSQL support" > @${ECHO} "*---------------------------------------------------------------------------*" > @${ECHO} "" > >Index: security/samhain/Makefile >=================================================================== >RCS file: /home/ncvs/ports/security/samhain/Makefile,v >retrieving revision 1.11 >diff -u -r1.11 Makefile >--- security/samhain/Makefile 7 Feb 2004 05:09:02 -0000 1.11 >+++ security/samhain/Makefile 8 Feb 2004 23:45:30 -0000 >@@ -69,7 +69,7 @@ > --with-cflags=-I${LOCALBASE}/include/mysql \ > --with-libs=-L${LOCALBASE}/lib/mysql --enable-xml-log > .endif >-.if defined(WITH_POSTGRES) >+.if defined(WITH_POSTGRESQL) > CONFIGURE_ARGS+= --with-database=postgresql --enable-xml-log > .endif > .if defined(WITH_LIBWRAP) >Index: security/snort/Makefile >=================================================================== >RCS file: /home/ncvs/ports/security/snort/Makefile,v >retrieving revision 1.48 >diff -u -r1.48 Makefile >--- security/snort/Makefile 20 Jan 2004 14:38:18 -0000 1.48 >+++ security/snort/Makefile 8 Feb 2004 23:45:30 -0000 >@@ -19,7 +19,7 @@ > #OPTIONS= FLEXRESP "Flexible response to events" off \ > # MYSQL "Enable MySQL support" off \ > # ODBC "Enable ODBC support" off \ >-# POSTGRES "Enable PostgreSQL support" off >+# POSTGRESQL "Enable PostgreSQL support" off > > #USE_GPG= yes > #SIG_SUFFIX= .asc >@@ -50,7 +50,7 @@ > CONFIGURE_ARGS+= --with-odbc=no > .endif > >-.if defined(WITH_POSTGRES) >+.if defined(WITH_POSTGRESQL) > POSTGRESQL_PORT?= databases/postgresql7 > LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} > CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} >@@ -70,7 +70,7 @@ > > pre-configure: > @${ECHO} "" >- @${ECHO} "Set WITH_FLEXRESP, WITH_MYSQL, WITH_ODBC or WITH_POSTGRES" >+ @${ECHO} "Set WITH_FLEXRESP, WITH_MYSQL, WITH_ODBC or WITH_POSTGRESQL" > @${ECHO} "to get additional support." > @${ECHO} "" > >Index: www/MT/Makefile >=================================================================== >RCS file: /home/ncvs/ports/www/MT/Makefile,v >retrieving revision 1.9 >diff -u -r1.9 Makefile >--- www/MT/Makefile 17 Jan 2004 15:28:30 -0000 1.9 >+++ www/MT/Makefile 8 Feb 2004 23:45:30 -0000 >@@ -21,7 +21,7 @@ > .if defined(WITH_MYSQL) > DB_DIR= /var/db/mysql/blog > USE_MYSQL= yes >-.elif defined(WITH_POSTGRES) >+.elif defined(WITH_POSTGRESQL) > DB_DIR= ${PREFIX}/pgsql/data/blog # Or somewhere defined in $PGDATA > RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql7 > .else
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 62557
: 39723