Here are patches for some ports still using MODPY_EXPAT_DEPENDS.
PLISTS have been regenerated and some ports got a SUBST_VARS to
keep PLIST diffs smaller for future updates. License information
updated and/or fixed where necessary; funny enough, dbus-python is
much more free than it claimed to be ;-)

I really need oks from our python crew, because I don't know enough
of this python stuff, especially those strange egg-info things.

I'll send a separate diff for print/py-reportlab/reportlab in a
minute, since that one is still broken and needs some more work.

Ciao,
        Kili

ps: www/moinmoin looks like the ultimate license hell. I think it's
nut more restrictive than GPLv2, but some eyeballing by a native
speaker would be appreciated.

Index: biology/py-biopython/Makefile
===================================================================
RCS file: /cvs/ports/biology/py-biopython/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- biology/py-biopython/Makefile       12 Jan 2008 02:00:24 -0000      1.12
+++ biology/py-biopython/Makefile       3 Jan 2009 19:30:01 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY=    Yes
 COMMENT=       Python tools for computational molecular biology
 
 DISTNAME=      biopython-1.44
-PKGNAME=       py-${DISTNAME}
+PKGNAME=       py-${DISTNAME}p0
 CATEGORIES=    biology
 
 HOMEPAGE=      http://www.biopython.org/
@@ -24,11 +24,9 @@ PY_FLAVOR=   python${MODPY_VERSION}
 
 WANTLIB+=      stdc++
 
-BUILD_DEPENDS= ${MODPY_EXPAT_DEPENDS} \
-               ::math/py-Numeric \
+BUILD_DEPENDS= ::math/py-Numeric \
                ::devel/swig
-RUN_DEPENDS=   ${MODPY_EXPAT_DEPENDS} \
-               :py-mxDateTime-*-${PY_FLAVOR}:devel/py-mxDateTime,${PY_FLAVOR} \
+RUN_DEPENDS=   :py-mxDateTime-*-${PY_FLAVOR}:devel/py-mxDateTime,${PY_FLAVOR} \
                :py-Numeric-*:math/py-Numeric \
                :py-reportlab-*:print/py-reportlab/reportlab
 REGRESS_DEPENDS=${RUN_DEPENDS}
Index: devel/libglade2/Makefile
===================================================================
RCS file: /cvs/ports/devel/libglade2/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- devel/libglade2/Makefile    15 Jun 2008 00:06:25 -0000      1.28
+++ devel/libglade2/Makefile    3 Jan 2009 19:30:01 -0000
@@ -4,28 +4,26 @@ COMMENT=              library for loading GLADE inte
 
 GNOME_VERSION=         2.6.2
 GNOME_PROJECT=         libglade
-PKGNAME=               libglade2-${GNOME_VERSION}p1
+PKGNAME=               libglade2-${GNOME_VERSION}p2
 SHARED_LIBS += glade-2.0            1.0      # .0.8
 
 CATEGORIES=            devel
 
 HOMEPAGE=              http://www.gnome.org/
 
-# LGPL
+# LGPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 WANTLIB=       X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
                Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
-               freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \
-               pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png z
+               freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m \
+               pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png z
 
 MODULES=               devel/gettext \
                        lang/python \
                        x11/gnome
-RUN_DEPENDS=           ${MODPY_EXPAT_DEPENDS}
-BUILD_DEPENDS=         ${RUN_DEPENDS}
 LIB_DEPENDS=           gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
                        xml2.>=7:libxml->=2.6.16p6:textproc/libxml
 
Index: devel/libglade2/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libglade2/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- devel/libglade2/pkg/PLIST   24 Apr 2007 20:55:56 -0000      1.7
+++ devel/libglade2/pkg/PLIST   3 Jan 2009 19:30:01 -0000
@@ -10,10 +10,7 @@ include/libglade-2.0/glade/glade-xml.h
 include/libglade-2.0/glade/glade.h
 lib/libglade-2.0.a
 lib/libglade-2.0.la
-lib/pkgconfig/
 lib/pkgconfig/libglade-2.0.pc
-share/gtk-doc/
-share/gtk-doc/html/
 share/gtk-doc/html/libglade/
 share/gtk-doc/html/libglade/GladeXML.html
 share/gtk-doc/html/libglade/home.png
@@ -36,7 +33,6 @@ share/gtk-doc/html/libglade/libglade.dev
 share/gtk-doc/html/libglade/right.png
 share/gtk-doc/html/libglade/style.css
 share/gtk-doc/html/libglade/up.png
-share/libxml2/
 share/libxml2/libglade2.spec
 @exec %D/share/libxml2/rebuild
 @unexec %D/share/libxml2/rebuild
Index: net/gajim/Makefile
===================================================================
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- net/gajim/Makefile  12 Jun 2008 21:58:11 -0000      1.24
+++ net/gajim/Makefile  3 Jan 2009 19:30:01 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY=    Yes
 
 COMMENT=       jabber client written in pygtk
 DISTNAME=      gajim-0.11.4
-PKGNAME=       ${DISTNAME}p0
+PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    net x11
 
 MASTER_SITES=  ${HOMEPAGE}/downloads/
@@ -37,14 +37,13 @@ MODULES=    devel/gettext \
 
 BUILD_DEPENDS= ${RUN_DEPENDS}
 LIB_DEPENDS=   gtkspell::textproc/gtkspell
-RUN_DEPENDS=   ${MODPY_EXPAT_DEPENDS} \
-               ::databases/py-sqlite2 \
+RUN_DEPENDS=   ::databases/py-sqlite2 \
                ::devel/desktop-file-utils \
                ::net/py-dns \
                :dbus-python-*:x11/dbus-python \
                ::x11/py-gtk2
 WANTLIB=       X11 Xcomposite Xdamage Xext Xss Xrender fontconfig freetype \
-               m z aspell atk-1.0.>=1011.0 cairo gdk-x11-2.0.>=600.0 pcre \
+               m z atk-1.0.>=1011.0 cairo gio-2.0 gdk-x11-2.0.>=600.0 pcre \
                gdk_pixbuf-2.0.>=600.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \
                gobject-2.0.>=600.0 gtk-x11-2.0.>=600.0 pango-1.0.>=800.0 \
                pangocairo-1.0 pangoft2-1.0 png glitz Xau Xdmcp expat \
Index: net/gajim/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/gajim/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- net/gajim/pkg/PLIST 25 Nov 2007 15:17:20 -0000      1.7
+++ net/gajim/pkg/PLIST 3 Jan 2009 19:30:01 -0000
@@ -10,7 +10,6 @@ lib/gajim/trayicon.la
 lib/gajim/trayicon.so
 @man man/man1/gajim-remote.1
 @man man/man1/gajim.1
-share/applications/
 share/applications/gajim.desktop
 share/doc/gajim/
 share/doc/gajim/AUTHORS
@@ -865,6 +864,8 @@ share/locale/pt_BR/LC_MESSAGES/gajim.mo
 share/locale/ru/LC_MESSAGES/gajim.mo
 share/locale/sk/LC_MESSAGES/gajim.mo
 share/locale/sr/LC_MESSAGES/gajim.mo
+share/locale/s...@latn/
+share/locale/s...@latn/LC_MESSAGES/
 share/locale/s...@latn/LC_MESSAGES/gajim.mo
 share/locale/sv/LC_MESSAGES/gajim.mo
 share/locale/zh_CN/LC_MESSAGES/gajim.mo
Index: net/telepathy/telepathy-gabble/Makefile
===================================================================
RCS file: /cvs/ports/net/telepathy/telepathy-gabble/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- net/telepathy/telepathy-gabble/Makefile     22 Dec 2008 23:58:58 -0000      
1.7
+++ net/telepathy/telepathy-gabble/Makefile     3 Jan 2009 19:30:01 -0000
@@ -3,6 +3,7 @@
 COMMENT=               flexible communications framework, xmpp component
 
 DISTNAME=              telepathy-gabble-0.7.17
+PKGNAME=               ${DISTNAME}p0
 
 MASTER_SITES=          ${MASTER_SITES_TELEPATHY:=telepathy-gabble/}
 
@@ -15,8 +16,7 @@ MODULES=              devel/gettext \
 BUILD_DEPENDS=         ${RUN_DEPENDS} \
                        ::devel/py-twisted/words \
                        ::net/py-xmpp
-RUN_DEPENDS=           ${MODPY_EXPAT_DEPENDS} \
-                       ::textproc/libxslt
+RUN_DEPENDS=           ::textproc/libxslt
 LIB_DEPENDS=           loudmouth-1::net/loudmouth \
                        telepathy-glib.>=3::net/telepathy/telepathy-glib
 
Index: net/telepathy/telepathy-glib/Makefile
===================================================================
RCS file: /cvs/ports/net/telepathy/telepathy-glib/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- net/telepathy/telepathy-glib/Makefile       23 Dec 2008 00:05:21 -0000      
1.9
+++ net/telepathy/telepathy-glib/Makefile       3 Jan 2009 19:30:01 -0000
@@ -3,6 +3,7 @@
 COMMENT=               flexible communications framework, glib bindings
 
 DISTNAME=              telepathy-glib-0.7.20
+PKGNAME=               ${DISTNAME}p0
 SHARED_LIBS += telepathy-glib       3.1      # .20.0
 
 MASTER_SITES=          ${MASTER_SITES_TELEPATHY:=telepathy-glib/}
@@ -13,8 +14,7 @@ MODULES=              devel/gettext \
                        lang/python
 
 BUILD_DEPENDS=         ${RUN_DEPENDS}
-RUN_DEPENDS=           ${MODPY_EXPAT_DEPENDS} \
-                       ::textproc/libxslt
+RUN_DEPENDS=           ::textproc/libxslt
 LIB_DEPENDS=           dbus-glib-1::x11/dbus-glib
 
 USE_GMAKE=             Yes
Index: net/telepathy/telepathy-idle/Makefile
===================================================================
RCS file: /cvs/ports/net/telepathy/telepathy-idle/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- net/telepathy/telepathy-idle/Makefile       30 Dec 2007 22:50:27 -0000      
1.4
+++ net/telepathy/telepathy-idle/Makefile       3 Jan 2009 19:30:01 -0000
@@ -3,7 +3,7 @@
 COMMENT=               flexible communications framework, IRC component
 
 DISTNAME=              telepathy-idle-0.1.2
-PKGNAME=               ${DISTNAME}p1
+PKGNAME=               ${DISTNAME}p2
 
 MASTER_SITES=          ${MASTER_SITES_TELEPATHY:=telepathy-idle}
 
@@ -14,8 +14,7 @@ MODULES=              devel/gettext \
                        lang/python
 
 BUILD_DEPENDS=         ${RUN_DEPENDS}
-RUN_DEPENDS=           ${MODPY_EXPAT_DEPENDS} \
-                       ::textproc/libxslt
+RUN_DEPENDS=           ::textproc/libxslt
 LIB_DEPENDS=           telepathy-glib::net/telepathy/telepathy-glib
 
 USE_GMAKE=             Yes
Index: net/telepathy/telepathy-idle/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/telepathy/telepathy-idle/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- net/telepathy/telepathy-idle/pkg/PLIST      27 Oct 2007 16:18:54 -0000      
1.1.1.1
+++ net/telepathy/telepathy-idle/pkg/PLIST      3 Jan 2009 19:30:01 -0000
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2007/10/27 16:18:54 jasper Exp $
-bin/telepathy-idle
-share/dbus-1/
-share/dbus-1/services/
+...@bin bin/telepathy-idle
 share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.idle.service
 share/telepathy/
 share/telepathy/managers/
Index: net/telepathy/telepathy-mission-control/Makefile
===================================================================
RCS file: /cvs/ports/net/telepathy/telepathy-mission-control/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- net/telepathy/telepathy-mission-control/Makefile    4 Nov 2008 22:48:17 
-0000       1.8
+++ net/telepathy/telepathy-mission-control/Makefile    3 Jan 2009 19:30:01 
-0000
@@ -3,7 +3,7 @@
 COMMENT=               abstraction layer between apps and connection managers
 
 DISTNAME=              telepathy-mission-control-4.67
-PKGNAME=               ${DISTNAME}p0
+PKGNAME=               ${DISTNAME}p1
 SHARED_LIBS +=  mcclient              0.0      # .5.0
 SHARED_LIBS +=  missioncontrol-client 2.0      # .4.3
 SHARED_LIBS +=  missioncontrol-server 1.0      # .4.1
@@ -18,9 +18,7 @@ WANTLIB=      ORBit-2 c dbus-1 dbus-glib-1 gl
 MODULES=               devel/gettext \
                        lang/python
 
-BUILD_DEPENDS=         ${MODPY_EXPAT_DEPENDS} \
-                       ::textproc/libxslt
-RUN_DEPENDS=           ${MODPY_EXPAT_DEPENDS}
+BUILD_DEPENDS=         ::textproc/libxslt
 LIB_DEPENDS=           gconf-2::devel/gconf2 \
                        telepathy.>=2::net/telepathy/libtelepathy
 
Index: net/telepathy/telepathy-mission-control/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/telepathy/telepathy-mission-control/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- net/telepathy/telepathy-mission-control/pkg/PLIST   27 Oct 2008 00:07:11 
-0000      1.3
+++ net/telepathy/telepathy-mission-control/pkg/PLIST   3 Jan 2009 19:30:01 
-0000
@@ -65,16 +65,11 @@ lib/libmissioncontrol-client.a
 lib/libmissioncontrol-client.la
 lib/libmissioncontrol-server.a
 lib/libmissioncontrol-server.la
-lib/pkgconfig/
 lib/pkgconfig/libmcclient.pc
 lib/pkgconfig/libmissioncontrol.pc
 lib/pkgconfig/mission-control.pc
 @bin libexec/mission-control
-share/dbus-1/
-share/dbus-1/services/
 share/dbus-1/services/org.freedesktop.Telepathy.MissionControl.service
-share/gtk-doc/
-share/gtk-doc/html/
 share/gtk-doc/html/libmissioncontrol/
 share/gtk-doc/html/libmissioncontrol-server/
 share/gtk-doc/html/libmissioncontrol-server/McdChannel.html
Index: net/telepathy/telepathy-python/Makefile
===================================================================
RCS file: /cvs/ports/net/telepathy/telepathy-python/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- net/telepathy/telepathy-python/Makefile     27 Oct 2008 00:03:12 -0000      
1.5
+++ net/telepathy/telepathy-python/Makefile     3 Jan 2009 19:30:01 -0000
@@ -3,14 +3,14 @@
 COMMENT=               flexible communications framework, python bindings
 
 DISTNAME=              telepathy-python-0.15.3
+PKGNAME=               ${DISTNAME}p0
 
 MASTER_SITES=          ${MASTER_SITES_TELEPATHY:=telepathy-python/}
 
 MODULES=               lang/python
 
 BUILD_DEPENDS=         ${RUN_DEPENDS}
-RUN_DEPENDS=           ${MODPY_EXPAT_DEPENDS} \
-                       ::devel/py-gobject \
+RUN_DEPENDS=           ::devel/py-gobject \
                        ::textproc/libxslt \
                        :pymsn->=0.3.3:net/pymsn \
                        ::x11/dbus-python \
Index: security/kedpm/Makefile
===================================================================
RCS file: /cvs/ports/security/kedpm/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- security/kedpm/Makefile     8 Oct 2007 08:22:42 -0000       1.4
+++ security/kedpm/Makefile     3 Jan 2009 19:30:01 -0000
@@ -2,15 +2,16 @@
 
 COMMENT=       application for managing passwords
 
-DISTNAME=      kedpm-0.4.0
-PKGNAME=       ${DISTNAME}p1
+V=             0.4.0
+DISTNAME=      kedpm-$V
+PKGNAME=       ${DISTNAME}p2
 CATEGORIES=    security
 
-HOMEPAGE=      http://kedpm.sourceforge.net/ 
+HOMEPAGE=      http://kedpm.sourceforge.net/
 
 MAINTAINER=    Joerg Zinke <[email protected]>
 
-# GPL 
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
@@ -18,12 +19,13 @@ PERMIT_DISTFILES_FTP=       Yes
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=kedpm/}
 
-RUN_DEPENDS=   ${MODPY_EXPAT_DEPENDS} \
-               :py-gtk2-*:x11/py-gtk2 \
+RUN_DEPENDS=   :py-gtk2-*:x11/py-gtk2 \
                :py-crypto-*:security/py-crypto
 REGRESS_DEPENDS=${RUN_DEPENDS}
 
 MODULES=       lang/python
+
+SUBST_VARS=    V
 
 do-regress:
        @cd ${WRKSRC} && ${MODPY_BIN} ./run_tests
Index: security/kedpm/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/kedpm/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- security/kedpm/pkg/PLIST    4 Dec 2005 17:36:51 -0000       1.1.1.1
+++ security/kedpm/pkg/PLIST    3 Jan 2009 19:30:02 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2005/12/04 17:36:51 alek Exp $
 bin/kedpm
 lib/python${MODPY_VERSION}/site-packages/kedpm/
+lib/python${MODPY_VERSION}/site-packages/kedpm-${V}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/kedpm/__init__.py
 lib/python${MODPY_VERSION}/site-packages/kedpm/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/kedpm/config.py
Index: sysutils/duplicity/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- sysutils/duplicity/Makefile 17 Sep 2008 02:40:27 -0000      1.3
+++ sysutils/duplicity/Makefile 3 Jan 2009 19:30:02 -0000
@@ -4,6 +4,7 @@ COMMENT =       encrypted backup using rsync a
 
 MODPY_EGG_VERSION = 0.5.01
 DISTNAME =     duplicity-${MODPY_EGG_VERSION}
+PKGNAME=       ${DISTNAME}p0
 CATEGORIES =   sysutils
 
 HOMEPAGE =     http://www.nongnu.org/duplicity/
@@ -33,8 +34,7 @@ LIB_DEPENDS +=        rsync::net/librsync
 RUN_DEPENDS += ::devel/py-pexpect \
                ::net/py-boto \
                ::net/ncftp \
-               ::security/py-gnupg \
-               ${MODPY_EXPAT_DEPENDS}
+               ::security/py-gnupg
 
 MAKE_ENV +=    LIBRSYNC_DIR=${LOCALBASE}
 
Index: textproc/py-ElementTree/Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-ElementTree/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- textproc/py-ElementTree/Makefile    19 Mar 2008 15:54:01 -0000      1.8
+++ textproc/py-ElementTree/Makefile    3 Jan 2009 19:30:02 -0000
@@ -3,7 +3,7 @@
 COMMENT=       pure-Python implementation of the ElementTree API
 
 DISTNAME=      elementtree-1.2.6-20050316
-PKGNAME=       py-ElementTree-1.2.6p3
+PKGNAME=       py-ElementTree-1.2.6p4
 CATEGORIES=    textproc devel
 
 HOMEPAGE=      http://effbot.org/zone/element-index.htm
@@ -18,7 +18,6 @@ MASTER_SITES= http://effbot.org/download
 MODULES=       lang/python
 MODPY_VERSION= 2.4
 
-RUN_DEPENDS=   ${MODPY_EXPAT_DEPENDS}
 REGRESS_DEPENDS=${RUN_DEPENDS}
 
 post-install:
Index: www/moinmoin/Makefile
===================================================================
RCS file: /cvs/ports/www/moinmoin/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- www/moinmoin/Makefile       9 May 2008 22:15:30 -0000       1.11
+++ www/moinmoin/Makefile       3 Jan 2009 19:30:02 -0000
@@ -4,13 +4,14 @@ COMMENT =     wiki engine written in python
 
 MODPY_EGG_VERSION = 1.6.3
 DISTNAME =     moin-${MODPY_EGG_VERSION}
-PKGNAME =      moin${DISTNAME}
+PKGNAME =      moin${DISTNAME}p0
 
 CATEGORIES =   www
 
 HOMEPAGE =     http://moinmo.in/
 
-# GPL
+# GPLv2 and several other ones claiming to be compatible to GPLv2
+# or actually beeing less restrictive.
 PERMIT_PACKAGE_CDROM = Yes
 PERMIT_PACKAGE_FTP =   Yes
 PERMIT_DISTFILES_CDROM = Yes
@@ -19,7 +20,6 @@ PERMIT_DISTFILES_FTP =        Yes
 MASTER_SITES = http://static.moinmo.in/files/
 
 MODULES =      lang/python
-RUN_DEPENDS =  ${MODPY_EXPAT_DEPENDS}
 
 NO_REGRESS =   Yes
 
Index: www/rawdog/Makefile
===================================================================
RCS file: /cvs/ports/www/rawdog/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- www/rawdog/Makefile 8 Oct 2007 08:22:43 -0000       1.16
+++ www/rawdog/Makefile 3 Jan 2009 19:30:02 -0000
@@ -2,13 +2,14 @@
 
 COMMENT=       RSS Aggregator Without Delusions Of Grandeur
 
-DISTNAME=      rawdog-2.10
-PKGNAME=       ${DISTNAME}p0
+V=             2.10
+DISTNAME=      rawdog-$V
+PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    www news
 
 HOMEPAGE=      http://offog.org/code/rawdog.html
 
-# GPL
+# GPLv2, LGPLv2.1
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -18,12 +19,12 @@ MASTER_SITES=       http://offog.org/files/
 
 MODULES=       lang/python
 
-RUN_DEPENDS=   ${MODPY_EXPAT_DEPENDS}
-
 NO_REGRESS=    Yes
 
 DOCDIR=                ${PREFIX}/share/doc/rawdog
 EXAMPLESDIR=   ${PREFIX}/share/examples/rawdog
+
+SUBST_VARS=    V
 
 do-configure:
        @perl -pi -e \
Index: www/rawdog/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/rawdog/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- www/rawdog/pkg/PLIST        21 Sep 2006 08:20:28 -0000      1.6
+++ www/rawdog/pkg/PLIST        3 Jan 2009 19:30:02 -0000
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.6 2006/09/21 08:20:28 xsa Exp $
 bin/rawdog
+lib/python${MODPY_VERSION}/site-packages/rawdog-${V}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/__init__.pyc
Index: www/zope/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/zope/Makefile.inc,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.inc
--- www/zope/Makefile.inc       20 Mar 2008 11:37:47 -0000      1.1
+++ www/zope/Makefile.inc       3 Jan 2009 19:30:03 -0000
@@ -11,7 +11,7 @@ HOMEPAGE=     http://www.zope.org/
 
 MAINTAINER=    Marc Balmer <[email protected]>
 
-# Zope Public License
+# Zope Public License 2.1
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
@@ -22,8 +22,6 @@ EXTRACT_SUFX= .tgz
 
 MODPY_VERSION= 2.4
 MODULES=       lang/python
-
-RUN_DEPENDS+=  ${MODPY_EXPAT_DEPENDS}
 
 BUILD_ARGS=    --build-base=${WRKSRC} \
                --build-lib="${WRKSRC}/build-lib" \
Index: www/zope/2.10/Makefile
===================================================================
RCS file: /cvs/ports/www/zope/2.10/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- www/zope/2.10/Makefile      20 Mar 2008 11:37:47 -0000      1.1
+++ www/zope/2.10/Makefile      3 Jan 2009 19:30:03 -0000
@@ -3,6 +3,6 @@
 VERSION=       2.10
 PATCHLEVEL=    .5
 
-PKGNAME=       ${DISTNAME:S/-final//:L}
+PKGNAME=       ${DISTNAME:S/-final//:L}p0
 
 .include <bsd.port.mk>
Index: www/zope/2.9/Makefile
===================================================================
RCS file: /cvs/ports/www/zope/2.9/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- www/zope/2.9/Makefile       20 Mar 2008 11:37:47 -0000      1.1
+++ www/zope/2.9/Makefile       3 Jan 2009 19:30:03 -0000
@@ -3,6 +3,6 @@
 VERSION=       2.9
 PATCHLEVEL=    .8
 
-PKGNAME=       ${DISTNAME:S/-final//:L}p0
+PKGNAME=       ${DISTNAME:S/-final//:L}p1
 
 .include <bsd.port.mk>
Index: x11/dbus-python/Makefile
===================================================================
RCS file: /cvs/ports/x11/dbus-python/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- x11/dbus-python/Makefile    27 Oct 2008 13:59:21 -0000      1.6
+++ x11/dbus-python/Makefile    3 Jan 2009 19:30:03 -0000
@@ -3,12 +3,13 @@
 COMMENT=       dbus bindings for Python
 
 DISTNAME=      dbus-python-0.83.0
+PKGNAME=       ${DISTNAME}p0
 CATEGORIES=    x11
 MASTER_SITES=  ${HOMEPAGE}releases/dbus-python/
 
 HOMEPAGE=      http://dbus.freedesktop.org/
 
-# GPL
+# ISC-like
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 PERMIT_PACKAGE_CDROM=  Yes
@@ -19,7 +20,6 @@ WANTLIB+=     glib-2.0 gobject-2.0 pcre
 MODULES=       lang/python \
                devel/gettext
 
-RUN_DEPENDS+=  ${MODPY_EXPAT_DEPENDS}
 LIB_DEPENDS+=  dbus-1.>=5::x11/dbus \
                dbus-glib-1::x11/dbus-glib
 

Reply via email to