Make this pkg build shared libraries as well.

Fixes pkg/12770 from Hume Smith <hclsmith@operamail.com>

6 files changed, 152 insertions, 41 deletions

diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index 7167cc55f1a..978bfceafd2 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:30:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/04/29 09:47:02 skrll Exp $
 
 DISTNAME=	cdparanoia-III-alpha9.7
 PKGNAME=	cdparanoia-3.a9.7
@@ -11,11 +11,12 @@ HOMEPAGE=	http://www.xiph.org/paranoia/
 COMMENT=	CDDA reading utility with extra data verification features
 
 GNU_CONFIGURE=	YES
-ALL_TARGET=	static
+USE_GMAKE=	YES
+USE_LIBTOOL=	YES
 MAKE_ENV+=	GCC=yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cdparanoia ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/cdparanoia.1 ${PREFIX}/man/man1
+#do-install:
+#	${INSTALL_PROGRAM} ${WRKSRC}/cdparanoia ${PREFIX}/bin
+#	${INSTALL_MAN} ${WRKSRC}/cdparanoia.1 ${PREFIX}/man/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo
index ff94905e211..5279fd462ab 100644
--- a/audio/cdparanoia/distinfo
+++ b/audio/cdparanoia/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 13:04:19 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/29 09:47:02 skrll Exp $
 
 SHA1 (cdparanoia-III-alpha9.7.src.tgz) = 7c379d3628878fd79ebc1d567408a4d31a7f2e39
 Size (cdparanoia-III-alpha9.7.src.tgz) = 109670 bytes
 SHA1 (patch-aa) = e013ea41a177441efff076bebf55ff3675ca97f3
-SHA1 (patch-ab) = 714ba2c17584ec255de6179391925a994066f60e
+SHA1 (patch-ab) = 8f81f892294d069d9b86b7c4bc74e6acf2af5923
 SHA1 (patch-ac) = 895f0fcc76788d592738424e476109c7052526cb
 SHA1 (patch-ad) = 7d8084320e736e5d012e8a8f2e13653a41f03f6d
 SHA1 (patch-ae) = 213d45a11dda42e19d45d4ec1b8d6dcf32cede02
-SHA1 (patch-ba) = 76041a8ff7b24c6aff9d2bdeb483f4a787650a88
-SHA1 (patch-ca) = 21b51b909363b45801700417c5439598d4711a7f
+SHA1 (patch-ba) = 05f8efe4f0a2753217d3c1cf1014da64b1d92b73
+SHA1 (patch-ca) = 4d7c183aae36fd525a1294be4b6f9a76401c524e
 SHA1 (patch-cb) = aed42b4763b4a19187bbeb0714b8480f331bc5d4
 SHA1 (patch-cc) = 4132884598e845aa9ea0a501dd1635f9030cc104
 SHA1 (patch-cd) = 44b8050dddae449b4e16c5aab9cfcaccb62f9031
diff --git a/audio/cdparanoia/patches/patch-ab b/audio/cdparanoia/patches/patch-ab
index e20bf652c80..22903fc1b65 100644
--- a/audio/cdparanoia/patches/patch-ab
+++ b/audio/cdparanoia/patches/patch-ab
@@ -1,8 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-ab,v 1.2 2001/04/29 09:47:02 skrll Exp $
 
---- Makefile.in.orig	Tue Dec 14 17:42:14 1999
-+++ Makefile.in	Mon Jan 17 23:32:22 2000
-@@ -8,7 +8,7 @@
+--- Makefile.in.orig	Tue Dec 14 08:42:14 1999
++++ Makefile.in
+@@ -3,12 +3,12 @@
+ # DO NOT EDIT BELOW! ##########################################################
+ # (unless, of course, you know what you are doing :) ##########################
+ 
+-VERSION=9.7
++VERSION=97
+ VPATH=@srcdir@
  srcdir=@srcdir@
  
  @SET_MAKE@
@@ -11,14 +17,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
  OPT=@OPT@ $(FLAGS)
  DEBUG=@DEBUG@ $(FLAGS)
  CC=@CC@
-@@ -27,29 +27,27 @@
+@@ -27,29 +27,29 @@
  
  OFILES = main.o report.o header.o buffering_write.o
  
 -export STATIC 
--export VERSION
-+STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a -lm
-+STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
+ export VERSION
  
 -ifeq ($(STATIC),TRUE)
 -	LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
@@ -28,24 +32,27 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
 -	LIBS = -lcdda_interface -lcdda_paranoia -lm
 -	LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
 -endif
-+SHLIBS = -lcdda_interface -lcdda_paranoia -lm
-+SHLIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
++STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a -lm
++STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
  
++SHLIBDEP = interface/libcdda_interface.la paranoia/libcdda_paranoia.la
++SHLIBS = $(SHLIBDEP) -lm
  
 -all: 	
++
 +all:
  	cd interface && $(MAKE) all
  	cd paranoia && $(MAKE) all
 -	$(MAKE) cdparanoia CFLAGS="$(OPT)" 
 -	strip cdparanoia
 +	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
- 
--debug:  
++
 +static:
 +	cd interface && $(MAKE) lib
 +	cd paranoia && $(MAKE) lib
 +	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
-+
+ 
+-debug:  
 +debug:
  	cd interface && $(MAKE) debug
  	cd paranoia && $(MAKE) debug
@@ -54,3 +61,34 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
  
  test:	
  	cd interface && $(MAKE) all
+@@ -64,26 +64,15 @@
+ 	cd paranoia && $(MAKE) slib
+ 
+ install:
+-	$(INSTALL) -p -m 0755 $(srcdir)/cdparanoia $(BINDIR)
++	$(LIBTOOL) --mode=install $(INSTALL) -p -m 0755 $(srcdir)/cdparanoia $(BINDIR)
+ 	$(INSTALL) -p -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
+ 	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
+-	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
+-	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
++	$(LIBTOOL) --mode=install $(INSTALL) -p -m 0644 $(srcdir)/paranoia/libcdda_paranoia.la $(LIBDIR)
+ 	$(INSTALL) -p -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
+-	$(INSTALL) -p -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
+-	$(INSTALL) -p -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
+-	ln -fs libcdda_interface.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_interface.so.0
+-	ln -fs libcdda_interface.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_interface.so
+-	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_paranoia.so.0
+-	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_paranoia.so
++	$(LIBTOOL) --mode=install $(INSTALL) -p -m 0644 $(srcdir)/interface/libcdda_interface.la $(LIBDIR)
+ 
+ cdparanoia:	$(OFILES) $(LIBDEP)
+-		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
+-		-L$(PWD)/paranoia -L$(PWD)/interface \
++		$(LIBTOOL) --mode=link $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
+ 		-o cdparanoia $(LIBS)
+ 
+ .c.o:
diff --git a/audio/cdparanoia/patches/patch-ba b/audio/cdparanoia/patches/patch-ba
index 08f3d2a0209..292b3cb6ef1 100644
--- a/audio/cdparanoia/patches/patch-ba
+++ b/audio/cdparanoia/patches/patch-ba
@@ -1,21 +1,50 @@
-$NetBSD: patch-ba,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-ba,v 1.2 2001/04/29 09:47:03 skrll Exp $
 
---- paranoia/Makefile.in.orig	Tue Dec 14 13:28:04 1999
-+++ paranoia/Makefile.in	Mon Jan 17 23:26:01 2000
-@@ -22,7 +22,6 @@
+--- paranoia/Makefile.in.orig	Tue Dec 14 04:28:04 1999
++++ paranoia/Makefile.in
+@@ -21,10 +21,9 @@
+ OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
  #TFILES = isort.t gap.t p_block.t paranoia.t
  
- LIBS = ../interface/libcdda_interface.a -lm
+-LIBS = ../interface/libcdda_interface.a -lm
 -export VERSION
++LIBS = ../interface/libcdda_interface.la -lm
  
- all: lib slib
+-all: lib slib
++all: slib
  
-@@ -34,7 +33,7 @@
+ debug: 
+ 	$(MAKE) libcdda_paranoia.a CFLAGS="$(DEBUG)"
+@@ -33,23 +32,21 @@
+ 	$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" 
  
  slib:	
- 	$(MAKE) lessmessy
+-	$(MAKE) lessmessy
 -	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" 
-+	$(MAKE) libcdda_paranoia.so VERSION=$(VERSION) CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_paranoia.so VERSION=$(VERSION) CFLAGS="$(OPT)"
  
  #test:	$(TFILES)
  #
+ 
+-libcdda_paranoia.a: 	$(OFILES)	
+-	$(AR) -r libcdda_paranoia.a $(OFILES)
+-	$(RANLIB) libcdda_paranoia.a
+-
+-libcdda_paranoia.so: 	$(OFILES)	
+-	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
+-	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
+-	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
++libcdda_paranoia.la: 	$(OFILES)	
++	$(LIBTOOL) --mode=link $(CC) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
++	    -version-info 0:$(VERSION) -rpath $(PREFIX)/lib
++
++libcdda_paranoia.a: 	libcdda_paranoia.la
++
++libcdda_paranoia.so: 	libcdda_paranoia.la
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
+ 
+ .c.t:
+ 	$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
diff --git a/audio/cdparanoia/patches/patch-ca b/audio/cdparanoia/patches/patch-ca
index 445a9515182..d9c99535516 100644
--- a/audio/cdparanoia/patches/patch-ca
+++ b/audio/cdparanoia/patches/patch-ca
@@ -1,22 +1,53 @@
-$NetBSD: patch-ca,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-ca,v 1.2 2001/04/29 09:47:03 skrll Exp $
 
---- interface/Makefile.in.orig	Tue Dec 14 13:27:59 1999
-+++ interface/Makefile.in	Mon Jan 17 23:26:00 2000
-@@ -21,8 +21,6 @@
+--- interface/Makefile.in.orig	Tue Dec 14 04:27:59 1999
++++ interface/Makefile.in
+@@ -21,9 +21,7 @@
  OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
  	scsi_interface.o smallft.o toc.o test_interface.o
  
 -export VERSION
 -
- all: lib slib
+-all: lib slib
++all: slib
  
  debug: 
-@@ -33,7 +31,7 @@
+ 	$(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)"
+@@ -32,26 +30,24 @@
+ 	$(MAKE) libcdda_interface.a CFLAGS="$(OPT)" 
  
  slib:	
- 	$(MAKE) lessmessy
+-	$(MAKE) lessmessy
 -	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" 
-+	$(MAKE) libcdda_interface.so VERSION=$(VERSION) CFLAGS="$(OPT) -fpic" 
- 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
+-	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
++	$(MAKE) libcdda_interface.la VERSION=$(VERSION) CFLAGS="$(OPT)" 
  
  test:	
++	$(MAKE) lessmessy
+ 	$(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)"
+ 	$(CC) $(DEBUG) -c test.c
+-	$(LD) $(DEBUG) test.o $(LDFLAGS) -o cdda_test $(LIBS) libcdda_interface.a
++	$(LIBTOOL) --mode=link $(LD) $(DEBUG) test.o $(LDFLAGS) -o cdda_test $(LIBS) libcdda_interface.la
++
++libcdda_interface.la: 	$(OFILES)	
++	$(LIBTOOL) --mode=link $(CC) -o libcdda_interface.la $(OFILES:.o=.lo) \
++	    -version-info 0:$(VERSION) -rpath $(PREFIX)/lib
++
++libcdda_interface.a: 	libcdda_interface.la
+ 
+-libcdda_interface.a: 	$(OFILES)	
+-	$(AR) -r libcdda_interface.a $(OFILES)
+-	$(RANLIB) libcdda_interface.a
+-
+-libcdda_interface.so: 	$(OFILES)	
+-	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES)
+-	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
+-	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
++libcdda_interface.so: 	libcdda_interface.la
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
+ 
+ lessmessy:
+ 	-rm  -f *.o core *~ *.out
diff --git a/audio/cdparanoia/pkg/PLIST b/audio/cdparanoia/pkg/PLIST
index 7b53490c249..434d20183ea 100644
--- a/audio/cdparanoia/pkg/PLIST
+++ b/audio/cdparanoia/pkg/PLIST
@@ -1,3 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/01/19 08:03:01 itohy Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/04/29 09:47:03 skrll Exp $
 bin/cdparanoia
+include/cdda_interface.h
+include/cdda_paranoia.h
+lib/libcdda_interface.a
+lib/libcdda_interface.la
+lib/libcdda_interface.so
+lib/libcdda_interface.so.0
+lib/libcdda_interface.so.0.97
+lib/libcdda_paranoia.a
+lib/libcdda_paranoia.la
+lib/libcdda_paranoia.so
+lib/libcdda_paranoia.so.0
+lib/libcdda_paranoia.so.0.97
 man/man1/cdparanoia.1