Attachment 222180 Details for Bug 252941 – NO_WERROR | bsd.port.post | REINPLACE | .info

[patch] NO_WERROR | bsd.port.post | REINPLACE | .info

bsdgames-NO_WERROR--tabs-replace-info.patch (text/plain), 2.00 KB, created by Joachim Werner on 2021-02-05 14:11:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joachim Werner

Created: 2021-02-05 14:11:27 UTC

Size: 2.00 KB

patch

obsolete

>Index: games/bsdgames/Makefile
>===================================================================
>--- games/bsdgames/Makefile	(Revision 564076)
>+++ games/bsdgames/Makefile	(Arbeitskopie)
>@@ -20,42 +20,17 @@
> CONFLICTS=	hangman-[0-9]*
> 
> CFLAGS+=	-fcommon
>-MAKE_ENV=	NO_WERROR=1
>+MAKE_ENV=	WITHOUT_WERROR=yes
> MAKE_ARGS=	BINGRP=${BINGRP}
> 
>-# contain /usr/share/games
>-SHAREPATH_FILES=atc/atc.6 \
>-		atc/pathnames.h \
>-		boggle/boggle/bog.h \
>-		boggle/boggle/boggle.6 \
>-		cribbage/cribbage.6 \
>-		cribbage/pathnames.h \
>-		fish/pathnames.h \
>-		larn/pathnames.h \
>-		quiz/datfiles/index \
>-		quiz/pathnames.h \
>-		quiz/quiz.6 \
>-		wump/pathnames.h
>+INFO=		wump
>+INFO_PATH=	share/games
> 
>-# contain /usr/games/*
>-GAMESPATH_FILES=backgammon/backgammon/backgammon.6 \
>-		backgammon/common_source/init.c \
>-		canfield/canfield/canfield.6 \
>-		cribbage/cribbage.6 \
>-		hunt/hunt/hunt.6 \
>-		hunt/huntd/huntd.6 \
>-		phantasia/pathnames.h \
>-		wargames/wargames.sh
>+.include <bsd.port.pre.mk>
> 
>-post-patch:
>-	@for f in ${SHAREPATH_FILES}; do \
>-		${REINPLACE_CMD} -e 's|/usr/share/games|${PREFIX}/share/games|g' \
>-			${WRKSRC}/$${f}; \
>-	done
>-	@for f in ${GAMESPATH_FILES}; do \
>-		${REINPLACE_CMD} -e 's|/usr/games|${PREFIX}/bin|g' \
>-			${WRKSRC}/$${f}; \
>-	done
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300134
>+MAKE_ARGS+=	NO_WERROR=yes
>+.endif
> 
> pre-install:
> .for d in atc larn quiz.db boggle
>@@ -75,4 +50,4 @@
> 	@${TOUCH} ${STAGEDIR}/var/games/atc_score
> 	@${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \;
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: games/bsdgames/pkg-plist
>===================================================================
>--- games/bsdgames/pkg-plist	(Revision 564076)
>+++ games/bsdgames/pkg-plist	(Arbeitskopie)
>@@ -118,7 +118,6 @@
> share/games/quiz.db/state
> share/games/quiz.db/trek
> share/games/quiz.db/ucc
>-share/games/wump.info
> @sample(,games,0664) /var/games/atc_score.sample
> @sample(,games,0664) /var/games/battlestar.log.sample
> @sample(,games,0664) /var/games/cfscores.sample

Flags:

jockl: maintainer-approval+

Actions: View | Diff

Attachments on bug 252941: 221836 | 221871 | 221888 | 222180