update to 1.0.2

3 files changed, 18 insertions, 23 deletions

diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index 82624879ce3c..b3c989f746a5 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mahjong
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	games net
 MASTER_SITES=	http://www.dcs.ed.ac.uk/home/jcb/stevens-bradfield/MahJong/Downloads/
 DISTNAME=	mj-${PORTVERSION}-src
@@ -22,4 +22,8 @@ INSTALL_TARGET=	install install.man
 
 MAN1=		xmj.1 mj-player.1 mj-server.1
 
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Makefile
+	@${PERL} -pi -e "s|%%GTK_CONFIG%%|${GTK_CONFIG}|g" ${WRKSRC}/Makefile
+
 .include <bsd.port.mk>
diff --git a/games/mahjong/distinfo b/games/mahjong/distinfo
index 9d8226192ed8..7ecd37d53e7e 100644
--- a/games/mahjong/distinfo
+++ b/games/mahjong/distinfo
@@ -1 +1 @@
-MD5 (mj-1.0.1-src.tar.gz) = 662a6e80a349cbdeb4fd99e79d8af013
+MD5 (mj-1.0.2-src.tar.gz) = 541fa66cce0497640ea6857808b8cdfe
diff --git a/games/mahjong/files/patch-Makefile b/games/mahjong/files/patch-Makefile
index 8ba7755eb56d..fbb10d95904c 100644
--- a/games/mahjong/files/patch-Makefile
+++ b/games/mahjong/files/patch-Makefile
@@ -1,40 +1,31 @@
---- Makefile.orig	Mon Jan 29 17:16:27 2001
-+++ Makefile	Wed Jan 31 05:53:24 2001
+--- Makefile.orig	Sat Feb 17 00:44:26 2001
++++ Makefile	Sat Feb 17 00:46:24 2001
 @@ -32,7 +32,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}/
++DESTDIR = %%PREFIX%%/
  BINDIR = bin
  # The man pages go into $(DESTDIR)$(MANDIR)
  MANDIR = man/man1
-@@ -52,7 +52,7 @@
- # C debugging and optimization flags. 
- # This code is supposed to be reasonably safe, so we turn on all
- # reasonable warnings: you shouldn't see any warnings with these.
--CDEBUGFLAGS = -g -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-+#CDEBUGFLAGS = -g -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes
+@@ -56,7 +56,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.
-@@ -92,8 +92,8 @@
+@@ -96,8 +96,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.
 -EXTRA_INCLUDES=`gtk-config --cflags`
 -GUILIBS=`gtk-config --libs`
-+EXTRA_INCLUDES=`${GTK_CONFIG} --cflags`
-+GUILIBS=`${GTK_CONFIG} --libs`
++EXTRA_INCLUDES=`%%GTK_CONFIG%% --cflags`
++GUILIBS=`%%GTK_CONFIG%% --libs`
  endif
  
  # We use gcc to link as well
-@@ -102,7 +102,7 @@
- # don't mess with these
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(EXTRA_DEFINES) $(DEFINES)
--CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
-+CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS)
- 
- # various auxiliary program and settings.