Update to 1.3.2

PR:		35790
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

3 files changed, 15 insertions, 37 deletions

diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index e4faddcb0877..678f4848dd32 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mahjong
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	games net
 MASTER_SITES=	http://www.stevens-bradfield.com/MahJong/Source/
 DISTNAME=	mj-${PORTVERSION}-src
@@ -16,15 +16,22 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_GTK=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	PERL="${PERL}"
-
+MAKE_ENV=	CCLINK="${CC}" CDEBUGFLAGS="${CFLAGS}" \
+		DESTDIR="${PREFIX}/" INSTMANFLAGS="${INSTALL_MAN}" \
+		INSTPGMFLAGS="${INSTALL_PROGRAM}" PERL="${PERL}"
 INSTALL_TARGET=	install install.man
 
-MAN1=		xmj.1 mj-player.1 mj-server.1
+MAN1=		xmj.1
+MLINKS=		xmj.1 mj-player.1 \
+		xmj.1 mj-server.1
 
 post-patch:
-	@${PERL} -pi -e "s,^CC ,#CC ,g ; \
-		s,^PERL,#PERL,g ; \
-		s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile
+	@${PERL} -pi -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
 
 .include <bsd.port.mk>
diff --git a/games/mahjong/distinfo b/games/mahjong/distinfo
index 0e16de6d8b21..ae90bc520529 100644
--- a/games/mahjong/distinfo
+++ b/games/mahjong/distinfo
@@ -1 +1 @@
-MD5 (mj-1.3.1-src.tar.gz) = ce5a7096d4061f3aeabfc5f1b26b75dc
+MD5 (mj-1.3.2-src.tar.gz) = 1250df8a76bf0f176d54da8136139424
diff --git a/games/mahjong/files/patch-Makefile b/games/mahjong/files/patch-Makefile
deleted file mode 100644
index 451672405ad6..000000000000
--- a/games/mahjong/files/patch-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig	Wed Jan  2 23:23:30 2002
-+++ Makefile	Sat Jan  5 19:48:56 2002
-@@ -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)
--DESTDIR = /usr/local/
-+DESTDIR = ${PREFIX}/
- BINDIR = bin
- # The man pages go into $(DESTDIR)$(MANDIR)
- MANDIR = man/man1
-@@ -59,7 +59,7 @@
- # 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.
-@@ -117,7 +117,7 @@
- # don't mess with these
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(EXTRA_DEFINES) $(DEFINES)
--CFLAGS = $(EXTRA_CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
-+CFLAGS += $(EXTRA_CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS)
- 
- # various auxiliary program and settings.