fix some path substitution so that that thing finally works,

and update to 0.6 which brings some UI fixes and improvents

4 files changed, 27 insertions, 16 deletions

diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index de85cb0fe33..3bb2c7df7ad 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/04/22 09:22:16 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/08 13:09:39 drochner Exp $
 #
 
-DISTNAME=	browser-bookmarks-menu-0.3
-PKGREVISION=	4
+DISTNAME=	browser-bookmarks-menu-0.6
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=browserbookapp/}
 
@@ -10,28 +9,25 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://browserbookapp.sourceforge.net/
 COMMENT=	Easy access to web bookmarks through a GNOME Panel Applet
 
-USE_LANGUAGES=		# empty
-
+NO_BUILD=	yes
 PYTHON_PATCH_SCRIPTS=	browser-bookmarks-menu.py
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing paths to installed files.
 SUBST_FILES.paths=	BrowserBookmarksMenu.server
-SUBST_FILES.paths+=	browser-bookmarks-menu.py
-SUBST_SED.paths=	-e 's|/usr|${PREFIX}|g'
-
-INSTALLATION_DIRS=	libexec
+SUBST_SED.paths= -e 's|/usr/lib/browser-bookmarks-menu|${PREFIX}/libexec|g'
+SUBST_SED.paths+= -e 's|/usr/share|${PREFIX}/share|g'
 
-do-build:
+PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/BrowserBookmarksMenu.server \
 		${PREFIX}/lib/bonobo/servers/
 	${INSTALL_SCRIPT} ${WRKSRC}/browser-bookmarks-menu.py \
 		${PREFIX}/libexec
+	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/libexec
 
 .include "../../lang/python/application.mk"
-.include "../../textproc/py-xml/buildlink3.mk"
 .include "../../x11/py-gnome2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/browser-bookmarks-menu/PLIST b/www/browser-bookmarks-menu/PLIST
index cf03e36bee9..38cd15f350a 100644
--- a/www/browser-bookmarks-menu/PLIST
+++ b/www/browser-bookmarks-menu/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/19 17:33:03 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/05/08 13:09:39 drochner Exp $
 lib/bonobo/servers/BrowserBookmarksMenu.server
 libexec/browser-bookmarks-menu.py
+libexec/browser-bookmarks-menu.pyc
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/www/browser-bookmarks-menu/distinfo b/www/browser-bookmarks-menu/distinfo
index 822b14f8893..ca7df8a54c9 100644
--- a/www/browser-bookmarks-menu/distinfo
+++ b/www/browser-bookmarks-menu/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:08:29 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/05/08 13:09:39 drochner Exp $
 
-SHA1 (browser-bookmarks-menu-0.3.tar.gz) = ddaf7dff15064e029319d9f3e9ea1ffa115cc44a
-RMD160 (browser-bookmarks-menu-0.3.tar.gz) = 8cb4e909bb61b731528c3ae35ed00bc253faa9d0
-Size (browser-bookmarks-menu-0.3.tar.gz) = 12017 bytes
+SHA1 (browser-bookmarks-menu-0.6.tar.gz) = c822bf2d95a3233a724242b3b6f791bb04e827a3
+RMD160 (browser-bookmarks-menu-0.6.tar.gz) = ec943d7127bb4d5844db903f80858141d4076407
+Size (browser-bookmarks-menu-0.6.tar.gz) = 14442 bytes
+SHA1 (patch-aa) = dc620dbb7abde69b9eb40070188db8ce63639e17
diff --git a/www/browser-bookmarks-menu/patches/patch-aa b/www/browser-bookmarks-menu/patches/patch-aa
new file mode 100644
index 00000000000..23fbf467eb9
--- /dev/null
+++ b/www/browser-bookmarks-menu/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/05/08 13:09:39 drochner Exp $
+
+--- browser-bookmarks-menu.py.orig	2006-05-05 23:29:03.000000000 +0200
++++ browser-bookmarks-menu.py
+@@ -543,7 +543,7 @@ def fill_menu(menu, tooltips, contents, 
+ 						menu_item.set_sensitive(False)
+ 					else:
+ 						menu_item.connect("activate", url_show, (name, href))
+-					if favicons.has_key(href):
++					if favicons and favicons.has_key(href):
+ 						image = gtk.Image()
+ 						image.set_from_pixbuf(favicons[href])
+ 						menu_item.set_image(image)