Attachment 146334 Details for Bug 193036 – games_xjewel.diff

[patch] games_xjewel.diff

games_xjewel.diff (text/plain), 4.25 KB, created by tkato432 on 2014-08-26 18:37:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

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

Size: 4.25 KB

patch

obsolete

>diff -urN /usr/ports/games/xjewel/Makefile games/xjewel/Makefile
>--- /usr/ports/games/xjewel/Makefile	2014-06-21 17:43:49.000000000 +0900
>+++ games/xjewel/Makefile	2014-08-27 00:00:00.000000000 +0900
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	xjewel
> PORTVERSION=	1.6
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	games
> MASTER_SITES=	XCONTRIB/../R5contrib
> EXTRACT_SUFX=	.tar.z
>@@ -14,22 +14,22 @@
> BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
> 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
> 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
>+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
> 
> USES=		imake
> USE_XORG=	x11 xext
> 
>-MAN6=		xjewel.6
>+SUB_FILES=	pkg-install pkg-deinstall
>+SUB_LIST=	FONTSDIR="${FONTSDIR}"
> 
>-FONTSDIR=	lib/X11/fonts/local
>-PLIST_SUB=	FONTSDIR=${FONTSDIR}
>+PLIST_SUB=	FONTSDIR="${FONTSDIR}"
>+
>+DESKTOP_ENTRIES="XJewel" "" "" "${PORTNAME}" "" ""
> 
>-NO_STAGE=	yes
>-pre-install:
>-	@${SETENV} PKG_PREFIX=${PREFIX} \
>-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
>+FONTSDIR=	lib/X11/fonts/local
> 
> post-install:
>-	${INSTALL_DATA} ${WRKSRC}/bitmaps/seven_seg.pcf.gz ${PREFIX}/${FONTSDIR}
>-	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
>+	(cd ${WRKSRC}/bitmaps && ${INSTALL_DATA} seven_seg.pcf.gz \
>+		${STAGEDIR}${PREFIX}/${FONTSDIR})
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/xjewel/files/patch-aa games/xjewel/files/patch-aa
>--- /usr/ports/games/xjewel/files/patch-aa	2014-06-21 17:43:49.000000000 +0900
>+++ games/xjewel/files/patch-aa	2014-08-27 00:00:00.000000000 +0900
>@@ -41,6 +41,8 @@
>  all:: $(CFONT)
>  
>  install::
>+-	touch  $(HSCORE_FILE)
>+-	chmod a+w $(HSCORE_FILE)
> +	MakeDir($(DESTDIR)$(HSCORE_DIR))
>- 	touch  $(HSCORE_FILE)
>- 	chmod a+w $(HSCORE_FILE)
>++	touch  $(DESTDIR)$(HSCORE_FILE)
>++	chmod a+w $(DESTDIR)$(HSCORE_FILE)
>diff -urN /usr/ports/games/xjewel/files/pkg-deinstall.in games/xjewel/files/pkg-deinstall.in
>--- /usr/ports/games/xjewel/files/pkg-deinstall.in	1970-01-01 09:00:00.000000000 +0900
>+++ games/xjewel/files/pkg-deinstall.in	2014-08-27 00:00:00.000000000 +0900
>@@ -0,0 +1,13 @@
>+#!/bin/sh
>+
>+if [ "x$2" = "xPOST-DEINSTALL" ]; then
>+	cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
>+	${PKG_PREFIX}/bin/xset fp rehash ||
>+	(
>+	 echo "**********************************************************"
>+	 echo "You should restart X server or do 'xset fp rehash' command"
>+	 echo "to enable this update."
>+	 echo "**********************************************************"
>+	)
>+	[ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
>+fi
>diff -urN /usr/ports/games/xjewel/files/pkg-install.in games/xjewel/files/pkg-install.in
>--- /usr/ports/games/xjewel/files/pkg-install.in	1970-01-01 09:00:00.000000000 +0900
>+++ games/xjewel/files/pkg-install.in	2014-08-27 00:00:00.000000000 +0900
>@@ -0,0 +1,12 @@
>+#!/bin/sh
>+
>+if [ "x$2" = "xPOST-INSTALL" ]; then
>+	cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
>+	${PKG_PREFIX}/bin/xset fp rehash ||
>+	(
>+	 echo "**********************************************************"
>+	 echo "You should restart X server or do 'xset fp rehash' command"
>+	 echo "to enable this update."
>+	 echo "**********************************************************"
>+	)
>+fi
>diff -urN /usr/ports/games/xjewel/pkg-plist games/xjewel/pkg-plist
>--- /usr/ports/games/xjewel/pkg-plist	2014-06-21 17:43:49.000000000 +0900
>+++ games/xjewel/pkg-plist	2014-08-27 00:00:00.000000000 +0900
>@@ -1,7 +1,5 @@
> bin/xjewel
>+man/man6/xjewel.6.gz
> lib/X11/xjewel/xjewel.scores
> %%FONTSDIR%%/seven_seg.pcf.gz
>-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
>-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
>-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
> @dirrm lib/X11/xjewel
>diff -urN /usr/ports/games/xjewel/pkg-req games/xjewel/pkg-req
>--- /usr/ports/games/xjewel/pkg-req	2014-06-21 17:43:49.000000000 +0900
>+++ games/xjewel/pkg-req	1970-01-01 09:00:00.000000000 +0900
>@@ -1,15 +0,0 @@
>-#!/bin/sh
>-
>-if [ "x$1" = "x" ]; then
>-	exit 1;
>-fi
>-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
>-	exit 1;
>-fi
>-
>-echo "**********************************************************"
>-echo "You should restart X server or do 'xset fp rehash' command"
>-echo "to enable this update."
>-echo "**********************************************************"
>-
>-exit 0;

Actions: View | Diff

Attachments on bug 193036: 146334