Integrate ARM 64bit fixedpoint patch submitted by Tim Deegan in pkg/16479.

This feature is enabled by MPG123_ARM_FIXED64.

mpg123/Makefile.common contains common stuff of mpg123 and mpg123-esound.

2 files changed, 7 insertions, 60 deletions

diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
index 3c228157676..c744718eb88 100644
--- a/audio/mpg123-esound/Makefile
+++ b/audio/mpg123-esound/Makefile
@@ -1,63 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2002/06/22 17:56:38 kent Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/23 08:45:09 kent Exp $
 
-DISTNAME=	mpg123-0.59r
-PKGNAME=	mpg123-esound-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/
-PATCHFILES=	mpg123-059r-v6-20000713b.diff.gz
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.mpg123.de/
+PKGNAME=	mpg123-esound-${MPG123_VERSION}
 COMMENT=	Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
 
-BUILD_DEFS+=	USE_INET6
-DIST_SUBDIR=	mpg123
-
-PATCHDIR=	../mpg123/patches
-FILESDIR=	../mpg123/files
-
-USE_BUILDLINK_ONLY=	# defined
-
-# for OBJECT_FMT
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "i386")
-.if (${OBJECT_FMT} == "ELF")
-ALL_TARGET=	netbsd-i386-elf-esd
-.else
-ALL_TARGET=	netbsd-i386-esd
-.endif
-.elif (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32")
-ALL_TARGET=	netbsd-arm-esd
-.elif (${MACHINE_ARCH} == "m68k")
-ALL_TARGET=	netbsd-m68k-esd
-.else
-ALL_TARGET=	${LOWER_OPSYS}-esd
-.endif
-
-.if ${OPSYS} == "SunOS"
-ALL_TARGET=	solaris-gcc-esd
-.endif
-
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CPPFLAGS+=	-DINET6
-.endif
-
-MAKE_FLAGS+=	PREFIX="${PREFIX}"
-
-pre-patch:
-	${LN} -s . ${WRKSRC}/mpg123
-
-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
+TARGET_SUFFIX=	-esd
+.include "../mpg123/Makefile.common"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound
diff --git a/audio/mpg123-esound/distinfo b/audio/mpg123-esound/distinfo
index 9df513986a7..91c9a7c634f 100644
--- a/audio/mpg123-esound/distinfo
+++ b/audio/mpg123-esound/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/06/22 19:03:11 kent Exp $
+$NetBSD: distinfo,v 1.4 2002/06/23 08:45:09 kent 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) = 5f5310e52c8a7b17bc675d6d3b21ea629f644b40
+SHA1 (patch-aa) = ac0daa7156f6125e8988431fba52964696af4b61
 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
@@ -13,7 +13,7 @@ SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452
 SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b
 SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43
 SHA1 (patch-ai) = 021c5bb2baa56327d486bf134b537ac5c6aa8fba
-SHA1 (patch-aj) = 910b2834c34e617c492a3c72e4d2185d3eb53ecc
+SHA1 (patch-aj) = b828a5e35a03b307d46cd07356624d19b9d56777
 SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8
 SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222
 SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822