Date: Sun, 6 Jan 2008 02:42:07 +0900 (JST) From: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp> Subject: ports/119365: Modify CONFLICTS between plone and zope-* to include plone3 Message-ID: <20080105174207.368091534D8@xeon.quad.dyndns.org> Resent-Message-ID: <200801051750.m05Ho1Ut006731@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119365
>Category: ports
>Synopsis: Modify CONFLICTS between plone and zope-* to include plone3
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 05 17:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: TAOKA Fumiyoshi
>Release:
>Organization:
>Environment:
>Description:
Modify CONFLICTS between plone and zope-* to include plone3.
>How-To-Repeat:
>Fix:
Index: zope-archetypes/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-archetypes/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- zope-archetypes/Makefile 6 Jun 2007 07:45:33 -0000 1.10
+++ zope-archetypes/Makefile 12 Dec 2007 02:23:50 -0000
@@ -30,7 +30,7 @@
USE_PYTHON= yes
PLIST= ${WRKDIR}/pkg-plist
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
Index: zope-btreefolder2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-btreefolder2/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- zope-btreefolder2/Makefile 31 Jul 2007 11:55:26 -0000 1.4
+++ zope-btreefolder2/Makefile 12 Dec 2007 02:23:58 -0000
@@ -24,7 +24,7 @@
WRKSRC= ${WRKDIR}/BTreeFolder2
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/tests
Index: zope-cmf/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-cmf/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- zope-cmf/Makefile 6 Jun 2007 07:45:33 -0000 1.17
+++ zope-cmf/Makefile 12 Dec 2007 02:24:09 -0000
@@ -18,7 +18,7 @@
USE_ZOPE= yes
DIST_SUBDIR= zope
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/CMF*
Index: zope-cmfactionicons/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-cmfactionicons/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- zope-cmfactionicons/Makefile 2 Dec 2005 12:00:32 -0000 1.4
+++ zope-cmfactionicons/Makefile 12 Dec 2007 02:24:31 -0000
@@ -26,7 +26,7 @@
PLIST= ${WRKDIR}/pkg-plist
WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}-${PORTVERSION}/${ZOPEPRODUCTNAME}
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
Index: zope-cmfformcontroller/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-cmfformcontroller/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- zope-cmfformcontroller/Makefile 2 Dec 2005 12:00:32 -0000 1.3
+++ zope-cmfformcontroller/Makefile 12 Dec 2007 02:24:38 -0000
@@ -28,7 +28,7 @@
PLIST= ${WRKDIR}/pkg-plist
WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
Index: zope-cmfquickinstaller/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-cmfquickinstaller/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- zope-cmfquickinstaller/Makefile 2 Dec 2005 12:00:32 -0000 1.4
+++ zope-cmfquickinstaller/Makefile 12 Dec 2007 02:24:42 -0000
@@ -26,7 +26,7 @@
WRKSRC= ${WRKDIR}/CMFQuickInstallerTool
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/interfaces/
Index: zope-generator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-generator/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- zope-generator/Makefile 6 Jun 2007 07:45:33 -0000 1.5
+++ zope-generator/Makefile 12 Dec 2007 02:24:48 -0000
@@ -23,7 +23,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST= ${WRKDIR}/pkg-plist
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
Index: zope-groupuserfolder/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-groupuserfolder/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- zope-groupuserfolder/Makefile 2 Dec 2005 12:00:32 -0000 1.6
+++ zope-groupuserfolder/Makefile 12 Dec 2007 02:24:55 -0000
@@ -28,7 +28,7 @@
PRODUCTNAME= GroupUserFolder
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
Index: zope-kupu/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-kupu/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- zope-kupu/Makefile 7 Feb 2006 20:44:58 -0000 1.6
+++ zope-kupu/Makefile 12 Dec 2007 02:25:00 -0000
@@ -24,7 +24,7 @@
WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
Index: zope-mimetypesregistry/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-mimetypesregistry/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- zope-mimetypesregistry/Makefile 6 Jun 2007 07:45:33 -0000 1.5
+++ zope-mimetypesregistry/Makefile 12 Dec 2007 02:25:04 -0000
@@ -27,7 +27,7 @@
WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}
PLIST= ${WRKDIR}/pkg-plist
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
Index: zope-placelesstranslationservice/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-placelesstranslationservice/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- zope-placelesstranslationservice/Makefile 2 Dec 2005 12:00:33 -0000 1.5
+++ zope-placelesstranslationservice/Makefile 12 Dec 2007 02:25:08 -0000
@@ -25,7 +25,7 @@
PLIST= ${WRKDIR}/pkg-plist
WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
Index: zope-plonelanguagetool/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-plonelanguagetool/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- zope-plonelanguagetool/Makefile 19 May 2007 20:25:43 -0000 1.4
+++ zope-plonelanguagetool/Makefile 12 Dec 2007 02:25:13 -0000
@@ -33,7 +33,7 @@
PLIST= ${WRKDIR}/pkg-plist
WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -x skins ${WRKSRC}
Index: zope-portaltransforms/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-portaltransforms/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- zope-portaltransforms/Makefile 6 Jun 2007 07:45:34 -0000 1.10
+++ zope-portaltransforms/Makefile 12 Dec 2007 02:25:18 -0000
@@ -27,7 +27,7 @@
USE_ZOPE= yes
DIST_SUBDIR= zope
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
ZOPEPRODUCTNAME= PortalTransforms
WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}
Index: zope-validation/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zope-validation/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- zope-validation/Makefile 6 Jun 2007 07:45:34 -0000 1.5
+++ zope-validation/Makefile 12 Dec 2007 02:25:26 -0000
@@ -23,7 +23,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST= ${WRKDIR}/pkg-plist
-CONFLICTS= plone-[0-9]*
+CONFLICTS= plone[0-9]*-[0-9]*
do-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080105174207.368091534D8>