From owner-svn-ports-all@FreeBSD.ORG Sat Jan 4 01:16:21 2014 Return-Path: Delivered-To: svn-ports-all@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 ESMTPS id 0C283122; Sat, 4 Jan 2014 01:16:21 +0000 (UTC) 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 EC7EC12D5; Sat, 4 Jan 2014 01:16:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s041GK5h044093; Sat, 4 Jan 2014 01:16:20 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s041GJUa044088; Sat, 4 Jan 2014 01:16:19 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401040116.s041GJUa044088@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 4 Jan 2014 01:16:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338620 - in head/x11-toolkits: py-wxPython26 py-wxPython28 wxgtk26 wxgtk28 wxgtk29 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 01:16:21 -0000 Author: bapt Date: Sat Jan 4 01:16:19 2014 New Revision: 338620 URL: http://svnweb.freebsd.org/changeset/ports/338620 Log: Fix pkg name collisions Modified: head/x11-toolkits/py-wxPython26/Makefile head/x11-toolkits/py-wxPython28/Makefile head/x11-toolkits/wxgtk26/Makefile head/x11-toolkits/wxgtk28/Makefile head/x11-toolkits/wxgtk29/Makefile Modified: head/x11-toolkits/py-wxPython26/Makefile ============================================================================== --- head/x11-toolkits/py-wxPython26/Makefile Sat Jan 4 01:05:19 2014 (r338619) +++ head/x11-toolkits/py-wxPython26/Makefile Sat Jan 4 01:16:19 2014 (r338620) @@ -7,6 +7,7 @@ PORTREVISION?= 7 CATEGORIES= x11-toolkits python MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 26 DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= neal@nelson.name @@ -83,7 +84,7 @@ PLIST_SUB+= WX_VERSION=${WX_VERSION} .if defined(WITH_COMMON_ONLY) ## These are not shared amongst installations -PKGNAMESUFFIX= -common +PKGNAMESUFFIX= 26-common PYDISTUTILS_BUILDARGS+= \ INSTALL_MULTIVERSION=1 @@ -99,7 +100,7 @@ PYDISTUTILS_BUILDARGS+= \ . if defined(WITH_WXPYTHON_UNICODE) WX_UNICODE= yes -PKGNAMESUFFIX= -unicode +PKGNAMESUFFIX= 26-unicode PYDISTUTILS_BUILDARGS+= \ UNICODE=1 Modified: head/x11-toolkits/py-wxPython28/Makefile ============================================================================== --- head/x11-toolkits/py-wxPython28/Makefile Sat Jan 4 01:05:19 2014 (r338619) +++ head/x11-toolkits/py-wxPython28/Makefile Sat Jan 4 01:16:19 2014 (r338620) @@ -7,6 +7,7 @@ PORTREVISION?= 2 CATEGORIES= x11-toolkits python MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 28 DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= neal@nelson.name @@ -72,7 +73,7 @@ PLIST_SUB+= WX_VERSION=${USE_WX} .if defined(WITH_COMMON_ONLY) ## These are not shared amongst installations -PKGNAMESUFFIX= -common +PKGNAMESUFFIX= 28-common PYDISTUTILS_BUILDARGS+= \ INSTALL_MULTIVERSION=1 @@ -88,7 +89,7 @@ PYDISTUTILS_BUILDARGS+= \ . if defined(WITH_WXPYTHON_UNICODE) WX_UNICODE= yes -PKGNAMESUFFIX= -unicode +PKGNAMESUFFIX= 28-unicode PYDISTUTILS_BUILDARGS+= \ UNICODE=1 Modified: head/x11-toolkits/wxgtk26/Makefile ============================================================================== --- head/x11-toolkits/wxgtk26/Makefile Sat Jan 4 01:05:19 2014 (r338619) +++ head/x11-toolkits/wxgtk26/Makefile Sat Jan 4 01:16:19 2014 (r338620) @@ -6,7 +6,7 @@ PORTVERSION= 2.6.4 PORTREVISION?= 7 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION} -PKGNAMESUFFIX= ${WXGTK_FLAVOR} +PKGNAMESUFFIX= 26-${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org Modified: head/x11-toolkits/wxgtk28/Makefile ============================================================================== --- head/x11-toolkits/wxgtk28/Makefile Sat Jan 4 01:05:19 2014 (r338619) +++ head/x11-toolkits/wxgtk28/Makefile Sat Jan 4 01:16:19 2014 (r338620) @@ -6,7 +6,7 @@ PORTVERSION= 2.8.12 PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} -PKGNAMESUFFIX= ${WXGTK_FLAVOR} +PKGNAMESUFFIX= 28-${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org Modified: head/x11-toolkits/wxgtk29/Makefile ============================================================================== --- head/x11-toolkits/wxgtk29/Makefile Sat Jan 4 01:05:19 2014 (r338619) +++ head/x11-toolkits/wxgtk29/Makefile Sat Jan 4 01:16:19 2014 (r338620) @@ -6,7 +6,7 @@ PORTVERSION= 2.9.4 PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} -PKGNAMESUFFIX= gtk2 +PKGNAMESUFFIX= 29-gtk2 DISTNAME= wxWidgets-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org