Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Nov 2015 20:57:44 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401973 - head/games/rubix
Message-ID:  <201511192057.tAJKvioZ085697@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Nov 19 20:57:43 2015
New Revision: 401973
URL: https://svnweb.freebsd.org/changeset/ports/401973

Log:
  - Simplify
  - Fix compiler requirements
  - Fix build on mips, mips64

Modified:
  head/games/rubix/Makefile

Modified: head/games/rubix/Makefile
==============================================================================
--- head/games/rubix/Makefile	Thu Nov 19 20:57:35 2015	(r401972)
+++ head/games/rubix/Makefile	Thu Nov 19 20:57:43 2015	(r401973)
@@ -10,29 +10,30 @@ MASTER_SITES=	http://sed.free.fr/rubix/ 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another Rubik's cube game with a rather interesting interface
 
-USES=		gmake tar:bzip2
+USES=		compiler:nestedfct gmake tar:bzip2
 USE_XORG=	x11
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DENGLISH" \
 		XINC="-I${LOCALBASE}/include" XLIB="-L${LOCALBASE}/lib -lX11"
 ALL_TARGET=	${PORTNAME}
-USE_GCC=	any
 
-PORTDOCS=	${DOCFILES}
+PORTDOCS=	AUTHORS BUGS INSTALL README TODO
 PLIST_FILES=	bin/rubix
 
-DOCFILES=	AUTHORS BUGS INSTALL README TODO
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+.if (${ARCH} == mips || ${ARCH} == mips64) && ${COMPILER_TYPE} == gcc
+CFLAGS+=	-fnested-functions
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rubix ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ${DOCFILES}
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511192057.tAJKvioZ085697>