2 files changed, 41 insertions, 48 deletions

diff --git a/www/zope-zmysqlda/Makefile b/www/zope-zmysqlda/Makefile
index beb0ae38599c..b341d5d37b31 100644
--- a/www/zope-zmysqlda/Makefile
+++ b/www/zope-zmysqlda/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zmysqlda
 PORTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	www databases zope
 MASTER_SITES=	http://www.zope.org/Members/adustman/Products/ZMySQLDA/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,22 +18,14 @@ DISTNAME=	${ZOPEPRODUCTNAME}-${PORTVERSION}
 MAINTAINER=	wjv@FreeBSD.org
 COMMENT=	MySQL Database Adapter for the Zope web application framework
 
-RUN_DEPENDS=	${ZOPEBASEDIR}/skel/bin/zopectl.in:${PORTSDIR}/www/zope \
-		${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/MySQLdb/__init__.py:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/MySQLdb/__init__.py:${PORTSDIR}/databases/py-MySQLdb
 
 USE_PYTHON=	yes
+USE_ZOPE=	yes
 DIST_SUBDIR=	zope
 
-# You can change this in the environment if you like
-SZOPEBASEDIR?=		www/Zope
-
-# Don't change these
-ZOPEBASEDIR=		${PREFIX}/${SZOPEBASEDIR}
 ZOPEPRODUCTNAME=	ZMySQLDA
-ZOPEPRODUCTDIR=		lib/python/Products
-
-PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR}
-WRKSRC=		${WRKDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
+WRKSRC=		${WRKDIR}/lib/python/Products/${ZOPEPRODUCTNAME}
 CPIO_OPTIONS=	--quiet -pdum -R
 
 do-build:
diff --git a/www/zope-zmysqlda/pkg-plist b/www/zope-zmysqlda/pkg-plist
index 8d03274c04cf..fbaf65dd629d 100644
--- a/www/zope-zmysqlda/pkg-plist
+++ b/www/zope-zmysqlda/pkg-plist
@@ -1,37 +1,37 @@
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/CHANGES.txt
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/DA.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/DA.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/DABase.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/DABase.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/DEPENDENCIES.txt
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/VERSION.txt
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/browse.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/connectionAdd.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/connectionEdit.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/db.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/db.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/help/DA.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/help/DA.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/help/DABase.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/help/DABase.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/help/db.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/help/db.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/bin.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/date.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/datetime.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/field.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/float.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/int.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/stable.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/table.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/text.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/time.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/view.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons/what.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/table_info.dtml
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/icons
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA/help
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZMySQLDA
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/CHANGES.txt
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/DA.py
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/DA.pyc
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/DABase.py
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/DABase.pyc
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/DEPENDENCIES.txt
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/README.txt
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/VERSION.txt
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/__init__.py
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/__init__.pyc
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/browse.dtml
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/connectionAdd.dtml
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/connectionEdit.dtml
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/db.py
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/db.pyc
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/help/DA.py
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/help/DA.pyc
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/help/DABase.py
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/help/DABase.pyc
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/help/db.py
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/help/db.pyc
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/bin.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/date.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/datetime.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/field.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/float.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/int.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/stable.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/table.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/text.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/time.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/view.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/icons/what.gif
+%%ZOPEPRODUCTDIR%%/ZMySQLDA/table_info.dtml
+@dirrm %%ZOPEPRODUCTDIR%%/ZMySQLDA/icons
+@dirrm %%ZOPEPRODUCTDIR%%/ZMySQLDA/help
+@dirrm %%ZOPEPRODUCTDIR%%/ZMySQLDA