svn commit: r333018 - in head: databases/msql databases/msql3 irc/ninja mail/dbmail mail/dbmail22 security/tripwire security/tripwire-131 security/tripwire12

[Baptiste Daroussin]

Author: bapt
Date: Wed Nov  6 17:52:42 2013
New Revision: 333018
URL: http://svnweb.freebsd.org/changeset/ports/333018

Log:
  Fix pkg name collisions
  
  With hat:	portmgr

Modified:
  head/databases/msql/Makefile
  head/databases/msql3/Makefile
  head/irc/ninja/Makefile
  head/mail/dbmail/Makefile
  head/mail/dbmail22/Makefile
  head/security/tripwire-131/Makefile
  head/security/tripwire/Makefile
  head/security/tripwire12/Makefile

Modified: head/databases/msql/Makefile
==============================================================================
--- head/databases/msql/Makefile	Wed Nov  6 17:49:44 2013	(r333017)
+++ head/databases/msql/Makefile	Wed Nov  6 17:52:42 2013	(r333018)
@@ -9,7 +9,7 @@ CATEGORIES=	databases
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	The Mini SQL server, version 2
 
-CONFLICTS=	msql-3*
+CONFLICTS=	msql-3* msql3-*
 
 USES=		perl5
 USE_LDCONFIG=	YES

Modified: head/databases/msql3/Makefile
==============================================================================
--- head/databases/msql3/Makefile	Wed Nov  6 17:49:44 2013	(r333017)
+++ head/databases/msql3/Makefile	Wed Nov  6 17:52:42 2013	(r333018)
@@ -4,6 +4,7 @@
 PORTNAME=	msql
 PORTVERSION=	3.8
 CATEGORIES=	databases
+PKGNAMESUFX=	3
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Version 3 of the Mini SQL relational database system
@@ -16,8 +17,6 @@ USE_LDCONFIG=	YES
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
-LATEST_LINK=	msql3
-
 # Not free for commercial use.
 RESTRICTED=	restrictive copyright (no commercial use)
 

Modified: head/irc/ninja/Makefile
==============================================================================
--- head/irc/ninja/Makefile	Wed Nov  6 17:49:44 2013	(r333017)
+++ head/irc/ninja/Makefile	Wed Nov  6 17:52:42 2013	(r333018)
@@ -4,6 +4,7 @@
 PORTNAME=	ninja
 PORTVERSION=	1.5.8.1
 CATEGORIES=	irc
+PKGNAMEPREFIX=	irc-
 MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/
 
 MAINTAINER=	ports at FreeBSD.org
@@ -15,8 +16,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	IRCLIB="${DATADIR}"
 MAKE_JOBS_UNSAFE=	yes
 
-LATEST_LINK=	irc-ninja
-
 NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%IRCLIB%%|${DATADIR}|g" \

Modified: head/mail/dbmail/Makefile
==============================================================================
--- head/mail/dbmail/Makefile	Wed Nov  6 17:49:44 2013	(r333017)
+++ head/mail/dbmail/Makefile	Wed Nov  6 17:52:42 2013	(r333018)
@@ -20,7 +20,7 @@ BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/tex
 		xmlto:${PORTSDIR}/textproc/xmlto \
 		${LOCALBASE}/share/sgml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-450
 
-CONFLICTS=	dbmail-2.*
+CONFLICTS=	dbmail-2.* dbmail22-*
 
 OPTIONS_DEFINE=	DOCS LDAP SIEVE THREADS
 OPTIONS_DEFAULT=	THREADS

Modified: head/mail/dbmail22/Makefile
==============================================================================
--- head/mail/dbmail22/Makefile	Wed Nov  6 17:49:44 2013	(r333017)
+++ head/mail/dbmail22/Makefile	Wed Nov  6 17:52:42 2013	(r333018)
@@ -5,6 +5,7 @@ PORTNAME=	dbmail
 PORTVERSION=	2.2.18
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.2/
+PKGNAMESUFFIX=	22
 
 MAINTAINER=	ahicks at p-o.co.uk
 COMMENT=	SQL database-based mail system (POP3 and IMAP)

Modified: head/security/tripwire-131/Makefile
==============================================================================
--- head/security/tripwire-131/Makefile	Wed Nov  6 17:49:44 2013	(r333017)
+++ head/security/tripwire-131/Makefile	Wed Nov  6 17:52:42 2013	(r333018)
@@ -7,11 +7,11 @@ CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cc.uoc.gr/system/security/tools/tripwire/ \
 		ftp://ftp.uni-potsdam.de/pub/unix/tools/
 DISTNAME=	Tripwire-${PORTVERSION}-1
+PKGNAMESUFFIX=	-131
 
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	File system security and verification program
 
-LATEST_LINK=	tripwire-131
 MAN5=		tw.config.5
 MAN8=		siggen.8 tripwire.8
 NO_CDROM=	cannot be redistributed for more than the cost of duplication

Modified: head/security/tripwire/Makefile
==============================================================================
--- head/security/tripwire/Makefile	Wed Nov  6 17:49:44 2013	(r333017)
+++ head/security/tripwire/Makefile	Wed Nov  6 17:52:42 2013	(r333018)
@@ -14,7 +14,6 @@ COMMENT=	File system security and verifi
 LICENSE=	GPLv2
 
 NO_LICENSES_INSTALL=	yes
-LATEST_LINK=	${PORTNAME}
 MAN5=		twfiles.5 twconfig.5 twpolicy.5
 MAN8=		siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src

Modified: head/security/tripwire12/Makefile
==============================================================================
--- head/security/tripwire12/Makefile	Wed Nov  6 17:49:44 2013	(r333017)
+++ head/security/tripwire12/Makefile	Wed Nov  6 17:52:42 2013	(r333018)
@@ -6,11 +6,11 @@ PORTVERSION=	1.2
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_NETBSD}
+PKGNAMESUFFIX=	12
 
 MAINTAINER=	jgreco at ns.sol.net
 COMMENT=	File system security and verification program
 
-LATEST_LINK=	tripwire12
 MAN5=		tw.config.5
 MAN8=		siggen.8 tripwire.8
 NO_CDROM=	cannot be redistributed for more than the cost of duplication