svn commit: r466375 - in head/emulators: mame mess

[Jan Beich]

Danilo Egea Gondolfo <danilo at FreeBSD.org> writes:

>  .if ${OSVERSION} < 1100055
> -USE_GCC=	6
> +BUILD_DEPENDS+=	clang50:devel/llvm50
> +CC=		clang50
> +CXX=		clang++50
>  .endif

This is identical to defining USES=compiler:c++14-lang.

> +USES=		compiler:c11 gmake jpeg pkgconfig python:2.7,build shebangfix
>  USE_GITHUB=	yes
>  GH_ACCOUNT=	mamedev
>  GH_PROJECT=	mame				# explicit (master port)
> @@ -28,10 +30,11 @@ OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
>  .include <bsd.port.options.mk>
[...]
>  
> -USES=		compiler:c11 gmake jpeg pkgconfig python:2.7,build shebangfix
>  SHEBANG_FILES=	src/devices/cpu/m6502/m6502make.py \
>  		src/devices/cpu/m6809/m6809make.py \
>  		src/devices/cpu/mcs96/mcs96make.py \

USE_GITHUB often has its own block before USES. Maybe drop duplicate
bsd.port.options.mk include and group USES, USE_*, options.

Index: emulators/mame/Makefile
===================================================================
--- emulators/mame/Makefile	(revision 466391)
+++ emulators/mame/Makefile	(working copy)
@@ -19,30 +19,20 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf
 
-USES=		compiler:c11 gmake jpeg pkgconfig python:2.7,build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	mamedev
 GH_PROJECT=	mame				# explicit (master port)
 GH_TAGNAME=	mame${PORTVERSION:S/.//}
 
-OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
-
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 1100055
-BUILD_DEPENDS+=	clang50:devel/llvm50
-CC=		clang50
-CXX=		clang++50
-.endif
-
+USES=		compiler:c++14-lang gmake jpeg pkgconfig python:2.7,build shebangfix
+USE_GL=		gl
+USE_SDL=	sdl2 ttf2
+USE_QT5=	buildtools core gui qmake_build widgets
+USE_XORG=	x11 xext xi xinerama xrender
 SHEBANG_FILES=	src/devices/cpu/m6502/m6502make.py \
 		src/devices/cpu/m6809/m6809make.py \
 		src/devices/cpu/mcs96/mcs96make.py \
 		src/devices/cpu/tms57002/tmsmake.py
-USE_XORG=	x11 xext xi xinerama xrender
-USE_GL=		gl
-USE_SDL=	sdl2 ttf2
-USE_QT5=	buildtools core gui qmake_build widgets
 MTARGET?=	mame
 MSUBTARGET?=	mame
 CFLAGS+=	-I${LOCALBASE}/include
@@ -59,6 +49,8 @@ PORTEXAMPLES=	${MSUBTARGET}.ini
 SUB_FILES=	pkg-message target.ini
 SUB_LIST=	MTARGET=${MTARGET} MSUBTARGET=${MSUBTARGET}
 
+OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
+
 DEBUG_MAKE_ENV=		DEBUG=1
 
 .include <bsd.port.options.mk>