svn commit: r383507 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Tue Apr  7 12:25:28 2015
New Revision: 383507
URL: https://svnweb.freebsd.org/changeset/ports/383507

Log:
  Remove last traces of USE_PGSQL
  Add USE_PGSQL to ERRORS in bsd.sanity.mk to avoid others to readd it by mistake

Modified:
  head/Mk/bsd.database.mk
  head/Mk/bsd.sanity.mk

Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk	Tue Apr  7 12:23:22 2015	(r383506)
+++ head/Mk/bsd.database.mk	Tue Apr  7 12:25:28 2015	(r383507)
@@ -32,8 +32,6 @@ Database_Include_MAINTAINER=	ports at FreeB
 # MYSQL_VER
 #			- Detected MySQL version.
 ##
-# USE_PGSQL		- Do not use this-- instead use USES=pgsql
-##
 # USE_BDB	- Add Berkeley DB library dependency.
 #			  If no version is given (by the maintainer via the port or
 #			  by the user via defined variable), try to find the
@@ -99,10 +97,6 @@ Database_Include_MAINTAINER=	ports at FreeB
 WARNING+=	"DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead"
 .endif
 
-.if defined(DEFAULT_PGSQL_VER)
-WARNING+=	"DEFAULT_PGSQL_VER is defined, consider using DEFAULT_VERSIONS=pgsql=${DEFAULT_PGSQL_VER} instead"
-.endif
-
 .if defined(USE_MYSQL)
 DEFAULT_MYSQL_VER?=	${MYSQL_DEFAULT:S/.//}
 # MySQL client version currently supported.

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Tue Apr  7 12:23:22 2015	(r383506)
+++ head/Mk/bsd.sanity.mk	Tue Apr  7 12:25:28 2015	(r383507)
@@ -151,7 +151,7 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM U
 		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \
 		INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
-		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ
+		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL
 SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX
 
 USE_OPENAL_ALT=		USES=openal
@@ -175,6 +175,7 @@ USE_GETTEXT_ALT=	USES=gettext
 USE_SCONS_ALT=		USES=scons
 USE_DRUPAL_ALT=		USES=drupal
 USE_PYDISTUTILS_ALT=		USE_PYTHON=distutils
+USE_PGSQL_ALT=		USES=pgsql
 INSTALLS_SHLIB_ALT=	USE_LDCONFIG
 PYTHON_CONCURRENT_INSTALL_ALT=	USE_PYTHON=concurrent
 PYDISTUTILS_AUTOPLIST_ALT=	USE_PYTHON=autoplist