Attachment 40997 Details for Bug 64296 – file.diff

[patch] file.diff

file.diff (text/plain), 5.55 KB, created by Filippo Natali on 2004-03-15 14:30:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Filippo Natali

Created: 2004-03-15 14:30:16 UTC

Size: 5.55 KB

patch

obsolete

>diff -crN plone/Makefile plone.new/Makefile
>*** plone/Makefile	Mon Mar 15 12:15:54 2004
>--- plone.new/Makefile	Mon Mar 15 12:17:44 2004
>***************
>*** 6,50 ****
>  #
>  
>  PORTNAME=	plone
>! PORTVERSION=	1.0.5
>  CATEGORIES=	www zope
>  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>  MASTER_SITE_SUBDIR=	plone
>! DISTNAME=	CMFPlone1.0.5
>  DIST_SUBDIR=	zope
>  
>  MAINTAINER=	filippo@widestore.net
>  COMMENT=	A user friendly implementation of the CMF written on top of ZOPE
>  
>! RUN_DEPENDS=	${LOCALBASE}/${SZOPEBASEDIR}/lib/python/Products/CMFDefault/__init__.py:${PORTSDIR}/www/zope-cmf13
>  
>- CONFLICTS=	zope-formulator-*
>- 
>- USE_PYTHON=	yes
>  USE_ZOPE=	yes
>! PYTHON_VERSION=	python2.1
>! 
>! WRKSRC=		${WRKDIR}/CMFPlone-1.0.5
>! MODULES=	CMFPlone DCWorkflow Formulator i18n
>! 
>! # You can change this in the environment if you like.
>! SZOPEBASEDIR?=	www/Zope
>! 
>! # Don't change these
>! ZOPEBASEDIR=		${PREFIX}/${SZOPEBASEDIR}
>! ZOPEPRODUCTNAME=
>! ZOPEPRODUCTDIR=		lib/python/Products
>  
>! PLIST_SUB=		ZOPEBASEDIR=${SZOPEBASEDIR}
>  
>  do-build:
>  	@for m in ${MODULES}; do \
>  		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/$$m; \
>  	done
>  
>  do-install:
>  	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}
>! 	@(cd ${WRKSRC} && ${CP} -R ${MODULES} \
>! 		${ZOPEBASEDIR}/${ZOPEPRODUCTDIR})
>  
>! .include <bsd.port.mk>
>--- 6,116 ----
>  #
>  
>  PORTNAME=	plone
>! PORTVERSION=	2.0
>  CATEGORIES=	www zope
>  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>  MASTER_SITE_SUBDIR=	plone
>! DISTNAME=	CMFPlone-${PORTVERSION}-final
>  DIST_SUBDIR=	zope
>  
>  MAINTAINER=	filippo@widestore.net
>  COMMENT=	A user friendly implementation of the CMF written on top of ZOPE
>  
>! RUN_DEPENDS= ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/CMFDefault/__init__.py:${PORTSDIR}/www/zope-cmf
>  
>  USE_ZOPE=	yes
>! USE_PYTHON=	yes
>  
>! WRKSRC=		${WRKDIR}/CMFPlone-${PORTVERSION}-final
>! PLIST=      ${WRKDIR}/pkg-plist
>! MODULES= CMFPlone CMFFormController
>! 
>! OPTIONS=	FORMULATOR "Install Formulator port" off \
>! 			BTREEFOLDER2 "Install BTreeFolder2 port" off \
>! 			CMFQUICKINSTALLER "Install CMFQuickInstallerTool port" off \
>! 			CMFACTIONICONS "Install CMFActionIcons port" off \
>! 			GROUPUSERFOLDER "Install GroupUserFolder port" off \
>! 			PLTRANSSERVICE "Install PlacelessTranslationService port" off
>! 
>! .include <bsd.port.pre.mk>
>! 
>! .if defined(WITH_FORMULATOR)
>! RUN_DEPENDS+=  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/Formulator/__init__.py:${PORTSDIR}/www/zope-formulator
>! .else
>! MODULES+= Formulator
>! .endif
>! 
>! .if defined(WITH_BTREEFOLDER2)
>! RUN_DEPENDS+= ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/BTreeFolder2/__init__.py:${PORTSDIR}/www/zope-btreefolder2
>! .else
>! MODULES+= BTreeFolder2
>! .endif
>! 
>! .if defined(WITH_CMFQUICKINSTALLER)
>! RUN_DEPENDS+= ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/CMFQuickInstallerTool/__init__.py:${PORTSDIR}/www/zope-cmfquickinstaller
>! .else
>! MODULES+= CMFQuickInstallerTool
>! .endif
>! 
>! .if defined(WITH_CMFACTIONICONS)
>! RUN_DEPENDS+= ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/CMFActionIcons/__init__.py:${PORTSDIR}/www/zope-cmfactionicons
>! .else
>! MODULES+= CMFActionIcons
>! .endif
>! 
>! .if defined(WITH_GROUPUSERFOLDER)
>! RUN_DEPENDS+= ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/GroupUserFolder/__init__.py:${PORTSDIR}/www/zope-groupuserfolder
>! .else
>! MODULES+= GroupUserFolder
>! .endif
>! 
>! .if defined(WITH_PLTRANSSERVICE)
>! RUN_DEPENDS+= ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/PlacelessTranslationService/__init__.py:${PORTSDIR}/www/zope-placelesstranslationservice
>! .else
>! MODULES+= PlacelessTranslationService
>! .endif
>! 
>! pre-everything::
>! .if !defined(BATCH)
>! 	@${ECHO_MSG} ""
>! 	@${ECHO_MSG} "If you are upgrading from an earlier version"
>! 	@${ECHO_MSG} "backup your site before proceeding."
>! 	@${ECHO_MSG} "If you haven't done so, please press CTRL-C now."
>! 	@${ECHO_MSG} ""
>! .endif
>  
>  do-build:
>  	@for m in ${MODULES}; do \
>  		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/$$m; \
>  	done
>  
>+ pre-install:
>+ 	@${RM} -f ${PLIST}
>+ 	@${TOUCH} ${PLIST}
>+ 	@for m in ${MODULES}; do \
>+ 		if [ ! -f ${ZOPEBASEDIR}/lib/python/Products/$${m}/__init__.py ]; then \
>+ 			cd ${WRKSRC}; \
>+ 			for i in `${FIND} $${m} -type f`; do \
>+ 				${ECHO_CMD} %%ZOPEBASEDIR%%/lib/python/Products/$${i} >> ${PLIST}; \
>+ 			done; \
>+ 			for i in `${FIND} -d $${m} -type d`; do \
>+ 				${ECHO_CMD} @dirrm %%ZOPEBASEDIR%%/lib/python/Products/$${i} >> ${PLIST}; \
>+ 			done; \
>+ 		fi;\
>+ 	done
>+ 
>  do-install:
>  	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}
>! 	@cd ${WRKSRC}; \
>! 	for m in ${MODULES}; do \
>! 		if [ ! -f ${ZOPEBASEDIR}/lib/python/Products/$${m}/__init__.py ]; then \
>! 			${CP} -R $${m} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}; \
>! 		fi; \
>! 	done
>! 
>! post-install:
>! .if !defined(BATCH)
>! 	@${CAT} ${PKGMESSAGE}
>! .endif
>  
>! .include <bsd.port.post.mk>
>diff -crN plone/distinfo plone.new/distinfo
>*** plone/distinfo	Mon Mar 15 12:15:54 2004
>--- plone.new/distinfo	Mon Mar 15 11:56:23 2004
>***************
>*** 1 ****
>! MD5 (zope/CMFPlone1.0.5.tar.gz) = 942dbc488e6fb15c356e010076857999
>--- 1,2 ----
>! MD5 (zope/CMFPlone-2.0-final.tar.gz) = 208b500b4ef247db8fb54d9a7fac84ab
>! SIZE (zope/CMFPlone-2.0-final.tar.gz) = 3625248
>diff -crN plone/pkg-message plone.new/pkg-message
>*** plone/pkg-message	Thu Jan  1 01:00:00 1970
>--- plone.new/pkg-message	Wed Mar 10 10:36:55 2004
>***************
>*** 0 ****
>--- 1,16 ----
>+ To complete the installation of Plone: 
>+ 
>+ - Restart Zope.  This may be done from the Zope Control Panel.
>+ 
>+ If you are upgrading from an earlier version:
>+ 
>+ - Go to http://yoursite/manage
>+ 
>+ - Go to portal_migrations
>+ 
>+ - Click the Migration tab
>+ 
>+ - Click Migrate
>+ 
>+ If you are upgrading from plone 1.0, please read:
>+ http://plone.org/documentation/migration/2.0

Actions: View | Diff

Attachments on bug 64296: 40997