- Update to 1.10

- While here, remove stuff from pkg-descr that doesn't belong in there

PR:		159451
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 16 insertions, 24 deletions

diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index 8681ef89fcac..3cb4a48683c2 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -7,23 +7,23 @@
 #
 
 PORTNAME=	mahjong
-PORTVERSION=	1.8
-PORTREVISION=	1
+PORTVERSION=	1.10
 CATEGORIES=	games net
-MASTER_SITES=	http://www.stevens-bradfield.com/MahJong/Source/%SUBDIR%/
+MASTER_SITES=	http://mahjong.julianbradfield.org/Source/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Old
 DISTNAME=	mj-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A networked Mah Jong program, together with a computer player
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-09-01
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
 
+USE_GNOME=	gtk20
 USE_PERL5_BUILD=	yes
-USE_GNOME=	gtk12
 USE_GMAKE=	yes
 MAKE_ENV=	CCLINK="${CC}" CDEBUGFLAGS="${CFLAGS}" PERL="${PERL}"
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		xmj.1
 MLINKS=		xmj.1 mj-player.1 \
@@ -31,13 +31,12 @@ MLINKS=		xmj.1 mj-player.1 \
 PLIST_FILES=	bin/mj-server bin/mj-player bin/xmj
 
 post-patch:
-	@${PERL} -pi -e 's|^CC|#CC|g ; \
+	@${REINPLACE_CMD} -e 's|^CC|#CC|g ; \
 		 s|^DESTDIR|#DESTDIR|g ; \
 		 s|^CDEBUGFLAGS|#CDEBUGFLAGS|g ; \
 		 s|^MAKE|#MAKE|g ; \
 		 s|^PERL|#PERL|g ; \
-		 s|^INST|#INST|g ; \
-		 s|gtk-config|\$$\{GTK_CONFIG\}|g' ${WRKSRC}/Makefile
+		 s|^INST|#INST|g' ${WRKSRC}/Makefile
 
 do-install:
 .for file in mj-server mj-player xmj
diff --git a/games/mahjong/distinfo b/games/mahjong/distinfo
index d0bfbdda9a77..9853bcdee84e 100644
--- a/games/mahjong/distinfo
+++ b/games/mahjong/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mj-1.8-src.tar.gz) = b27d7ec12be5efa705998de84421cfbe9f57dcaa2e3a1ebf1918f2c077c54c11
-SIZE (mj-1.8-src.tar.gz) = 370814
+SHA256 (mj-1.10-src.tar.gz) = b3993a6f9efbb238415697631e048e04839a695e250b59e59173d7096373bc81
+SIZE (mj-1.10-src.tar.gz) = 400283
diff --git a/games/mahjong/pkg-descr b/games/mahjong/pkg-descr
index 99039ef4c883..967d06236bac 100644
--- a/games/mahjong/pkg-descr
+++ b/games/mahjong/pkg-descr
@@ -1,14 +1,7 @@
-This is a set of three programs which provide a networked Mah Jong
-program, together with a computer player. Thus the game can be played
-by four humans, by a human and three computer players, or any other
-combination. There is a server program, which handles the game - only
-one game, since I'm not trying to compete with Yahoo! and friends -,
-an X client to allow humans to play naturally, and a computer player.
-The version of Mah Jong is that generally called Chinese Classical.
-Of course, there are many variants within this; I intend to
-accommodate most of the more interesting variants via options, but
-this is future work. In the longer term, I might also be interested
-in adding Hong Kong and Japanese versions. I'm not interested in
-adding American versions, though somebody else might be. 
+This is a set of three programs which provide a networked Mah Jong program,
+together with a computer player. Thus the game can be played by four humans, by
+a human and three computer players, or any other combination. There is a server
+program, which handles the game. An X client to allow humans to play naturally,
+and a computer player.
 
-WWW: http://www.stevens-bradfield.com/MahJong/
+WWW: http://mahjong.julianbradfield.org/