Update to version 2.4

PR: 31220
Submitted by: MAINTAINER

5 files changed, 11 insertions, 39 deletions

diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index 65dda523141a..3501d0173813 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gtypist
-PORTVERSION=	2.3.2
+PORTVERSION=	2.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ MAINTAINER=	naddy@mips.inka.de
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/games/gtypist/distinfo b/games/gtypist/distinfo
index f16dd243b334..bd7a54c8fe87 100644
--- a/games/gtypist/distinfo
+++ b/games/gtypist/distinfo
@@ -1 +1 @@
-MD5 (gtypist-2.3.2.tar.gz) = 26cc537a215d8ba8b1cfb4e7d7471df3
+MD5 (gtypist-2.4.tar.gz) = c889c01bba588225d2769a9c4ce4b691
diff --git a/games/gtypist/files/patch-Makefile_in b/games/gtypist/files/patch-Makefile_in
deleted file mode 100644
index 8051dbac09e3..000000000000
--- a/games/gtypist/files/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
-$FreeBSD$
---- Makefile.in.orig	Thu May 17 15:58:41 2001
-+++ Makefile.in	Thu May 17 15:59:28 2001
-@@ -95,8 +95,6 @@ gtypist_LDADD = @INTLLIBS@
- man_MANS = gtypist.1
- INCLUDES = -I./intl -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" 
- 
--CPPFLAGS =  -Wall
--
- # GEN_MAN is a shell command that generates the man page
- GEN_MAN = @GEN_MAN@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -107,6 +105,7 @@ PROGRAMS =  $(bin_PROGRAMS)
- 
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I.
-+CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- gtypist_OBJECTS =  gtypist.o getopt.o getopt1.o
diff --git a/games/gtypist/files/patch-aclocal_m4 b/games/gtypist/files/patch-aclocal_m4
deleted file mode 100644
index 4b21001b4c5b..000000000000
--- a/games/gtypist/files/patch-aclocal_m4
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
---- aclocal.m4.orig	Fri Dec  8 12:32:15 2000
-+++ aclocal.m4	Thu May 17 15:54:17 2001
-@@ -173,10 +173,9 @@ AC_DEFUN(AM_WITH_NLS,
- 
- 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
- 	     AC_CHECK_LIB(intl, bindtextdomain,
--	       [AC_CACHE_CHECK([for gettext in libintl],
--		 gt_cv_func_gettext_libintl,
-+	       [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
- 		 [AC_CHECK_LIB(intl, gettext,
--		  gt_cv_func_gettext_libintl=yes,
-+		  [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
- 		  gt_cv_func_gettext_libintl=no)],
- 		 gt_cv_func_gettext_libintl=no)])
- 	   fi
diff --git a/games/gtypist/pkg-plist b/games/gtypist/pkg-plist
index 2ead4927dfae..f0af4e45e7d8 100644
--- a/games/gtypist/pkg-plist
+++ b/games/gtypist/pkg-plist
@@ -7,14 +7,22 @@ share/gtypist/d.typ
 share/gtypist/demo.typ
 share/gtypist/esp.typ
 share/gtypist/gtypist.typ
+share/gtypist/ktde.typ
+share/gtypist/kten.typ
+share/gtypist/ktfr.typ
+share/gtypist/ktlecten.typ
+share/gtypist/ktno.typ
+share/gtypist/ktnumber.typ
 share/gtypist/m.typ
 share/gtypist/n.typ
 share/gtypist/q.typ
 share/gtypist/r.typ
 share/gtypist/s.typ
 share/gtypist/t.typ
+share/gtypist/ttde.typ
 share/gtypist/u.typ
 share/gtypist/v.typ
 share/locale/de/LC_MESSAGES/gtypist.mo
 share/locale/es/LC_MESSAGES/gtypist.mo
+share/locale/fi/LC_MESSAGES/gtypist.mo
 @dirrm share/gtypist