From owner-svn-ports-head@FreeBSD.ORG Mon Oct 7 11:09:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1929423C; Mon, 7 Oct 2013 11:09:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EBFA529CF; Mon, 7 Oct 2013 11:09:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r97B96Kj047794; Mon, 7 Oct 2013 11:09:06 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r97B95GF047779; Mon, 7 Oct 2013 11:09:05 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201310071109.r97B95GF047779@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 7 Oct 2013 11:09:05 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 11:09:07 -0000 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