Stop removing the inter-library dependencies and stop messing with the *.pc files.
Index: Makefile =================================================================== RCS file: /cvs/ports/audio/flac/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile 21 Mar 2013 08:45:12 -0000 1.41 +++ Makefile 24 Mar 2013 17:26:53 -0000 @@ -3,7 +3,7 @@ COMMENT= free lossless audio codec DISTNAME= flac-1.2.1 -REVISION= 2 +REVISION= 3 CATEGORIES= audio archivers HOMEPAGE= https://www.xiph.org/flac/ SHARED_LIBS += FLAC 9.0 # .10.0 @@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= http://downloads.xiph.org/releases/flac/ -WANTLIB= c m ogg>=5 stdc++ +WANTLIB= c m ogg stdc++ MODULES= converters/libiconv LIB_DEPENDS= audio/libogg Index: patches/patch-src_libFLAC++_Makefile_in =================================================================== RCS file: patches/patch-src_libFLAC++_Makefile_in diff -N patches/patch-src_libFLAC++_Makefile_in --- patches/patch-src_libFLAC++_Makefile_in 24 Sep 2007 17:23:55 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_libFLAC++_Makefile_in,v 1.3 2007/09/24 17:23:55 naddy Exp $ ---- src/libFLAC++/Makefile.in.orig Tue Sep 18 22:26:25 2007 -+++ src/libFLAC++/Makefile.in Tue Sep 18 22:26:49 2007 -@@ -252,7 +252,7 @@ EXTRA_DIST = \ - - # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention - libFLAC___la_LDFLAGS = -version-info 8:0:2 --libFLAC___la_LIBADD = ../libFLAC/libFLAC.la -+libFLAC___la_LIBADD = - - libFLAC___la_SOURCES = \ - metadata.cpp \ Index: patches/patch-src_libFLAC++_flac++_pc_in =================================================================== RCS file: patches/patch-src_libFLAC++_flac++_pc_in diff -N patches/patch-src_libFLAC++_flac++_pc_in --- patches/patch-src_libFLAC++_flac++_pc_in 7 Apr 2008 03:54:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_libFLAC++_flac++_pc_in,v 1.1 2008/04/07 03:54:39 fgsch Exp $ ---- src/libFLAC++/flac++.pc.in.orig Tue Apr 1 00:21:29 2008 -+++ src/libFLAC++/flac++.pc.in Tue Apr 1 00:21:50 2008 -@@ -7,5 +7,5 @@ Name: FLAC++ - Description: Free Lossless Audio Codec Library (C++ API) - Version: @VERSION@ - Requires: flac --Libs: -L${libdir} -lFLAC++ -lm --Cflags: -I${includedir}/FLAC++ -+Libs: -L${libdir} -lFLAC++ @OGG_LIBS@ -lm -+Cflags: -I${includedir}/FLAC++ @OGG_CFLAGS@ Index: patches/patch-src_libFLAC_Makefile_in =================================================================== RCS file: /cvs/ports/audio/flac/patches/patch-src_libFLAC_Makefile_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-src_libFLAC_Makefile_in --- patches/patch-src_libFLAC_Makefile_in 24 Sep 2007 17:23:55 -0000 1.4 +++ patches/patch-src_libFLAC_Makefile_in 24 Mar 2013 17:26:53 -0000 @@ -1,24 +1,11 @@ $OpenBSD: patch-src_libFLAC_Makefile_in,v 1.4 2007/09/24 17:23:55 naddy Exp $ ---- src/libFLAC/Makefile.in.orig Tue Sep 18 22:27:04 2007 -+++ src/libFLAC/Makefile.in Tue Sep 18 22:27:38 2007 -@@ -249,10 +249,9 @@ AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@ +--- src/libFLAC/Makefile.in.orig Sun Sep 16 22:05:12 2007 ++++ src/libFLAC/Makefile.in Sun Mar 24 17:54:19 2013 +@@ -249,7 +249,6 @@ AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@ @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ia32/libFLAC-asm.la @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la -@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning" @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = "" --libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ -+libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) - - SUBDIRS = $(ARCH_SUBDIRS) include . - -@@ -279,7 +278,7 @@ EXTRA_DIST = \ - @FLaC__HAS_OGG_TRUE@ ogg_mapping.c - - # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention --libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS) -+libFLAC_la_LDFLAGS = -version-info 10:0:2 $(LOCAL_EXTRA_LDFLAGS) - libFLAC_la_SOURCES = \ - bitmath.c \ - bitreader.c \ + libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ Index: patches/patch-src_libFLAC_flac_pc_in =================================================================== RCS file: patches/patch-src_libFLAC_flac_pc_in diff -N patches/patch-src_libFLAC_flac_pc_in --- patches/patch-src_libFLAC_flac_pc_in 7 Apr 2008 03:54:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_libFLAC_flac_pc_in,v 1.1 2008/04/07 03:54:39 fgsch Exp $ ---- src/libFLAC/flac.pc.in.orig Tue Apr 1 00:19:43 2008 -+++ src/libFLAC/flac.pc.in Tue Apr 1 00:20:45 2008 -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: FLAC - Description: Free Lossless Audio Codec Library - Version: @VERSION@ --Libs: -L${libdir} -lFLAC -lm --Cflags: -I${includedir}/FLAC -+Libs: -L${libdir} -lFLAC @OGG_LIBS@ -lm -+Cflags: -I${includedir}/FLAC @OGG_CFLAGS@ Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 18 Sep 2007 18:22:32 -0000 1.11 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.11 2007/09/18 18:22:32 naddy Exp $ -@lib lib/libFLAC++.so.${LIBFLAC++_VERSION} -@lib lib/libFLAC.so.${LIBFLAC_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/flac/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 24 Sep 2007 17:23:55 -0000 1.12 +++ pkg/PLIST 24 Mar 2013 17:26:53 -0000 @@ -1,6 +1,6 @@ @comment $OpenBSD: PLIST,v 1.12 2007/09/24 17:23:55 naddy Exp $ -bin/flac -bin/metaflac +@bin bin/flac +@bin bin/metaflac include/FLAC/ include/FLAC++/ include/FLAC++/all.h @@ -19,8 +19,10 @@ include/FLAC/stream_decoder.h include/FLAC/stream_encoder.h lib/libFLAC++.a lib/libFLAC++.la +@lib lib/libFLAC++.so.${LIBFLAC++_VERSION} lib/libFLAC.a lib/libFLAC.la +@lib lib/libFLAC.so.${LIBFLAC_VERSION} lib/pkgconfig/ lib/pkgconfig/flac++.pc lib/pkgconfig/flac.pc @@ -309,4 +311,3 @@ share/doc/flac/html/ru/id.html share/doc/flac/html/ru/index.html share/doc/flac/html/ru/links.html share/doc/flac/html/ru/news.html -%%SHARED%% -- Christian "naddy" Weisgerber [email protected]
