Attachment #131496 for bug #175584

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




# Created by: Andrey Zakhvatov
# Date created:				21 March 1998
# Whom:					Andrey Zakhvatov
#
# $FreeBSD: head/games/xvmahjongg/Makefile 300896 2012-07-14 13:54:48Z beat $
#

PORTNAME=	xvmahjongg
PORTVERSION=	2.1
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	XCONTRIB/../R5contrib
DISTNAME=	${PORTNAME}${PORTVERSION}
EXTRACT_SUFX=	.tar.Z

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Mahjongg for XView with multicolored tiles

LIB_DEPENDS=	xview:${PORTSDIR}/x11-toolkits/xview

OPTIONS_DEFINE=	DOCS

ALL_TARGET=	mahjongg.swap
WRKSRC=		${WRKDIR}/mahjongg2.1

MAKE_ENV=	OPENWINHOME="${LOCALBASE}" MKDIR="${MKDIR}"
ALL_TARGET=	mahjongg.swap
MAKE_JOBS_UNSAFE=	yes

MAN6=		xvmahjongg.6
PORTDOCS=	Notes README README.too
PLIST_FILES=	bin/xvmahjongg

.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e \
		'/^XVIEWLIBDIR/s| =.*| = -L$${XVIEWROOT}/lib| ; \
		 /^CFLAGS/s| = -O | += | ; \
		 s|cc |$$(CC) |' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e \
		's|cc |$$(CC) | ; \
		 s|mkdir |-$$(MKDIR) |' ${WRKSRC}/image-stuff/Makefile

do-install:
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} mahjongg \
		${PREFIX}/bin/xvmahjongg)
	(cd ${WRKSRC} && ${INSTALL_MAN} mahjongg.6 \
		${MAN6PREFIX}/man/man6/xvmahjongg.6)
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
.endfor
.endif





--- image-stuff/Makefile	Thu Dec 19 23:01:20 1991
+++ /home/andy/tmp/wrk/image-stuff/Makefile	Sat Mar 21 23:44:49 1998
@@ -18,13 +18,13 @@
 	cd ..; image-stuff/Img-mk-swap
 
 ../images/color: ../images
-	mkdir $@
+	- mkdir $@
 
 ../images/bandw: ../images
-	mkdir $@
+	- mkdir $@
 
 ../images/swap: ../images
-	mkdir $@
+	- mkdir $@
 
 ../images:
-	mkdir $@
+	- mkdir $@




--- Makefile.orig	Fri Dec 20 23:33:15 1991
+++ Makefile	Thu May 14 09:05:45 1998
@@ -29,12 +29,12 @@
 
 # Root directory of XView developers package
 # For OpenWindows users, this is the same as $OPENWINHOME.
-XVIEWROOT = ${OPENWINHOME}
+XVIEWROOT = ${LOCALBASE}
 
 # If not in OpenWindows, need to specify directory where libxview
 # and libolgx are.
 # For OpenWindows users, this is taken care of via $LD_LIBRARY_PATH.
-XVIEWLIBDIR =
+XVIEWLIBDIR = -L${LOCALBASE}/lib
 # e.g., XVIEWLIBDIR = -L/usr/openwin/lib
 # This -L... stuff may only be appropriate in a SunOS environment,
 # so do what's appropriate in your environment.  The -L<pathname>
@@ -45,7 +45,7 @@
 # currently only necessary when compiling icons.o
 TARGET=
 
-CFLAGS = -O -I${XVIEWROOT}/include
+CFLAGS+= -I${XVIEWROOT}/include
 
 SWOBJS = icons.o mahjongg.o event.o
 SWLIBS= ${XVIEWLIBDIR} -lxview -lolgx -lX11




--- event.c.orig
+++ event.c
@@ -134,7 +134,7 @@
 set_special_event_handling()
 {
     if (In_special_event_mode)
-	return;
+	return(0);
 
     xv_set(message_panel,
 			PANEL_BACKGROUND_PROC,	play_back_proc,
@@ -151,7 +151,7 @@
 clr_special_event_handling()
 {
     if (!In_special_event_mode)
-	return;
+	return(0);
 
     xv_set(message_panel,
 			PANEL_BACKGROUND_PROC,	NULL,
@@ -761,7 +761,7 @@
 	    p = xv_mem_create(64, 64, 8);
 	    if (p == NULL) {
 		fprintf(stderr, "begin_preview: xv_mem_create returned NULL\n");
-		return;
+		return(0);
 	    }
 	}
 	if (selptr->si_before_preview == NULL) {
@@ -775,7 +775,7 @@
 	    if (selptr->si_before_preview == NULL) {
 		fprintf(stderr,
 			"begin_preview: error, couldn't create server image\n");
-		return;
+		return(0);
 	    }
 	}
 




--- mahjongg.c.orig
+++ mahjongg.c
@@ -41,6 +41,7 @@
  */
 
 #include <stdio.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <xview/xview.h>
@@ -1178,7 +1179,7 @@
     tileptr->y_loc = y_loc;
 
     if (tileptr->removed)
-	return;
+	return(0);
 
     if (! tileptr->top_covered)
 	if (Use_tile_server_images)
@@ -1245,7 +1246,7 @@
 Pixrect *pr;
 {
     if (PIXRECT_IMAGE_DEPTH(pr) <= 1)
-	return;
+	return(0);
 
     shift_image_colors( PIXRECT_IMAGE_DATA_PTR(pr),
 			PIXRECT_IMAGE_SIZE(pr) );




Mah jongg is an ancient Chinese game whose origins are supposed to date
back around 3000 years. It is typically a four player game with
similarities to most popular card games. This version is a solitaire
game using the mahjongg tiles. It was inspired by a version originally
seen on a PC.

The object of the game is to remove all the tiles from the board in
matching pairs. Tiles match only if they are identical.  Exceptions are
the flower and season tiles. Any season tile will match any other season
tile and any flower tile will match any other flower tile. Tiles may be
removed from the board only if they have either a left or a right edge
open and they do not have a tile covering them.

Lines 1-5 Link Here

(-)games/xvmahjongg/pkg-plist (-5 lines)
1	bin/xvmahjongg
2	%%PORTDOCS%%share/doc/xvmahjongg/Notes
3	%%PORTDOCS%%share/doc/xvmahjongg/README
4	%%PORTDOCS%%share/doc/xvmahjongg/README.too
5	%%PORTDOCS%%@dirrm share/doc/xvmahjongg

Return to bug 175584

Lines 1-33 Link Here

(-)games/xvmahjongg/Makefile (-14 / +32 lines)
1	# New ports collection makefile for: xvmahjongg	1	# Created by: Andrey Zakhvatov
2	# Date created: 21 March 1998
3	# Whom: Andrey Zakhvatov
4	#
5	# $FreeBSD: head/games/xvmahjongg/Makefile 300896 2012-07-14 13:54:48Z beat $	2	# $FreeBSD: head/games/xvmahjongg/Makefile 300896 2012-07-14 13:54:48Z beat $
6	#
7		3
8	PORTNAME= xvmahjongg	4	PORTNAME= xvmahjongg
9	PORTVERSION= 2.1	5	PORTVERSION= 2.1
10	PORTREVISION= 2	6	PORTREVISION= 2
11	CATEGORIES= games	7	CATEGORIES= games
12	MASTER_SITES= ftp://ftp.x.org/R5contrib/	8	MASTER_SITES= XCONTRIB/../R5contrib
13	DISTFILES= ${PORTNAME}${PORTVERSION}.tar.Z	9	DISTNAME= ${PORTNAME}${PORTVERSION}
		10	EXTRACT_SUFX= .tar.Z
14		11
15	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
16	COMMENT= Mahjongg for XView with multicolored tiles	13	COMMENT= Mahjongg for XView with multicolored tiles
17		14
18	LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview	15	LIB_DEPENDS= xview:${PORTSDIR}/x11-toolkits/xview
		16
		17	OPTIONS_DEFINE= DOCS
19		18
20	ALL_TARGET= mahjongg.swap
21	WRKSRC= ${WRKDIR}/mahjongg2.1	19	WRKSRC= ${WRKDIR}/mahjongg2.1
		20
		21	MAKE_ENV= OPENWINHOME="${LOCALBASE}" MKDIR="${MKDIR}"
		22	ALL_TARGET= mahjongg.swap
		23	MAKE_JOBS_UNSAFE= yes
		24
22	MAN6= xvmahjongg.6	25	MAN6= xvmahjongg.6
		26	PORTDOCS= Notes README README.too
		27	PLIST_FILES= bin/xvmahjongg
		28
		29	.include <bsd.port.options.mk>
		30
		31	post-patch:
		32	@${REINPLACE_CMD} -e \
		33	'/^XVIEWLIBDIR/s\| =.*\| = -L$${XVIEWROOT}/lib\| ; \
		34	/^CFLAGS/s\| = -O \| += \| ; \
		35	s\|cc \|$$(CC) \|' ${WRKSRC}/Makefile
		36	@${REINPLACE_CMD} -e \
		37	's\|cc \|$$(CC) \| ; \
		38	s\|mkdir \|-$$(MKDIR) \|' ${WRKSRC}/image-stuff/Makefile
23		39
24	do-install:	40	do-install:
25	${INSTALL_PROGRAM} ${WRKSRC}/mahjongg ${PREFIX}/bin/xvmahjongg	41	(cd ${WRKSRC} && ${INSTALL_PROGRAM} mahjongg \
26	${INSTALL_MAN} ${WRKSRC}/mahjongg.6 ${PREFIX}/man/man6/xvmahjongg.6	42	${PREFIX}/bin/xvmahjongg)
27	.if !defined(NOPORTDOCS)	43	(cd ${WRKSRC} && ${INSTALL_MAN} mahjongg.6 \
		44	${MAN6PREFIX}/man/man6/xvmahjongg.6)
		45	.if ${PORT_OPTIONS:MDOCS}
28	@${MKDIR} ${DOCSDIR}	46	@${MKDIR} ${DOCSDIR}
29	.for file in Notes README README.too	47	.for i in ${PORTDOCS}
30	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	48	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
31	.endfor	49	.endfor
32	.endif	50	.endif
33		51

Lines 1-20 Link Here

(-)games/xvmahjongg/files/patch-aa (-20 lines)
1	--- image-stuff/Makefile Thu Dec 19 23:01:20 1991
2	+++ /home/andy/tmp/wrk/image-stuff/Makefile Sat Mar 21 23:44:49 1998
3	@@ -18,13 +18,13 @@
4	cd ..; image-stuff/Img-mk-swap
5
6	../images/color: ../images
7	- mkdir $@
8	+ - mkdir $@
9
10	../images/bandw: ../images
11	- mkdir $@
12	+ - mkdir $@
13
14	../images/swap: ../images
15	- mkdir $@
16	+ - mkdir $@
17
18	../images:
19	- mkdir $@
20	+ - mkdir $@

Lines 1-26 Link Here

(-)games/xvmahjongg/files/patch-ab (-26 lines)
1	--- Makefile.orig Fri Dec 20 23:33:15 1991
2	+++ Makefile Thu May 14 09:05:45 1998
3	@@ -29,12 +29,12 @@
4
5	# Root directory of XView developers package
6	# For OpenWindows users, this is the same as $OPENWINHOME.
7	-XVIEWROOT = ${OPENWINHOME}
8	+XVIEWROOT = ${LOCALBASE}
9
10	# If not in OpenWindows, need to specify directory where libxview
11	# and libolgx are.
12	# For OpenWindows users, this is taken care of via $LD_LIBRARY_PATH.
13	-XVIEWLIBDIR =
14	+XVIEWLIBDIR = -L${LOCALBASE}/lib
15	# e.g., XVIEWLIBDIR = -L/usr/openwin/lib
16	# This -L... stuff may only be appropriate in a SunOS environment,
17	# so do what's appropriate in your environment. The -L<pathname>
18	@@ -45,7 +45,7 @@
19	# currently only necessary when compiling icons.o
20	TARGET=
21
22	-CFLAGS = -O -I${XVIEWROOT}/include
23	+CFLAGS+= -I${XVIEWROOT}/include
24
25	SWOBJS = icons.o mahjongg.o event.o
26	SWLIBS= ${XVIEWLIBDIR} -lxview -lolgx -lX11

Line 0 Link Here

(-)games/xvmahjongg/files/patch-event.c (+38 lines)
	1	--- event.c.orig
	2	+++ event.c
	3	@@ -134,7 +134,7 @@
	4	set_special_event_handling()
	5	{
	6	if (In_special_event_mode)
	7	- return;
	8	+ return(0);
	9
	10	xv_set(message_panel,
	11	PANEL_BACKGROUND_PROC, play_back_proc,
	12	@@ -151,7 +151,7 @@
	13	clr_special_event_handling()
	14	{
	15	if (!In_special_event_mode)
	16	- return;
	17	+ return(0);
	18
	19	xv_set(message_panel,
	20	PANEL_BACKGROUND_PROC, NULL,
	21	@@ -761,7 +761,7 @@
	22	p = xv_mem_create(64, 64, 8);
	23	if (p == NULL) {
	24	fprintf(stderr, "begin_preview: xv_mem_create returned NULL\n");
	25	- return;
	26	+ return(0);
	27	}
	28	}
	29	if (selptr->si_before_preview == NULL) {
	30	@@ -775,7 +775,7 @@
	31	if (selptr->si_before_preview == NULL) {
	32	fprintf(stderr,
	33	"begin_preview: error, couldn't create server image\n");
	34	- return;
	35	+ return(0);
	36	}
	37	}
	38

Line 0 Link Here

(-)games/xvmahjongg/files/patch-mahjongg.c (+28 lines)
	1	--- mahjongg.c.orig
	2	+++ mahjongg.c
	3	@@ -41,6 +41,7 @@
	4	*/
	5
	6	#include <stdio.h>
	7	+#include <unistd.h>
	8	#include <sys/types.h>
	9	#include <sys/time.h>
	10	#include <xview/xview.h>
	11	@@ -1178,7 +1179,7 @@
	12	tileptr->y_loc = y_loc;
	13
	14	if (tileptr->removed)
	15	- return;
	16	+ return(0);
	17
	18	if (! tileptr->top_covered)
	19	if (Use_tile_server_images)
	20	@@ -1245,7 +1246,7 @@
	21	Pixrect *pr;
	22	{
	23	if (PIXRECT_IMAGE_DEPTH(pr) <= 1)
	24	- return;
	25	+ return(0);
	26
	27	shift_image_colors( PIXRECT_IMAGE_DATA_PTR(pr),
	28	PIXRECT_IMAGE_SIZE(pr) );

Lines 1-12 Link Here

(-)games/xvmahjongg/pkg-descr (-12 / +12 lines)
1	Mah jongg is an ancient Chinese game whose origins are supposed	1	Mah jongg is an ancient Chinese game whose origins are supposed to date
2	to date back around 3000 years. It is typically a four player game	2	back around 3000 years. It is typically a four player game with
3	with similarities to most popular card games. This version is a	3	similarities to most popular card games. This version is a solitaire
4	solitaire game using the mahjongg tiles. It was inspired by a	4	game using the mahjongg tiles. It was inspired by a version originally
5	version originally seen on a PC.	5	seen on a PC.
6	The object of the game is to remove all the tiles from the	6
7	board in matching pairs. Tiles match only if they are identical.	7	The object of the game is to remove all the tiles from the board in
8	Exceptions are the flower and season tiles. Any season tile will	8	matching pairs. Tiles match only if they are identical. Exceptions are
9	match any other season tile and any flower tile will match any	9	the flower and season tiles. Any season tile will match any other season
10	other flower tile. Tiles may be removed from the board only if	10	tile and any flower tile will match any other flower tile. Tiles may be
11	they have either a left or a right edge open and they do not have	11	removed from the board only if they have either a left or a right edge
12	a tile covering them.	12	open and they do not have a tile covering them.