Update to 1.7.

Fix typo in LDFLAGS so gettext is found.
Mark ignore on 4.x, its freezes when starting a new game.
Patches are welcome.

4 files changed, 40 insertions, 19 deletions

diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index a3faa92dafab..49f925430dba 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	monster
-PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTVERSION=	1.7
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.cs.aau.dk/~olau/monster-masher/source/
 PKGNAMESUFFIX=	-masher
@@ -16,7 +15,7 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Gnomemm puzzle game where you have to clean the caves of monsters
 
-LIB_DEPENDS=	gnomeuimm-2.0:${PORTSDIR}/x11-toolkits/libgnomeuimm
+LIB_DEPENDS=	gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
@@ -24,13 +23,14 @@ USE_GNOME=	gnomeprefix gnomehack gnometarget intlhack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASA}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	monster-masher.schemas
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500010
+IGNORE=		Freezes when starting a new game
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-vector.hpp
 .endif
 
diff --git a/games/monster-masher/distinfo b/games/monster-masher/distinfo
index c7118690a38b..a15643b4222a 100644
--- a/games/monster-masher/distinfo
+++ b/games/monster-masher/distinfo
@@ -1,2 +1,2 @@
-MD5 (monster-masher-1.6.1.tar.bz2) = ac8eb251dbccd1676b3b4c2ecedb41d4
-SIZE (monster-masher-1.6.1.tar.bz2) = 1091703
+MD5 (monster-masher-1.7.tar.bz2) = 2fd7df60c87041ff8fcf03944ae01ed0
+SIZE (monster-masher-1.7.tar.bz2) = 1091488
diff --git a/games/monster-masher/files/patch-src-Makefile.in b/games/monster-masher/files/patch-src-Makefile.in
index 88343513b2ff..8e80d68a08d9 100644
--- a/games/monster-masher/files/patch-src-Makefile.in
+++ b/games/monster-masher/files/patch-src-Makefile.in
@@ -1,14 +1,11 @@
---- src/Makefile.in.orig	Sat Jan 17 19:15:03 2004
-+++ src/Makefile.in	Sat Jan 17 19:16:39 2004
-@@ -53,9 +53,9 @@
- CXX = @CXX@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
--@MAINTAINER_MODE_FALSE@CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -Wall -O3
-+@MAINTAINER_MODE_FALSE@CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -Wall @CFLAGS@
+--- src/Makefile.in.orig	Thu Apr 28 14:07:13 2005
++++ src/Makefile.in	Thu Apr 28 14:07:55 2005
+@@ -199,7 +199,7 @@
+                       ucompose.hpp \
+                       vector.hpp
+ 
+-@MAINTAINER_MODE_FALSE@AM_CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -Wall -O3
++@MAINTAINER_MODE_FALSE@AM_CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -Wall @CFLAGS@
+ 
+ @MAINTAINER_MODE_TRUE@AM_CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -O0 -Wall
  
--@MAINTAINER_MODE_TRUE@CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -O0 -Wall
-+@MAINTAINER_MODE_TRUE@CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -Wall @CFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
diff --git a/games/monster-masher/pkg-plist b/games/monster-masher/pkg-plist
index aabe0d9a2edd..f7d96ff6b6dc 100644
--- a/games/monster-masher/pkg-plist
+++ b/games/monster-masher/pkg-plist
@@ -95,6 +95,30 @@ share/gnome/monster-masher/pixmaps/wall-32.png
 share/gnome/monster-masher/sounds/clinck.wav
 share/gnome/monster-masher/sounds/splat.wav
 share/gnome/pixmaps/monster-masher.png
+share/locale/az/LC_MESSAGES/monster-masher.mo
+share/locale/cs/LC_MESSAGES/monster-masher.mo
+share/locale/cy/LC_MESSAGES/monster-masher.mo
+share/locale/da/LC_MESSAGES/monster-masher.mo
+share/locale/de/LC_MESSAGES/monster-masher.mo
+share/locale/el/LC_MESSAGES/monster-masher.mo
+share/locale/en_CA/LC_MESSAGES/monster-masher.mo
+share/locale/en_GB/LC_MESSAGES/monster-masher.mo
+share/locale/es/LC_MESSAGES/monster-masher.mo
+share/locale/eu/LC_MESSAGES/monster-masher.mo
+share/locale/ga/LC_MESSAGES/monster-masher.mo
+share/locale/hr/LC_MESSAGES/monster-masher.mo
+share/locale/it/LC_MESSAGES/monster-masher.mo
+share/locale/lt/LC_MESSAGES/monster-masher.mo
+share/locale/nl/LC_MESSAGES/monster-masher.mo
+share/locale/no/LC_MESSAGES/monster-masher.mo
+share/locale/pl/LC_MESSAGES/monster-masher.mo
+share/locale/pt/LC_MESSAGES/monster-masher.mo
+share/locale/pt_BR/LC_MESSAGES/monster-masher.mo
+share/locale/sr/LC_MESSAGES/monster-masher.mo
+share/locale/sr@Latn/LC_MESSAGES/monster-masher.mo
+share/locale/sv/LC_MESSAGES/monster-masher.mo
+share/locale/tr/LC_MESSAGES/monster-masher.mo
+share/locale/zh_TW/LC_MESSAGES/monster-masher.mo
 @dirrm share/gnome/monster-masher/glade
 @dirrm share/gnome/monster-masher/pixmaps
 @dirrm share/gnome/monster-masher/sounds