From owner-svn-ports-all@FreeBSD.ORG Fri Mar 15 16:10:11 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 67216CC1; Fri, 15 Mar 2013 16:10:11 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4B1CAAA1; Fri, 15 Mar 2013 16:10:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FGABTg076202; Fri, 15 Mar 2013 16:10:11 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2FGA7mj076173; Fri, 15 Mar 2013 16:10:07 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201303151610.r2FGA7mj076173@svn.freebsd.org> From: Jason Helfman Date: Fri, 15 Mar 2013 16:10:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314312 - in head/emulators: mupen64-base mupen64-dummyaudio mupen64-glide mupen64-gln64 mupen64-input mupen64-rsp mupen64-sdlaudio mupen64-sdlinput mupen64-softgfx mupen64-sound mupen6... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 16:10:11 -0000 Author: jgh Date: Fri Mar 15 16:10:06 2013 New Revision: 314312 URL: http://svnweb.freebsd.org/changeset/ports/314312 Log: - adopt optionsNG - trim historical headers Approved by: portmgr (miwi) Modified: head/emulators/mupen64-base/Makefile head/emulators/mupen64-dummyaudio/Makefile head/emulators/mupen64-glide/Makefile head/emulators/mupen64-gln64/Makefile head/emulators/mupen64-input/Makefile head/emulators/mupen64-rsp/Makefile head/emulators/mupen64-sdlaudio/Makefile head/emulators/mupen64-sdlinput/Makefile head/emulators/mupen64-softgfx/Makefile head/emulators/mupen64-sound/Makefile head/emulators/mupen64-tr64/Makefile head/emulators/mupen64plus-audio-sdl/Makefile head/emulators/mupen64plus-input-sdl/Makefile head/emulators/mupen64plus-plugins/Makefile head/emulators/mupen64plus-rsp-hle/Makefile head/emulators/mupen64plus-rsp-z64/Makefile head/emulators/mupen64plus-ui-console/Makefile head/emulators/mupen64plus-video-arachnoid/Makefile head/emulators/mupen64plus-video-glide64/Makefile head/emulators/mupen64plus-video-rice/Makefile head/emulators/mupen64plus-video-z64/Makefile Modified: head/emulators/mupen64-base/Makefile ============================================================================== --- head/emulators/mupen64-base/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-base/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -25,11 +25,12 @@ MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS} MUPEN64VERSION= 0.5 FIXFILES?= r4300/r4300.c memory/dma.c r4300/recomp.c r4300/x86/assemble.c -OPTIONS?= GTK2 "Use gtk20 instead of gtk12" off +OPTIONS_DEFINE= GTK2 +GTK2_DESC= Use gtk20 instead of gtk12 .include -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} HAVE_GTK2= true .endif Modified: head/emulators/mupen64-dummyaudio/Makefile ============================================================================== --- head/emulators/mupen64-dummyaudio/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-dummyaudio/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -10,6 +10,6 @@ PLUGIN_NAME= dummyaudio MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-glide/Makefile ============================================================================== --- head/emulators/mupen64-glide/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-glide/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -17,6 +17,6 @@ PLUGIN_NAME= Glide64 MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-gln64/Makefile ============================================================================== --- head/emulators/mupen64-gln64/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-gln64/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -16,6 +16,6 @@ PLUGIN_NAME= glN64 MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-input/Makefile ============================================================================== --- head/emulators/mupen64-input/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-input/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -13,6 +13,6 @@ PLUGIN_NAME= mupen64_input MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-rsp/Makefile ============================================================================== --- head/emulators/mupen64-rsp/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-rsp/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -10,6 +10,6 @@ PLUGIN_NAME= mupen64_hle_rsp_azimer MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-sdlaudio/Makefile ============================================================================== --- head/emulators/mupen64-sdlaudio/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-sdlaudio/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -14,6 +14,6 @@ PLUGIN_NAME= jttl_audio MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-sdlinput/Makefile ============================================================================== --- head/emulators/mupen64-sdlinput/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-sdlinput/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -16,6 +16,6 @@ PLUGIN_NAME= blight_input MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-softgfx/Makefile ============================================================================== --- head/emulators/mupen64-softgfx/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-softgfx/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64-softgfx -# Date created: 2007-10-08 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTREVISION= 1 PKGNAMESUFFIX= -softgfx @@ -18,6 +14,6 @@ PLUGIN_NAME= mupen64_soft_gfx MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-sound/Makefile ============================================================================== --- head/emulators/mupen64-sound/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-sound/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -10,6 +10,6 @@ PLUGIN_NAME= mupen64_audio MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64-tr64/Makefile ============================================================================== --- head/emulators/mupen64-tr64/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64-tr64/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64-tr64 -# Date created: 2007-10-09 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTVERSION= 0.7.8 PORTREVISION= 3 @@ -20,6 +16,6 @@ PLUGIN_NAME= tr64gl MASTERDIR= ${.CURDIR}/../mupen64-base -OPTIONS= # +OPTIONS_OVERRIDE= GTK2 .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-audio-sdl/Makefile ============================================================================== --- head/emulators/mupen64plus-audio-sdl/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-audio-sdl/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-audio-sdl -# Date created: 2008-05-16 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PKGNAMESUFFIX= -audio-sdl @@ -13,6 +9,6 @@ USE_SDL= sdl MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTIONS_DEFINE= # .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-input-sdl/Makefile ============================================================================== --- head/emulators/mupen64plus-input-sdl/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-input-sdl/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-input-sdl -# Date created: 2008-05-16 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PKGNAMESUFFIX= -input-sdl @@ -11,6 +7,6 @@ COMMENT= Input plugin for Mupen64plus MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTION_DEFINE= # .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-plugins/Makefile ============================================================================== --- head/emulators/mupen64plus-plugins/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-plugins/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-plugins -# Date created: 2011-12-20 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= mupen64plus PORTVERSION= 1.99.4 @@ -16,28 +12,31 @@ EXTRACT_ONLY= # empty MAINTAINER?= acm@FreeBSD.org COMMENT= Third party plugins for Mupen64plus -OPTIONS= VIDEO_ARACHNOID "Arachnoid video plugin" on \ - VIDEO_GLIDE64 "Glide64 video plugin" on \ - VIDEO_Z64 "z64 video plugin" on \ - RSP_Z64 "z64 RSP plugin" on +OPTIONS_DEFINE= VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 +VIDEO_ARACHNOID_DESC= Arachnoid video plugin +VIDEO_GLIDE64_DESC= Glide64 video plugin +VIDEO_Z64_DESC= z64 video plugin +RSP_Z64_DESC= z64 RSP plugin + +OPTIONS_DEFAULT= VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 .include - + # Graphics plugins -.if defined(WITH_VIDEO_ARACHNOID) +.if ${PORT_OPTIONS:MVIDEO_ARACHNOID} RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-arachnoid.so:${PORTSDIR}/emulators/mupen64plus-video-arachnoid .endif -.if defined(WITH_VIDEO_GLIDE64) +.if ${PORT_OPTIONS:MVIDEO_GLIDE64} RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-glide64.so:${PORTSDIR}/emulators/mupen64plus-video-glide64 .endif -.if defined(WITH_VIDEO_Z64) +.if ${PORT_OPTIONS:MVIDEO_Z64} RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-z64.so:${PORTSDIR}/emulators/mupen64plus-video-z64 .endif # RSP plugins -.if defined(WITH_RSP_Z64) +.if ${PORT_OPTIONS:MRSP_Z64} RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-z64.so:${PORTSDIR}/emulators/mupen64plus-rsp-z64 .endif Modified: head/emulators/mupen64plus-rsp-hle/Makefile ============================================================================== --- head/emulators/mupen64plus-rsp-hle/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-rsp-hle/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-rsp-hle -# Date created: 2008-05-16 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PKGNAMESUFFIX= -rsp-hle @@ -11,6 +7,6 @@ COMMENT= RSP plugin for Mupen64plus MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTIONS_DEFINE= # .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-rsp-z64/Makefile ============================================================================== --- head/emulators/mupen64plus-rsp-z64/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-rsp-z64/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-rsp-z64 -# Date created: 2011-12-20 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTREVISION= 2 PKGNAMESUFFIX= -rsp-z64 @@ -18,7 +14,7 @@ USE_SDL= # MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib Modified: head/emulators/mupen64plus-ui-console/Makefile ============================================================================== --- head/emulators/mupen64plus-ui-console/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-ui-console/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-ui-console -# Date created: 2010-11-28 -# Whom: Alonso Cardenas Marquez -# +# Created by: Alonso Cardenas Marquez # $FreeBSD$ -# PKGNAMESUFFIX= -ui-console @@ -11,6 +7,6 @@ COMMENT= UI for Mupen64plus MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTIONS_DEFINE= # .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-video-arachnoid/Makefile ============================================================================== --- head/emulators/mupen64plus-video-arachnoid/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-video-arachnoid/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-video-arachnoid -# Date created: 2011-12-20 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTREVISION= 2 PKGNAMESUFFIX= -video-arachnoid @@ -18,7 +14,7 @@ USE_SDL= # MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib Modified: head/emulators/mupen64plus-video-glide64/Makefile ============================================================================== --- head/emulators/mupen64plus-video-glide64/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-video-glide64/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-video-glide64 -# Date created: 2011-12-20 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTREVISION= 2 PKGNAMESUFFIX= -video-glide64 @@ -18,7 +14,7 @@ USE_SDL= yes MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib Modified: head/emulators/mupen64plus-video-rice/Makefile ============================================================================== --- head/emulators/mupen64plus-video-rice/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-video-rice/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-video-rice -# Date created: 2008-05-16 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PKGNAMESUFFIX= -video-rice @@ -13,6 +9,6 @@ USE_GL= yes MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTIONS_DEFINE= # .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-video-z64/Makefile ============================================================================== --- head/emulators/mupen64plus-video-z64/Makefile Fri Mar 15 16:03:04 2013 (r314311) +++ head/emulators/mupen64plus-video-z64/Makefile Fri Mar 15 16:10:06 2013 (r314312) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mupen64plus-video-z64 -# Date created: 2011-12-20 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTREVISION= 2 PKGNAMESUFFIX= -video-z64 @@ -18,7 +14,7 @@ USE_SDL= yes MASTERDIR= ${.CURDIR}/../mupen64plus-core -OPTIONS= # +OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib