Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Feb 2004 19:13:12 +0100 (CET)
From:      Ulrich Spoerlein <q@uni.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        ume@FreeBSD.org
Subject:   ports/63176: [patch] WITH_PGSQL -> WITH_POSTGRESQL across all ports
Message-ID:  <200402211813.i1LIDCXG002825@roadrunner.q.local>
Resent-Message-ID: <200402211820.i1LIK8PF036761@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         63176
>Category:       ports
>Synopsis:       [patch] WITH_PGSQL -> WITH_POSTGRESQL across all ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 21 10:20:07 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 5.2.1-RC2 i386
>Organization:
>Environment:
>Description:
After submitting PR 62557 I noticed that some ports use WITH_PGSQL. This
patch will change them to WITH_POSTGRESQL, so we have only one true knob
for PostgreSQL support.

I also included an update for CHANGES.

Note: Maintainers have been CC'ed.
>How-To-Repeat:
>Fix:

--- pgsql.patch begins here ---
Index: comms/gnokii/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/gnokii/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- comms/gnokii/Makefile	13 Feb 2004 19:13:27 -0000	1.32
+++ comms/gnokii/Makefile	21 Feb 2004 18:04:25 -0000
@@ -66,7 +66,7 @@
 .if exists(${LOCALBASE}/lib/libpq.so)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 PLIST_SUB+=	PGM=''
-WITH_PGSQL=	yes
+WITH_POSTGRESQL=	yes
 .else
 PLIST_SUB+=	PGM='@comment '
 .endif
@@ -111,7 +111,7 @@
 .if defined(WITH_MYSQL)
 	@cd ${WRKSRC}/smsd && ${GMAKE} libmysql.la LOCALBASE=${LOCALBASE}
 .endif
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 	@cd ${WRKSRC}/smsd && ${GMAKE} libpq.la LOCALBASE=${LOCALBASE}
 .endif
 .endif
@@ -135,7 +135,7 @@
 .if defined(WITH_MYSQL)
 	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.mysql.sql ${PREFIX}/share/smsd/sms.tables.mysql.sql
 .endif
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.pq.sql ${PREFIX}/share/smsd/sms.tables.pq.sql
 .endif
 .endif
Index: dns/mydns/Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/mydns/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- dns/mydns/Makefile	11 Feb 2004 22:35:34 -0000	1.26
+++ dns/mydns/Makefile	21 Feb 2004 18:04:25 -0000
@@ -35,7 +35,7 @@
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 POSTGRESQL_PORT?=	databases/postgresql-client
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=--without-mysql
@@ -50,7 +50,7 @@
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
-	@${ECHO} "      WITH_PGSQL=yes          Build with PostgreSQL support"
+	@${ECHO} "      WITH_POSTGRESQL=yes     Build with PostgreSQL support"
 	@${ECHO} "      WITH_ALIAS=yes          Enable server side aliases"
 	@${ECHO} "      WITH_OPENSSL=yes        Enable OpenSSL (needed if MySQL is linked with OpenSSL)"
 	@${ECHO} ""
Index: finance/qhacc/Makefile
===================================================================
RCS file: /home/ncvs/ports/finance/qhacc/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- finance/qhacc/Makefile	8 Feb 2004 16:40:03 -0000	1.46
+++ finance/qhacc/Makefile	21 Feb 2004 18:04:25 -0000
@@ -50,7 +50,7 @@
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=	--enable-psql
@@ -74,7 +74,7 @@
 	@${ECHO_MSG} "QHacc has the following tunable option(s):"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "	WITH_MYSQL=yes		Turns on MySQL support"
-	@${ECHO_MSG} "	WITH_PGSQL=yes		Turns on PostgreSQL support"
+	@${ECHO_MSG} "	WITH_POSTGRESQL=yes	Turns on PostgreSQL support"
 	@${ECHO_MSG} "	WITH_SQLITE=yes		Turns on SQLite support"
 	@${ECHO_MSG}
 
Index: ftp/pure-ftpd/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/pure-ftpd/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- ftp/pure-ftpd/Makefile	4 Dec 2003 14:08:00 -0000	1.41
+++ ftp/pure-ftpd/Makefile	21 Feb 2004 18:04:25 -0000
@@ -51,7 +51,7 @@
 .endif
 
 # postgresql support requested?
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=	--with-pgsql
@@ -63,7 +63,7 @@
 .endif
 
 # if mysql or ldap are disabled, enable pam
-.if !defined(WITH_LDAP) && !defined(WITH_MYSQL) && !defined(WITH_PGSQL)
+.if !defined(WITH_LDAP) && !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pam
 .endif
 
@@ -97,7 +97,7 @@
 	@${ECHO_MSG} "You can use the following additional options:"
 	@${ECHO_MSG} "WITH_LDAP=1           - Support for users in LDAP directories"
 	@${ECHO_MSG} "WITH_MYSQL=1          - Support for users in MySQL databases"
-	@${ECHO_MSG} "WITH_PGSQL=1          - Support for users in PostgreSQL databases"
+	@${ECHO_MSG} "WITH_POSTGRESQL=1     - Support for users in PostgreSQL databases"
 	@${ECHO_MSG} "WITH_PRIVSEP=1        - Enable privilege separation"
 	@${ECHO_MSG} "WITH_LANG=lang        - Enable compilation of language support, lang is one of"
 	@${ECHO_MSG} "  english, german, romanian, french, french-funny, polish, spanish,"
Index: mail/dbmail/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dbmail/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- mail/dbmail/Makefile	4 Feb 2004 05:21:46 -0000	1.10
+++ mail/dbmail/Makefile	21 Feb 2004 18:04:25 -0000
@@ -22,7 +22,7 @@
 USE_GMAKE=	YES
 USE_OPENSSL=	YES
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql
 LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql-client
 DATABASE=		postgresql
@@ -51,7 +51,7 @@
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} "   By default dbmail uses MySQL backend database."
 	@${ECHO} "   To build dbmail with PostgreSQL as backend database,"
-	@${ECHO} "	define WITH_PGSQL"
+	@${ECHO} "	define WITH_POSTGRESQL"
 	@${ECHO} ""
 
 post-patch:
Index: mail/dovecot/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- mail/dovecot/Makefile	1 Feb 2004 16:01:29 -0000	1.23
+++ mail/dovecot/Makefile	21 Feb 2004 18:04:25 -0000
@@ -74,12 +74,12 @@
 .endif
 
 ## PostgreSQL Support
-OPTIONS+=	PGSQL  "PostgreSQL support" off
+OPTIONS+=	POSTGRESQL  "PostgreSQL support" off
 #
 # PostgreSQL is a powerful SQL database that
 # can be used to store user tables.
 #
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=	--with-pgsql
 .endif
Index: mail/exim/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/exim/Makefile,v
retrieving revision 1.169
diff -u -r1.169 Makefile
--- mail/exim/Makefile	18 Feb 2004 08:48:00 -0000	1.169
+++ mail/exim/Makefile	21 Feb 2004 18:04:25 -0000
@@ -78,7 +78,7 @@
 # email content scanner support.
 #WITHOUT_EXISCAN=	yes
 
-# Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_PGSQL to link against
+# Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_POSTGRESQL to link against
 # libwrap, libmysqlclient and libpq respectively.  Define
 # WITH_SASLAUTHD to enable use of the Cyrus SASL authentication daemon.
 # Define WITH_MYSQL_VER to specify a particular version of MySQL to
@@ -87,7 +87,7 @@
 #WITH_TCP_WRAPPERS=	yes
 #WITH_MYSQL=		yes
 #WITH_MYSQL_VER=	40
-#WITH_PGSQL=		yes
+#WITH_POSTGRESQL=	yes
 #WITH_SASLAUTHD=	yes
 
 # As an alternative to WITH_SASLAUTHD, you can define WITH_PWCHECK to
@@ -300,7 +300,7 @@
 SEDLIST+=	-e 's,^\# AUTH_SPA=,AUTH_SPA=,'
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE}/lib -lpq,' \
 		-e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE}/include/pgsql,' \
@@ -309,7 +309,7 @@
 SEDLIST+=	-e 's,XX_PGSQL_[^ ]*_XX,,'
 .endif
 
-.if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(LDAP_LIB_TYPE) && \
+.if !defined(WITH_POSTGRESQL) && !defined(WITH_MYSQL) && !defined(LDAP_LIB_TYPE) && \
     ${WITH_BDB_VER} == 1
 SEDLIST+=	-e 's,^LOOKUP_LIBS=,\#LOOKUP_LIBS=,' \
 		-e 's,^LOOKUP_INCLUDE=,\#LOOKUP_INCLUDE=,'
Index: mail/exim-old/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/exim-old/Makefile,v
retrieving revision 1.123
diff -u -r1.123 Makefile
--- mail/exim-old/Makefile	4 Sep 2003 09:03:54 -0000	1.123
+++ mail/exim-old/Makefile	21 Feb 2004 18:04:25 -0000
@@ -38,13 +38,13 @@
 # XFree86 to be installed if it is not present.
 #WITH_EXIMON=	yes
 
-# Define WITH_TCP_WRAPPERS, WITH_LDAP, WITH_MYSQL, and WITH_PGSQL to
+# Define WITH_TCP_WRAPPERS, WITH_LDAP, WITH_MYSQL, and WITH_POSTGRESQL to
 # link against libwrap, an LDAP library (see below), liblibmysqlclient
 # and libpq respectively.
 #WITH_TCP_WRAPPERS=	yes
 #WITH_LDAP=		yes
 #WITH_MYSQL=		yes
-#WITH_PGSQL=		yes
+#WITH_POSTGRESQL=	yes
 
 # Define WITHOUT_IPV6 to exclude IPv6 support from the compiled exim
 # binary.  Exim compiled with IPv6 support will still operate on
@@ -158,7 +158,7 @@
 SEDLIST+=	-e 's,^\# AUTH_PLAINTEXT=,AUTH_PLAINTEXT=,'
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE}/lib -lpq,' \
 		-e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE}/include/pgsql,' \
@@ -171,7 +171,7 @@
 SEDLIST+=	-e 's,^\# HAVE_IPV6=,HAVE_IPV6=,'
 .endif
 
-.if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(WITH_LDAP)
+.if !defined(WITH_POSTGRESQL) && !defined(WITH_MYSQL) && !defined(WITH_LDAP)
 SEDLIST+=	-e 's,^LOOKUP_LIBS=,\#LOOKUP_LIBS=,' \
 		-e 's,^LOOKUP_INCLUDE=,\#LOOKUP_INCLUDE=,'
 .endif
Index: mail/perdition/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/perdition/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- mail/perdition/Makefile	4 Feb 2004 04:36:07 -0000	1.24
+++ mail/perdition/Makefile	21 Feb 2004 18:04:25 -0000
@@ -40,7 +40,7 @@
 ##   WITH_GDBM: Enable gdbm database backend
 ##   WITH_MYSQL: Enable MySQL database backend
 ##   WITH_NIS: Enable NIS database backend
-##   WITH_PGSQL: Enable PostgreSQL database backend
+##   WITH_POSTGRESQL: Enable PostgreSQL database backend
 ##   WITH_ODBC: Enable ODBC database backend
 ##   WITH_OPENLDAP: Enable OpenLDAP database backend
 ##
@@ -110,7 +110,7 @@
 PLIST_SUB+=		MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--enable-pg
 LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 PLIST_SUB+=		PGSQL=""
Index: mail/teapop/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/teapop/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- mail/teapop/Makefile	4 Dec 2003 12:09:44 -0000	1.24
+++ mail/teapop/Makefile	21 Feb 2004 18:04:25 -0000
@@ -60,10 +60,10 @@
 ## Authentication backend
 ##   WITH_OPENLDAP: add support for authentication through OpenLDAP server
 ##   WITH_MYSQL: enable support for authentication from MySQL database
-##   WITH_PGSQL: enable support for authentication from PostgreSQL database
+##   WITH_POSTGRESQL: enable support for authentication from PostgreSQL database
 ##
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql
 LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 .endif
Index: mail/teapop-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/teapop-devel/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- mail/teapop-devel/Makefile	7 Feb 2004 16:29:17 -0000	1.26
+++ mail/teapop-devel/Makefile	21 Feb 2004 18:04:25 -0000
@@ -62,10 +62,10 @@
 ## Authentication backend
 ##   WITH_OPENLDAP: add support for authentication through OpenLDAP server
 ##   WITH_MYSQL: enable support for authentication from MySQL database
-##   WITH_PGSQL: enable support for authentication from PostgreSQL database
+##   WITH_POSTGRESQL: enable support for authentication from PostgreSQL database
 ##
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql
 LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 .endif
Index: net/jabberd/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/jabberd/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- net/jabberd/Makefile	9 Feb 2004 07:31:14 -0000	1.9
+++ net/jabberd/Makefile	21 Feb 2004 18:04:26 -0000
@@ -32,7 +32,7 @@
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql-client
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}/include:${LOCALBASE}/lib
 STORAGE+=	pgsql
@@ -64,10 +64,10 @@
 pre-everything::
 	@${ECHO}
 	@${ECHO} "You can build Jabber with the following options:"
-	@${ECHO} "WITH_PGSQL	use PostgreSQL for storage and authentication"
-	@${ECHO} "WITH_BDB	use Berkeley DB for storage and authentication"
-	@${ECHO} "WITH_MYSQL	use MySQL for storage and authentication"
-	@${ECHO} "WITH_LDAP	use LDAP for authentication"
+	@${ECHO} "WITH_POSTGRESQL  use PostgreSQL for storage and authentication"
+	@${ECHO} "WITH_BDB	   use Berkeley DB for storage and authentication"
+	@${ECHO} "WITH_MYSQL	   use MySQL for storage and authentication"
+	@${ECHO} "WITH_LDAP	   use LDAP for authentication"
 	@${ECHO}
 
 pre-install:
Index: net/pmacct/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/pmacct/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- net/pmacct/Makefile	12 Feb 2004 15:25:33 -0000	1.14
+++ net/pmacct/Makefile	21 Feb 2004 18:04:26 -0000
@@ -24,7 +24,7 @@
 PLIST_SUB+=	WITH_MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--enable-pgsql
 PLIST_SUB+=	WITH_PGSQL=""
Index: security/audit/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/audit/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- security/audit/Makefile	4 Feb 2004 05:08:42 -0000	1.11
+++ security/audit/Makefile	21 Feb 2004 18:04:26 -0000
@@ -19,7 +19,7 @@
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .endif
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 .endif
@@ -39,7 +39,7 @@
 .else
 PLIST_SUB+=	MYSQL='@comment '
 .endif
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql \
 			--with-pgsql-libdir=${LOCALBASE}/lib \
 			--with-pgsql-incdir=${LOCALBASE}/include
Index: security/cyrus-sasl2/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- security/cyrus-sasl2/Makefile	6 Feb 2004 17:29:28 -0000	1.96
+++ security/cyrus-sasl2/Makefile	21 Feb 2004 18:04:26 -0000
@@ -88,13 +88,13 @@
 CONFIGURE_ARGS+=--with-mysql=${PREFIX}
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 POSTGRESQL_PORT?=	databases/postgresql-client
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=--with-pgsql=${PREFIX}
 .endif
 
-.if defined(WITH_MYSQL) || defined(WITH_PGSQL)
+.if defined(WITH_MYSQL) || defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=--enable-sql
 .else
 SQL=	"@comment "
Index: sysutils/msyslog/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/msyslog/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- sysutils/msyslog/Makefile	4 Feb 2004 05:09:04 -0000	1.15
+++ sysutils/msyslog/Makefile	21 Feb 2004 18:04:26 -0000
@@ -20,7 +20,7 @@
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .endif
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 .endif
@@ -32,7 +32,7 @@
 .if !defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--without-mysql
 .endif
-.if !defined(WITH_PGSQL)
+.if !defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--without-pgsql
 .endif
 
@@ -42,7 +42,7 @@
 .if defined(WITH_MYSQL)
 MAN8+=	om_mysql.8
 .endif
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 MAN8+=	om_pgsql.8
 .endif
 MANCOMPRESSED=	yes
Index: www/mod_accounting/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_accounting/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- www/mod_accounting/Makefile	4 Feb 2004 05:09:30 -0000	1.9
+++ www/mod_accounting/Makefile	21 Feb 2004 18:04:26 -0000
@@ -19,7 +19,7 @@
 
 MAKE_ARGS+=	APXS="${APXS}"
 
-.if defined(WITHOUT_PGSQL)
+.if defined(WITHOUT_POSTGRESQL)
 MAKE_ARGS+=	WITHOUT_PGSQL=YES
 .else
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
@@ -36,7 +36,7 @@
 pre-everything::
 	@${ECHO} ""
 	@${ECHO} "      WITHOUT_MYSQL        Disable MySQL support"
-	@${ECHO} "      WITHOUT_PGSQL        Disable PostgreSQL support"
+	@${ECHO} "      WITHOUT_POSTGRESQL   Disable PostgreSQL support"
 	@${ECHO} ""
 
 post-install:
Index: www/udmsearch/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/udmsearch/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- www/udmsearch/Makefile	4 Feb 2004 05:09:37 -0000	1.24
+++ www/udmsearch/Makefile	21 Feb 2004 18:04:26 -0000
@@ -26,7 +26,7 @@
 		--sysconfdir=${PREFIX}/etc/udmsearch \
 		--localstatedir=/var/udmsearch
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_POSTGRESQL)
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}/pgsql
@@ -47,7 +47,7 @@
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You may alternately build udmsearch with either msql or"
 	@${ECHO_MSG} "postgresql support by invoking make with WITH_MSQL=yes or"
-	@${ECHO_MSG} "WITH_PGSQL=yes respectively."
+	@${ECHO_MSG} "WITH_POSTGRESQL=yes respectively."
 	@${ECHO_MSG}
 .endif
 
--- pgsql.patch ends here ---

--- changes.patch begins here ---
Index: CHANGES
===================================================================
RCS file: /home/ncvs/ports/CHANGES,v
retrieving revision 1.6
diff -u -r1.6 CHANGES
--- CHANGES	18 Feb 2004 04:02:44 -0000	1.6
+++ CHANGES	21 Feb 2004 18:04:26 -0000
@@ -10,6 +10,12 @@
 
 All ports committers are allowed to commit to this file.
 
+20040221:
+	The flags for specifying PostgreSQL support were unified.
+	WITH_POSTGRES and WITH_PGSQL have been removed in favour of
+	WITH_POSTGRESQL. You might want to update /etc/make.conf or
+	pkgtools.conf or Makefile.local to reflect this change.
+
 20040217:
 	Mozilla will now default to using GTK2, and will only compile
 	against Gtk+-1.2 if explicitly requested.  This is in exact
--- changes.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402211813.i1LIDCXG002825>