svn commit: r330414 - in head/databases: postgresql84-client postgresql84-contrib postgresql84-server postgresql90-client postgresql90-contrib postgresql90-server postgresql91-client postgresql91-c...

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Tue Oct 15 17:17:09 UTC 2013 

Author: sunpoet
Date: Tue Oct 15 17:17:05 2013
New Revision: 330414
URL: http://svnweb.freebsd.org/changeset/ports/330414

Log:
  - Remove DISTV: only used in PKGNAMESUFFIX and complained by portlint
  - Convert to new LIB_DEPENDS format for postgresql*-contrib
  
  Submitted by:	sunpoet (myself)
  Reviewed by:	crees (pgsql)
  Approved by:	jgh (pgsql)

Modified:
  head/databases/postgresql84-client/Makefile   (contents, props changed)
  head/databases/postgresql84-contrib/Makefile   (contents, props changed)
  head/databases/postgresql84-server/Makefile
  head/databases/postgresql90-client/Makefile   (contents, props changed)
  head/databases/postgresql90-contrib/Makefile   (contents, props changed)
  head/databases/postgresql90-server/Makefile
  head/databases/postgresql91-client/Makefile   (contents, props changed)
  head/databases/postgresql91-contrib/Makefile   (contents, props changed)
  head/databases/postgresql91-server/Makefile
  head/databases/postgresql92-client/Makefile   (contents, props changed)
  head/databases/postgresql92-contrib/Makefile   (contents, props changed)
  head/databases/postgresql92-server/Makefile
  head/databases/postgresql93-client/Makefile   (contents, props changed)
  head/databases/postgresql93-contrib/Makefile   (contents, props changed)
  head/databases/postgresql93-server/Makefile

Modified: head/databases/postgresql84-client/Makefile
==============================================================================
--- head/databases/postgresql84-client/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql84-client/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 COMMENT=	PostgreSQL database (client)
 

Modified: head/databases/postgresql84-contrib/Makefile
==============================================================================
--- head/databases/postgresql84-contrib/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql84-contrib/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -4,13 +4,13 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql at FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=84

Modified: head/databases/postgresql84-server/Makefile
==============================================================================
--- head/databases/postgresql84-server/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql84-server/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -7,8 +7,7 @@ PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql at FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

Modified: head/databases/postgresql90-client/Makefile
==============================================================================
--- head/databases/postgresql90-client/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql90-client/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 COMMENT=	PostgreSQL database (client)
 

Modified: head/databases/postgresql90-contrib/Makefile
==============================================================================
--- head/databases/postgresql90-contrib/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql90-contrib/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -4,14 +4,13 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX?=        ${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql at FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=90

Modified: head/databases/postgresql90-server/Makefile
==============================================================================
--- head/databases/postgresql90-server/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql90-server/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -3,8 +3,7 @@
 
 DISTVERSION?=	9.0.14
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql at FreeBSD.org
 

Modified: head/databases/postgresql91-client/Makefile
==============================================================================
--- head/databases/postgresql91-client/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql91-client/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 COMMENT=	PostgreSQL database (client)
 

Modified: head/databases/postgresql91-contrib/Makefile
==============================================================================
--- head/databases/postgresql91-contrib/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql91-contrib/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -3,14 +3,13 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases
-PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql at FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=91

Modified: head/databases/postgresql91-server/Makefile
==============================================================================
--- head/databases/postgresql91-server/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql91-server/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -7,8 +7,7 @@ PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql at FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

Modified: head/databases/postgresql92-client/Makefile
==============================================================================
--- head/databases/postgresql92-client/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql92-client/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 COMMENT=	PostgreSQL database (client)
 

Modified: head/databases/postgresql92-contrib/Makefile
==============================================================================
--- head/databases/postgresql92-contrib/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql92-contrib/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -3,14 +3,13 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases
-PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql at FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=92

Modified: head/databases/postgresql92-server/Makefile
==============================================================================
--- head/databases/postgresql92-server/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql92-server/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -7,8 +7,7 @@ PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql at FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

Modified: head/databases/postgresql93-client/Makefile
==============================================================================
--- head/databases/postgresql93-client/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql93-client/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 COMMENT=	PostgreSQL database (client)
 

Modified: head/databases/postgresql93-contrib/Makefile
==============================================================================
--- head/databases/postgresql93-contrib/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql93-contrib/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -4,14 +4,13 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql at FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=93

Modified: head/databases/postgresql93-server/Makefile
==============================================================================
--- head/databases/postgresql93-server/Makefile	Tue Oct 15 16:59:06 2013	(r330413)
+++ head/databases/postgresql93-server/Makefile	Tue Oct 15 17:17:05 2013	(r330414)
@@ -3,8 +3,7 @@
 
 DISTVERSION?=	9.3.1
 PORTREVISION?=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql at FreeBSD.org

More information about the svn-ports-head mailing list