ports/68589: [patch][non-maintainer] replace WITHOUT_GETTEXT in databases/postgresql*

[Mark Linimon]

>Number:         68589
>Category:       ports
>Synopsis:       [patch][non-maintainer] replace WITHOUT_GETTEXT in databases/postgresql*
>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:   Fri Jul 02 05:50:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Mark Linimon
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
Lonesome Dove Computing Services
>Environment:
System: FreeBSD lonesome.lonesome.com 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #3: Thu Jan 22 20:41:05 CST 2004 root at lonesome.lonesome.com:/usr/src/sys/compile/MULTIMEDIA i386
>Description:
	In a recent commit to the Porter's Handbook, it was discovered
	that WITHOUT_GETTEXT has mostly been replaced by WITHOUT_NLS
	to skip building National Language encodings.  This patch fixes
	the last few ports that have the older usage.  Oddly, it had
	been changed in databases/postgresql7 but not in the -devel port,
	so really all this patch does is to make all 3 ports work the same.
>How-To-Repeat:
	(n/a)
>Fix:
	This was given some light testing on -stable.

Index: postgresql-devel/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/databases/postgresql-devel/Makefile,v
retrieving revision 1.137
diff -u -r1.137 Makefile
--- postgresql-devel/Makefile	19 Mar 2004 13:38:49 -0000	1.137
+++ postgresql-devel/Makefile	2 Jul 2004 05:05:11 -0000
@@ -44,7 +44,7 @@
 USE_GETOPT_LONG=yes
 .endif
 
-.if !defined(WITHOUT_GETTEXT)
+.if !defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	yes
@@ -168,10 +168,10 @@
 	@${ECHO} "				block sizes require a dump, initdb, reload!)"
 	@${ECHO} "	WITH_RENDEZVOUS		Builds with Rendezvous support"
 	@${ECHO} "	WITH_TCL		Builds with pl/tcl support"
-	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
-	@${ECHO} "				internationalized error messages"
 	@${ECHO} "	WITHOUT_GNUGETOPT	Don't install GNU getopt (will"
 	@${ECHO} "				still be used if already installed)"
+	@${ECHO} "	WITHOUT_NLS		Skips building with support for"
+	@${ECHO} "				internationalized error messages"
 	@${ECHO} "	WITHOUT_PGCRYPTO	Builds without pgcrypto support"
 	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
 	@${ECHO} "				PostgreSQL clients"
Index: postgresql7/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/databases/postgresql7/Makefile,v
retrieving revision 1.125
diff -u -r1.125 Makefile
--- postgresql7/Makefile	11 Mar 2004 14:45:42 -0000	1.125
+++ postgresql7/Makefile	1 Jul 2004 08:41:58 -0000
@@ -45,7 +45,7 @@
 USE_GETOPT_LONG=yes
 .endif
 
-.if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
+.if !defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	YES
Index: postgresql73/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/databases/postgresql73/Makefile,v
retrieving revision 1.125
diff -u -r1.125 Makefile
--- postgresql73/Makefile	14 May 2004 13:16:02 -0000	1.125
+++ postgresql73/Makefile	2 Jul 2004 04:57:32 -0000
@@ -42,7 +42,7 @@
 USE_GETOPT_LONG=yes
 .endif
 
-.if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
+.if !defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	GETTEXT=""
 USE_GETTEXT=	yes
>Release-Note:
>Audit-Trail:
>Unformatted: