On Sun, 03 Dec 2006 15:29:14 +0100, Dmitri Alenitchev wrote:
> I fix problems with lib-depends-check and add NO_REGRESS=Yes (thanks
> to Matthias Kilian for comments), but one problem still present:
>
> Missing: libaudacious.so.4 (/usr/local/bin/audtool): NOT REACHABLE
Here is a patch that addresses the above issue as well as the following
three.
- add MODULES=devel/gettext
- small hack to remove the dependency on devel/subversion (works for me)
- CONFIGURE_ARGS are pointless here; they apply to audacious-plugins
What do you think?
Regards,
Tim
diff -Nru audacious.orig/Makefile audacious/Makefile
--- audacious.orig/Makefile Sun Dec 3 15:23:31 2006
+++ audacious/Makefile Sun Dec 3 16:42:04 2006
@@ -20,7 +20,7 @@
gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
cairo iconv intl pthread stdc++ xml2
-BUILD_DEPENDS= ::devel/subversion
+MODULES= devel/gettext
LIB_DEPENDS= gtk-x11-2.0.>=0.802::x11/gtk+2 \
gdk-x11-2.0.>=0.802::x11/gtk+2 \
gdk_pixbuf-2.0.>=0.802::x11/gtk+2 \
@@ -31,9 +31,6 @@
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --disable-alsa --disable-oss --disable-jack \
- --disable-adplug --disable-lirc -disable-amidiplug \
- --disable-arts --disable-wma
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CFLAGS="-I${LOCALBASE}/include"
diff -Nru audacious.orig/patches/patch-audacious_Makefile
audacious/patches/patch-audacious_Makefile
--- audacious.orig/patches/patch-audacious_Makefile Thu Jan 1 01:00:00 1970
+++ audacious/patches/patch-audacious_Makefile Sun Oct 29 02:20:00 2006
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- audacious/Makefile.orig Sun Oct 22 20:54:51 2006
++++ audacious/Makefile Sun Oct 29 02:19:21 2006
+@@ -87,7 +87,6 @@ build_stamp.c:
+ echo ' */'; \
+ echo '#include <glib.h>'; \
+ echo -n 'const gchar *svn_stamp = "'; \
+- (cd ..; svnversion -n .); \
+ echo '";' \
+ ) > build_stamp.c; \
+ fi;
diff -Nru audacious.orig/patches/patch-libaudacious_Makefile
audacious/patches/patch-libaudacious_Makefile
--- audacious.orig/patches/patch-libaudacious_Makefile Thu Jan 1 01:00:00 1970
+++ audacious/patches/patch-libaudacious_Makefile Sun Oct 29 02:34:00 2006
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- libaudacious/Makefile.orig Sat Oct 14 20:39:17 2006
++++ libaudacious/Makefile Sun Oct 29 02:33:56 2006
+@@ -6,7 +6,7 @@ PICLDFLAGS = $(LIBLDFLAGS)
+ beepincludedir = $(includedir)/audacious
+
+ OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX)
+-OBJECTIVE_SONAME_SUFFIX = 4
++OBJECTIVE_SONAME_SUFFIX = 4.0
+
+ LIBADD = \
+ $(GTK_LIBS) \
+@@ -46,8 +46,4 @@ HEADERS = \
+ include ../mk/objective.mk
+
+ install-posthook:
+- @mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)
${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0
+- @ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0 \
+- ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4
+- @ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4 \
+- ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)
++ @mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)
${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0
diff -Nru audacious.orig/pkg/PFRAG.shared audacious/pkg/PFRAG.shared
--- audacious.orig/pkg/PFRAG.shared Thu Jan 1 01:00:00 1970
+++ audacious/pkg/PFRAG.shared Sun Dec 3 16:37:39 2006
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] lib/libaudacious.so.${LIBaudacious_VERSION}
diff -Nru audacious.orig/pkg/PLIST audacious/pkg/PLIST
--- audacious.orig/pkg/PLIST Wed Nov 29 10:24:11 2006
+++ audacious/pkg/PLIST Sun Dec 3 16:37:39 2006
@@ -1,4 +1,5 @@
@comment $OpenBSD$
+%%SHARED%%
bin/audacious
bin/audtool
include/audacious/
@@ -20,9 +21,6 @@
include/audacious/xconvert.h
include/audacious/xentry.h
include/audacious/xml_document.h
-lib/libaudacious.so
-lib/libaudacious.so.4
-lib/libaudacious.so.4.0.0
lib/pkgconfig/
lib/pkgconfig/audacious.pc
@man man/man1/audacious.1
