ports/162820: Update port: games/mahjong to 1.11

[KATO Tsuguru]

>Number:         162820
>Category:       ports
>Synopsis:       Update port: games/mahjong to 1.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 24 18:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 1.11

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/mahjong/Makefile games/mahjong/Makefile
--- /usr/ports/games/mahjong/Makefile	2011-08-10 14:39:37.000000000 +0900
+++ games/mahjong/Makefile	2011-11-23 00:12:44.000000000 +0900
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mahjong
-PORTVERSION=	1.10
+PORTVERSION=	1.11
 CATEGORIES=	games net
 MASTER_SITES=	http://mahjong.julianbradfield.org/Source/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Old
@@ -16,13 +16,13 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A networked Mah Jong program, together with a computer player
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2 # (or later)
 
 USE_GNOME=	gtk20
-USE_PERL5_BUILD=	yes
+USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
-MAKE_ENV=	CCLINK="${CC}" CDEBUGFLAGS="${CFLAGS}" PERL="${PERL}"
+MAKE_ENV=	CCLINK="${CC}" CDEBUGFLAGS="${CFLAGS}" PERL="${PERL}" \
+		INCLUDES="-I."
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		xmj.1
@@ -31,12 +31,18 @@
 PLIST_FILES=	bin/mj-server bin/mj-player bin/xmj
 
 post-patch:
-	@${REINPLACE_CMD} -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' ${WRKSRC}/Makefile
+		 s|^INST|#INST|g ; \
+		 s|make |$$(MAKE) |g' ${WRKSRC}/Makefile.in
+
+do-configure:
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		Makefile.in Makefile)
 
 do-install:
 .for file in mj-server mj-player xmj
diff -urN /usr/ports/games/mahjong/distinfo games/mahjong/distinfo
--- /usr/ports/games/mahjong/distinfo	2011-08-10 14:39:38.000000000 +0900
+++ games/mahjong/distinfo	2011-11-22 23:02:37.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (mj-1.10-src.tar.gz) = b3993a6f9efbb238415697631e048e04839a695e250b59e59173d7096373bc81
-SIZE (mj-1.10-src.tar.gz) = 400283
+SHA256 (mj-1.11-src.tar.gz) = 10b068c833c02176ce613945cdf9af034249fb73d9616e0697119315ead7d1f4
+SIZE (mj-1.11-src.tar.gz) = 405620
>Release-Note:
>Audit-Trail:
>Unformatted: