[pkgsrc/trunk]: pkgsrc/emulators * Remove compile warnings with gcc3.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/09578e417145
branches:  trunk
changeset: 498804:09578e417145
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Sep 03 18:16:07 2005 +0000

description:
* Remove compile warnings with gcc3.
* Use PKG_OPTIONS_OPTIONAL_GROUPS for sdl and opengl options.

diffstat:

 emulators/xmame/Makefile   |   9 ++++++++-
 emulators/xmame/options.mk |  13 ++++++-------
 emulators/xmess/Makefile   |   9 ++++++++-
 emulators/xmess/options.mk |  12 +++++-------
 4 files changed, 27 insertions(+), 16 deletions(-)

diffs (103 lines):

diff -r 9828de4a9ef7 -r 09578e417145 emulators/xmame/Makefile
--- a/emulators/xmame/Makefile  Sat Sep 03 17:00:07 2005 +0000
+++ b/emulators/xmame/Makefile  Sat Sep 03 18:16:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2005/08/25 19:54:22 kristerw Exp $
+# $NetBSD: Makefile,v 1.134 2005/09/03 18:16:07 xtraeme Exp $
 #
 
 DISTNAME=              xmame-0.99
@@ -113,6 +113,13 @@
        ${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/xmame
        ${INSTALL_DATA} ${WRKSRC}/doc/xmame-doc.txt ${PREFIX}/share/doc/xmame
 
+.if !empty(CC_VERSION:Mgcc-3*)
+SUBST_CLASSES=         pragma
+SUBST_STAGE.pragma=    pre-configure
+SUBST_FILES.pragma=    src/*.h
+SUBST_SED.pragma=      -e "s|\#pragma once||g"
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff -r 9828de4a9ef7 -r 09578e417145 emulators/xmame/options.mk
--- a/emulators/xmame/options.mk        Sat Sep 03 17:00:07 2005 +0000
+++ b/emulators/xmame/options.mk        Sat Sep 03 18:16:07 2005 +0000
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.2 2004/11/08 14:54:18 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2005/09/03 18:16:07 xtraeme Exp $
 #
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.xmame
-PKG_SUPPORTED_OPTIONS= sdl opengl esound
+PKG_OPTIONS_VAR=               PKG_OPTIONS.xmame
+PKG_OPTIONS_OPTIONAL_GROUPS=   video
+PKG_OPTIONS_GROUP.video=       sdl opengl
+PKG_SUPPORTED_OPTIONS=         esound
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msdl)
@@ -15,10 +18,6 @@
 MAME_DISP_METHOD?=     x11
 .endif
 
-.if !empty(PKG_OPTIONS:Msdl) && !empty(PKG_OPTIONS:Mopengl)
-PKG_SKIP_REASON+=      "Only one display method is allowed."
-.endif
-
 .if !empty(PKG_OPTIONS:Mesound)
 MAKE_FLAGS+=           SOUND_ESOUND=1
 .include "../../audio/esound/buildlink3.mk"
diff -r 9828de4a9ef7 -r 09578e417145 emulators/xmess/Makefile
--- a/emulators/xmess/Makefile  Sat Sep 03 17:00:07 2005 +0000
+++ b/emulators/xmess/Makefile  Sat Sep 03 18:16:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2005/08/25 19:54:49 kristerw Exp $
+# $NetBSD: Makefile,v 1.74 2005/09/03 18:16:07 xtraeme Exp $
 #
 
 DISTNAME=              xmame-0.99
@@ -108,6 +108,13 @@
        ${INSTALL_DATA_DIR} ${ROMPATH}
        ${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc
 
+.if !empty(CC_VERSION:Mgcc-3*)
+SUBST_CLASSES=         pragma
+SUBST_STAGE.pragma=    pre-configure
+SUBST_FILES.pragma=    src/*.h
+SUBST_SED.pragma=      -e "s|\#pragma once||g"
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff -r 9828de4a9ef7 -r 09578e417145 emulators/xmess/options.mk
--- a/emulators/xmess/options.mk        Sat Sep 03 17:00:07 2005 +0000
+++ b/emulators/xmess/options.mk        Sat Sep 03 18:16:07 2005 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.2 2004/11/08 14:55:23 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2005/09/03 18:16:07 xtraeme Exp $
 #
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.xmess
-PKG_SUPPORTED_OPTIONS= sdl opengl esound
+PKG_OPTIONS_VAR=               PKG_OPTIONS.xmess
+PKG_OPTIONS_OPTIONAL_GROUPS=   video
+PKG_OPTIONS_GROUP.video=       sdl opengl
+PKG_SUPPORTED_OPTIONS=         esound
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msdl)
@@ -15,10 +17,6 @@
 MAME_DISP_METHOD?=     x11
 .endif
 
-.if !empty(PKG_OPTIONS:Msdl) && !empty(PKG_OPTIONS:Mopengl)
-PKG_SKIP_REASON+=      "Only one display method is allowed."
-.endif
-
 .if !empty(PKG_OPTIONS:Mesound)
 MAKE_FLAGS+=           SOUND_ESOUND=1
 .include "../../audio/esound/buildlink3.mk"