- Update to 1.96.1

PR:		ports/89577
Submitted by:	Ports Fury

6 files changed, 49 insertions, 35 deletions

diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index 90a1b6ba98ec..fb10654ff9aa 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -6,29 +6,43 @@
 #
 
 PORTNAME=	gno3dtet
-PORTVERSION=	1.6.4
-PORTREVISION=	1
+PORTVERSION=	1.96.1
 CATEGORIES=	games gnome
-MASTER_SITES=	ftp://12.206.131.3/pub/gno3dtet/ \
-		http://www.eseb.net/ftp/gno3dtet/
+MASTER_SITES=	http://eseb.net/ftp/gno3dtet/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME version of the classic 3D-ified T*tris
 
-USE_REINPLACE=	yes
+EXTRACT_DEPENDS=intltoolize:${PORTSDIR}/textproc/intltool
+
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui librsvg2
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	autoheader:259 automake:19 aclocal:19 autoconf:259
+ACLOCAL_ARGS=	-I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	-a -c -f
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
+INSTALLS_OMF=	yes
+
+run-autotools:: run-autotools-aclocal run-autotools-autoheader \
+		run-autotools-automake run-autotools-autoconf
+
+post-extract:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/intltoolize -c -f
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/LIBTOOL/d ; \
+		 s|gnome-games|gno3dtet|g' ${WRKSRC}/configure.in
+	@${REINPLACE_CMD} -e 's|/gnome/help/|/help/|g' \
+		${WRKSRC}/xmldocs.make
+	@${REINPLACE_CMD} -e 's|/gnome/help/|/help/|g ; \
+		 s|datadir)/locale|prefix)/share/locale|g' ${WRKSRC}/src/Makefile.am
+
+pre-configure:
+	@${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/mkinstalldirs ${WRKSRC}
 
 post-install:
 	${CHOWN} root:games ${PREFIX}/bin/gno3dtet
diff --git a/games/gno3dtet/distinfo b/games/gno3dtet/distinfo
index 56369d7801b1..c3aa01508c82 100644
--- a/games/gno3dtet/distinfo
+++ b/games/gno3dtet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gno3dtet-1.6.4.tgz) = 62c01388996b648c07fc2fe46fb6bca6
-SHA256 (gno3dtet-1.6.4.tgz) = 3bfc727884d0fb1fd82bef09d161c035017776c577b2e6a27a0da88daf63c200
-SIZE (gno3dtet-1.6.4.tgz) = 313454
+MD5 (gno3dtet-1.96.1.tgz) = f298fe3306d5938ef843302a31a19713
+SHA256 (gno3dtet-1.96.1.tgz) = 81988eee8d824962d5d348ae72c5c66bf4e15dc406eac2bce8a76b098709f37b
+SIZE (gno3dtet-1.96.1.tgz) = 202401
diff --git a/games/gno3dtet/files/patch-gno3dtet:main.cc b/games/gno3dtet/files/patch-gno3dtet:main.cc
deleted file mode 100644
index 5f5372a6bfdb..000000000000
--- a/games/gno3dtet/files/patch-gno3dtet:main.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- gno3dtet/main.cc.orig	Thu May  3 12:30:56 2001
-+++ gno3dtet/main.cc	Sat Oct  6 02:07:05 2001
-@@ -374,6 +374,7 @@
- 	textdomain (PACKAGE);
- 
- 	// init
-+	setregid(getegid(), -1);
- 	gnome_init_with_popt_table (GNO3DTET_EXENAME, GNO3DTET_VERSION,
- 		argc, argv, options, 0, NULL);
- 
diff --git a/games/gno3dtet/files/patch-src__main.cc b/games/gno3dtet/files/patch-src__main.cc
new file mode 100644
index 000000000000..6c2d27a3187d
--- /dev/null
+++ b/games/gno3dtet/files/patch-src__main.cc
@@ -0,0 +1,10 @@
+--- src/main.cc.orig	Wed Mar  9 11:07:47 2005
++++ src/main.cc	Fri Nov 25 23:00:18 2005
+@@ -375,6 +375,7 @@
+ 	textdomain (PACKAGE);
+ 
+ 	// init
++	setregid(getegid(), -1);
+ //	gnome_init_with_popt_table (GNO3DTET_EXENAME, GNO3DTET_VERSION, argc, argv, options, 0, NULL);// gnome-1
+     gnome_program_init (GNO3DTET_EXENAME, GNO3DTET_VERSION,
+                 LIBGNOMEUI_MODULE,
diff --git a/games/gno3dtet/pkg-descr b/games/gno3dtet/pkg-descr
index bd7060bb4974..065b29055e6a 100644
--- a/games/gno3dtet/pkg-descr
+++ b/games/gno3dtet/pkg-descr
@@ -1,9 +1,8 @@
-Gno3DTet is a funky 3D-ified version of T*tris
-that reminds me of games I used to play 10 years
-ago. It'll make for hours of fun if you learn
+Gno3DTet is a funky 3D-ified version of T*tris that reminds me of games
+I used to play 10 years ago. It'll make for hours of fun if you learn
 how to move the pieces around right.
 
-WWW: http://gno3dtet.eseb.net/
-Author: Sebastien Nicoud <snicoud@rmi.net>
+WWW: http://eseb.net/3dtetris.php
+Author: Sebastien Nicoud <seb at eseb.net>
 
 --Will <andrews@technologist.com>
diff --git a/games/gno3dtet/pkg-plist b/games/gno3dtet/pkg-plist
index 0694b7bb88dc..f30fe4b054c7 100644
--- a/games/gno3dtet/pkg-plist
+++ b/games/gno3dtet/pkg-plist
@@ -1,9 +1,9 @@
 bin/gno3dtet
-share/gnome/apps/Games/gno3dtet.desktop
+share/gnome/applications/gno3dtet.desktop
 share/gnome/games/gno3dtet.hof
-share/gnome/help/gno3dtet/C/copying.html
-share/gnome/help/gno3dtet/C/gno3dtet.html
-share/gnome/help/gno3dtet/C/topic.dat
+share/gnome/help/gno3dtet/C/gno3dtet.xml
+share/gnome/help/gno3dtet/C/legal.xml
+share/gnome/omf/gno3dtet/gno3dtet-C.omf
 share/gnome/pixmaps/gno3dtet.png
 share/gnome/sounds/gno3dtet/danger.wav
 share/gnome/sounds/gno3dtet/fall.wav
@@ -11,11 +11,12 @@ share/gnome/sounds/gno3dtet/hof.wav
 share/gnome/sounds/gno3dtet/land.wav
 share/gnome/sounds/gno3dtet/layer.wav
 share/gnome/sounds/gno3dtet/level.wav
-share/gnome/sounds/gno3dtet/move.wav
 share/gnome/sounds/gno3dtet/new.wav
 share/gnome/sounds/gno3dtet/pause.wav
 share/gnome/sounds/gno3dtet/score.wav
 share/gnome/sounds/gno3dtet/screwd.wav
+share/locale/fr/LC_MESSAGES/gno3dtet.mo
 @dirrm share/gnome/sounds/gno3dtet
+@dirrm share/gnome/omf/gno3dtet
 @dirrm share/gnome/help/gno3dtet/C
 @dirrm share/gnome/help/gno3dtet