* Use ossaudio.buildlink2.mk and some other features of buildlink2 to

  remove unwanted paths to headers and libraries when invoking the
  compiler.  Also remove patches that are no longer needed with the
  complete conversion of this package to buildlink2.

* Also run cdda2wav.1 through tbl to make "man cdda2wav" readable for the
  -v option.

* Rearrange logic to simplify/shorten the package Makefile.

6 files changed, 41 insertions, 108 deletions

diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index ec4a3845a96..6a0a6e85005 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2002/08/25 21:50:55 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2002/09/26 11:32:02 jlam Exp $
 
 DISTNAME=	cdrtools-1.10
 PKGNAME=	cdrecord-1.10
+WRKSRC=		${WRKDIR}/${DISTNAME:C/a.*//}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/
 
@@ -10,44 +11,50 @@ HOMEPAGE=	http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/pr
 COMMENT=	This program allows you to create CD's on a CD-Recorder
 
 CONFLICTS=	mkisofs-[0-9]*
-USE_GMAKE=	yes
-USE_BUILDLINK2=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/a.*//}
-TARGET_ARCH=	${MACHINE_ARCH}-netbsd-cc
-TARGET_DIR=	OBJ/${TARGET_ARCH}
-#override ARCH to avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+=      ARCH=""
-TBL?=		tbl
+.include "../../mk/bsd.prefs.mk"
+
+USE_BUILDLINK2=		# defined
+USE_GMAKE=		# defined
+TBL?=			tbl
 
-post-extract:
-	@cd ${WRKSRC}; \
-	    ${MV} mkisofs/mkisofs.8 mkisofs/mkisofs.tbl
+.if ${LOCALBASE} != "/opt/schily"
+BUILDLINK_TRANSFORM=	r:-I/opt/schily
+BUILDLINK_TRANSFORM+=	r:-L/opt/schily
+.endif
+
+# avoid picking up a bad ${ARCH} during the build
+MAKE_ENV+=      ARCH=""
+MAKE_ENV+=      MAKEPROG="gmake"
 
 do-configure:
-	${MKDIR} ${WRKSRC}/include/sys
-	${LN} -fs /usr/include/soundcard.h ${WRKSRC}/include/sys
-	cd ${WRKSRC}/RULES; \
-	${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
-	${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
-	${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
-	${LN} -sf netbsd-cc.rul ${TARGET_ARCH}.rul
+	cd ${WRKSRC}/RULES;						\
+	for suffix in netbsd-cc.rul netbsd-gcc.rul; do			\
+		if [ ! -f ${MACHINE}-$$suffix ]; then			\
+			${LN} -sf i386-$$suffix ${MACHINE}-$$suffix;	\
+		fi;							\
+	done
 
 post-build:
-	${TBL} ${WRKSRC}/mkisofs/mkisofs.tbl > ${WRKSRC}/mkisofs/mkisofs.8
+	cd ${WRKSRC};							\
+	for file in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do		\
+		${TBL} $${file} > $${file}.tmp;				\
+		${MV} -f $${file}.tmp $${file};				\
+	done
 
 do-install:
-	cd ${WRKSRC}/cdda2wav; \
-	    ${INSTALL_PROGRAM} ${TARGET_DIR}/cdda2wav ${PREFIX}/bin; \
-	    ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1
-	cd ${WRKSRC}/cdrecord; \
-	    ${INSTALL_PROGRAM} ${TARGET_DIR}/cdrecord ${PREFIX}/bin; \
-	    ${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
-	cd ${WRKSRC}/mkisofs; \
-	    ${INSTALL_PROGRAM} ${TARGET_DIR}/mkisofs ${PREFIX}/bin; \
-	    ${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
-	cd ${WRKSRC}/misc; \
-	    ${INSTALL_PROGRAM} ${TARGET_DIR}/readcd ${PREFIX}/bin; \
-	    ${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
-
+	cd ${WRKSRC}/cdda2wav;						\
+		${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin;	\
+		${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1
+	cd ${WRKSRC}/cdrecord;						\
+		${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin;	\
+		${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
+	cd ${WRKSRC}/mkisofs;						\
+		${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin;		\
+		${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
+	cd ${WRKSRC}/misc;						\
+		${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin;		\
+		${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
+
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo
index f0be0e6b9af..1ca31d1e7c5 100644
--- a/sysutils/cdrecord/distinfo
+++ b/sysutils/cdrecord/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 21:50:56 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/09/26 11:32:02 jlam Exp $
 
 SHA1 (cdrtools-1.10.tar.gz) = 0d61bd1331d69a579e6582719a119d94166fcf10
 Size (cdrtools-1.10.tar.gz) = 1331424 bytes
-SHA1 (patch-aa) = bdc174326fbdae33cd49ff9374476565c541c1e8
-SHA1 (patch-ab) = 83421ef29ffb086f026df4cac4d880c92169b96c
 SHA1 (patch-ac) = 8faabd6be403f62f09da4016d2263b946d95c42e
-SHA1 (patch-ae) = 7ba558f84d126baf500415c1f900d7b58748f9ca
-SHA1 (patch-af) = 29d23a7dbe7034415ba2e9442a9117a430c3cc18
 SHA1 (patch-ah) = 97796b651f305b8942f463f2438783cd5b686fd8
 SHA1 (patch-ai) = 3dd98fc56a3304b980797f9a898bec2bd3dd484c
 SHA1 (patch-aj) = 0030dee842d2ed96b58486039ec0cd0999a6db86
diff --git a/sysutils/cdrecord/patches/patch-aa b/sysutils/cdrecord/patches/patch-aa
deleted file mode 100644
index 74e3f969b87..00000000000
--- a/sysutils/cdrecord/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/08/07 11:23:57 drochner Exp $
-
---- TARGETS/Targetdirs.orig	Mon Aug  6 10:21:54 2001
-+++ TARGETS/Targetdirs	Mon Aug  6 10:22:26 2001
-@@ -1,5 +1,5 @@
- #ident %W% %E% %Q%
- ###########################################################################
- DIRS=		patches conf inc lib libdeflt libscg librscg libhfs_iso libfile libunls \
--		cdrecord mkisofs mkisofs/diag cdda2wav misc rscsi scgcheck man
-+		cdrecord mkisofs mkisofs/diag cdda2wav misc rscsi scgcheck
- ###########################################################################
diff --git a/sysutils/cdrecord/patches/patch-ab b/sysutils/cdrecord/patches/patch-ab
deleted file mode 100644
index 78987c6676f..00000000000
--- a/sysutils/cdrecord/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/08/07 11:23:57 drochner Exp $
-
---- DEFAULTS/Defaults.netbsd.orig	Mon Mar 13 13:37:50 2000
-+++ DEFAULTS/Defaults.netbsd	Mon Aug  6 10:24:20 2001
-@@ -19,7 +19,7 @@
- CWARNOPTS=
- 
- DEFINCDIRS=	$(SRCROOT)/include
--LDPATH=		-L/opt/schily/lib
-+LDPATH=		-L$(SRCROOT)/lib
- #RUNPATH=	-R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)	Will probably not work
- 
- ###########################################################################
-@@ -27,7 +27,7 @@
- # Installation config stuff
- #
- ###########################################################################
--INS_BASE=	/opt/schily
-+INS_BASE=	$(PREFIX)
- INS_KBASE=	/
- #
- DEFUMASK=	002
diff --git a/sysutils/cdrecord/patches/patch-ae b/sysutils/cdrecord/patches/patch-ae
deleted file mode 100644
index 4464884abe8..00000000000
--- a/sysutils/cdrecord/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2001/08/07 11:23:57 drochner Exp $
-
---- cdda2wav/Makefile.orig	Sun Mar 11 17:56:52 2001
-+++ cdda2wav/Makefile	Mon Aug  6 10:29:26 2001
-@@ -7,7 +7,8 @@
- 
- INSDIR=		bin
- TARGET=		cdda2wav
--CPPOPTS +=	-DFIFO -I../cdrecord $(CDDA2WAVDEFS)
-+CPPOPTS +=	-DFIFO -I../cdrecord $(CDDA2WAVDEFS) \
-+		-DECHO_TO_SOUNDCARD -DHAVE_OSS=1 -DHAVE_SYS_SOUNDCARD_H
- CFILES=		cdda2wav.c interface.c semshm.c resample.c \
- 		toc.c wav.c sun.c raw.c md5c.c setuid.c ringbuff.c \
- 		sndconfig.c scsi_cmds.c aiff.c aifc.c \
-@@ -17,7 +18,8 @@
- 		config.h saveargs.h sndfile.h aiff.h aifc.h \
- 		sndconfig.h scsi_cmds.h lowlevel.h byteorder.h mycdrom.h \
- 		base64.h sha.h mmsystem.h
--LIBS=		-lrscg -lscg -lschily $(SCSILIB) $(EXTRALIB) $(LIB_SOCKET)
-+LIBS=		-lrscg -lscg -lschily $(SCSILIB) $(EXTRALIB) $(LIB_SOCKET) \
-+		-lossaudio
- XMK_FILE=	Makefile.man
- 
- LCONFIG=	local.cnf
diff --git a/sysutils/cdrecord/patches/patch-af b/sysutils/cdrecord/patches/patch-af
deleted file mode 100644
index 43eb00cbbfb..00000000000
--- a/sysutils/cdrecord/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2001/08/07 11:23:57 drochner Exp $
-
---- RULES/mk-gmake.id.orig	Sun Dec  6 13:51:19 1998
-+++ RULES/mk-gmake.id	Mon Aug  6 10:31:33 2001
-@@ -41,7 +41,7 @@
- _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
- 
- XP_ARCH:=	$(shell $(_MACHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
--XK_ARCH:=	$(shell uname -m    | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
-+XK_ARCH:=	$(shell uname -p    | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
- XM_ARCH:=	$(shell $(_ARCHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
- 
- P_ARCH=		$(XP_ARCH)