Update to version 3.61.

Changes:

xmahjongg version 3 is a complete rewrite by Eddie Kohler <eddietwo at lcs dot
mit dot edu> of xmahjongg versions 1 and 2 by Jeff S. Young <jsy at cray dot
com>.

Features

- Those pretty, round-edged colored tiles
- Multiple tile sets (it comes with ten)
- Multiple layouts (it comes with twenty-four)
- Undo and redo
- Helpful hints for happy play, and a clean button for cheating
- Boards that are always solvable (but you can turn this feature off)
- It can show you a solution
- Aesthetics (or ugliness, depending on your taste)

- We regret to report some featurecide relative to version 2: there are no
  tournaments, no visible board numbers, and no layout configuration mode.
  May these features rest in peace, probably forever.

Since the license of the rewritten versions is GPL, the binary package can be
redistributed and the restriction was removed.

6 files changed, 64 insertions, 130 deletions

diff --git a/games/xmahjongg/DESCR b/games/xmahjongg/DESCR
index 14ac911fd2c..0bd220d6269 100644
--- a/games/xmahjongg/DESCR
+++ b/games/xmahjongg/DESCR
@@ -1,13 +1,13 @@
-Mah jongg is an ancient chinese game usually played by four players
-with tiles similar to dominos.  This is an X windows version for
-the solitaire game originally seen on the PC and later ported to
-SunView.  It also has a new tournament option.
+Mah Jongg is an ancient chinese game usually played by four players, named
+after the four winds, who take tiles similar to dominos from a wall in turn.
 
 THEORY OF PLAY
-The object of the game is to remove all the tiles from the board.
-Tiles are removed in by matching two identical tiles which have
-either an open left edge or open right edge.  The only exception
-to this rule is that any open "flower" tile (bamboo, orchid, plum,
-or chrysanthemum) matches any other open "flower" tile and any open
-"season" tile (spring, summer, autumn, or winter) matches any other
-open "season" tile.
+The object of the game is to remove all the tiles from the board.  Tiles are
+removed in by matching two identical tiles which have either an open left edge
+or open right edge.  The only exception to this rule is that any open "flower"
+tile (bamboo, orchid, plum, or chrysanthemum) matches any other open "flower"
+tile and any open "season" tile (spring, summer, autumn, or winter) matches
+any other open "season" tile.
+
+xmahjongg version 3 is a complete rewrite by Eddie Kohler of xmahjongg
+versions 1 and 2 by Jeff S. Young.
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index b21e98d4c76..f997d9a969e 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,29 +1,16 @@
-# $NetBSD: Makefile,v 1.14 2003/03/29 12:41:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 17:58:07 salo Exp $
+#
 
-DISTNAME=	xmahjongg
-PKGNAME=	xmahjongg-1.0
-PKGREVISION=	2
-WRKSRC=		${WRKDIR}/xmahjongg
-CATEGORIES=	games
-# Most Usenet archive sites don't store it as a .tar.gz, but Slackware
-# and its mirrors do.
-MASTER_SITES=	ftp://wcarchive.cdrom.com/pub/linux/slackware/source/xap/xgames/
+DISTNAME=	xmahjongg-3.6.1
+CATEGORIES=	games x11
+MASTER_SITES=	http://www.lcdf.org/~eddietwo/xmahjongg/
 
-MAINTAINER=	packages@netbsd.org
-COMMENT=	The Chinese game of Mahjongg for X11
+MAINTAINER=	salo@netbsd.org
+HOMEPAGE=	http://www.lcdf.org/~eddietwo/xmahjongg/
+COMMENT=	The Chinese game of Mah Jongg for X11
 
-USE_IMAKE=	yes
-
-RESTRICTED=	"Restrictive copyright"
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-PLIST_SUBST+=	X11BASE="${X11BASE}"
-
-post-extract:
-	@${CP} ${WRKSRC}/xmahjongg.6 ${WRKSRC}/xmahjongg.man
-
-post-install:
-	${GZIP_CMD} ${X11PREFIX}/lib/X11/fonts/misc/xmahjongg.bdf
-	${X11BASE}/bin/mkfontdir ${X11PREFIX}/lib/X11/fonts/misc
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xmahjongg/PLIST b/games/xmahjongg/PLIST
index 45ff26bcdc1..e06191bac1f 100644
--- a/games/xmahjongg/PLIST
+++ b/games/xmahjongg/PLIST
@@ -1,10 +1,40 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/26 04:07:50 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/04/10 17:58:07 salo Exp $
 bin/xmahjongg
-${IMAKE_MAN_SOURCE_PATH}6/xmahjongg.${IMAKE_MANNEWSUFFIX}
-lib/X11/xmahjongg/bridge
-lib/X11/xmahjongg/default
-lib/X11/xmahjongg/wedges
-@dirrm lib/X11/xmahjongg
-lib/X11/fonts/misc/xmahjongg.bdf.gz
-@exec ${X11BASE}/bin/mkfontdir %B
-@unexec ${X11BASE}/bin/mkfontdir %B
+man/man6/xmahjongg.6
+share/xmahjongg/backgrounds/default.gif
+share/xmahjongg/backgrounds/green.gif
+share/xmahjongg/layouts/arena
+share/xmahjongg/layouts/arrow
+share/xmahjongg/layouts/boar
+share/xmahjongg/layouts/bridge
+share/xmahjongg/layouts/ceremonial
+share/xmahjongg/layouts/deepwell
+share/xmahjongg/layouts/default
+share/xmahjongg/layouts/dog
+share/xmahjongg/layouts/dragon
+share/xmahjongg/layouts/farandole
+share/xmahjongg/layouts/hare
+share/xmahjongg/layouts/horse
+share/xmahjongg/layouts/hourglass
+share/xmahjongg/layouts/monkey
+share/xmahjongg/layouts/ox
+share/xmahjongg/layouts/papillon
+share/xmahjongg/layouts/ram
+share/xmahjongg/layouts/rat
+share/xmahjongg/layouts/rooster
+share/xmahjongg/layouts/snake
+share/xmahjongg/layouts/theater
+share/xmahjongg/layouts/tiger
+share/xmahjongg/layouts/wedges
+share/xmahjongg/tiles/dorothys.gif
+share/xmahjongg/tiles/dorwhite.gif
+share/xmahjongg/tiles/gnome.gif
+share/xmahjongg/tiles/gnome2.gif
+share/xmahjongg/tiles/real.gif
+share/xmahjongg/tiles/small.gif
+share/xmahjongg/tiles/thick.gif
+share/xmahjongg/tiles/thin.gif
+@dirrm share/xmahjongg/tiles
+@dirrm share/xmahjongg/layouts
+@dirrm share/xmahjongg/backgrounds
+@dirrm share/xmahjongg
diff --git a/games/xmahjongg/distinfo b/games/xmahjongg/distinfo
index db83e1ac186..984cf115df3 100644
--- a/games/xmahjongg/distinfo
+++ b/games/xmahjongg/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/10/14 16:20:24 tron Exp $
+$NetBSD: distinfo,v 1.4 2003/04/10 17:58:07 salo Exp $
 
-SHA1 (xmahjongg.tar.gz) = 2f2c642a89249cac8642e1ef3be97058f4e39aa8
-Size (xmahjongg.tar.gz) = 32850 bytes
-SHA1 (patch-aa) = d595dd3c7876f34509ffec64d6d8d3b87e53efe7
-SHA1 (patch-ab) = fdf3116384c4fcc84758a021c996cc21e8338859
+SHA1 (xmahjongg-3.6.1.tar.gz) = 35e380e53412568e6af7f4fcc1677693f52fc60e
+Size (xmahjongg-3.6.1.tar.gz) = 462833 bytes
diff --git a/games/xmahjongg/patches/patch-aa b/games/xmahjongg/patches/patch-aa
deleted file mode 100644
index 522dab1074a..00000000000
--- a/games/xmahjongg/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/10/14 16:20:24 tron Exp $
-
---- Imakefile.orig	Sat Dec 11 03:35:21 1993
-+++ Imakefile	Sun Oct 14 18:17:08 2001
-@@ -5,7 +5,26 @@
- #	copyright laws of the United States.
- # 
- LOCAL_LIBRARIES = $(XLIB) 
--SRCS	= xmahjongg.c draw.c event.c initial.c packet.c play.c random.c sysdep.c variables.c
--OBJS	= xmahjongg.o draw.o event.o initial.o packet.o play.o random.o sysdep.o variables.o
-+         LAYOUT = $(LIBDIR)/xmahjongg
-+  EXTRA_DEFINES = -DLAYOUT=\"$(LAYOUT)\"
-+         BOARDS = bridge default wedges
-+           FONT = xmahjongg.bdf
-+      MANSUFFIX = 6
-+
-+SRCS	= xmahjongg.c draw.c event.c initial.c packet.c \
-+	play.c random.c sysdep.c variables.c
-+OBJS	= xmahjongg.o draw.o event.o initial.o packet.o \
-+	play.o random.o sysdep.o variables.o
-+
-+all:: $(FONT)
-+$(FONT): x.bdf.1 x.bdf.2 x.bdf.3
-+	@echo "Creating xmahjongg.bdf..."; \
-+	cat x.bdf.1 x.bdf.2 x.bdf.3 > $(FONT)
- 
- ComplexProgramTarget(xmahjongg)
-+InstallTarget(install,$(FONT),$(INSTDATFLAGS),$(FONTDIR)/misc)
-+MakeDirectories(install,$(LAYOUT))
-+InstallMultipleDestFlags(install,$(BOARDS),$(LAYOUT),$(INSTDATFLAGS))
-+
-+#install::
-+#	RunProgram(MKFONTDIR,$(FONTDIR)/misc)
diff --git a/games/xmahjongg/patches/patch-ab b/games/xmahjongg/patches/patch-ab
deleted file mode 100644
index 1e348a1fc5c..00000000000
--- a/games/xmahjongg/patches/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:45 agc Exp $
-
---- variables.c.orig	Sat Dec 11 03:35:04 1993
-+++ variables.c	Fri Aug 16 17:38:24 1996
-@@ -7,17 +7,18 @@
-  ******************************************************************************
-  */
- 
--#ifdef	GLOBAL
--#undef	GLOBAL
--#endif
--#define	GLOBAL 
--
- #include <pwd.h>
- #include <stdio.h>
- #include <string.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include "xmahjongg.h"
-+
-+#ifdef	GLOBAL
-+#undef	GLOBAL
-+#endif
-+#define	GLOBAL 
-+
- #include "variables.h"
- 
- variables()
---- xmahjongg.h.orig	Sun Jun 18 03:07:25 1995
-+++ xmahjongg.h	Fri Aug 16 17:47:28 1996
-@@ -14,7 +14,9 @@
- /*
-  *	Path used for layout files
-  */
-+#ifndef LAYOUT		/* to be passed from Imakefile */
- #define	LAYOUT		"/usr/X11R6/lib/xmahjongg"
-+#endif
- 
- /*
-  *	Fundamental definitions
-@@ -34,6 +36,7 @@
- #define FREE		0
- #define	USED		1
- 
-+#define GLOBAL		extern
- /*
-  *	Dimensions for boxes, tiles and options
-  */