- update to 1.2.2

- make it both CC and PERL (use correct system location for PERL) safe

PR:		30340
Submitted by:	Patrick Li <pat@databits.net>

3 files changed, 50 insertions, 9 deletions

diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index 3db2bc40b166..98ed0718178b 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mahjong
-PORTVERSION=	1.2
+PORTVERSION=	1.2.2
 CATEGORIES=	games net
 MASTER_SITES=	http://www.stevens-bradfield.com/MahJong/Source/
 DISTNAME=	mj-${PORTVERSION}-src
@@ -15,8 +15,8 @@ DISTNAME=	mj-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 
 USE_GTK=	yes
-
 USE_GMAKE=	yes
+MAKE_ENV=	PERL="${PERL}"
 
 INSTALL_TARGET=	install install.man
 
diff --git a/games/mahjong/distinfo b/games/mahjong/distinfo
index 8804df9b579c..2776df4a7aac 100644
--- a/games/mahjong/distinfo
+++ b/games/mahjong/distinfo
@@ -1 +1 @@
-MD5 (mj-1.2-src.tar.gz) = e6d75fc2058d55cf574da46a8510005c
+MD5 (mj-1.2.2-src.tar.gz) = 9d35d53f14b2113f2d90bc9aa39ccd92
diff --git a/games/mahjong/files/patch-Makefile b/games/mahjong/files/patch-Makefile
index eda1aa99f68e..f4c3bc412e45 100644
--- a/games/mahjong/files/patch-Makefile
+++ b/games/mahjong/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Sat Feb 17 00:44:26 2001
-+++ Makefile	Sat Feb 17 00:46:24 2001
-@@ -32,7 +32,7 @@
+--- Makefile.orig	Tue Sep  4 21:39:37 2001
++++ Makefile	Thu Sep  6 01:24:46 2001
+@@ -35,7 +35,7 @@
  # (Don't bother with this on Windows; I don't have an install target
  # for Windows.)
  # The binaries go into  $(DESTDIR)$(BINDIR)
@@ -9,16 +9,23 @@
  BINDIR = bin
  # The man pages go into $(DESTDIR)$(MANDIR)
  MANDIR = man/man1
-@@ -56,7 +56,7 @@
+@@ -50,7 +50,6 @@
+ # makefile was made by stripping out most of an imake-generated file.
+ 
+ # It's best to use gcc if you can.
+-CC = gcc
+ 
+ # C debugging and optimization flags. 
+ # In development, we turn on all reasonable warnings, thus:
+@@ -59,7 +58,6 @@
  # code (e.g. glib) may provoke warnings.
  # Also, we do NOT enable optimization by default, because RedHat 6
  # Linux distributions have a seriously buggy C compiler.
 -CDEBUGFLAGS = -g
-+#CDEBUGFLAGS = -g
  # The -Wconversion flag is also useful to detect (more than usual)
  # abuse of enums, but it generates many superfluous warnings, so
  # is not on by default.
-@@ -96,8 +96,8 @@
+@@ -101,8 +99,8 @@
  GUILIBS=-LC:/gtk -lgtk-1.3 -lgdk-1.3 -lglib-1.3 -lgmodule-1.3 -Wl,-subsystem,windows
  else
  # Not Windows. If gtk+ is properly installed, this is all that's needed.
@@ -29,3 +36,37 @@
  endif
  
  # We use gcc to link as well
+@@ -125,7 +123,6 @@
+ DEPEND = ./makedep
+ DEPENDFLAGS =
+ # perl is needed for generating several files
+-PERL = perl
+ # suffix of executables
+ EXE = 
+ # programs used in installation
+@@ -144,7 +141,6 @@
+ DEPEND =
+ DEPENDFLAGS =
+ # perl is needed for generating several files
+-PERL = perl
+ # suffix of executables
+ EXE = .exe
+ # programs used in installation: not in windows
+@@ -259,8 +255,6 @@
+ 
+ # version.h is now made from version.h.in by the release script.
+ # so if we are not making a release, we'd better provide it.
+-version.h: version.h.in
+-	$(CP) $< $@ 
+ 
+ # rule to generate the fallback tiles
+ fbtiles.c: $(FALLBACKTILES) makefallbacktiles Makefile
+@@ -304,7 +298,7 @@
+ 
+ use.txt rules.txt: xmj.man
+ 	$(RM) use.txt rules.txt
+-	$(PERL) maketxt xmj.man
++	$(xPERL) maketxt xmj.man
+ 	chmod 444 use.txt rules.txt
+ 
+