- Update to 1.1.12

- Add knob WITH_ZOPE to install optional Zope product

PR:		ports/66363
Submitted by:	Radim Kolar <hsn@netmag.cz>, Alex Rodioukov <simuran@shaw.ca>
Approved by:	maintainer timeout (2 weeks)

3 files changed, 68 insertions, 16 deletions

diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index 95ea47f4f1a6..ff06dc212fbd 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	psycopg
-PORTVERSION=	1.1.9
-PORTREVISION=	1
+PORTVERSION=	1.1.12
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/pub/software/psycopg/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -33,6 +32,13 @@ CONFIGURE_ARGS=	--with-python=${PYTHON_CMD} \
 		--with-postgres-includes=${LOCALBASE}/include \
 		--with-mxdatetime-includes=${DATETIME_INC}
 
+.if defined(WITH_ZOPE)
+USE_ZOPE=	yes
+PLIST_SUB+=	ZOPE=""
+.else
+PLIST_SUB+=	ZOPE="@comment "
+.endif
+
 DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
 DATETIME_INC=	${PYTHON_SITELIBDIR}/mx/DateTime/mxDateTime/
 
@@ -47,26 +53,46 @@ EXAMPLES=	binary.py bool.py commit.py copy_from.py copy_from2.py \
 DOCS=		AUTHORS COPYING CREDITS ChangeLog FAQ INSTALL NEWS \
 		README RELEASE-1.0 SUCCESS TODO
 
+pre-everything::
+.if !defined(WITH_ZOPE)
+	@${ECHO} ""
+	@${ECHO} "* To build with Zope support please specify WITH_ZOPE=YES"
+	@${ECHO} ""
+.endif
+
+.if defined(WITH_ZOPE)
+post-build:
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/ZPsycopgDA
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/psycopgmodule.so \
 		${PYTHON_SITELIBDIR}
+.if defined(WITH_ZOPE)
+	${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/ZPsycopgDA
+	${CP} -R ${WRKSRC}/ZPsycopgDA ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
+.endif
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/${f} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/examples/${f} ${EXAMPLESDIR}
 .endfor
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
-	${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
+	@${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
-.else
-PLIST=	${WRKDIR}/PLIST.nodocs
-pre-install:
-	${RM} -f ${PLIST}
-	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)' \
-		${PKGDIR}/pkg-plist > ${PLIST}
+.endif
+.if !defined(BATCH) && defined(WITH_ZOPE)
+	@${ECHO} ""
+	@${ECHO} "To complete the installation of ZPsycopgDA:"
+	@${ECHO} ""
+	@${ECHO} "    - Restart Zope. This may be done from the Zope Control Panel."
+	@${ECHO} ""
+	@${ECHO} "    - Verify that the ZPsycopgDA product is loaded properly by"
+	@${ECHO} "      examining them in Control_Panel/Products."
+	@${ECHO} ""
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-psycopg/distinfo b/databases/py-psycopg/distinfo
index cfd051916b06..e14405a0754d 100644
--- a/databases/py-psycopg/distinfo
+++ b/databases/py-psycopg/distinfo
@@ -1,2 +1,2 @@
-MD5 (psycopg-1.1.9.tar.gz) = 3a8ab26a7b9d83c179675866e7d6d414
-SIZE (psycopg-1.1.9.tar.gz) = 216531
+MD5 (psycopg-1.1.12.tar.gz) = a3dddfe889e6a47678c834066d708b17
+SIZE (psycopg-1.1.12.tar.gz) = 250999
diff --git a/databases/py-psycopg/pkg-plist b/databases/py-psycopg/pkg-plist
index cc34f1054779..aa0f13721754 100644
--- a/databases/py-psycopg/pkg-plist
+++ b/databases/py-psycopg/pkg-plist
@@ -1,3 +1,4 @@
+lib/%%PYTHON_VERSION%%/site-packages/psycopgmodule.so
 %%PORTDOCS%%share/doc/py-psycopg/AUTHORS
 %%PORTDOCS%%share/doc/py-psycopg/COPYING
 %%PORTDOCS%%share/doc/py-psycopg/CREDITS
@@ -26,6 +27,31 @@
 %%PORTDOCS%%share/examples/py-psycopg/usercast.py
 %%PORTDOCS%%share/examples/py-psycopg/whereareyou.jpg
 %%PORTDOCS%%share/examples/py-psycopg/work.py
-lib/%%PYTHON_VERSION%%/site-packages/psycopgmodule.so
 %%PORTDOCS%%@dirrm share/examples/py-psycopg
 %%PORTDOCS%%@dirrm share/doc/py-psycopg
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DA.py
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DA.pyc
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DABase.py
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/DABase.pyc
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/__init__.py
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/__init__.pyc
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/browse.dtml
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/connectionAdd.dtml
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/connectionEdit.dtml
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/db.py
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/db.pyc
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/bin.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/date.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/datetime.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/field.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/float.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/int.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/stable.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/table.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/text.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/time.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/view.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons/what.gif
+%%ZOPE%%%%ZOPEPRODUCTDIR%%/ZPsycopgDA/table_info.dtml
+%%ZOPE%%@dirrm %%ZOPEPRODUCTDIR%%/ZPsycopgDA/icons
+%%ZOPE%%@dirrm %%ZOPEPRODUCTDIR%%/ZPsycopgDA