cosmetics:

-make sure sqlite3 is found for a pointless configure check, avoids
 an error message
-deal with hicolor-icon-theme

4 files changed, 22 insertions, 6 deletions

diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index 189638b5d10..b4ddf1d2751 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/08/12 23:13:06 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/08/13 12:06:40 drochner Exp $
 #
 
 DISTNAME=	bmpx-0.40.1
@@ -19,6 +19,8 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 CONFIGURE_ENV+=		BOOST_REGEX_LIBS=-lboost_regex-mt
+# the following is a fix for nonsense in the configure script
+CONFIGURE_ENV+=		SQL3PATH=${BUILDLINK_PREFIX.sqlite3}
 CPPFLAGS+=		-I${LOCALBASE}/include/cdparanoia
 
 .include "../../audio/cdparanoia/buildlink3.mk"
@@ -34,6 +36,7 @@ BUILDLINK_API_DEPENDS.libglademm+=	libglademm>=2.6.0
 BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.14.0
 .include "../../devel/libsexymm/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/bmpx/PLIST b/audio/bmpx/PLIST
index fc611267cb1..888086878ab 100644
--- a/audio/bmpx/PLIST
+++ b/audio/bmpx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/08/12 23:13:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/08/13 12:06:40 drochner Exp $
 bin/beep-media-player-2
 bin/bmp-enqueue-files-2.0
 bin/bmp-enqueue-uris-2.0
@@ -275,9 +275,8 @@ share/locale/ru/LC_MESSAGES/bmpx.mo
 share/locale/sv/LC_MESSAGES/bmpx.mo
 share/locale/th_TH/LC_MESSAGES/bmpx.mo
 share/locale/zh_CN/LC_MESSAGES/bmpx.mo
-@dirrm share/locale/th_TH/LC_MESSAGES
-@dirrm share/locale/th_TH
-@dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/doc/bmpx/images
 @dirrm share/doc/bmpx
 @comment in dbus: @dirrm share/dbus-1/services
diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo
index 746e7bdb2ca..b558a75835a 100644
--- a/audio/bmpx/distinfo
+++ b/audio/bmpx/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/08/12 23:13:06 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/08/13 12:06:40 drochner Exp $
 
 SHA1 (bmpx-0.40.1.tar.bz2) = c2d69fd8909d1d7a69ff13eee149084da9b802f0
 RMD160 (bmpx-0.40.1.tar.bz2) = 8d00392449ad4602e380c9f78cb12c4077db9eec
 Size (bmpx-0.40.1.tar.bz2) = 1793356 bytes
+SHA1 (patch-aa) = b4a761b618aa976945c6983e752389cc226b1cbb
diff --git a/audio/bmpx/patches/patch-aa b/audio/bmpx/patches/patch-aa
new file mode 100644
index 00000000000..b9bb4ad0388
--- /dev/null
+++ b/audio/bmpx/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2007/08/13 12:06:41 drochner Exp $
+
+--- configure.orig	2007-08-13 12:13:03.000000000 +0200
++++ configure
+@@ -31402,7 +31402,7 @@ fi
+     { echo "$as_me:$LINENO: checking for SQLite3 library >= $sqlite3_version_req" >&5
+ echo $ECHO_N "checking for SQLite3 library >= $sqlite3_version_req... $ECHO_C" >&6; }
+ 
+-    for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
++    for ac_sqlite3_path_tmp in ${SQL3PATH} /usr /usr/local /opt ; do
+         if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
+             && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
+             ac_sqlite3_path=$ac_sqlite3_path_tmp