diff --git a/trac-plugins-AuthOpenId/Makefile b/trac-plugins-AuthOpenId/Makefile
index 3ac4bbefd7..54a5e53100 100644
--- a/trac-plugins-AuthOpenId/Makefile
+++ b/trac-plugins-AuthOpenId/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/08/10 13:41:34 rsmarples Exp $
+# $NetBSD: Makefile,v 1.4 2012/05/10 20:11:34 noud4 Exp $
 
 DISTVERS=	0.3.4
 DISTNAME=	TracAuthOpenId-${DISTVERS}
 PKGNAME=	trac-plugins-AuthOpenId-${DISTVERS}
-EGG_NAME=	${PKGNAME}
+PKGREVISION=	1
+EGG_NAME=	${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://pypi.python.org/packages/source/T/TracAuthOpenId/
 
diff --git a/trac-plugins-AuthOpenId/PLIST b/trac-plugins-AuthOpenId/PLIST
index 41a8820a89..a778b03e5f 100644
--- a/trac-plugins-AuthOpenId/PLIST
+++ b/trac-plugins-AuthOpenId/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2011/08/10 13:41:34 rsmarples Exp $
-${PYSITELIB}/TracAuthOpenId-${PKGVERSION}-py2.5.egg-info/PKG-INFO
-${PYSITELIB}/TracAuthOpenId-${PKGVERSION}-py2.5.egg-info/SOURCES.txt
-${PYSITELIB}/TracAuthOpenId-${PKGVERSION}-py2.5.egg-info/dependency_links.txt
-${PYSITELIB}/TracAuthOpenId-${PKGVERSION}-py2.5.egg-info/entry_points.txt
-${PYSITELIB}/TracAuthOpenId-${PKGVERSION}-py2.5.egg-info/top_level.txt
-${PYSITELIB}/TracAuthOpenId-${PKGVERSION}-py2.5.egg-info/trac_plugin.txt
+@comment $NetBSD: PLIST,v 1.3 2012/05/10 20:11:34 noud4 Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/trac_plugin.txt
 ${PYSITELIB}/authopenid/__init__.py
 ${PYSITELIB}/authopenid/__init__.pyc
 ${PYSITELIB}/authopenid/__init__.pyo
diff --git a/trac-plugins-FullBlog/Makefile b/trac-plugins-FullBlog/Makefile
index ed16f9587c..b9d64ec269 100644
--- a/trac-plugins-FullBlog/Makefile
+++ b/trac-plugins-FullBlog/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2012/01/18 15:02:39 moubctez Exp $
+# $NetBSD: Makefile,v 1.6 2012/05/10 20:11:34 noud4 Exp $
 
 DISTNAME=	fullblogplugin_0.11-r${SVN_REV}
 PKGNAME=	trac-plugins-FullBlog-0.1.1pre${SVN_REV}
-PKGREVISION=	1
-EGG_NAME=	TracFullBlogPlugin-0.11pre${SVN_REV}
+PKGREVISION=	2
+EGG_NAME=	TracFullBlogPlugin-0.1.1
 CATEGORIES=	www
 MASTER_SITES=	-http://trac-hacks.org/changeset/${SVN_REV}/${SVN_MOD}?old_path=/&format=zip
 EXTRACT_SUFX=	.zip
diff --git a/trac-plugins-FullBlog/PLIST b/trac-plugins-FullBlog/PLIST
index 050fe1b38b..02c3f3da3b 100644
--- a/trac-plugins-FullBlog/PLIST
+++ b/trac-plugins-FullBlog/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2010/07/04 19:02:05 rsmarples Exp $
-${PYSITELIB}/TracFullBlogPlugin-0.1.1-py2.5.egg-info/PKG-INFO
-${PYSITELIB}/TracFullBlogPlugin-0.1.1-py2.5.egg-info/SOURCES.txt
-${PYSITELIB}/TracFullBlogPlugin-0.1.1-py2.5.egg-info/dependency_links.txt
-${PYSITELIB}/TracFullBlogPlugin-0.1.1-py2.5.egg-info/entry_points.txt
-${PYSITELIB}/TracFullBlogPlugin-0.1.1-py2.5.egg-info/not-zip-safe
-${PYSITELIB}/TracFullBlogPlugin-0.1.1-py2.5.egg-info/requires.txt
-${PYSITELIB}/TracFullBlogPlugin-0.1.1-py2.5.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.3 2012/05/10 20:11:34 noud4 Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/tracfullblog/__init__.py
 ${PYSITELIB}/tracfullblog/__init__.pyc
 ${PYSITELIB}/tracfullblog/__init__.pyo
diff --git a/trac-plugins-FullBlogNotification/Makefile b/trac-plugins-FullBlogNotification/Makefile
index c4a0ba2f71..cc94496182 100644
--- a/trac-plugins-FullBlogNotification/Makefile
+++ b/trac-plugins-FullBlogNotification/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/07/04 19:39:18 rsmarples Exp $
+# $NetBSD: Makefile,v 1.3 2012/05/10 20:11:34 noud4 Exp $
 
 DISTNAME=	fullblognotification_0.11-r${SVN_REV}
 PKGNAME=	trac-plugins-FullBlogNotification-0.1pre${SVN_REV}
-PKGREVISION=	# blank on purpose even though pkglint moans
-EGG_NAME=	TracFullBlogNotification-0.1dev
+PKGREVISION=	1
+EGG_NAME=	TracFullBlogNotificationPlugin-0.1
 CATEGORIES=	www
 MASTER_SITES=	-http://trac-hacks.org/changeset/${SVN_REV}/${SVN_MOD}?old_path=/&format=zip
 EXTRACT_SUFX=	.zip
diff --git a/trac-plugins-FullBlogNotification/PLIST b/trac-plugins-FullBlogNotification/PLIST
index f74fc31565..41b4988523 100644
--- a/trac-plugins-FullBlogNotification/PLIST
+++ b/trac-plugins-FullBlogNotification/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2010/07/04 19:39:18 rsmarples Exp $
-${PYSITELIB}/TracFullBlogNotificationPlugin-0.1-py2.5.egg-info/PKG-INFO
-${PYSITELIB}/TracFullBlogNotificationPlugin-0.1-py2.5.egg-info/SOURCES.txt
-${PYSITELIB}/TracFullBlogNotificationPlugin-0.1-py2.5.egg-info/dependency_links.txt
-${PYSITELIB}/TracFullBlogNotificationPlugin-0.1-py2.5.egg-info/entry_points.txt
-${PYSITELIB}/TracFullBlogNotificationPlugin-0.1-py2.5.egg-info/not-zip-safe
-${PYSITELIB}/TracFullBlogNotificationPlugin-0.1-py2.5.egg-info/requires.txt
-${PYSITELIB}/TracFullBlogNotificationPlugin-0.1-py2.5.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.3 2012/05/10 20:11:34 noud4 Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/fullblognotification/__init__.py
 ${PYSITELIB}/fullblognotification/__init__.pyc
 ${PYSITELIB}/fullblognotification/__init__.pyo
diff --git a/trac-plugins-screenshots/Makefile b/trac-plugins-screenshots/Makefile
index 2058dbd28f..cbd9b2c1d6 100644
--- a/trac-plugins-screenshots/Makefile
+++ b/trac-plugins-screenshots/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/07/04 19:10:03 rsmarples Exp $
+# $NetBSD: Makefile,v 1.5 2012/05/10 20:11:34 noud4 Exp $
 
 DISTNAME=	screenshotsplguin_0.11-r${SVN_REV}
 PKGNAME=	trac-plugins-screenshots-0.1pre${SVN_REV}
-EGG_NAME=	TracScreenshots-0.1dev
+PKGREVISION=	1
+EGG_NAME=	TracScreenshots-0.7
 CATEGORIES=	www
 MASTER_SITES=	-http://trac-hacks.org/changeset/${SVN_REV}/${SVN_MOD}?old_path=/&format=zip
 EXTRACT_SUFX=	.zip
diff --git a/trac-plugins-screenshots/PLIST b/trac-plugins-screenshots/PLIST
index cf225a4928..51be6d7dea 100644
--- a/trac-plugins-screenshots/PLIST
+++ b/trac-plugins-screenshots/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:22 thomasklausner Exp $
-${PYSITELIB}/TracScreenshots-0.7-py2.5.egg-info/PKG-INFO
-${PYSITELIB}/TracScreenshots-0.7-py2.5.egg-info/SOURCES.txt
-${PYSITELIB}/TracScreenshots-0.7-py2.5.egg-info/dependency_links.txt
-${PYSITELIB}/TracScreenshots-0.7-py2.5.egg-info/entry_points.txt
-${PYSITELIB}/TracScreenshots-0.7-py2.5.egg-info/requires.txt
-${PYSITELIB}/TracScreenshots-0.7-py2.5.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.3 2012/05/10 20:11:34 noud4 Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/tracscreenshots/__init__.py
 ${PYSITELIB}/tracscreenshots/__init__.pyc
 ${PYSITELIB}/tracscreenshots/__init__.pyo
diff --git a/trac-plugins-spamfilter/Makefile b/trac-plugins-spamfilter/Makefile
index f843e78702..e8e93b8366 100644
--- a/trac-plugins-spamfilter/Makefile
+++ b/trac-plugins-spamfilter/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/07/04 20:55:12 rsmarples Exp $
+# $NetBSD: Makefile,v 1.6 2012/05/10 20:11:34 noud4 Exp $
 
 SVNREV=		9935
 DISTNAME=	TracSpamFilter-0.3.2dev
 PKGNAME=	trac-plugins-spamfilter-0.3.2pre${SVNREV}
-PKGREVISION=	# blank on purpose even though pkglint moans
+PKGREVISION=	1
 EGG_NAME=	${DISTNAME}
 CATEGORIES=	www
 
diff --git a/trac-plugins-spamfilter/PLIST b/trac-plugins-spamfilter/PLIST
index 3f8ea3c789..5bf86f4b53 100644
--- a/trac-plugins-spamfilter/PLIST
+++ b/trac-plugins-spamfilter/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2010/07/04 20:55:12 rsmarples Exp $
-${PYSITELIB}/TracSpamFilter-0.3.2dev-py2.5.egg-info/PKG-INFO
-${PYSITELIB}/TracSpamFilter-0.3.2dev-py2.5.egg-info/SOURCES.txt
-${PYSITELIB}/TracSpamFilter-0.3.2dev-py2.5.egg-info/dependency_links.txt
-${PYSITELIB}/TracSpamFilter-0.3.2dev-py2.5.egg-info/entry_points.txt
-${PYSITELIB}/TracSpamFilter-0.3.2dev-py2.5.egg-info/not-zip-safe
-${PYSITELIB}/TracSpamFilter-0.3.2dev-py2.5.egg-info/requires.txt
-${PYSITELIB}/TracSpamFilter-0.3.2dev-py2.5.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.4 2012/05/10 20:11:34 noud4 Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/tracspamfilter/__init__.py
 ${PYSITELIB}/tracspamfilter/__init__.pyc
 ${PYSITELIB}/tracspamfilter/__init__.pyo