Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Oct 2013 11:09:05 +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: r329692 - in head: audio/gkrellmvolume2 devel/cvsweb3 devel/gearmand-devel emulators/wine-devel emulators/wine-gecko-devel mail/mutt14 mail/qmailadmin-devel
Message-ID:  <201310071109.r97B95GF047779@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Oct  7 11:09:05 2013
New Revision: 329692
URL: http://svnweb.freebsd.org/changeset/ports/329692

Log:
  Fix pkgname collision
  
  With hat:	portmgr

Modified:
  head/audio/gkrellmvolume2/Makefile
  head/devel/cvsweb3/Makefile
  head/devel/gearmand-devel/Makefile
  head/emulators/wine-devel/Makefile
  head/emulators/wine-gecko-devel/Makefile
  head/mail/mutt14/Makefile
  head/mail/qmailadmin-devel/Makefile

Modified: head/audio/gkrellmvolume2/Makefile
==============================================================================
--- head/audio/gkrellmvolume2/Makefile	Mon Oct  7 11:02:43 2013	(r329691)
+++ head/audio/gkrellmvolume2/Makefile	Mon Oct  7 11:09:05 2013	(r329692)
@@ -14,7 +14,7 @@ COMMENT=	GKrellM volume plugin
 BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
-LATEST_LINK=	gkrellmvolume2
+PKGNAMESUFFIX=	2
 WRKSRC=		${WRKDIR}/gkrellm-volume
 
 PLIST_FILES=	libexec/gkrellm2/plugins/volume.so \

Modified: head/devel/cvsweb3/Makefile
==============================================================================
--- head/devel/cvsweb3/Makefile	Mon Oct  7 11:02:43 2013	(r329691)
+++ head/devel/cvsweb3/Makefile	Mon Oct  7 11:09:05 2013	(r329692)
@@ -27,7 +27,7 @@ RUN_DEPENDS+=	p5-MIME-Types>=0:${PORTSDI
 PAPERSIZE?=	letter
 RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-${PAPERSIZE}
 
-LATEST_LINK=	cvsweb3
+PKGNAMESUFFIX=	3
 CONFLICTS=	cvsweb-2.*
 
 USES=		perl5

Modified: head/devel/gearmand-devel/Makefile
==============================================================================
--- head/devel/gearmand-devel/Makefile	Mon Oct  7 11:02:43 2013	(r329691)
+++ head/devel/gearmand-devel/Makefile	Mon Oct  7 11:09:05 2013	(r329692)
@@ -26,7 +26,7 @@ GID_FILES=	../../GIDs
 .endif
 .endif
 
-LATEST_LINK=	gearmand-devel
+PKGNAMESUFFIX=	-devel
 
 USERS=		gearmand
 GROUPS=		gearmand

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Mon Oct  7 11:02:43 2013	(r329691)
+++ head/emulators/wine-devel/Makefile	Mon Oct  7 11:09:05 2013	(r329692)
@@ -25,7 +25,7 @@ LIB_DEPENDS=	fontconfig:${PORTSDIR}/x11-
 
 CONFLICTS_INSTALL=	i386-wine-* wine-1.4* wine-1.6*
 
-LATEST_LINK?=	wine-devel
+PKGNAMESUFFIX=	-devel
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GCC=	any

Modified: head/emulators/wine-gecko-devel/Makefile
==============================================================================
--- head/emulators/wine-gecko-devel/Makefile	Mon Oct  7 11:02:43 2013	(r329691)
+++ head/emulators/wine-gecko-devel/Makefile	Mon Oct  7 11:09:05 2013	(r329692)
@@ -15,7 +15,7 @@ COMMENT=	Gecko Layout Engine for Wine de
 LICENSE=	MPL GPLv2 GPLv3 LGPL21 LGPL3
 LICENSE_COMB=	multi
 
-LATEST_LINK=	wine-gecko-devel
+PKGNAMESUFFIX=	-devel
 NO_BUILD=	yes
 PLIST_SUB+=	GECKO_VERSION="${DISTVERSION}"
 DATADIR=	${PREFIX}/share/wine

Modified: head/mail/mutt14/Makefile
==============================================================================
--- head/mail/mutt14/Makefile	Mon Oct  7 11:02:43 2013	(r329691)
+++ head/mail/mutt14/Makefile	Mon Oct  7 11:09:05 2013	(r329692)
@@ -23,7 +23,7 @@ MAINTAINER?=	udo.schweigert@siemens.com
 COMMENT?=	The Mongrel of Mailers (part Elm, Pine, Mush, mh, etc.)
 
 CONFLICTS?=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-devel-[0-9]* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* mutt-[^1].[^4]*
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}14${PKGNAMESUFFIX}
+PKGNAMESUFFIX=	14
 
 OPTIONS_DEFINE=	NLS SGML_DOCS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI
 OPTIONS_DEFAULT=	MUTT_FLOCK MUTT_ICONV GSSAPI
@@ -47,7 +47,7 @@ MUTT_ICONV_DESC=	Enable mutt's iconv cha
 USE_OPENSSL=	yes
 
 .if defined (MUTT_LITE)
-PKGNAMESUFFIX=	-lite
+PKGNAMESUFFIX=	14-lite
 OPTIONS_EXCLUDE=	SGML_DOCS
 .endif
 

Modified: head/mail/qmailadmin-devel/Makefile
==============================================================================
--- head/mail/qmailadmin-devel/Makefile	Mon Oct  7 11:02:43 2013	(r329691)
+++ head/mail/qmailadmin-devel/Makefile	Mon Oct  7 11:09:05 2013	(r329692)
@@ -10,6 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	ismail.yenigul@endersys.com.tr
 COMMENT=	CGI program for administering Qmail with vchkpw/vpopmail
 
+PKGNAMESUFFIX=	-devel
+
 # vpopmail installation directory
 #
 # NB: change this with extreme caution!  For instance, if vpopmail is not
@@ -34,7 +36,6 @@ RUN_DEPENDS+=	ezmlm-idx:${PORTSDIR}/mail
 .endif
 
 CONFLICTS=	qmailadmin-1.*
-LATEST_LINK=	qmailadmin-devel
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES



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