On Sat, 27 Dec 2008, Damien Miller wrote:
> I'll commit this in a couple of days unless there are objections.
> There is a separate diff (coming shortly) to remove dependencies
> from other ports on python-expat, python-bz2 and python-sqlite
Here is the diff for the other ports (MAINTAINERs Cc'd):
Index: ./databases/py-axiom/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-axiom/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- ./databases/py-axiom/Makefile 1 Sep 2008 19:10:22 -0000 1.2
+++ ./databases/py-axiom/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,7 +4,7 @@ COMMENT= sqlite-based object persistence
VERSION= 0.5.28
DISTNAME= Axiom-${VERSION}
-PKGNAME= py-axiom-${VERSION}
+PKGNAME= py-axiom-${VERSION}p0
CATEGORIES= databases
HOMEPAGE= http://divmod.org/trac/wiki/DivmodAxiom
@@ -27,8 +27,7 @@ BUILD_DEPENDS+= :py-epsilon-*:devel/py-e
RUN_DEPENDS= ${BUILD_DEPENDS} \
:py-twisted-conch-*:devel/py-twisted/conch
-REGRESS_DEPENDS=${BUILD_DEPENDS} \
- :python-bz2-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-bz2
+REGRESS_DEPENDS=${BUILD_DEPENDS}
MODPY_DISTUTILS_BUILD= build --build-base=${WRKSRC}/.build
MODPY_EGG_VERSION= ${VERSION}
Index: ./databases/py-sqlite2/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-sqlite2/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- ./databases/py-sqlite2/Makefile 30 Jan 2008 17:33:13 -0000 1.10
+++ ./databases/py-sqlite2/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,7 +4,7 @@ COMMENT= SQLite3 adapter for Python
VERSION= 2.4.1
DISTNAME= pysqlite-${VERSION}
-PKGNAME= py-sqlite2-${VERSION}
+PKGNAME= py-sqlite2-${VERSION}p0
CATEGORIES= databases devel
MAINTAINER= Eric Faurot <e...@openbsd.org>
@@ -21,7 +21,6 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
LIB_DEPENDS= sqlite3.>=8.6::databases/sqlite3
-REGRESS_DEPENDS= :python-bz2-*:lang/python/${MODPY_VERSION},-bz2
SUBST_VARS= VERSION
Index: ./devel/bzr/Makefile
===================================================================
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- ./devel/bzr/Makefile 28 Oct 2008 09:28:24 -0000 1.5
+++ ./devel/bzr/Makefile 26 Dec 2008 23:38:33 -0000
@@ -6,6 +6,7 @@ COMMENT= distributed version control sys
MODPY_EGG_VERSION=1.3
DISTNAME= bzr-${MODPY_EGG_VERSION}
+PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
HOMEPAGE= http://bazaar-vcs.org/
@@ -20,9 +21,7 @@ MASTER_SITES= ${HOMEPAGE}releases/src/
MODULES= lang/python
-RUN_DEPENDS+= ::lang/python/${MODPY_VERSION},-bz2 \
- ::lang/python/${MODPY_VERSION},-expat \
- ::net/py-curl \
+RUN_DEPENDS+= ::net/py-curl \
::security/py-paramiko \
::textproc/gdiff
Index: ./devel/iso-codes/Makefile
===================================================================
RCS file: /cvs/ports/devel/iso-codes/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- ./devel/iso-codes/Makefile 9 Nov 2008 19:11:56 -0000 1.12
+++ ./devel/iso-codes/Makefile 26 Dec 2008 23:38:33 -0000
@@ -3,6 +3,7 @@
COMMENT= lists of the country, language and currency iso names
DISTNAME= iso-codes-3.3
+PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
@@ -21,8 +22,7 @@ CONFIGURE_STYLE=gnu
MODULES= lang/python
MODPY_RUNDEP= No
-BUILD_DEPENDS= ::devel/gettext \
-
:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat
+BUILD_DEPENDS= ::devel/gettext
FAKE_FLAGS= pkgconfigdir=${PREFIX}/lib/pkgconfig
Index: ./devel/mercurial/Makefile
===================================================================
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- ./devel/mercurial/Makefile 24 Aug 2008 11:24:24 -0000 1.13
+++ ./devel/mercurial/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,6 +4,7 @@ COMMENT= fast, lightweight source contr
MODPY_EGG_VERSION= 1.0.2
DISTNAME= mercurial-${MODPY_EGG_VERSION}
+PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
HOMEPAGE= http://www.selenic.com/mercurial/
@@ -19,8 +20,7 @@ MASTER_SITES= http://www.selenic.com/me
MODULES= lang/python
-REGRESS_DEPENDS= :python-bz2-*:lang/python/${MODPY_VERSION},-bz2 \
- ::archivers/unzip
+REGRESS_DEPENDS= ::archivers/unzip
FILES= hgeditor hgweb.cgi hgwebdir.cgi
Index: ./devel/py-twisted/core/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-twisted/core/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- ./devel/py-twisted/core/Makefile 28 Oct 2008 09:28:24 -0000 1.11
+++ ./devel/py-twisted/core/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,7 +4,7 @@ COMMENT= event-based Python framework (c
VERSION= 8.1.0
DISTNAME= TwistedCore-${VERSION}
-PKGNAME= py-twisted-core-${VERSION}p0
+PKGNAME= py-twisted-core-${VERSION}p1
HOMEPAGE= http://twistedmatrix.com/trac/wiki/TwistedCore
@@ -12,7 +12,6 @@ MASTER_SITES= http://tmrc.mit.edu/mirror
RUN_DEPENDS= :py-zopeinterface-*:devel/py-zopeinterface \
:py-openssl-*:security/py-openssl
-REGRESS_DEPENDS=:python-bz2-*:lang/python/${MODPY_VERSION},-bz2
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-twisted-core
Index: ./devel/waf/Makefile
===================================================================
RCS file: /cvs/ports/devel/waf/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- ./devel/waf/Makefile 28 Oct 2008 09:28:24 -0000 1.2
+++ ./devel/waf/Makefile 26 Dec 2008 23:38:33 -0000
@@ -3,6 +3,7 @@
COMMENT= Python-based build system
DISTNAME= waf-1.4.4
+PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
EXTRACT_SUFX= .tar.bz2
@@ -20,10 +21,6 @@ MODULES= lang/python
NO_REGRESS= Yes
SUBST_VARS= MODPY_SITEPKG
-
-# waf needs bz2 subpackage
-RUN_DEPENDS = ::lang/python/${MODPY_VERSION},-bz2
-BUILD_DEPENDS = ${RUN_DEPENDS}
pre-configure:
${SUBST_CMD} ${WRKSRC}/waf ${WRKSRC}/wscript
Index: ./games/childsplay/Makefile
===================================================================
RCS file: /cvs/ports/games/childsplay/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- ./games/childsplay/Makefile 28 Oct 2008 13:40:36 -0000 1.6
+++ ./games/childsplay/Makefile 26 Dec 2008 23:38:33 -0000
@@ -3,7 +3,7 @@
COMMENT= suite of educational games for young children
DISTNAME= childsplay-0.85.1
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
EXTRACT_SUFX= .tgz
CATEGORIES= games education
@@ -21,8 +21,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=childsplay/}
MODULES= lang/python
-RUN_DEPENDS= :pygame->=1.7:devel/pygame \
-
:python-expat-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-expat
+RUN_DEPENDS= :pygame->=1.7:devel/pygame
PKG_ARCH= *
NO_BUILD= Yes
Index: ./games/mnemosyne/Makefile
===================================================================
RCS file: /cvs/ports/games/mnemosyne/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- ./games/mnemosyne/Makefile 26 Nov 2008 13:32:31 -0000 1.7
+++ ./games/mnemosyne/Makefile 26 Dec 2008 23:38:33 -0000
@@ -6,6 +6,7 @@ COMMENT= flash-card tool which optimises
MODPY_EGG_VERSION=1.2
DISTNAME= mnemosyne-${MODPY_EGG_VERSION}
+PKGNAME= ${DISTNAME}p0
CATEGORIES= games education
EXTRACT_SUFX= .tgz
@@ -27,7 +28,6 @@ MODULES= lang/python
MODPY_SETUPTOOLS=yes
RUN_DEPENDS= ::x11/py-qt3 \
- :python-bz2-*:lang/python/${MODPY_VERSION},-bz2 \
::devel/pygame \
::textproc/py-xml \
:desktop-file-utils-*:devel/desktop-file-utils
Index: ./misc/gutenpy/Makefile
===================================================================
RCS file: /cvs/ports/misc/gutenpy/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- ./misc/gutenpy/Makefile 26 Sep 2008 08:20:45 -0000 1.7
+++ ./misc/gutenpy/Makefile 26 Dec 2008 23:38:33 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY= Yes
COMMENT= text reader and catalog browser for Project Gutenberg
DISTNAME= gutenpy-0.3.0
-PKGNAME= ${DISTNAME}p3
+PKGNAME= ${DISTNAME}p4
CATEGORIES= misc x11
HOMEPAGE= http://gutenpy.sourceforge.net/
@@ -25,8 +25,6 @@ MODULES= lang/python
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= :py-xml-*:textproc/py-xml \
-
:python-bz2-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-bz2 \
-
:python-expat-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-expat \
:py-gtk2->=2.6.3:x11/py-gtk2
NO_BUILD= Yes
Index: ./net/scapy6/Makefile
===================================================================
RCS file: /cvs/ports/net/scapy6/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- ./net/scapy6/Makefile 17 Mar 2008 20:59:47 -0000 1.4
+++ ./net/scapy6/Makefile 26 Dec 2008 23:38:33 -0000
@@ -3,7 +3,7 @@
COMMENT= scapy extension to handle IPv6
DISTNAME= scapy6-20070426
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
CATEGORIES= net
HOMEPAGE= http://namabiiru.hongo.wide.ad.jp/scapy6
@@ -18,8 +18,7 @@ MASTER_SITES= http://diehard.n-r-g.com/f
MODULES= lang/python
-RUN_DEPENDS= :scapy->=1.1:net/scapy \
- :python-bz2-*:lang/python/${MODPY_VERSION},-bz2
+RUN_DEPENDS= :scapy->=1.1:net/scapy
PKG_ARCH= *
NO_REGRESS= Yes
Index: ./print/py-cups/Makefile
===================================================================
RCS file: /cvs/ports/print/py-cups/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- ./print/py-cups/Makefile 17 Sep 2008 11:57:44 -0000 1.4
+++ ./print/py-cups/Makefile 26 Dec 2008 23:38:33 -0000
@@ -6,7 +6,7 @@ COMMENT= CUPS bindings for Python
VERSION= 1.9.42
DISTNAME= pycups-${VERSION}
-PKGNAME= py-cups-${VERSION}
+PKGNAME= py-cups-${VERSION}p0
CATEGORIES= print
HOMEPAGE= http://cyberelk.net/tim/software/pycups/
@@ -23,7 +23,6 @@ EXTRACT_SUFX= .tar.bz2
MODULES= converters/libiconv \
lang/python
-RUN_DEPENDS= :python-bz2-*:lang/python/${MODPY_VERSION},-bz2
LIB_DEPENDS= cups::print/cups
CFLAGS+= -I${LOCALBASE}/include -DVERSION=\"${VERSION}\"
Index: ./textproc/py-xml/Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-xml/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- ./textproc/py-xml/Makefile 16 Dec 2008 04:55:09 -0000 1.34
+++ ./textproc/py-xml/Makefile 26 Dec 2008 23:38:33 -0000
@@ -8,7 +8,7 @@ MODPY_EGG_VERSION=0.8.4
VERSION= ${MODPY_EGG_VERSION}
DISTNAME= PyXML-${VERSION}
-PKGNAME= py-xml-${VERSION}p5
+PKGNAME= py-xml-${VERSION}p6
CATEGORIES= textproc devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyxml/}
@@ -28,13 +28,8 @@ MODPY_DISTUTILS_BUILDARGS= --with-libexp
# pyexpat - use our own pyexpat.so
# otherwise use the python-expat version
-
FLAVORS=pyexpat
FLAVOR?=
-
-.if !${FLAVOR:L:Mpyexpat}
-BUILD_DEPENDS= ${MODPY_EXPAT_DEPENDS}
-.endif
REGRESS_DEPENDS=
:python-tests-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-tests
Index: ./www/plone/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/plone/Makefile.inc,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.inc
--- ./www/plone/Makefile.inc 20 Mar 2008 11:42:34 -0000 1.1
+++ ./www/plone/Makefile.inc 26 Dec 2008 23:38:33 -0000
@@ -20,5 +20,4 @@ MODULES= www/zope
MODZOPE_VERSION?= 2.9
PY_FLAVOR= python${MODZOPE_PYTHON_VERSION}
-RUN_DEPENDS+=
:python-expat-${MODZOPE_PYTHON_VERSION}*:lang/python/${MODZOPE_PYTHON_VERSION},-expat
\
- :py-Imaging-*-${PY_FLAVOR}:graphics/py-Imaging,${PY_FLAVOR}
+RUN_DEPENDS+= :py-Imaging-*-${PY_FLAVOR}:graphics/py-Imaging,${PY_FLAVOR}
Index: ./www/plone/2.1/Makefile
===================================================================
RCS file: /cvs/ports/www/plone/2.1/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- ./www/plone/2.1/Makefile 20 Mar 2008 11:42:34 -0000 1.1
+++ ./www/plone/2.1/Makefile 26 Dec 2008 23:38:33 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/20 11:42:34 winiger Exp $
DISTNAME= Plone-2.1.4
-PKGNAME= ${DISTNAME:L}p0
+PKGNAME= ${DISTNAME:L}p1
do-install:
${INSTALL_PROGRAM_DIR} ${MODZOPE_PRODUCTSDIR}
Index: ./www/plone/2.5/Makefile
===================================================================
RCS file: /cvs/ports/www/plone/2.5/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- ./www/plone/2.5/Makefile 20 Mar 2008 11:42:34 -0000 1.1
+++ ./www/plone/2.5/Makefile 26 Dec 2008 23:38:33 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/20 11:42:34 winiger Exp $
DISTNAME= Plone-2.5.3-final
-PKGNAME= ${DISTNAME:S/-final//:L}p0
+PKGNAME= ${DISTNAME:S/-final//:L}p1
do-install:
${INSTALL_PROGRAM_DIR} ${MODZOPE_PRODUCTSDIR}
Index: ./www/plone/3.0/Makefile
===================================================================
RCS file: /cvs/ports/www/plone/3.0/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- ./www/plone/3.0/Makefile 20 Mar 2008 11:42:35 -0000 1.1
+++ ./www/plone/3.0/Makefile 26 Dec 2008 23:38:33 -0000
@@ -3,7 +3,7 @@
COMMENT= content management system built on top of Zope
DISTNAME= Plone-3.0.6
-PKGNAME= ${DISTNAME:L}
+PKGNAME= ${DISTNAME:L}p0
MASTER_SITES= https://launchpad.net/plone/3.0/3.0.6/+download/
Index: ./www/py-formencode/Makefile
===================================================================
RCS file: /cvs/ports/www/py-formencode/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- ./www/py-formencode/Makefile 15 Apr 2008 09:35:18 -0000 1.8
+++ ./www/py-formencode/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,7 +4,7 @@ COMMENT= HTML form validation, generati
MODPY_EGG_VERSION= 1.0.1
DISTNAME= FormEncode-${MODPY_EGG_VERSION}
-PKGNAME= py-formencode-${MODPY_EGG_VERSION}
+PKGNAME= py-formencode-${MODPY_EGG_VERSION}p0
CATEGORIES= www
@@ -24,8 +24,7 @@ MODULES= devel/gettext \
lang/python
RUN_DEPENDS= ::devel/py-ruledispatch
-REGRESS_DEPENDS=
:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat \
- ::www/py-formencode \
+REGRESS_DEPENDS= ::www/py-formencode \
::devel/py-py \
::devel/py-ruledispatch \
::devel/py-nose
Index: ./www/py-genshi/Makefile
===================================================================
RCS file: /cvs/ports/www/py-genshi/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- ./www/py-genshi/Makefile 10 Jul 2008 23:37:21 -0000 1.1.1.1
+++ ./www/py-genshi/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,7 +4,7 @@ COMMENT = toolkit for generation of outp
MODPY_EGG_VERSION = 0.5
DISTNAME = Genshi-${MODPY_EGG_VERSION}
-PKGNAME = py-${DISTNAME:L}
+PKGNAME = py-${DISTNAME:L}p0
CATEGORIES = www
@@ -22,8 +22,6 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
-BUILD_DEPENDS = \
- :python-expat-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-expat
REGRESS_DEPENDS = ${BUILD_DEPENDS}
post-install:
Index: ./x11/driconf/Makefile
===================================================================
RCS file: /cvs/ports/x11/driconf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- ./x11/driconf/Makefile 11 Jul 2008 13:07:54 -0000 1.1.1.1
+++ ./x11/driconf/Makefile 26 Dec 2008 23:38:33 -0000
@@ -3,7 +3,7 @@
COMMENT = configuration utility for DRI drivers
MODPY_EGG_VERSION = 0.9.1
-DISTNAME = driconf-${MODPY_EGG_VERSION}
+DISTNAME = driconf-${MODPY_EGG_VERSION}p0
CATEGORIES = x11
HOMEPAGE =
http://people.freedesktop.org/~fxkuehl/driconf/dri_config_design_rev4.html
@@ -16,8 +16,7 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
MODULES = lang/python
-RUN_DEPENDS = ::x11/py-gtk2 \
-
:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat
+RUN_DEPENDS = ::x11/py-gtk2
pre-configure:
@mkdir -p ${WRKSRC}/lib/driconf
Index: ./x11/gnome/alacarte/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/alacarte/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- ./x11/gnome/alacarte/Makefile 20 Dec 2008 14:28:38 -0000 1.10
+++ ./x11/gnome/alacarte/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,7 +4,7 @@ COMMENT= easy GNOME menu editing tool
GNOME_PROJECT= alacarte
GNOME_VERSION= 0.11.6
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
CATEGORIES= x11
# LGPLv2
@@ -18,7 +18,6 @@ MODULES= lang/python \
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ::devel/gettext \
-
:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat \
:fam-*:sysutils/fam \
:py-gtk2->=2.8.6:x11/py-gtk2 \
:gnome-menus-*:x11/gnome/menus \
Index: ./x11/gnome/deskbar-applet/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/deskbar-applet/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- ./x11/gnome/deskbar-applet/Makefile 22 Nov 2008 15:15:54 -0000 1.7
+++ ./x11/gnome/deskbar-applet/Makefile 26 Dec 2008 23:38:33 -0000
@@ -5,6 +5,7 @@ COMMENT= universal search and navigatio
GNOME_VERSION= 2.24.2
GNOME_PROJECT= deskbar-applet
CATEGORIES= sysutils
+PKGNAME= ${DISTNAME}p0
HOMEPAGE= http://projects.gnome.org/deskbar-applet/
@@ -34,8 +35,7 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM
BUILD_DEPENDS= ::x11/dbus-python \
::x11/gnome/doc-utils \
::x11/gnome/py-gnome-desktop
-RUN_DEPENDS= ::lang/python/${MODPY_VERSION},-bz2 \
- ::mail/evolution \
+RUN_DEPENDS= ::mail/evolution \
::x11/dbus-python \
::x11/gnome/py-gnome-desktop \
::devel/py-simplejson
Index: ./x11/gnome/conduit/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/conduit/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- ./x11/gnome/conduit/Makefile 12 Dec 2008 09:15:45 -0000 1.4
+++ ./x11/gnome/conduit/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,7 +4,7 @@ COMMENT= synchronization application fo
GNOME_PROJECT= conduit
GNOME_VERSION= 0.3.15
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -21,7 +21,6 @@ BUILD_DEPENDS= ::x11/gnome/doc-utils \
RUN_DEPENDS= ::devel/gettext \
::devel/xdg-utils \
::graphics/py-goocanvas \
-
:python-sqlite-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-sqlite \
::textproc/py-vobject \
::x11/dbus-python
Index: ./x11/gnome/hamster-applet/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/hamster-applet/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- ./x11/gnome/hamster-applet/Makefile 28 Nov 2008 15:34:26 -0000 1.2
+++ ./x11/gnome/hamster-applet/Makefile 26 Dec 2008 23:38:33 -0000
@@ -4,6 +4,7 @@ COMMENT= time tracker applet for GNOME
GNOME_PROJECT= hamster-applet
GNOME_VERSION= 2.24.2
+PKGNAME= ${DISTNAME}p0
CATEGORIES= productivity
HOMEPAGE= http://live.gnome.org/ProjectHamster
@@ -28,8 +29,7 @@ USE_X11= Yes
# controlcenter2 is needed for custom keybindings
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS=
:python-sqlite-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-sqlite \
- ::x11/gnome/controlcenter2 \
+RUN_DEPENDS= ::x11/gnome/controlcenter2 \
::x11/gnome/py-gnome-desktop
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
