svn commit: r441053 - in head/databases: pgpool-II-35 pgpool-II-36

[Antoine Brodin]

Author: antoine
Date: Tue May 16 20:01:43 2017
New Revision: 441053
URL: https://svnweb.freebsd.org/changeset/ports/441053

Log:
  Fix PKGBASE collision with databases/pgpool

Modified:
  head/databases/pgpool-II-35/Makefile
  head/databases/pgpool-II-36/Makefile

Modified: head/databases/pgpool-II-35/Makefile
==============================================================================
--- head/databases/pgpool-II-35/Makefile	Tue May 16 19:52:45 2017	(r441052)
+++ head/databases/pgpool-II-35/Makefile	Tue May 16 20:01:43 2017	(r441053)
@@ -1,11 +1,11 @@
 # Created by: Choe, Cheng-Dae <whitekid at gmail.com>
 # $FreeBSD$
 
-PORTNAME=	pgpool
+PORTNAME=	pgpool-II
 PORTVERSION=	3.5.8
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
-DISTNAME=	${PORTNAME}-II-${PORTVERSION}
+PKGNAMESUFFIX=	35
 
 MAINTAINER=	tz at FreeBSD.org
 COMMENT=	Connection pool server for PostgreSQL
@@ -19,8 +19,6 @@ USES=		gmake libtool pgsql:9.3+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-DATADIR=	${PREFIX}/share/${PORTNAME}-II
-
 USE_RC_SUBR=	pgpool
 CONFLICTS=	pgpool-II-[0-9]*
 

Modified: head/databases/pgpool-II-36/Makefile
==============================================================================
--- head/databases/pgpool-II-36/Makefile	Tue May 16 19:52:45 2017	(r441052)
+++ head/databases/pgpool-II-36/Makefile	Tue May 16 20:01:43 2017	(r441053)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	pgpool
+PORTNAME=	pgpool-II
 PORTVERSION=	3.6.4
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
-DISTNAME=	${PORTNAME}-II-${PORTVERSION}
+PKGNAMESUFFIX=	36
 
 MAINTAINER=	tz at FreeBSD.org
 COMMENT=	Connection pool server for PostgreSQL
@@ -18,8 +18,6 @@ USES=		gmake libtool pgsql:9.3+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-DATADIR=	${PREFIX}/share/${PORTNAME}-II
-
 USE_RC_SUBR=	pgpool
 CONFLICTS=	pgpool-II-[0-9]*