From ddbc89cbea9e724929924695d9af695bf4a4f201 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 2 Dec 2005 12:00:34 +0000 Subject: - Add conflicts to current plone version PR: 86451 Submitted by: Filippo Natali --- www/zope-archetypes/Makefile | 2 ++ www/zope-btreefolder2/Makefile | 2 ++ www/zope-cmf/Makefile | 2 ++ www/zope-cmfactionicons/Makefile | 2 ++ www/zope-cmfformcontroller/Makefile | 2 ++ www/zope-cmfquickinstaller/Makefile | 2 ++ www/zope-generator/Makefile | 2 ++ www/zope-groupuserfolder/Makefile | 2 ++ www/zope-kupu/Makefile | 2 ++ www/zope-mimetypesregistry/Makefile | 2 ++ www/zope-placelesstranslationservice/Makefile | 2 ++ www/zope-plonelanguagetool/Makefile | 2 ++ www/zope-portaltransforms/Makefile | 2 ++ www/zope-validation/Makefile | 2 ++ 14 files changed, 28 insertions(+) diff --git a/www/zope-archetypes/Makefile b/www/zope-archetypes/Makefile index a03cd9ba0dfe..ddcddeb85a22 100644 --- a/www/zope-archetypes/Makefile +++ b/www/zope-archetypes/Makefile @@ -29,6 +29,8 @@ USE_ZOPE= yes USE_PYTHON= yes PLIST= ${WRKDIR}/pkg-plist +CONFLICTS= plone-[0-9]* + do-build: -@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} diff --git a/www/zope-btreefolder2/Makefile b/www/zope-btreefolder2/Makefile index b334dc8e1a06..01272c8c737e 100644 --- a/www/zope-btreefolder2/Makefile +++ b/www/zope-btreefolder2/Makefile @@ -22,6 +22,8 @@ DIST_SUBDIR= zope WRKSRC= ${WRKDIR}/BTreeFolder2 +CONFLICTS= plone-[0-9]* + do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/tests @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${WRKSRC} diff --git a/www/zope-cmf/Makefile b/www/zope-cmf/Makefile index 489455f50182..fa443bf01147 100644 --- a/www/zope-cmf/Makefile +++ b/www/zope-cmf/Makefile @@ -18,6 +18,8 @@ USE_PYTHON= yes USE_ZOPE= yes DIST_SUBDIR= zope +CONFLICTS= plone-[0-9]* + do-build: -@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/CMF* diff --git a/www/zope-cmfactionicons/Makefile b/www/zope-cmfactionicons/Makefile index 880eb9249fac..78e2a8a90d5f 100644 --- a/www/zope-cmfactionicons/Makefile +++ b/www/zope-cmfactionicons/Makefile @@ -26,6 +26,8 @@ ZOPEPRODUCTNAME= CMFActionIcons PLIST= ${WRKDIR}/pkg-plist WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}-${PORTVERSION}/${ZOPEPRODUCTNAME} +CONFLICTS= plone-[0-9]* + do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/ diff --git a/www/zope-cmfformcontroller/Makefile b/www/zope-cmfformcontroller/Makefile index 934e7cb0a560..8622c8f8044f 100644 --- a/www/zope-cmfformcontroller/Makefile +++ b/www/zope-cmfformcontroller/Makefile @@ -28,6 +28,8 @@ ZOPEPRODUCTNAME= CMFFormController PLIST= ${WRKDIR}/pkg-plist WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME} +CONFLICTS= plone-[0-9]* + do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} diff --git a/www/zope-cmfquickinstaller/Makefile b/www/zope-cmfquickinstaller/Makefile index 060d130a9397..484792d83a78 100644 --- a/www/zope-cmfquickinstaller/Makefile +++ b/www/zope-cmfquickinstaller/Makefile @@ -26,6 +26,8 @@ DIST_SUBDIR= zope WRKSRC= ${WRKDIR}/CMFQuickInstallerTool +CONFLICTS= plone-[0-9]* + do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/interfaces/ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${WRKSRC} diff --git a/www/zope-generator/Makefile b/www/zope-generator/Makefile index 75d6d142575f..7c072c9bd67f 100644 --- a/www/zope-generator/Makefile +++ b/www/zope-generator/Makefile @@ -23,6 +23,8 @@ DIST_SUBDIR= zope WRKSRC= ${WRKDIR}/${PORTNAME} PLIST= ${WRKDIR}/pkg-plist +CONFLICTS= plone-[0-9]* + do-build: -@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} diff --git a/www/zope-groupuserfolder/Makefile b/www/zope-groupuserfolder/Makefile index 1df4156e0d3a..97a762cdcbc4 100644 --- a/www/zope-groupuserfolder/Makefile +++ b/www/zope-groupuserfolder/Makefile @@ -28,6 +28,8 @@ WRKSRC= ${WRKDIR}/GroupUserFolder PRODUCTNAME= GroupUserFolder +CONFLICTS= plone-[0-9]* + do-build: -@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/ diff --git a/www/zope-kupu/Makefile b/www/zope-kupu/Makefile index 2a7aaf3260c8..cebc4736dec6 100644 --- a/www/zope-kupu/Makefile +++ b/www/zope-kupu/Makefile @@ -22,6 +22,8 @@ ZOPEPRODUCTNAME= kupu WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME} +CONFLICTS= plone-[0-9]* + do-build: -@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} diff --git a/www/zope-mimetypesregistry/Makefile b/www/zope-mimetypesregistry/Makefile index 73bb2ccaea1d..b73768563a16 100644 --- a/www/zope-mimetypesregistry/Makefile +++ b/www/zope-mimetypesregistry/Makefile @@ -27,6 +27,8 @@ ZOPEPRODUCTNAME= MimetypesRegistry WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME} PLIST= ${WRKDIR}/pkg-plist +CONFLICTS= plone-[0-9]* + do-build: -@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} diff --git a/www/zope-placelesstranslationservice/Makefile b/www/zope-placelesstranslationservice/Makefile index bcee14798741..bcc65fd6ab22 100644 --- a/www/zope-placelesstranslationservice/Makefile +++ b/www/zope-placelesstranslationservice/Makefile @@ -25,6 +25,8 @@ ZOPEPRODUCTNAME=PlacelessTranslationService PLIST= ${WRKDIR}/pkg-plist WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME} +CONFLICTS= plone-[0-9]* + do-build: -@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/ diff --git a/www/zope-plonelanguagetool/Makefile b/www/zope-plonelanguagetool/Makefile index 44c7e3d13cd3..cf417de28732 100644 --- a/www/zope-plonelanguagetool/Makefile +++ b/www/zope-plonelanguagetool/Makefile @@ -32,6 +32,8 @@ ZOPEPRODUCTNAME= PloneLanguageTool PLIST= ${WRKDIR}/pkg-plist WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME} +CONFLICTS= plone-[0-9]* + do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -x skins ${WRKSRC} diff --git a/www/zope-portaltransforms/Makefile b/www/zope-portaltransforms/Makefile index 491d3d03555a..b188581f1a56 100644 --- a/www/zope-portaltransforms/Makefile +++ b/www/zope-portaltransforms/Makefile @@ -26,6 +26,8 @@ USE_PYTHON= yes USE_ZOPE= yes DIST_SUBDIR= zope +CONFLICTS= plone-[0-9]* + ZOPEPRODUCTNAME= PortalTransforms WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME} PLIST= ${WRKDIR}/pkg-plist diff --git a/www/zope-validation/Makefile b/www/zope-validation/Makefile index 0bf6482921d6..822f50397dae 100644 --- a/www/zope-validation/Makefile +++ b/www/zope-validation/Makefile @@ -23,6 +23,8 @@ DIST_SUBDIR= zope WRKSRC= ${WRKDIR}/${PORTNAME} PLIST= ${WRKDIR}/pkg-plist +CONFLICTS= plone-[0-9]* + do-build: -@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} -- cgit v1.2.3