On Wed, Apr 20, 2011 at 12:27:42PM +0200, David Coppa wrote:
> It's set up as SHARED_ONLY, I think because there aren't consumers for
> those libraries atm.
There will be if the audacious flavour goes in, so it's probably wise to
do that beforehand. (And kill unneeded groff here too.)
conky's WANTLIB will then need aud{gui,core} added ofc.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 2 Mar 2011 14:07:09 -0000 1.24
+++ Makefile 20 Apr 2011 11:46:08 -0000
@@ -6,7 +6,11 @@ COMMENT = gtk+2 media player based on B
DISTNAME = audacious-2.4.4
-SHARED_LIBS = audclient 1.1 # 2.0
+REVISION = 0
+
+SHARED_LIBS = audclient 1.1 # 2.0
+SHARED_LIBS += audcore 0.0 # 1.0
+SHARED_LIBS += audgui 0.0 # 1.0
CATEGORIES = audio multimedia
@@ -43,9 +47,10 @@ LIB_DEPENDS = devel/libexecinfo \
x11/dbus \
x11/gtk+2
-MAKE_ENV = LIBaudclient_VERSION=${LIBaudclient_VERSION}
+MAKE_ENV = LIBaudclient_VERSION=${LIBaudclient_VERSION} \
+ LIBaudcore_VERSION=${LIBaudcore_VERSION} \
+ LIBaudgui_VERSION=${LIBaudgui_VERSION}
-USE_GROFF = Yes
USE_GMAKE = Yes
AUTOCONF_VERSION = 2.61
Index: patches/patch-src_libaudcore_Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libaudcore_Makefile
--- patches/patch-src_libaudcore_Makefile 19 Dec 2010 18:17:55 -0000
1.1
+++ patches/patch-src_libaudcore_Makefile 20 Apr 2011 11:46:08 -0000
@@ -1,6 +1,12 @@
$OpenBSD: patch-src_libaudcore_Makefile,v 1.1 2010/12/19 18:17:55 shadchin Exp
$
---- src/libaudcore/Makefile.orig Sat Dec 4 15:54:33 2010
-+++ src/libaudcore/Makefile Sat Dec 4 15:54:46 2010
+--- src/libaudcore/Makefile.orig Tue Feb 22 18:29:02 2011
++++ src/libaudcore/Makefile Wed Apr 20 13:38:18 2011
+@@ -1,4 +1,4 @@
+-LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
++LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}.${LIBaudcore_VERSION}
+ LIB_MAJOR = 1
+ LIB_MINOR = 0
+
@@ -43,4 +43,4 @@ includesubdir = libaudcore
CPPFLAGS += -DHAVE_CONFIG_H ${LIB_CPPFLAGS} ${CFLAGS} -I.. -I../..
CFLAGS += ${LIB_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS}
Index: patches/patch-src_libaudgui_Makefile
===================================================================
RCS file: patches/patch-src_libaudgui_Makefile
diff -N patches/patch-src_libaudgui_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libaudgui_Makefile 20 Apr 2011 11:46:08 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- src/libaudgui/Makefile.orig Wed Apr 20 13:38:32 2011
++++ src/libaudgui/Makefile Wed Apr 20 13:39:06 2011
+@@ -1,4 +1,4 @@
+-LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
++LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}.${LIBaudgui_VERSION}
+ LIB_MAJOR = 1
+ LIB_MINOR = 0
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 19 Dec 2010 18:17:55 -0000 1.9
+++ pkg/PLIST 20 Apr 2011 11:46:08 -0000
@@ -48,8 +48,8 @@ include/libaudgui/
include/libaudgui/libaudgui-gtk.h
include/libaudgui/libaudgui.h
@lib lib/libaudclient.so.${LIBaudclient_VERSION}
-lib/libaudcore.so
-lib/libaudgui.so
+@lib lib/libaudcore.so.${LIBaudcore_VERSION}
+@lib lib/libaudgui.so.${LIBaudgui_VERSION}
lib/libaudtag.so
lib/pkgconfig/audacious.pc
lib/pkgconfig/audclient.pc
> Btw, add comments to patches and it's ok for me. But coordinate with
> Benoit first (as pointed out by Jasper).
Yup, I've sent him an email. Sorry again.
>
> Cheers
> David
>
>
