More Python 2.5 fixes.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7711 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 7 insertions, 46 deletions

diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 5f1fe4cc5..0d6480cfa 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/gdbm.so:${PORTSDIR}/databases/py-gdbm \
-		${PYTHON_SITELIBDIR}/dbus.pth:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 LIB_DEPENDS=	avahi-client.3:${PORTSDIR}/net/avahi
-RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/gdbm.so:${PORTSDIR}/databases/py-gdbm \
-		${PYTHON_SITELIBDIR}/dbus.pth:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 
 MASTERDIR=	${.CURDIR}/../avahi
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index 2a0228d40..5d9952c34 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/service-discovery-applet/Makefile,v 1.1 2006/07/27 17:32:12 mezz Exp $
+#   $MCom: ports/net/service-discovery-applet/Makefile,v 1.2 2006/10/11 05:46:29 marcus Exp $
 #
 
 PORTNAME=	service-discovery-applet
@@ -15,8 +15,8 @@ MASTER_SITES=	http://0pointer.de/~sebest/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME applet that shows available network services using mDNS
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/avahi/__init__.py:${PORTSDIR}/net/py-avahi
-RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/avahi/__init__.py:${PORTSDIR}/net/py-avahi
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
 
 USE_XLIB=	yes
 USE_GETTEXT=	yes
diff --git a/net/service-discovery-applet/files/patch-plugins_gconfterminal.py b/net/service-discovery-applet/files/patch-plugins_gconfterminal.py
deleted file mode 100644
index 5350ae501..000000000
--- a/net/service-discovery-applet/files/patch-plugins_gconfterminal.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/gconfterminal.py.orig	Sat May  6 18:53:01 2006
-+++ plugins/gconfterminal.py	Sat May  6 18:53:10 2006
-@@ -16,7 +16,7 @@ from sdapplet.pluginutils import *
- 
- try:
-     import gettext
--    gettext.bindtextdomain("service-discovery-applet", "/usr/share/locale")
-+    gettext.bindtextdomain("service-discovery-applet", "%%PREFIX%%/share/locale")
-     gettext.textdomain("service-discovery-applet")
-     _ = gettext.gettext
-     import pygtk
diff --git a/net/service-discovery-applet/files/patch-plugins_xvncviewer.py b/net/service-discovery-applet/files/patch-plugins_xvncviewer.py
deleted file mode 100644
index 8de3c9b7d..000000000
--- a/net/service-discovery-applet/files/patch-plugins_xvncviewer.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- plugins/xvncviewer.py.orig	Sat May  6 15:19:12 2006
-+++ plugins/xvncviewer.py	Sat May  6 15:20:13 2006
-@@ -19,11 +19,11 @@ class plugin_xvncviewer:
-     def __init__(self):
-         self.service_type = ["_rfb._tcp"]
-         self.author = "Sebastien Estienne"
--        self.description = "Start a VNC connections with xvncviewer"
-+        self.description = "Start a VNC connections with vncviewer"
- 
-     def connect(self, use_host_names, name, stype, hostname, address, port, txts):
--        print "connecting using xvncviewer"
--	cmdline = ["xvncviewer", "-xrm", "*passwordDialog:true", hostname ]
-+        print "connecting using vncviewer"
-+	cmdline = ["vncviewer", "-xrm", "*passwordDialog:true", hostname]
- 	print cmdline
- 	pid = subprocess.Popen(cmdline, close_fds=True).pid
- 
diff --git a/net/service-discovery-applet/files/patch-servers_Makefile.in b/net/service-discovery-applet/files/patch-servers_Makefile.in
deleted file mode 100644
index 72f9f08f6..000000000
--- a/net/service-discovery-applet/files/patch-servers_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- servers/Makefile.in.orig	Sat May  6 15:01:00 2006
-+++ servers/Makefile.in	Sat May  6 15:01:20 2006
-@@ -367,7 +367,7 @@ uninstall-am: uninstall-info-am uninstal
- @INTLTOOL_SERVER_RULE@
- 
- all: GNOME_ServiceDiscoveryApplet.server
--	sed -i \
-+	sed -i "" \
- 	-e 's,@bindir\@,$(bindir),g' \
- 	-e 's,@iconsdir\@,$(ICONSDIR),g' \
- 	GNOME_ServiceDiscoveryApplet.server