svn commit: r316740 - in head/databases: postgresql84-server postgresql91-server postgresql92-server

[Chris Rees]

Author: crees
Date: Sun Apr 28 18:15:06 2013
New Revision: 316740
URL: http://svnweb.freebsd.org/changeset/ports/316740

Log:
  databases/postgresql-server ports: Unbreak NLS
  
  Submitted by:	bapt

Modified:
  head/databases/postgresql84-server/Makefile
  head/databases/postgresql91-server/Makefile
  head/databases/postgresql92-server/Makefile

Modified: head/databases/postgresql84-server/Makefile
==============================================================================
--- head/databases/postgresql84-server/Makefile	Sun Apr 28 18:11:38 2013	(r316739)
+++ head/databases/postgresql84-server/Makefile	Sun Apr 28 18:15:06 2013	(r316740)
@@ -115,8 +115,7 @@ DEBUG_DESC=	Builds with debugging symbol
 INTDATE_DESC=	Builds with 64-bit date/time type (server)
 SSL_DESC=	Build with OpenSSL support
 
-# For testing files in FILESDIR
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
@@ -305,6 +304,9 @@ SUB_LIST+=	PG_GROUP=${PG_GROUP} \
 		PG_USER=${PG_USER} \
 		PG_UID=${PG_UID}
 
+# For testing files in FILESDIR
+.include <bsd.port.pre.mk>
+
 .if !defined(NO_BUILD)
 .if !target(pre-build)
 pre-build:

Modified: head/databases/postgresql91-server/Makefile
==============================================================================
--- head/databases/postgresql91-server/Makefile	Sun Apr 28 18:11:38 2013	(r316739)
+++ head/databases/postgresql91-server/Makefile	Sun Apr 28 18:15:06 2013	(r316740)
@@ -112,8 +112,7 @@ SSL_DESC=	Build with OpenSSL support
 OPTIONS_DEFAULT=	NLS XML TZDATA INTDATE SSL
 .endif # !SLAVE_ONLY
 
-# For testing files in FILESDIR
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
@@ -327,6 +326,9 @@ SUB_LIST+=	PG_GROUP=${PG_GROUP} \
 		PG_USER=${PG_USER} \
 		PG_UID=${PG_UID}
 
+# For testing files in FILESDIR
+.include <bsd.port.pre.mk>
+
 .if defined(SERVER_ONLY)
 pre-build:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL

Modified: head/databases/postgresql92-server/Makefile
==============================================================================
--- head/databases/postgresql92-server/Makefile	Sun Apr 28 18:11:38 2013	(r316739)
+++ head/databases/postgresql92-server/Makefile	Sun Apr 28 18:15:06 2013	(r316740)
@@ -111,8 +111,7 @@ SSL_DESC=	Build with OpenSSL support
 OPTIONS_DEFAULT=	NLS XML TZDATA INTDATE SSL
 .endif # !SLAVE_ONLY
 
-# For testing files in FILESDIR
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
@@ -329,6 +328,9 @@ SUB_LIST+=	PG_GROUP=${PG_GROUP} \
 		PG_USER=${PG_USER} \
 		PG_UID=${PG_UID}
 
+# For testing files in FILESDIR
+.include <bsd.port.pre.mk>
+
 .if defined(SERVER_ONLY)
 pre-build:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL