From owner-svn-ports-all@freebsd.org  Thu Nov 19 20:57:45 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 243FBA3394A;
 Thu, 19 Nov 2015 20:57:45 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E72621DF7;
 Thu, 19 Nov 2015 20:57:44 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJKviJ8085698;
 Thu, 19 Nov 2015 20:57:44 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJKvioZ085697;
 Thu, 19 Nov 2015 20:57:44 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201511192057.tAJKvioZ085697@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 19 Nov 2015 20:57:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401973 - head/games/rubix
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Nov 2015 20:57:45 -0000

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>