svn commit: r378757 - head/emulators/xsystem35

[Jan Beich]

Author: jbeich
Date: Tue Feb 10 02:15:08 2015
New Revision: 378757
URL: https://svnweb.freebsd.org/changeset/ports/378757
QAT: https://qat.redports.org/buildarchive/r378757/

Log:
  - Convert to option helpers
  - Don't pretend MMX code can be used on amd64 [1]
  - Lazy check if MMX is available on i386 [1]
  
  [1] No changes in build behavior. --enable-mmx is a nop on non-i386 while
      i386 still passes --disable-mmx by default unless CPUTYPE is set.
  
  Approved by:	mentors (implicit)

Modified:
  head/emulators/xsystem35/Makefile

Modified: head/emulators/xsystem35/Makefile
==============================================================================
--- head/emulators/xsystem35/Makefile	Mon Feb  9 22:39:10 2015	(r378756)
+++ head/emulators/xsystem35/Makefile	Tue Feb 10 02:15:08 2015	(r378757)
@@ -17,6 +17,13 @@ LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/au
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 OPTIONS_DEFINE=	ESOUND DOCS EXAMPLES
+OPTIONS_DEFINE_i386=	MMX
+OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MMMX}
+
+ESOUND_USE=	GNOME=esound
+ESOUND_CONFIGURE_ON=--enable-audio=oss,esd --with-default-output=esd
+MMX_BUILD_DEPENDS=nasm:${PORTSDIR}/devel/nasm
+MMX_CONFIGURE_ENABLE=mmx
 
 USES=		gettext gmake libtool shebangfix
 SHEBANG_FILES=	contrib/instgame
@@ -27,6 +34,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-cachesize=20 \
 		--disable-static \
+		--enable-audio=oss \
+		--with-default-output=oss \
 		--enable-midi=seq,extp,raw \
 		--enable-cdrom=bsd,mp3
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -38,22 +47,6 @@ SUB_FILES=	pkg-message
 
 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--enable-audio=oss,esd --with-default-output=esd
-.else
-CONFIGURE_ARGS+=	--enable-audio=oss --with-default-output=oss
-.endif
-
-.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx}
-CONFIGURE_ARGS+=	--enable-mmx
-BUILD_DEPENDS+=		nasm:${PORTSDIR}/devel/nasm
-.else
-CONFIGURE_ARGS+=	--disable-mmx
-.endif
-
 post-patch:
 	@${CP} ${WRKSRC}/INSTALL ${WRKSRC}/doc/INSTALL
 	@${REINPLACE_CMD} '/-lxpg4/d' ${WRKSRC}/configure