Converted packages audio/mpg123* to bsd.options.mk framework (Approved by tron).

No bump of PKGREVISION necessary.

4 files changed, 26 insertions, 11 deletions

diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
index da933d961ea..408a48e5d64 100644
--- a/audio/mpg123-esound/Makefile
+++ b/audio/mpg123-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/10 21:31:41 heinz Exp $
 
 PKGNAME=	mpg123-esound-${MPG123_VERSION}
 PKGREVISION=	6
@@ -6,6 +6,7 @@ COMMENT=	Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
 
 TARGET_SUFFIX=	-esd
 
+PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-esound
 .include "../../audio/mpg123/Makefile.common"
 
 INSTALLATION_DIRS=	bin man/man1
diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile
index 7e31a7f96e4..d81cee3c403 100644
--- a/audio/mpg123-nas/Makefile
+++ b/audio/mpg123-nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/03 15:17:14 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/10 21:31:41 heinz Exp $
 
 PKGNAME=	mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
 PKGREVISION=	7
@@ -8,6 +8,7 @@ TARGET_SUFFIX=	-nas
 
 CONFLICTS+=	mpg123-[0-9]*
 
+PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-nas
 .include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/nas/buildlink3.mk"
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 362b90b6c89..9b2fd872335 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/10/03 15:17:14 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/10 21:31:41 heinz Exp $
 
 PKGNAME=	mpg123-${MPG123_VERSION}
 PKGREVISION=	8
@@ -6,5 +6,6 @@ COMMENT=	Command-line player for mpeg layer 1, 2 and 3 audio
 
 CONFLICTS+=	mpg123-nas-[0-9]*
 
+PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index f8a320cf226..1348b0bd182 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/12/10 21:31:41 heinz Exp $
 
 DISTNAME=	mpg123-0.59r
 MPG123_VERSION=	0.59.18
@@ -11,7 +11,6 @@ PATCHFILES=	mpg123-059r-v6-20000713b.diff.gz
 
 MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.mpg123.de/
-BUILD_DEFS+=	USE_INET6 MPG123_ARM_FIXED64
 DIST_SUBDIR=	mpg123
 PATCHDIR=	${.CURDIR}/../../audio/mpg123/patches
 FILESDIR=	${.CURDIR}/../../audio/mpg123/files
@@ -22,6 +21,20 @@ LICENSE=	no-commercial-use
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
+
+# PKG_OPTIONS_VAR must be set in the including Makefile
+PKG_SUPPORTED_OPTIONS=	inet6 mpg123-arm-fixed64
+PKG_SUGGESTED_OPTIONS=	inet6
+PKG_OPTIONS_LEGACY_VARS+= MPG123_ARM_FIXED64:mpg123-arm-fixed64
+.include "../../mk/bsd.options.mk"
+
+###
+### IPv6 support
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CPPFLAGS+=	-DINET6
+.endif
+
 .include "../../mk/compiler.mk"
 .if ${OPSYS} == "SunOS"
 .  if !empty(PKGSRC_COMPILER:Msunpro)
@@ -47,11 +60,14 @@ BUILD_TARGET=	netbsd-i386-elf${TARGET_SUFFIX}
 BUILD_TARGET=	netbsd-i386${TARGET_SUFFIX}
 .    endif # ELF
 .  elif ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-.    if defined(MPG123_ARM_FIXED64) && ${MPG123_ARM_FIXED64} == "YES"
+###
+### Optionally enable 64-bit calculations to avoid glitches on ARM.
+###
+.    if !empty(PKG_OPTIONS:Mmpg123-arm-fixed64)
 BUILD_TARGET=	netbsd-arm-64${TARGET_SUFFIX}
 .    else
 BUILD_TARGET=	netbsd-arm${TARGET_SUFFIX}
-.    endif # MPG123_ARM_FIXED64
+.    endif
 .  elif ${MACHINE_ARCH} == "m68k"
 BUILD_TARGET=	netbsd-m68k${TARGET_SUFFIX}
 .  else
@@ -61,10 +77,6 @@ BUILD_TARGET=	netbsd
 BUILD_TARGET=	${LOWER_OPSYS}${TARGET_SUFFIX}
 .endif
 
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CPPFLAGS+=	-DINET6
-.endif
-
 MAKE_FLAGS+=	PREFIX=${PREFIX:Q}
 
 pre-patch: