On Sun, Mar 24, 2013 at 05:27:41PM +0100, Christian Weisgerber wrote: > Stop removing the inter-library dependencies on libm, libogg, and--for > the helper libraries--libvorbis itself.
I was looking at this last night. I added your WANTLIB tweak. Here is a diff including some fixes for the pkg-config files for static vs shared linking. Index: Makefile =================================================================== RCS file: /home/cvs/ports/audio/libvorbis/Makefile,v retrieving revision 1.37 diff -u -p -r1.37 Makefile --- Makefile 21 Mar 2013 08:45:12 -0000 1.37 +++ Makefile 25 Mar 2013 00:22:30 -0000 @@ -3,6 +3,7 @@ COMMENT= audio compression codec library DISTNAME= libvorbis-1.3.3 +REVISION= 0 CATEGORIES= audio HOMEPAGE= http://www.xiph.org/vorbis/ SHARED_LIBS += vorbis 8.0 # .4.6 @@ -17,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ # no inter-library dependency, but we still build against the API -WANTLIB += ogg>=6 +WANTLIB= m ogg LIB_DEPENDS= audio/libogg CONFIGURE_STYLE=gnu Index: patches/patch-lib_Makefile_in =================================================================== RCS file: patches/patch-lib_Makefile_in diff -N patches/patch-lib_Makefile_in --- patches/patch-lib_Makefile_in 17 Feb 2012 22:17:52 -0000 1.9 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,49 +0,0 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.9 2012/02/17 22:17:52 naddy Exp $ ---- lib/Makefile.in.orig Fri Feb 3 23:21:55 2012 -+++ lib/Makefile.in Sun Feb 5 20:12:44 2012 -@@ -82,13 +82,13 @@ libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS) - libvorbis_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libvorbis_la_LDFLAGS) $(LDFLAGS) -o $@ --libvorbisenc_la_DEPENDENCIES = libvorbis.la -+libvorbisenc_la_DEPENDENCIES = - am_libvorbisenc_la_OBJECTS = vorbisenc.lo - libvorbisenc_la_OBJECTS = $(am_libvorbisenc_la_OBJECTS) - libvorbisenc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libvorbisenc_la_LDFLAGS) $(LDFLAGS) -o $@ --libvorbisfile_la_DEPENDENCIES = libvorbis.la -+libvorbisfile_la_DEPENDENCIES = - am_libvorbisfile_la_OBJECTS = vorbisfile.lo - libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS) - libvorbisfile_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -213,7 +213,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = - LIBTOOL = @LIBTOOL@ - LIBTOOL_DEPS = @LIBTOOL_DEPS@ - LIPO = @LIPO@ -@@ -328,14 +328,14 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelo - registry.h scales.h window.h lookup.h lookup_data.h\ - codec_internal.h backends.h bitrate.h - --libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ --libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@ -+libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ -+libvorbis_la_LIBADD = - libvorbisfile_la_SOURCES = vorbisfile.c --libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@ --libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ -+libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@ -+libvorbisfile_la_LIBADD = - libvorbisenc_la_SOURCES = vorbisenc.c --libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@ --libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@ -+libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@ -+libvorbisenc_la_LIBADD = - CLEANFILES = $(EXTRA_PROGRAMS) - barkmel_SOURCES = barkmel.c - tone_SOURCES = tone.c Index: patches/patch-test_Makefile_in =================================================================== RCS file: patches/patch-test_Makefile_in diff -N patches/patch-test_Makefile_in --- patches/patch-test_Makefile_in 17 Feb 2012 22:17:52 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-test_Makefile_in,v 1.3 2012/02/17 22:17:52 naddy Exp $ ---- test/Makefile.in.orig Fri Feb 3 23:21:56 2012 -+++ test/Makefile.in Sun Feb 5 20:13:04 2012 -@@ -212,7 +212,7 @@ top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign - INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@ - test_SOURCES = util.c util.h write_read.c write_read.h test.c --test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ -+test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ -lm - all: all-am - - .SUFFIXES: Index: patches/patch-vorbis_pc_in =================================================================== RCS file: patches/patch-vorbis_pc_in diff -N patches/patch-vorbis_pc_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-vorbis_pc_in 24 Mar 2013 02:14:32 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- vorbis.pc.in.orig Sat Mar 23 22:10:52 2013 ++++ vorbis.pc.in Sat Mar 23 22:11:17 2013 +@@ -8,7 +8,8 @@ includedir=@includedir@ + Name: vorbis + Description: vorbis is the primary Ogg Vorbis library + Version: @VERSION@ +-Requires: ogg ++Requires.private: ogg + Conflicts: +-Libs: -L${libdir} -lvorbis -lm ++Libs: -L${libdir} -lvorbis ++Libs.private: -lm + Cflags: -I${includedir} Index: patches/patch-vorbisenc_pc_in =================================================================== RCS file: patches/patch-vorbisenc_pc_in diff -N patches/patch-vorbisenc_pc_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-vorbisenc_pc_in 24 Mar 2013 02:14:25 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- vorbisenc.pc.in.orig Sat Mar 23 22:11:49 2013 ++++ vorbisenc.pc.in Sat Mar 23 22:14:09 2013 +@@ -8,7 +8,7 @@ includedir=@includedir@ + Name: vorbisenc + Description: vorbisenc is a library that provides a convenient API for setting up an encoding environment using libvorbis + Version: @VERSION@ +-Requires: vorbis ++Requires.private: vorbis + Conflicts: + Libs: -L${libdir} -lvorbisenc + Cflags: -I${includedir} Index: patches/patch-vorbisfile_pc_in =================================================================== RCS file: patches/patch-vorbisfile_pc_in diff -N patches/patch-vorbisfile_pc_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-vorbisfile_pc_in 24 Mar 2013 02:14:25 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- vorbisfile.pc.in.orig Sat Mar 23 22:12:28 2013 ++++ vorbisfile.pc.in Sat Mar 23 22:14:17 2013 +@@ -8,7 +8,7 @@ includedir=@includedir@ + Name: vorbisfile + Description: vorbisfile is a library that provides a convenient high-level API for decoding and basic manipulation of all Vorbis I audio streams + Version: @VERSION@ +-Requires: vorbis ++Requires.private: vorbis + Conflicts: + Libs: -L${libdir} -lvorbisfile + Cflags: -I${includedir} Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 23 Dec 2005 15:03:09 -0000 1.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.10 2005/12/23 15:03:09 espie Exp $ -@lib lib/libvorbis.so.${LIBvorbis_VERSION} -@lib lib/libvorbisenc.so.${LIBvorbisenc_VERSION} -@lib lib/libvorbisfile.so.${LIBvorbisfile_VERSION} Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/audio/libvorbis/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 25 Nov 2010 17:00:00 -0000 1.10 +++ pkg/PLIST 25 Mar 2013 00:24:14 -0000 @@ -5,10 +5,13 @@ include/vorbis/vorbisenc.h include/vorbis/vorbisfile.h lib/libvorbis.a lib/libvorbis.la +@lib lib/libvorbis.so.${LIBvorbis_VERSION} lib/libvorbisenc.a lib/libvorbisenc.la +@lib lib/libvorbisenc.so.${LIBvorbisenc_VERSION} lib/libvorbisfile.a lib/libvorbisfile.la +@lib lib/libvorbisfile.so.${LIBvorbisfile_VERSION} lib/pkgconfig/ lib/pkgconfig/vorbis.pc lib/pkgconfig/vorbisenc.pc @@ -161,4 +164,3 @@ share/doc/libvorbis/vorbisfile/vorbisfil share/doc/libvorbis/vorbisword2.png share/doc/libvorbis/wait.png share/doc/libvorbis/white-xifish.png -%%SHARED%% -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
