Update to 0.3.9

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

4 files changed, 28 insertions, 25 deletions

diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 157c6af05..5f5a7c1a2 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -3,10 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/conduit/Makefile,v 1.5 2008/02/27 16:21:52 ahze Exp $
+#    $MCom: ports/deskutils/conduit/Makefile,v 1.6 2008/02/27 20:29:39 ahze Exp $
 
 PORTNAME=	conduit
-PORTVERSION=	0.3.8
+PORTVERSION=	0.3.9
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
@@ -17,14 +17,16 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-g
 		${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree \
 		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \
 		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
-		${PYTHON_SITELIBDIR}/vobject/__init__.py:${PORTSDIR}/deskutils/py-vobject
+		${PYTHON_SITELIBDIR}/vobject/__init__.py:${PORTSDIR}/deskutils/py-vobject \
+		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
 LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
 		${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree \
 		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \
 		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
 		${PYTHON_SITELIBDIR}/vobject/__init__.py:${PORTSDIR}/deskutils/py-vobject \
-		firefox:${PORTSDIR}/www/firefox
+		firefox:${PORTSDIR}/www/firefox \
+		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
 
 USE_PYTHON=	2.4+
 USE_GMAKE=	yes
diff --git a/deskutils/conduit/distinfo b/deskutils/conduit/distinfo
index efa46425e..f0b202122 100644
--- a/deskutils/conduit/distinfo
+++ b/deskutils/conduit/distinfo
@@ -1,3 +1,3 @@
-MD5 (conduit-0.3.8.tar.gz) = a4b2025ea53e3cd8abcf2689a6f842e9
-SHA256 (conduit-0.3.8.tar.gz) = 4412eed98f6ea826f16b3fd8b1889d0c869bebaea2b80132e8c3d8bd266415e4
-SIZE (conduit-0.3.8.tar.gz) = 862659
+MD5 (conduit-0.3.9.tar.gz) = b04cd4b39ad0a689bff020ba23dd69b7
+SHA256 (conduit-0.3.9.tar.gz) = 04e6b207a73c140b09a96a32e81d470a46b414cc9f6022a2d4a4c0f8c59fb104
+SIZE (conduit-0.3.9.tar.gz) = 893253
diff --git a/deskutils/conduit/files/patch-configure b/deskutils/conduit/files/patch-configure
index e30345862..c7c260c88 100644
--- a/deskutils/conduit/files/patch-configure
+++ b/deskutils/conduit/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2008-02-27 09:51:17.000000000 -0500
-+++ configure	2008-02-27 09:51:34.000000000 -0500
-@@ -6500,24 +6500,8 @@
+--- configure.orig	2008-03-18 09:06:41.000000000 -0400
++++ configure	2008-03-18 10:48:08.000000000 -0400
+@@ -6447,24 +6447,8 @@
  v=`echo 0.9.0 | sed -e "s/\./,/g"`
  { echo "$as_me:$LINENO: checking for 0.9.0 of goocanvas" >&5
  echo $ECHO_N "checking for 0.9.0 of goocanvas... $ECHO_C" >&6; }
@@ -27,3 +27,12 @@
    { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
    else
+@@ -6496,7 +6480,7 @@
+ 	print 'yes'
+ "
+ out=`$PYTHON -c "$prog"`
+-if test "x$out" == xyes; then
++if test "x$out" = xyes; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+   else
diff --git a/deskutils/conduit/pkg-plist b/deskutils/conduit/pkg-plist
index 6a60c9ad6..810dce4ae 100644
--- a/deskutils/conduit/pkg-plist
+++ b/deskutils/conduit/pkg-plist
@@ -178,7 +178,6 @@ lib/conduit/modules/__init__.pyo
 lib/conduit/modules/iPodModule.py
 lib/conduit/modules/iPodModule.pyc
 lib/conduit/modules/iPodModule.pyo
-libdata/pkgconfig/conduit.pc
 %%PYTHON_SITELIBDIR%%/conduit/Conduit.py
 %%PYTHON_SITELIBDIR%%/conduit/Conduit.pyc
 %%PYTHON_SITELIBDIR%%/conduit/Conduit.pyo
@@ -338,6 +337,7 @@ libdata/pkgconfig/conduit.pc
 %%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.py
 %%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.pyo
+libdata/pkgconfig/conduit.pc
 share/applications/conduit.desktop
 %%DATADIR%%/backpack.png
 %%DATADIR%%/boxdotnet.png
@@ -356,11 +356,9 @@ share/applications/conduit.desktop
 share/dbus-1/services/org.conduit.service
 share/gnome/autostart/conduit-autostart.desktop
 share/gnome/help/conduit/C/conduit.xml
-share/gnome/help/conduit/C/figures/conduit.png
-share/gnome/help/conduit/es/conduit.xml
-share/gnome/help/conduit/es/figures/conduit.png
-share/gnome/help/conduit/sv/conduit.xml
-share/gnome/help/conduit/sv/figures/conduit.png
+share/gnome/help/conduit/C/figures/conduit-dp.png
+share/gnome/help/conduit/C/figures/conduit-folder-configuration.png
+share/gnome/help/conduit/C/figures/conduit-gui-parts.png
 share/icons/hicolor/16x16/actions/conduit-conflict-ask.png
 share/icons/hicolor/16x16/actions/conduit-conflict-delete.png
 share/icons/hicolor/16x16/actions/conduit-conflict-left.png
@@ -389,25 +387,20 @@ share/icons/hicolor/48x48/apps/conduit.png
 share/icons/hicolor/scalable/apps/conduit.svg
 share/locale/ar/LC_MESSAGES/conduit.mo
 share/locale/ca/LC_MESSAGES/conduit.mo
+share/locale/en_GB/LC_MESSAGES/conduit.mo
 share/locale/es/LC_MESSAGES/conduit.mo
 share/locale/fr/LC_MESSAGES/conduit.mo
 share/locale/it/LC_MESSAGES/conduit.mo
+share/locale/nb/LC_MESSAGES/conduit.mo
+share/locale/pt/LC_MESSAGES/conduit.mo
 share/locale/pt_BR/LC_MESSAGES/conduit.mo
 share/locale/ru/LC_MESSAGES/conduit.mo
 share/locale/sv/LC_MESSAGES/conduit.mo
 share/omf/conduit/conduit-C.omf
-share/omf/conduit/conduit-es.omf
-share/omf/conduit/conduit-sv.omf
 @dirrm share/omf/conduit
-@dirrm share/gnome/help/conduit/sv/figures
-@dirrm share/gnome/help/conduit/sv
-@dirrm share/gnome/help/conduit/es/figures
-@dirrm share/gnome/help/conduit/es
 @dirrm share/gnome/help/conduit/C/figures
 @dirrm share/gnome/help/conduit/C
 @dirrm share/gnome/help/conduit
-@dirrm share/dbus-1/services
-@dirrm share/dbus-1
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/conduit/hildonui
@@ -415,7 +408,6 @@ share/omf/conduit/conduit-sv.omf
 @dirrm %%PYTHON_SITELIBDIR%%/conduit/datatypes
 @dirrm %%PYTHON_SITELIBDIR%%/conduit/dataproviders
 @dirrm %%PYTHON_SITELIBDIR%%/conduit
-@dirrm %%PYTHON_SITELIBDIR%%
 @dirrm lib/conduit/modules/SmugMugModule/SmugMugAPI
 @dirrm lib/conduit/modules/SmugMugModule
 @dirrm lib/conduit/modules/ShutterflyModule/shutterfly