Attachment 150174 Details for Bug 195672 – diff which fix conflicts

[patch] diff which fix conflicts

bsdgames.diff (text/plain), 1.01 KB, created by Rusmir Dusko on 2014-12-04 07:26:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rusmir Dusko

Created: 2014-12-04 07:26:01 UTC

Size: 1.01 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 373860)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	bsdgames
> PORTVERSION=	3.8.2
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	games
> # Fetched from git://git.dragonflybsd.org/dragonfly.git, v${PORTVERSION}, /games
>@@ -75,6 +76,11 @@
> .endfor
> 
> post-install:
>+# avoid conflict with the games/bs
>+	${MV} ${STAGEDIR}${PREFIX}/bin/bs ${STAGEDIR}${PREFIX}/bin/bs-game
>+# avoid conflict with the shells/fish
>+	${MV} ${STAGEDIR}${PREFIX}/bin/fish ${STAGEDIR}${PREFIX}/bin/fish-game
>+
> 	@${TOUCH} ${STAGEDIR}/var/games/atc_score
> 	@${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \;
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 373860)
>+++ pkg-plist	(working copy)
>@@ -3,11 +3,11 @@
> bin/atc
> bin/backgammon
> bin/battlestar
>-bin/bs
>+bin/bs-game
> bin/canfield
> bin/cfscores
> bin/cribbage
>-bin/fish
>+bin/fish-game
> bin/hack
> bin/hangman
> bin/hunt

Actions: View | Diff

Attachments on bug 195672: 150174