[pkgsrc/trunk]: pkgsrc Converted packages audio/mpg123* to bsd.options.mk fra...

[heinz <heinz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c907c3b00462
branches:  trunk
changeset: 504388:c907c3b00462
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Sat Dec 10 21:31:41 2005 +0000

description:
Converted packages audio/mpg123* to bsd.options.mk framework (Approved by tron).
No bump of PKGREVISION necessary.

diffstat:

 audio/mpg123-esound/Makefile    |   3 ++-
 audio/mpg123-nas/Makefile       |   3 ++-
 audio/mpg123/Makefile           |   3 ++-
 audio/mpg123/Makefile.common    |  28 ++++++++++++++++++++--------
 mk/defaults/options.description |   1 +
 5 files changed, 27 insertions(+), 11 deletions(-)

diffs (127 lines):

diff -r f0432c5d51a5 -r c907c3b00462 audio/mpg123-esound/Makefile
--- a/audio/mpg123-esound/Makefile      Sat Dec 10 19:23:01 2005 +0000
+++ b/audio/mpg123-esound/Makefile      Sat Dec 10 21:31:41 2005 +0000
@@ -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 @@
 
 TARGET_SUFFIX= -esd
 
+PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-esound
 .include "../../audio/mpg123/Makefile.common"
 
 INSTALLATION_DIRS=     bin man/man1
diff -r f0432c5d51a5 -r c907c3b00462 audio/mpg123-nas/Makefile
--- a/audio/mpg123-nas/Makefile Sat Dec 10 19:23:01 2005 +0000
+++ b/audio/mpg123-nas/Makefile Sat Dec 10 21:31:41 2005 +0000
@@ -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 @@
 
 CONFLICTS+=    mpg123-[0-9]*
 
+PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-nas
 .include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/nas/buildlink3.mk"
diff -r f0432c5d51a5 -r c907c3b00462 audio/mpg123/Makefile
--- a/audio/mpg123/Makefile     Sat Dec 10 19:23:01 2005 +0000
+++ b/audio/mpg123/Makefile     Sat Dec 10 21:31:41 2005 +0000
@@ -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 @@
 
 CONFLICTS+=    mpg123-nas-[0-9]*
 
+PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r f0432c5d51a5 -r c907c3b00462 audio/mpg123/Makefile.common
--- a/audio/mpg123/Makefile.common      Sat Dec 10 19:23:01 2005 +0000
+++ b/audio/mpg123/Makefile.common      Sat Dec 10 21:31:41 2005 +0000
@@ -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 @@
 
 MAINTAINER=    tron%NetBSD.org@localhost
 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 @@
 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${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=  ${LOWER_OPSYS}${TARGET_SUFFIX}
 .endif
 
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CPPFLAGS+=     -DINET6
-.endif
-
 MAKE_FLAGS+=   PREFIX=${PREFIX:Q}
 
 pre-patch:
diff -r f0432c5d51a5 -r c907c3b00462 mk/defaults/options.description
--- a/mk/defaults/options.description   Sat Dec 10 19:23:01 2005 +0000
+++ b/mk/defaults/options.description   Sat Dec 10 21:31:41 2005 +0000
@@ -164,6 +164,7 @@
 modperl2               Use modperl 2.x as the CGI manager (with Apache 2.x).
 motif                  Enable motif support.
 mozilla                        Use mozilla as gecko rendering engine.
+mpg123-arm-fixed64     Enable 64-bit calculations to avoid glitches on ARM.
 mplayer-menu           Enable support for user-defined menus.
 mplayer-real           Enable usage of Real codecs.
 mplayer-runtime-cpudetection   Enable CPU detection at run time.