Attachment 146335 Details for Bug 193037 – games_xmris.diff

[patch] games_xmris.diff

games_xmris.diff (text/plain), 3.05 KB, created by tkato432 on 2014-08-26 18:37:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-08-26 18:37:34 UTC

Size: 3.05 KB

patch

obsolete

>diff -urN /usr/ports/games/xmris/Makefile games/xmris/Makefile
>--- /usr/ports/games/xmris/Makefile	2014-07-30 07:29:53.000000000 +0900
>+++ games/xmris/Makefile	2014-08-27 00:00:00.000000000 +0900
>@@ -3,10 +3,9 @@
> 
> PORTNAME=	xmris
> PORTVERSION=	4.04
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	games
>-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
>-MASTER_SITE_SUBDIR=	games
>+MASTER_SITES=	XCONTRIB/games
> DISTNAME=	${PORTNAME}.${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -14,17 +13,31 @@
> 
> USES=		imake tar:tgz
> USE_XORG=	x11 xext xaw xmu xt sm ice
>-MAKE_FLAGS=	XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
>+MAKE_ARGS=	XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults
> ALL_TARGET=	xmris xmred
>-MAN6=		xmred.6 xmris.6 xmsit.6
> 
>-NO_STAGE=	yes
>-post-configure:
>-	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/MANSUFFIX = 1/MANSUFFIX = 6/' \
>-	  -e 's/OWNER = -o games/OWNER = -g games/' \
>-	  -e 's/^INSTMRISFLAGS.*/INSTMRISFLAGS = \$(OWNER) -m 2555/' Makefile
>+DESKTOP_ENTRIES="XMRis" "" "" "${PORTNAME}" "" ""
> 
>-post-install:
>-	@${CHMOD} g+w ${LOCALBASE}/lib/X11/xmris
>+post-build:
>+	@${LN} -sf Xmris-ad.src ${WRKSRC}/Xmris
>+
>+do-install:
>+.for i in xmred xmris
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} \
>+		${STAGEDIR}${PREFIX}/bin)
>+.endfor
>+	@${LN} -sf xmris ${STAGEDIR}${PREFIX}/bin/xmsit
>+.for i in xmred xmris
>+	(cd ${WRKSRC} && ${INSTALL_MAN} ${i}.man \
>+		${STAGEDIR}${MANPREFIX}/man/man6/${i}.6)
>+.endfor
>+	@${LN} -sf xmris.6 ${STAGEDIR}${MANPREFIX}/man/man6/xmsit.6
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
>+	(cd ${WRKSRC} && ${INSTALL_DATA} Xmris \
>+		${STAGEDIR}${PREFIX}/lib/X11/app-defaults)
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/xmris
>+	(cd ${WRKSRC} && ${INSTALL_DATA} *.gdn \
>+		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/xmris)
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xmris
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/xmris/pkg-plist games/xmris/pkg-plist
>--- /usr/ports/games/xmris/pkg-plist	2014-06-21 17:43:46.000000000 +0900
>+++ games/xmris/pkg-plist	2014-08-27 00:00:00.000000000 +0900
>@@ -1,12 +1,18 @@
>+@group games
>+@mode 2555
> bin/xmris
> bin/xmsit
> bin/xmred
>-@exec mkdir -p %D/lib/X11/xmris
>-@exec chmod  775 %D/lib/X11/xmris
>-@unexec rm -rf %D/lib/X11/xmris
>+@mode
>+@group
>+man/man6/xmred.6.gz
>+man/man6/xmris.6.gz
>+man/man6/xmsit.6.gz
> lib/X11/app-defaults/Xmris
> lib/X11/app-defaults/xmris/alphabet.gdn
> lib/X11/app-defaults/xmris/digits.gdn
> lib/X11/app-defaults/xmris/puzzle.gdn
> lib/X11/app-defaults/xmris/xmred.gdn
>+@exec install -d -g games -m 775 %D/lib/X11/xmris
>+@dirrmtry lib/X11/xmris
> @dirrm lib/X11/app-defaults/xmris
>diff -urN /usr/ports/games/xmris/scripts/pre-configure games/xmris/scripts/pre-configure
>--- /usr/ports/games/xmris/scripts/pre-configure	2014-06-21 17:43:46.000000000 +0900
>+++ games/xmris/scripts/pre-configure	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>-#!/bin/sh
>-
>-mv ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
>-
>-echo "LOCAL=$PREFIX" >${WRKSRC}/Imakefile || exit 1;
>-
>-# remove extra space after \ in continuation lines
>-sed -e 's/\\ $/\\/' <${WRKSRC}/Imakefile.orig >>${WRKSRC}/Imakefile || exit 1
>-
>-exit 0

Actions: View | Diff

Attachments on bug 193037: 146335