Date: Thu, 29 Aug 2013 14:52:33 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325601 - in head/games/omega: . files Message-ID: <201308291452.r7TEqXRF084076@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <andy@icc.surw.chel.su> # $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 <bsd.port.options.mk> + 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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308291452.r7TEqXRF084076>