From c6c48e8eca76c54a6a5e1f6a28d91f2e5492137f Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 5 Dec 2013 11:10:49 +0000 Subject: Fixup pkgnames. PR: ports/184440, ports/184441, ports/184442, ports/184443, ports/184444, ports/184445, ports/184446, ports/184447, ports/184448, ports/184449, ports/184450 Submitted by: mat Approved by: portmgr (bapt) --- databases/pgpool-II-22/Makefile | 4 ++-- databases/pgpool-II-23/Makefile | 4 ++-- databases/pgpool-II-30/Makefile | 4 ++-- databases/pgpool-II/Makefile | 2 +- databases/rrdtool/Makefile | 2 +- databases/rrdtool10/Makefile | 4 ++-- databases/rrdtool12/Makefile | 5 ++--- 7 files changed, 12 insertions(+), 13 deletions(-) (limited to 'databases') diff --git a/databases/pgpool-II-22/Makefile b/databases/pgpool-II-22/Makefile index a2ba89463959..c11bb06bd6cb 100644 --- a/databases/pgpool-II-22/Makefile +++ b/databases/pgpool-II-22/Makefile @@ -6,6 +6,7 @@ PORTVERSION= 2.2.6 PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/2478/ +PKGNAMESUFFIX= 22 MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL @@ -14,9 +15,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_PGSQL= yes USE_LDCONFIG= yes -NO_LATEST_LINK= yes -CONFLICTS= pgpool-3.* pgpool-II-* +CONFLICTS= pgpool-3.* pgpool-II-3.* pgpool-II-23-* pgpool-II-30-* USE_RC_SUBR= pgpool PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp diff --git a/databases/pgpool-II-23/Makefile b/databases/pgpool-II-23/Makefile index c0f08f2c1b82..06544690256a 100644 --- a/databases/pgpool-II-23/Makefile +++ b/databases/pgpool-II-23/Makefile @@ -5,6 +5,7 @@ PORTNAME= pgpool-II PORTVERSION= 2.3.3 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/2664/ +PKGNAMESUFFIX= 23 MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL @@ -13,9 +14,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_PGSQL= yes USE_LDCONFIG= yes -NO_LATEST_LINK= yes -CONFLICTS= pgpool-3.* pgpool-II-* +CONFLICTS= pgpool-3.* pgpool-II-3.* pgpool-II-22-* pgpool-II-30-* USE_RC_SUBR= pgpool PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp diff --git a/databases/pgpool-II-30/Makefile b/databases/pgpool-II-30/Makefile index 928c3bdc87f0..31b3f347e049 100644 --- a/databases/pgpool-II-30/Makefile +++ b/databases/pgpool-II-30/Makefile @@ -5,6 +5,7 @@ PORTNAME= pgpool-II PORTVERSION= 3.0.4 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/3076/ +PKGNAMESUFFIX= 30 MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL @@ -15,9 +16,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_PGSQL= yes USE_LDCONFIG= yes -NO_LATEST_LINK= yes -CONFLICTS= pgpool-3.* pgpool-II-2.* pgpool-II-3.1.* +CONFLICTS= pgpool-3.* pgpool-II-3.* pgpool-II-22-* pgpool-II-23-* USE_RC_SUBR= pgpool PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile index 8e8e98e1990b..958d0219e741 100644 --- a/databases/pgpool-II/Makefile +++ b/databases/pgpool-II/Makefile @@ -19,7 +19,7 @@ USE_LDCONFIG= yes USE_OPENSSL= yes CONFIGURE_ARGS= --with-openssl -CONFLICTS= pgpool-3.* pgpool-II-2.* pgpool-II-3.0.* +CONFLICTS= pgpool-3.* pgpool-II-22-* pgpool-II-23-* pgpool-II-23-* USE_RC_SUBR= pgpool PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index a6131d741cf8..687c4052c6ba 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libxml2.so:${PORTSDIR}/textproc/libxml2 \ libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango -CONFLICTS= rrdtool-1.0* rrdtool-1.2* +CONFLICTS= rrdtool10-* rrdtool12-* USE_RC_SUBR= rrdcached USE_AUTOTOOLS= libtool diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile index 6d221967a76b..284c0df77090 100644 --- a/databases/rrdtool10/Makefile +++ b/databases/rrdtool10/Makefile @@ -6,14 +6,14 @@ PORTVERSION= 1.0.50 PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/ +PKGNAMESUFFIX= 10 MAINTAINER= lth@FreeBSD.org COMMENT= Round Robin Database Tools MAKE_ENV= PERL=${PERL} -CONFLICTS= rrdtool-1.2* -LATEST_LINK= rrdtool10 +CONFLICTS= rrdtool12-* rrdtool-1.* USES= pkgconfig perl5 USE_AUTOTOOLS= libtool diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile index 528a85ce9096..52b4fe2832aa 100644 --- a/databases/rrdtool12/Makefile +++ b/databases/rrdtool12/Makefile @@ -6,6 +6,7 @@ PORTVERSION= 1.2.30 PORTREVISION= 2 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ +PKGNAMESUFFIX= 12 MAINTAINER= beat@FreeBSD.org COMMENT= Round Robin Database Tools v1.2 @@ -14,9 +15,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ png15:${PORTSDIR}/graphics/png -LATEST_LINK= ${PORTNAME}12 - -CONFLICTS= rrdtool-1.0* rrdtool-1.3* +CONFLICTS= rrdtool10-* rrdtool-1.* USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -- cgit