Bring xmahjongg up to tne new (pseudo-)millenium, i. e. to version 3.2,

completely rewritten, looks a lot nicer than the 10-year old one.

In addition to the suggested patch, i have removed the NO_CDROM
restriction, after revisiting the accompanying documentation, the
``Don't redistribute for profit'' old tile images are obviously no
longer shipped.

PR:		ports/16673
Submitted by:	<tkato@prontomail.ne.jp> KATO Tsuguru

4 files changed, 35 insertions, 35 deletions

diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index a71c1f4fdc54..660c28119cc9 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,39 +1,19 @@
 # New ports collection makefile for:	xmahjongg
-# Version required:	
+# Version required:	3.2
 # Date created:		16 Aug 1996
 # Whom:			joerg@freebsd.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmahjongg
-PKGNAME=	xmahjongg-1.0
+DISTNAME=	xmahjongg-3.2
 CATEGORIES=	games
-# Most Usenet archive sites don't store it as a .tar.gz, but Slackware
-# and it's mirrors do.
-MASTER_SITES=	ftp://ftp.digex.net/pub/os/linux/slackware/source/xap/xgames/ \
-		ftp://wcarchive.cdrom.com/pub/linux/slackware/source/xap/xgames/
+MASTER_SITES=	http://www.lcdf.org/xmahjongg/
 
 MAINTAINER=	joerg@freebsd.org
 
-WRKSRC=		${WRKDIR}/xmahjongg
-USE_IMAKE=	yes
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
 MAN6=		xmahjongg.6
 
-NO_CDROM=	"Restrictive copyright"
-
-.include <bsd.port.pre.mk>
-
-post-extract:
-	@${CP} ${WRKSRC}/xmahjongg.6 ${WRKSRC}/xmahjongg.man
-
-pre-install:
-.if !exists(${X11BASE}/lib/X11/fonts/local)
-	@${ECHO} "*********************************************************"
-	@${ECHO} "Please update your XFree86 to version 3.3.3 or later"
-	@${ECHO} "or add ${X11BASE}/lib/X11/fonts/local to your font path"
-	@${ECHO} "in /etc/XF86Config."
-	@${ECHO} "*********************************************************"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xmahjongg/distinfo b/games/xmahjongg/distinfo
index 2d54ae81d73f..0b9666354ff3 100644
--- a/games/xmahjongg/distinfo
+++ b/games/xmahjongg/distinfo
@@ -1 +1 @@
-MD5 (xmahjongg.tar.gz) = 969200f399e9c5d28a7c1239a068fef0
+MD5 (xmahjongg-3.2.tar.gz) = 80958953120033362f91c0ef47c445ee
diff --git a/games/xmahjongg/pkg-descr b/games/xmahjongg/pkg-descr
index 14ac911fd2c6..bfb5ebc5d6a9 100644
--- a/games/xmahjongg/pkg-descr
+++ b/games/xmahjongg/pkg-descr
@@ -1,7 +1,7 @@
 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.
+SunView, and later on completely rewritten by Eddie Kohler.
 
 THEORY OF PLAY
 The object of the game is to remove all the tiles from the board.
@@ -11,3 +11,5 @@ 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.
+
+WWW: http://www.lcdf.org/xmahjongg/
diff --git a/games/xmahjongg/pkg-plist b/games/xmahjongg/pkg-plist
index caf7d4957c30..f7d422dccaaa 100644
--- a/games/xmahjongg/pkg-plist
+++ b/games/xmahjongg/pkg-plist
@@ -1,8 +1,26 @@
 bin/xmahjongg
-lib/X11/xmahjongg/bridge
-lib/X11/xmahjongg/default
-lib/X11/xmahjongg/wedges
-@dirrm lib/X11/xmahjongg
-lib/X11/fonts/local/xmahjongg.bdf 
-@exec /usr/X11R6/bin/mkfontdir %B
-@unexec /usr/X11R6/bin/mkfontdir %B
+share/xmahjongg/backgrounds/default.gif
+share/xmahjongg/backgrounds/green.gif
+share/xmahjongg/layouts/arena
+share/xmahjongg/layouts/arrow
+share/xmahjongg/layouts/bridge
+share/xmahjongg/layouts/ceremonial
+share/xmahjongg/layouts/deepwell
+share/xmahjongg/layouts/default
+share/xmahjongg/layouts/farandole
+share/xmahjongg/layouts/hourglass
+share/xmahjongg/layouts/papillon
+share/xmahjongg/layouts/theater
+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