From owner-svn-ports-all@FreeBSD.ORG Thu Aug 29 14:52:34 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4D4D73D3; Thu, 29 Aug 2013 14:52:34 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1F2A32D7A; Thu, 29 Aug 2013 14:52:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7TEqXXY084081; Thu, 29 Aug 2013 14:52:33 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7TEqXRF084076; Thu, 29 Aug 2013 14:52:33 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308291452.r7TEqXRF084076@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 29 Aug 2013 14:52:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325601 - in head/games/omega: . files 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: Thu, 29 Aug 2013 14:52:34 -0000 Author: danfe Date: Thu Aug 29 14:52:33 2013 New Revision: 325601 URL: http://svnweb.freebsd.org/changeset/ports/325601 Log: - Try to unbreak parallel builds (-jX): their makefile has a rule with multiple outputs, which is triggered twice; use GNU make(1) ordered prerequisites to avoid this race - Install manual page relative to MANPREFIX, not PREFIX - While here, convert to OptionsNG (NOPORTDOCS -> PORT_OPTIONS:MDOCS) Reported by: marino Modified: head/games/omega/Makefile head/games/omega/files/patch-aa Modified: head/games/omega/Makefile ============================================================================== --- head/games/omega/Makefile Thu Aug 29 14:41:35 2013 (r325600) +++ head/games/omega/Makefile Thu Aug 29 14:52:33 2013 (r325601) @@ -1,4 +1,4 @@ -# Created by: Andrey Zakhvatov +# Created by: Andrey Zakhvatov # $FreeBSD$ PORTNAME= omega @@ -10,6 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Complex rogue-style game of dungeon exploration +USES= gmake # to allow -jX builds (rules with multiple outputs) WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= # empty CFLAGS+= -Wno-return-type @@ -18,11 +19,15 @@ MAN6= omega.6 MYPORTDOCS= buglist.txt docs/compile.all docs/omega.txt docs/readme.1st \ docs/readme3 docs/readme4 +OPTIONS_DEFINE= DOCS + +.include + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/omega ${PREFIX}/bin/omega-game @${CHOWN} root:games ${PREFIX}/bin/omega-game @${CHMOD} 2711 ${PREFIX}/bin/omega-game - ${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${MANPREFIX}/man/man6 @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR} @${RM} ${DATADIR}/license.old @@ -31,11 +36,9 @@ do-install: ${CP} ${DATADIR}/omega.hi ${DATADIR}/omegahi.bak @${CHMOD} 0460 ${DATADIR}/omegahi.bak @${CHOWN} -R root:games ${DATADIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} -.for file in ${MYPORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor + ${INSTALL_DATA} ${MYPORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif .include Modified: head/games/omega/files/patch-aa ============================================================================== --- head/games/omega/files/patch-aa Thu Aug 29 14:41:35 2013 (r325600) +++ head/games/omega/files/patch-aa Thu Aug 29 14:52:33 2013 (r325601) @@ -47,3 +47,15 @@ cp omega $(BINDIR) chmod 4711 $(BINDIR)/omega - cp lib/* $(LIBDIR) +@@ -71,9 +74,9 @@ + + $(OBJ): clrgen.h defs.h extern.h glob.h + +-clrgen.h clrgen.c: genclr.c minit.h defs.h +- $(MAKE) genclr ++clrgen.c: genclr + $(CPP) -DOMEGA_CLRGEN *.[ch] | ./genclr clrgen.c clrgen.h ++clrgen.h: | clrgen.c + + genclr: genclr.o + $(CC) $(LDFLAGS) genclr.o -o genclr