Attachment 34471 Details for Bug 56005 – file.diff

[patch] file.diff

file.diff (text/plain), 6.14 KB, created by tkato on 2003-08-26 16:10:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-08-26 16:10:23 UTC

Size: 6.14 KB

patch

obsolete

>diff -urN /usr/ports/games/xscrabble/Makefile games/xscrabble/Makefile
>--- /usr/ports/games/xscrabble/Makefile	Wed Jul 23 06:43:37 2003
>+++ games/xscrabble/Makefile	Tue Aug 26 00:42:26 2003
>@@ -6,22 +6,42 @@
> #
> 
> PORTNAME=	xscrabble
>-PORTVERSION=	1.0
>+PORTVERSION=	2.10
> CATEGORIES=	games
>-MASTER_SITES=	http://ahoyhoy.org/devel/misc/ \
>-		${MASTER_SITE_LOCAL}
>-MASTER_SITE_SUBDIR=	mph
>-DISTNAME=	${PORTNAME}
>+MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/educational_games/
>+DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz ${PORTNAME}_en.tgz
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	X version of the popular board game
> 
>-USE_REINPLACE=		yes
>-USE_IMAKE=		yes
>-USE_XPM=		yes
>+USE_IMAKE=	yes
>+USE_XPM=	yes
>+USE_REINPLACE=	yes
> NO_INSTALL_MANPAGES=	yes
> 
>+XSCRABBLEDIR=	${PREFIX}/lib/X11/xscrabble
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/XScrabble.ad
>+	@${ECHO_CMD} '#define VERSION ${PORTVERSION:S/.//g}' \
>+		> ${WRKSRC}/src/config.h
>+	@${ECHO_CMD} '#define DICT_FILE "${XSCRABBLEDIR}/OSPD3.gz"' \
>+		>> ${WRKSRC}/src/config.h
>+	@${ECHO_CMD} '#define SCORE_FILE "${XSCRABBLEDIR}/scrabble_scores"' \
>+		>> ${WRKSRC}/src/config.h
>+	@${ECHO_CMD} '#define RULES_FILE "${XSCRABBLEDIR}/scrabble_rules"' \
>+		>> ${WRKSRC}/src/config.h
>+	@${SED} -e 's|/usr/games/lib/scrabble/en|${XSCRABBLEDIR}|g' \
>+		${WRKSRC}/../xscrabble_en/app-defaults/XScrabble_en \
>+		> ${WRKSRC}/XScrabble
>+	@${REINPLACE_CMD} -e 's|= -O|=$$(CDEBUGFLAGS)|g' ${WRKSRC}/Imakefile
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrab ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrabble ${PREFIX}/bin
>+	${INSTALL_DATA} ${WRKSRC}/XScrabble ${PREFIX}/lib/X11/app-defaults
>+	@${MKDIR} ${XSCRABBLEDIR}
>+.for file in OSPD3.gz duplicate scrabble_rules scrabble_scores
>+	${INSTALL_DATA} ${WRKSRC}/../xscrabble_en/lib/${file} ${XSCRABBLEDIR}
>+.endfor
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/xscrabble/distinfo games/xscrabble/distinfo
>--- /usr/ports/games/xscrabble/distinfo	Tue Sep 18 20:33:24 2001
>+++ games/xscrabble/distinfo	Tue Aug 26 00:34:13 2003
>@@ -1 +1,2 @@
>-MD5 (xscrabble.tar.gz) = 7bd0142d6131197cde7107a9e11f556a
>+MD5 (xscrabble-2.10.tgz) = 376531c836b62f81d2ac2281495b5030
>+MD5 (xscrabble_en.tgz) = 791244c62c92fc2dfd1c524f1a25eb9f
>diff -urN /usr/ports/games/xscrabble/files/patch-aa games/xscrabble/files/patch-aa
>--- /usr/ports/games/xscrabble/files/patch-aa	Mon Jan 24 15:01:01 2000
>+++ games/xscrabble/files/patch-aa	Thu Jan  1 09:00:00 1970
>@@ -1,20 +0,0 @@
>---- Imakefile.orig	Tue Mar 11 14:56:29 1997
>-+++ Imakefile	Tue Jan 18 00:00:00 2000
>-@@ -1,5 +1,5 @@
>- 
>--#define PassCDebugFlags 'CDEBUGFLAGS= -O'
>-+#define PassCDebugFlags 'CDEBUGFLAGS= $(CDEBUGFLAGS)'
>- #define IHaveSubdirs
>- 
>- SUBDIRS = Xc src
>-@@ -9,3 +9,10 @@
>- MakeLintLibSubdirs($(SUBDIRS))
>- MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
>- 
>-+InstallNamedNonExec(XScrabble.ad,XScrabble,$(LIBDIR)/app-defaults)
>-+InstallNonExecFile(OSPD3.gz,$(LIBDIR)/xscrabble)
>-+InstallNonExecFile(scrabble_permutations,$(LIBDIR)/xscrabble)
>-+InstallNonExecFile(xscrabble.scores,$(LIBDIR)/xscrabble)
>-+
>-+install::
>-+	@chmod a+rw $(LIBDIR)/xscrabble/xscrabble.scores
>diff -urN /usr/ports/games/xscrabble/files/patch-ab games/xscrabble/files/patch-ab
>--- /usr/ports/games/xscrabble/files/patch-ab	Mon Jan 24 15:01:01 2000
>+++ games/xscrabble/files/patch-ab	Thu Jan  1 09:00:00 1970
>@@ -1,15 +0,0 @@
>---- XScrabble.ad.orig	Tue Mar 11 06:57:16 1997
>-+++ XScrabble.ad	Tue Jan 18 00:00:00 1997
>-@@ -1,9 +1,9 @@
>- ! *** XScrabble resource file ***
>- 
>- ! edit the following three pathnames as required:
>--XScrabble.dictfile:		/usr/local/lib/OSPD3
>--XScrabble.permfile:		/usr/local/lib/scrabble_permutations
>--XScrabble.scorefile:		/usr/local/lib/xscrabble.scores
>-+XScrabble.dictfile:		%%PREFIX%%/lib/X11/xscrabble/OSPD3
>-+XScrabble.permfile:		%%PREFIX%%/lib/X11/xscrabble/scrabble_permutations
>-+XScrabble.scorefile:		%%PREFIX%%/lib/X11/xscrabble/xscrabble.scores
>- 
>- ! version string, to make sure correct resource file is loaded
>- XScrabble*version:		100
>diff -urN /usr/ports/games/xscrabble/files/patch-ac games/xscrabble/files/patch-ac
>--- /usr/ports/games/xscrabble/files/patch-ac	Mon Aug  4 20:45:49 1997
>+++ games/xscrabble/files/patch-ac	Thu Jan  1 09:00:00 1970
>@@ -1,13 +0,0 @@
>---- Xc/Imakefile.orig	Fri Nov 10 18:53:09 1995
>-+++ Xc/Imakefile	Sun Jul 27 10:23:24 1997
>-@@ -22,10 +22,8 @@
>- #endif
>- 
>- NormalLibraryTarget(Xc,$(OBJS))
>--InstallLibrary(Xc,$(USRLIBDIR))
>- 
>- BuildIncludes($(HEADERS),Xc,..)
>--InstallMultiple($(HEADERS),$(INCDIR)/Xc)
>- 
>- #clean::
>- #	$(RM) -r $(TOP)/X11
>diff -urN /usr/ports/games/xscrabble/files/patch-ad games/xscrabble/files/patch-ad
>--- /usr/ports/games/xscrabble/files/patch-ad	Mon Aug  4 20:45:49 1997
>+++ games/xscrabble/files/patch-ad	Thu Jan  1 09:00:00 1970
>@@ -1,21 +0,0 @@
>---- src/Imakefile.orig	Tue Mar 11 06:56:24 1997
>-+++ src/Imakefile	Sun Jul 27 10:04:12 1997
>-@@ -28,8 +28,8 @@
>-      PROGRAMS = xscrab xscrabble
>-         SLIBS = 
>- 
>--     INCLUDES = -I.. -I/home/mchapman/include
>--SYS_LIBRARIES = -lXpm -L../Xc -lXc -L/home/mchapman/lib
>-+     INCLUDES = -I..
>-+SYS_LIBRARIES = -lXpm -L../Xc -lXc
>- 
>-     CCOPTIONS = 
>- 
>-@@ -39,4 +39,7 @@
>- NormalProgramTarget(xscrabble,$(SETUP_OBJS),$(DEPLIBS),$(LOCAL_LIBS),$(SLIBS))
>- 
>- DependTarget()
>-+
>-+InstallProgram(xscrab,$(BINDIR))
>-+InstallProgram(xscrabble,$(BINDIR))
>- 
>diff -urN /usr/ports/games/xscrabble/pkg-descr games/xscrabble/pkg-descr
>--- /usr/ports/games/xscrabble/pkg-descr	Mon Jan 24 15:01:01 2000
>+++ games/xscrabble/pkg-descr	Mon Aug 25 23:57:38 2003
>@@ -17,5 +17,3 @@
> 
> Matt Chapman.                                                                   
> E-mail: matt@belgarath.demon.co.uk (no longer csuoq@csv.warwick.ac.uk)
>-
>-WWW: http://www.belgarath.demon.co.uk/programs/index.html#XScrabble
>diff -urN /usr/ports/games/xscrabble/pkg-plist games/xscrabble/pkg-plist
>--- /usr/ports/games/xscrabble/pkg-plist	Mon Aug  4 20:45:49 1997
>+++ games/xscrabble/pkg-plist	Tue Aug 26 00:38:28 2003
>@@ -2,6 +2,7 @@
> bin/xscrabble
> lib/X11/app-defaults/XScrabble
> lib/X11/xscrabble/OSPD3.gz
>-lib/X11/xscrabble/scrabble_permutations
>-lib/X11/xscrabble/xscrabble.scores
>+lib/X11/xscrabble/duplicate
>+lib/X11/xscrabble/scrabble_rules
>+lib/X11/xscrabble/scrabble_scores
> @dirrm lib/X11/xscrabble

Actions: View | Diff

Attachments on bug 56005: 34471