Attachment #34471 for bug #56005

View | Details | Raw Unified | Return to bug 56005
Collapse All | Expand All




#

PORTNAME=	xscrabble
PORTVERSION=	2.10
CATEGORIES=	games
MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/educational_games/
DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz ${PORTNAME}_en.tgz
MASTER_SITE_SUBDIR=	mph
DISTNAME=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	X version of the popular board game

USE_IMAKE=	yes
USE_XPM=	yes
USE_REINPLACE=	yes
NO_INSTALL_MANPAGES=	yes

XSCRABBLEDIR=	${PREFIX}/lib/X11/xscrabble

post-patch:
	@${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>

Line 1 Link Here

(-)games/xscrabble/distinfo (-1 / +2 lines)
1	MD5 (xscrabble.tar.gz) = 7bd0142d6131197cde7107a9e11f556a	1	MD5 (xscrabble-2.10.tgz) = 376531c836b62f81d2ac2281495b5030
		2	MD5 (xscrabble_en.tgz) = 791244c62c92fc2dfd1c524f1a25eb9f




--- 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




--- 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




--- 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




--- 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))
 

Lines 17-21 Link Here

(-)games/xscrabble/pkg-descr (-2 lines)
17		17
18	Matt Chapman.	18	Matt Chapman.
19	E-mail: matt@belgarath.demon.co.uk (no longer csuoq@csv.warwick.ac.uk)	19	E-mail: matt@belgarath.demon.co.uk (no longer csuoq@csv.warwick.ac.uk)
20
21	WWW: http://www.belgarath.demon.co.uk/programs/index.html#XScrabble

Lines 2-7 Link Here

(-)games/xscrabble/pkg-plist (-2 / +3 lines)
2	bin/xscrabble	2	bin/xscrabble
3	lib/X11/app-defaults/XScrabble	3	lib/X11/app-defaults/XScrabble
4	lib/X11/xscrabble/OSPD3.gz	4	lib/X11/xscrabble/OSPD3.gz
5	lib/X11/xscrabble/scrabble_permutations	5	lib/X11/xscrabble/duplicate
6	lib/X11/xscrabble/xscrabble.scores	6	lib/X11/xscrabble/scrabble_rules
		7	lib/X11/xscrabble/scrabble_scores
7	@dirrm lib/X11/xscrabble	8	@dirrm lib/X11/xscrabble

Return to bug 56005

Lines 6-27 Link Here

(-)games/xscrabble/Makefile (-9 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= xscrabble	8	PORTNAME= xscrabble
9	PORTVERSION= 1.0	9	PORTVERSION= 2.10
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://ahoyhoy.org/devel/misc/ \	11	MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/educational_games/
12	${MASTER_SITE_LOCAL}	12	DISTFILES= ${PORTNAME}-${PORTVERSION}.tgz ${PORTNAME}_en.tgz
13	MASTER_SITE_SUBDIR= mph
14	DISTNAME= ${PORTNAME}
15		13
16	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
17	COMMENT= X version of the popular board game	15	COMMENT= X version of the popular board game
18		16
19	USE_REINPLACE= yes	17	USE_IMAKE= yes
20	USE_IMAKE= yes	18	USE_XPM= yes
21	USE_XPM= yes	19	USE_REINPLACE= yes
22	NO_INSTALL_MANPAGES= yes	20	NO_INSTALL_MANPAGES= yes
23		21
		22	XSCRABBLEDIR= ${PREFIX}/lib/X11/xscrabble
		23
24	post-patch:	24	post-patch:
25	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/XScrabble.ad	25	@${ECHO_CMD} '#define VERSION ${PORTVERSION:S/.//g}' \
		26	> ${WRKSRC}/src/config.h
		27	@${ECHO_CMD} '#define DICT_FILE "${XSCRABBLEDIR}/OSPD3.gz"' \
		28	>> ${WRKSRC}/src/config.h
		29	@${ECHO_CMD} '#define SCORE_FILE "${XSCRABBLEDIR}/scrabble_scores"' \
		30	>> ${WRKSRC}/src/config.h
		31	@${ECHO_CMD} '#define RULES_FILE "${XSCRABBLEDIR}/scrabble_rules"' \
		32	>> ${WRKSRC}/src/config.h
		33	@${SED} -e 's\|/usr/games/lib/scrabble/en\|${XSCRABBLEDIR}\|g' \
		34	${WRKSRC}/../xscrabble_en/app-defaults/XScrabble_en \
		35	> ${WRKSRC}/XScrabble
		36	@${REINPLACE_CMD} -e 's\|= -O\|=$$(CDEBUGFLAGS)\|g' ${WRKSRC}/Imakefile
		37
		38	do-install:
		39	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrab ${PREFIX}/bin
		40	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrabble ${PREFIX}/bin
		41	${INSTALL_DATA} ${WRKSRC}/XScrabble ${PREFIX}/lib/X11/app-defaults
		42	@${MKDIR} ${XSCRABBLEDIR}
		43	.for file in OSPD3.gz duplicate scrabble_rules scrabble_scores
		44	${INSTALL_DATA} ${WRKSRC}/../xscrabble_en/lib/${file} ${XSCRABBLEDIR}
		45	.endfor
26		46
27	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)games/xscrabble/files/patch-aa (-20 lines)
1	--- Imakefile.orig Tue Mar 11 14:56:29 1997
2	+++ Imakefile Tue Jan 18 00:00:00 2000
3	@@ -1,5 +1,5 @@
4
5	-#define PassCDebugFlags 'CDEBUGFLAGS= -O'
6	+#define PassCDebugFlags 'CDEBUGFLAGS= $(CDEBUGFLAGS)'
7	#define IHaveSubdirs
8
9	SUBDIRS = Xc src
10	@@ -9,3 +9,10 @@
11	MakeLintLibSubdirs($(SUBDIRS))
12	MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
13
14	+InstallNamedNonExec(XScrabble.ad,XScrabble,$(LIBDIR)/app-defaults)
15	+InstallNonExecFile(OSPD3.gz,$(LIBDIR)/xscrabble)
16	+InstallNonExecFile(scrabble_permutations,$(LIBDIR)/xscrabble)
17	+InstallNonExecFile(xscrabble.scores,$(LIBDIR)/xscrabble)
18	+
19	+install::
20	+ @chmod a+rw $(LIBDIR)/xscrabble/xscrabble.scores

Lines 1-15 Link Here

(-)games/xscrabble/files/patch-ab (-15 lines)
1	--- XScrabble.ad.orig Tue Mar 11 06:57:16 1997
2	+++ XScrabble.ad Tue Jan 18 00:00:00 1997
3	@@ -1,9 +1,9 @@
4	! * XScrabble resource file *
5
6	! edit the following three pathnames as required:
7	-XScrabble.dictfile: /usr/local/lib/OSPD3
8	-XScrabble.permfile: /usr/local/lib/scrabble_permutations
9	-XScrabble.scorefile: /usr/local/lib/xscrabble.scores
10	+XScrabble.dictfile: %%PREFIX%%/lib/X11/xscrabble/OSPD3
11	+XScrabble.permfile: %%PREFIX%%/lib/X11/xscrabble/scrabble_permutations
12	+XScrabble.scorefile: %%PREFIX%%/lib/X11/xscrabble/xscrabble.scores
13
14	! version string, to make sure correct resource file is loaded
15	XScrabble*version: 100

Lines 1-13 Link Here

(-)games/xscrabble/files/patch-ac (-13 lines)
1	--- Xc/Imakefile.orig Fri Nov 10 18:53:09 1995
2	+++ Xc/Imakefile Sun Jul 27 10:23:24 1997
3	@@ -22,10 +22,8 @@
4	#endif
5
6	NormalLibraryTarget(Xc,$(OBJS))
7	-InstallLibrary(Xc,$(USRLIBDIR))
8
9	BuildIncludes($(HEADERS),Xc,..)
10	-InstallMultiple($(HEADERS),$(INCDIR)/Xc)
11
12	#clean::
13	# $(RM) -r $(TOP)/X11

Lines 1-21 Link Here

(-)games/xscrabble/files/patch-ad (-21 lines)
1	--- src/Imakefile.orig Tue Mar 11 06:56:24 1997
2	+++ src/Imakefile Sun Jul 27 10:04:12 1997
3	@@ -28,8 +28,8 @@
4	PROGRAMS = xscrab xscrabble
5	SLIBS =
6
7	- INCLUDES = -I.. -I/home/mchapman/include
8	-SYS_LIBRARIES = -lXpm -L../Xc -lXc -L/home/mchapman/lib
9	+ INCLUDES = -I..
10	+SYS_LIBRARIES = -lXpm -L../Xc -lXc
11
12	CCOPTIONS =
13
14	@@ -39,4 +39,7 @@
15	NormalProgramTarget(xscrabble,$(SETUP_OBJS),$(DEPLIBS),$(LOCAL_LIBS),$(SLIBS))
16
17	DependTarget()
18	+
19	+InstallProgram(xscrab,$(BINDIR))
20	+InstallProgram(xscrabble,$(BINDIR))
21