Use the mpg123 Makefile.common to build mpg123-nas.

Based on PR 18532 from Greg A. Woods.

3 files changed, 91 insertions, 61 deletions

diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile
index 7ee948abfa9..c86bcaee4e9 100644
--- a/audio/mpg123-nas/Makefile
+++ b/audio/mpg123-nas/Makefile
@@ -1,66 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2002/08/31 14:25:37 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/28 12:24:06 markd Exp $
 #
 
-DISTNAME=	mpg123-0.59r
-PKGNAME=	mpg123-nas-0.59.18
-CATEGORIES=	audio
-MASTER_SITES=	http://www.mpg123.de/mpg123/ \
-		http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/
-
-PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/ \
-		http://www.unix-ag.org/Linux-Alpha/Packages/
-PATCHFILES=	mpg123-059r-v6-20000713b.diff.gz l3.diff.gz
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.mpg123.de/
+PKGNAME=	mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
+PKGREVISION=	1
 COMMENT=	Command-line player for mpeg layer 1, 2 and 3 audio with NAS output
 
-BUILD_DEFS+=	USE_INET6
-DIST_SUBDIR=	mpg123
-FILESDIR=	${.CURDIR}/../mpg123/files
+TARGET_SUFFIX=	-nas
 
 CONFLICTS+=	mpg123-[0-9]*
 
-USE_X11BASE=		# defined
-USE_BUILDLINK2=		# defined
-
-# for OBJECT_FMT
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-.if ${OBJECT_FMT} == "ELF"
-ALL_TARGET=	netbsd-i386-elf
-.else
-ALL_TARGET=	netbsd-i386
-.endif
-.elif ${MACHINE_ARCH} == "arm32"
-ALL_TARGET=	netbsd-arm32
-.elif ${MACHINE_ARCH} == "m68k"
-ALL_TARGET=	netbsd-m68k
-.else
-ALL_TARGET=	${LOWER_OPSYS}
-.endif
-
-.if ${OPSYS} == "SunOS"
-ALL_TARGET=	solaris-gcc
-.endif
-
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CPPFLAGS+=	-DINET6
-.endif
-
-MAKE_FLAGS+=	PREFIX="${PREFIX}"
-
-pre-patch:
-	${LN} -s . ${WRKSRC}/mpg123
+USE_X11BASE=	# defined
 
-post-patch:
-	${RM} -f ${WRKSRC}/mpg123
-	${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/
-	cd ${WRKSRC} ; ${MV} decode_i586.s decode_i586.s.orig ;\
-	${SED} \
-		-e 's@^/@#/@g' \
-		<decode_i586.s.orig >decode_i586.s
+.include "../mpg123/Makefile.common"
 
 .include "../../audio/nas/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 5bbbe8ee4e4..4db5db4eada 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2002/09/06 11:51:58 wiz Exp $
+$NetBSD: distinfo,v 1.14 2002/11/28 12:24:06 markd Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
 SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
 Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
-SHA1 (patch-aa) = 6535af4383fc242d04b4c4cc0d3f84ef66a3df8b
+SHA1 (patch-aa) = 05f10bbb9b8249da7010fe25893c948fd7e758de
 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index 63ee0cf6bea..86990e51dec 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $
+$NetBSD: patch-aa,v 1.23 2002/11/28 12:24:07 markd Exp $
 
---- Makefile.orig	Sun Jun 23 16:56:17 2002
+--- Makefile.orig	Mon Nov 25 22:42:10 2002
 +++ Makefile
-@@ -54,6 +54,17 @@
+@@ -54,6 +54,23 @@
  	@echo "make aix-tk3play    IBM AIX"
  	@echo "make os2            IBM OS/2"
  	@echo "make netbsd         NetBSD"
@@ -17,10 +17,25 @@ $NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $
 +	@echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD"
 +	@echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD"
 +	@echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD"
++	@echo "make netbsd-nas     NetBSD with NAS"
++	@echo "make netbsd-arm-nas NetBSD for strongarm (32bit fixedpoint) with NAS"
++	@echo "make netbsd-arm-64-nas NetBSD for strongarm (64bit fixedpoint) with NAS"
++	@echo "make netbsd-i386-nas NetBSD optimized for i386 with NAS"
++	@echo "make netbsd-i386-elf-nas NetBSD optimized for i386, ELF format with NAS"
++	@echo "make netbsd-m68k-nas NetBSD optimized for m68k with NAS"
  	@echo "make bsdos          BSDI BSD/OS"
  	@echo "make bsdos4         BSDI BSD/OS 4.0"
  	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
-@@ -496,18 +507,120 @@
+@@ -398,7 +415,7 @@
+ 
+ solaris-gcc-nas:
+ 	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
+-		AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\
++		AUDIO_LIB='-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -laudio -lXt -lXau'\
+ 		OBJECTS='decode.o dct64.o audio_nas.o' \
+ 		CFLAGS='$(CFLAGS) -O2 -I/usr/openwin/include -Wall \
+ 			-DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
+@@ -496,18 +513,184 @@
  
  netbsd:
  	$(MAKE) CC=cc LDFLAGS= \
@@ -144,6 +159,70 @@ $NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $
 +			-march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
 +			-DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
 +			-DTERM_CONTROL -DNETBSD `esd-config --cflags`' \
++		mpg123-make
++
++netbsd-nas:
++	$(MAKE) CC=cc LDFLAGS= \
++		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
++		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
++			-funroll-all-loops -ffast-math -DREAD_MMAP \
++			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
++			-DNAS' \
++		mpg123-make
++
++netbsd-i386-nas:
++	$(MAKE) CC=cc LDFLAGS= \
++		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
++		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
++			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
++			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
++			-DNAS' \
++		mpg123-make
++
++netbsd-i386-elf-nas:
++	$(MAKE) CC=cc LDFLAGS= \
++		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
++			audio_nas.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
++			-funroll-all-loops -ffast-math -DROT_I386 \
++			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
++			-DREAD_MMAP -DNETBSD -DTERM_CONTROL \
++			-DNAS' \
++		mpg123-make
++
++netbsd-m68k-nas:
++	$(MAKE) CC=cc LDFLAGS= \
++		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
++		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
++			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
++			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
++			-DNAS' \
++		mpg123-make
++
++netbsd-arm-nas:
++	$(MAKE) CC=cc LDFLAGS= \
++		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
++		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
++			-funroll-all-loops -finline-functions -ffast-math \
++			-march=armv4 -mtune=strongarm -mcpu=strongarm \
++			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
++			-DNETBSD -DNAS' \
++		mpg123-make
++
++netbsd-arm-64-nas:
++	$(MAKE) CC=cc LDFLAGS= \
++		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
++		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
++			-funroll-all-loops -finline-functions -ffast-math \
++			-march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
++			-DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
++			-DTERM_CONTROL -DNETBSD -DNAS' \
  		mpg123-make
  
  bsdos: