Subject: pkg/12770: changes to audio/cdparanoia to build so's
To: None <gnats-bugs@gnats.netbsd.org>
From: None <hclsmith@operamail.com>
List: netbsd-bugs
Date: 04/27/2001 20:51:55
>Number:         12770
>Category:       pkg
>Synopsis:       changes to audio/cdparanoia to build so's
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Apr 27 16:49:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Hume Smith
>Release:        dunno
>Organization:
--
>Environment:
	
System: NetBSD aurora.hclsmith 1.5 NetBSD 1.5 (AURORA) #0: Tue Mar 20 12:24:00 AST 2001 kwantus@aurora.hclsmith:/foo/hclsmith/netbsd-1.5/usr/src/sys/arch/i386/compile/AURORA i386


>Description:
the present package does not build/install the dynamic libraries.
kdebase-2.1.1 wants them for its audiocd protocol.
	
>How-To-Repeat:
*shrug* build the package and look
	
>Fix:
i have three replacement files:

---BEGIN Makefile
# $NetBSD$

DISTNAME=	cdparanoia-III-alpha9.7
PKGNAME=	cdparanoia-3.a9.7
CATEGORIES=	audio
MASTER_SITES=	http://www.xiph.org/paranoia/download/
EXTRACT_SUFX=	.src.tgz

MAINTAINER=	packages@netbsd.org
HOMEPAGE=	http://www.xiph.org/paranoia/
COMMENT=	CDDA reading utility with extra data verification features

GNU_CONFIGURE=	YES
USE_GMAKE= yes
MAKE_ENV+=	GCC=yes

.include "../../mk/bsd.pkg.mk"

#eof
---END Makefile

---BEGIN patch/patch-ab
$NetBSD$

--- Makefile.in.orig	Tue Dec 14 04:42:14 1999
+++ Makefile.in	Tue Apr 24 17:07:32 2001
@@ -8,7 +8,7 @@
 srcdir=@srcdir@
 
 @SET_MAKE@
-FLAGS=@TYPESIZES@ @CFLAGS@
+FLAGS=@GETOPT_LONG@ @TYPESIZES@ @CFLAGS@
 OPT=@OPT@ $(FLAGS)
 DEBUG=@DEBUG@ $(FLAGS)
 CC=@CC@
@@ -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
+SHLIBS = -L./interface -lcdda_interface -L./paranoia -lcdda_paranoia -lm
+SHLIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
-ifeq ($(STATIC),TRUE)
-	LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
-		-static -lm
-	LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
-else
-	LIBS = -lcdda_interface -lcdda_paranoia -lm
-	LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
-endif
 
 
 all: 	
 	cd interface && $(MAKE) all
 	cd paranoia && $(MAKE) all
-	$(MAKE) cdparanoia CFLAGS="$(OPT)" 
-	strip cdparanoia
+	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
+
+static:
+	cd interface && $(MAKE) lib
+	cd paranoia && $(MAKE) lib
+	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
 
 debug:  
 	cd interface && $(MAKE) debug
 	cd paranoia && $(MAKE) debug
-	$(MAKE) cdparanoia CFLAGS="$(DEBUG)" STATIC=TRUE
+	$(MAKE) cdparanoia CFLAGS="$(DEBUG)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
 
 test:	
 	cd interface && $(MAKE) all
---END patch/patch-ab

---BEGIN pkg/PLIST
@comment $NetBSD$
bin/cdparanoia
include/cdda_interface.h
include/cdda_paranoia.h
lib/libcdda_interface.a
lib/libcdda_interface.so
lib/libcdda_interface.so.0
lib/libcdda_interface.so.0.9.7
lib/libcdda_paranoia.a
lib/libcdda_paranoia.so
lib/libcdda_paranoia.so.0
lib/libcdda_paranoia.so.0.9.7
man/man1/cdparanoia.1
---END pkg/PLIST

-- end of report
>Release-Note:
>Audit-Trail:
>Unformatted: