Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Jan 2014 00:57:53 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r338615 - in head/mail: qmail-scanner qmail-scanner1
Message-ID:  <201401040057.s040vrgG035829@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Jan  4 00:57:53 2014
New Revision: 338615
URL: http://svnweb.freebsd.org/changeset/ports/338615

Log:
  Fix pkg name collision

Modified:
  head/mail/qmail-scanner/Makefile
  head/mail/qmail-scanner1/Makefile

Modified: head/mail/qmail-scanner/Makefile
==============================================================================
--- head/mail/qmail-scanner/Makefile	Sat Jan  4 00:56:14 2014	(r338614)
+++ head/mail/qmail-scanner/Makefile	Sat Jan  4 00:57:53 2014	(r338615)
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=	reformime:${PORTSDIR}/ma
 		setuidgid:${PORTSDIR}/sysutils/daemontools \
 		bash:${PORTSDIR}/shells/bash
 
-CONFLICTS=	qmail-scanner-1.*
+CONFLICTS=	qmail-scanner-1.* qmail-scanner1-*
 
 USES=		qmail perl5
 

Modified: head/mail/qmail-scanner1/Makefile
==============================================================================
--- head/mail/qmail-scanner1/Makefile	Sat Jan  4 00:56:14 2014	(r338614)
+++ head/mail/qmail-scanner1/Makefile	Sat Jan  4 00:57:53 2014	(r338615)
@@ -8,6 +8,7 @@ CATEGORIES=	mail security
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 EXTRACT_SUFX=	.tgz
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Content/Anti-virus Scanner for qmail
@@ -20,7 +21,6 @@ MANUAL_PACKAGE_BUILD=	Requires qmail bui
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	SPOOLDIR=${SPOOLDIR}
 
-NO_LATEST_LINK=	yes
 CONFLICTS=	qmail-scanner-2.*
 
 USES=		qmail perl5



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401040057.s040vrgG035829>