diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-08-29 14:52:33 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-08-29 14:52:33 +0000 |
| commit | df286138e91ba031330ebdf325b268e778d4bedc (patch) | |
| tree | 432b9d5716ac8d92815ddadaaf68243088336e95 /games/omega | |
| parent | c13fdab32eab18f807811e3ebedf90a84020037b (diff) | |
| download | ports-df286138e91ba031330ebdf325b268e778d4bedc.tar.gz ports-df286138e91ba031330ebdf325b268e778d4bedc.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=325601
Diffstat (limited to 'games/omega')
| -rw-r--r-- | games/omega/Makefile | 15 | ||||
| -rw-r--r-- | games/omega/files/patch-aa | 12 |
2 files changed, 21 insertions, 6 deletions
diff --git a/games/omega/Makefile b/games/omega/Makefile index 5aa4875e4311..5124ceb0b5ea 100644 --- a/games/omega/Makefile +++ b/games/omega/Makefile @@ -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> diff --git a/games/omega/files/patch-aa b/games/omega/files/patch-aa index 424d092c9b45..b95523a850f8 100644 --- a/games/omega/files/patch-aa +++ b/games/omega/files/patch-aa @@ -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 |