sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Try to unbreak parallel builds (-jX): their makefile has a rule with

Browse source 
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
This commit is contained in:
Alexey Dokuchaev 2013-08-29 14:52:33 +00:00
parent c13fdab32e
commit df286138e9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=325601
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
games/omega/Makefile
View file

@ -1,4 +1,4 @@
# Created by: Andrey Zakhvatov # Created by: Andrey Zakhvatov <andy@icc.surw.chel.su>
# $FreeBSD$ # $FreeBSD$
PORTNAME= omega PORTNAME= omega
@ -10,6 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Complex rogue-style game of dungeon exploration COMMENT= Complex rogue-style game of dungeon exploration
USES= gmake # to allow -jX builds (rules with multiple outputs)
WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= # empty ALL_TARGET= # empty
CFLAGS+= -Wno-return-type CFLAGS+= -Wno-return-type
@ -18,11 +19,15 @@ MAN6= omega.6
MYPORTDOCS= buglist.txt docs/compile.all docs/omega.txt docs/readme.1st \ MYPORTDOCS= buglist.txt docs/compile.all docs/omega.txt docs/readme.1st \
docs/readme3 docs/readme4 docs/readme3 docs/readme4
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/omega ${PREFIX}/bin/omega-game ${INSTALL_PROGRAM} ${WRKSRC}/omega ${PREFIX}/bin/omega-game
@${CHOWN} root:games ${PREFIX}/bin/omega-game @${CHOWN} root:games ${PREFIX}/bin/omega-game
@${CHMOD} 2711 ${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} @${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}
@${RM} ${DATADIR}/license.old @${RM} ${DATADIR}/license.old
@ -31,11 +36,9 @@ do-install:
${CP} ${DATADIR}/omega.hi ${DATADIR}/omegahi.bak ${CP} ${DATADIR}/omega.hi ${DATADIR}/omegahi.bak
@${CHMOD} 0460 ${DATADIR}/omegahi.bak @${CHMOD} 0460 ${DATADIR}/omegahi.bak
@${CHOWN} -R root:games ${DATADIR} @${CHOWN} -R root:games ${DATADIR}
.if !defined(NOPORTDOCS) .if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}
.for file in ${MYPORTDOCS} ${INSTALL_DATA} ${MYPORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>

12
games/omega/files/patch-aa
View file

@ -47,3 +47,15 @@
cp omega $(BINDIR) cp omega $(BINDIR)
chmod 4711 $(BINDIR)/omega chmod 4711 $(BINDIR)/omega
- cp lib/* $(LIBDIR) - 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