svn commit: r338620 - in head/x11-toolkits: py-wxPython26 py-wxPython28 wxgtk26 wxgtk28 wxgtk29

[Baptiste Daroussin]

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 at 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 at 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 at 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 at 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 at FreeBSD.org