On Wed, 20 Apr 2011, Pascal Stumpf wrote: > 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
You should have switched to PFRAG.shared. Following is an updated diff, which also sync audacious-plugins WANTLIB accordingly. I've also bumped AUTOCONF_VERSION to a closer version. OKs ?? Ciao, David Index: audacious/Makefile =================================================================== RCS file: /cvs/ports/audio/audacious/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- audacious/Makefile 2 Mar 2011 14:07:09 -0000 1.24 +++ audacious/Makefile 20 Apr 2011 13:27:33 -0000 @@ -1,12 +1,14 @@ # $OpenBSD: Makefile,v 1.24 2011/03/02 14:07:09 shadchin Exp $ -SHARED_ONLY = Yes - COMMENT = gtk+2 media player based on BMP and XMMS 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,12 +45,14 @@ 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 +# Should be 2.68 +AUTOCONF_VERSION = 2.67 CONFIGURE_STYLE = autoconf Index: audacious/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 --- audacious/patches/patch-src_libaudcore_Makefile 19 Dec 2010 18:17:55 -0000 1.1 +++ audacious/patches/patch-src_libaudcore_Makefile 20 Apr 2011 13:27:33 -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: audacious/patches/patch-src_libaudgui_Makefile =================================================================== RCS file: audacious/patches/patch-src_libaudgui_Makefile diff -N audacious/patches/patch-src_libaudgui_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audacious/patches/patch-src_libaudgui_Makefile 20 Apr 2011 13:27:33 -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: audacious/pkg/PFRAG.shared =================================================================== RCS file: audacious/pkg/PFRAG.shared diff -N audacious/pkg/PFRAG.shared --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audacious/pkg/PFRAG.shared 20 Apr 2011 13:27:33 -0000 @@ -0,0 +1,4 @@ +@comment $OpenBSD$ +@lib lib/libaudclient.so.${LIBaudclient_VERSION} +@lib lib/libaudcore.so.${LIBaudcore_VERSION} +@lib lib/libaudgui.so.${LIBaudgui_VERSION} Index: audacious/pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- audacious/pkg/PLIST 19 Dec 2010 18:17:55 -0000 1.9 +++ audacious/pkg/PLIST 20 Apr 2011 13:27:33 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.9 2010/12/19 18:17:55 shadchin Exp $ +%%SHARED%% @bin bin/audacious2 @bin bin/audtool2 include/audacious/ @@ -47,9 +48,6 @@ include/libaudcore/vfs_buffered_file.h include/libaudgui/ include/libaudgui/libaudgui-gtk.h include/libaudgui/libaudgui.h -@lib lib/libaudclient.so.${LIBaudclient_VERSION} -lib/libaudcore.so -lib/libaudgui.so lib/libaudtag.so lib/pkgconfig/audacious.pc lib/pkgconfig/audclient.pc Index: audacious-plugins/Makefile =================================================================== RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- audacious-plugins/Makefile 18 Apr 2011 22:41:37 -0000 1.29 +++ audacious-plugins/Makefile 20 Apr 2011 13:27:33 -0000 @@ -8,8 +8,9 @@ COMMENT-jack = jack plugin for audaciou V = 2.4.4 DISTNAME = audacious-plugins-$V PKGNAME-main = ${DISTNAME} -REVISION-main = 1 +REVISION-main = 2 PKGNAME-jack = audacious-jack-$V +REVISION-jack = 0 CATEGORIES = audio multimedia @@ -22,12 +23,12 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ - Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo dbus-1 \ - dbus-glib-1 drm expat fontconfig freetype gdk-x11-2.0 \ - gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \ - gthread-2.0 gtk-x11-2.0 iconv intl m mcs mowgli pango-1.0 \ - pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs \ - samplerate xcb xcb-render xcb-shm z + Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 audcore audgui \ + cairo dbus-1 dbus-glib-1 drm expat fontconfig freetype \ + gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \ + gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv intl m mcs \ + mowgli pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \ + pthread-stubs samplerate xcb xcb-render xcb-shm z WANTLIB-main = ${WANTLIB} FLAC SDL avcodec avformat avutil bz2 cddb \ cdio cdio_cdda cue curl faac faad gsm mp3lame neon \ notify ogg orc-0.4 schroedinger-1.0 sndfile sndio speex \ @@ -76,7 +77,8 @@ MULTI_PACKAGES += -jack USE_GMAKE = Yes -AUTOCONF_VERSION = 2.61 +# Should be 2.68 +AUTOCONF_VERSION = 2.67 CONFIGURE_STYLE = autoconf CONFIGURE_ARGS += --enable-ipv6 \