Update FreeDink to 108.4, Data to 20140901 version, and dfarc to 3.12

PR:		197062

15 files changed, 112 insertions, 53 deletions

diff --git a/games/freedink-data/Makefile b/games/freedink-data/Makefile
index e7cb08491b0d..71e21a452ef0 100644
--- a/games/freedink-data/Makefile
+++ b/games/freedink-data/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	freedink-data
 PORTVERSION=	1.08.${PORTVER}
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	freedink
 
 MAINTAINER=	shurd@FreeBSD.org
@@ -13,7 +13,7 @@ COMMENT=	Game data for games/freedink (Dink Smallwood)
 USES=		gettext gmake
 NO_BUILD=	yes
 
-PORTVER=	20121209
+PORTVER=	20140901
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/games/freedink-data/distinfo b/games/freedink-data/distinfo
index bb95182f4838..079b0579453a 100644
--- a/games/freedink-data/distinfo
+++ b/games/freedink-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freedink-data-1.08.20121209.tar.gz) = 3258a83aaca8c51d8502f59edd50d6afe6a55ef26c4185424709e94013d016d6
-SIZE (freedink-data-1.08.20121209.tar.gz) = 44009314
+SHA256 (freedink-data-1.08.20140901.tar.gz) = 5797a6e3a8d407cc46080206a0f18265231d6cf912b2b3dfc4607cf79052c111
+SIZE (freedink-data-1.08.20140901.tar.gz) = 51303165
diff --git a/games/freedink-data/files/patch-Makefile b/games/freedink-data/files/patch-Makefile
index d02b47c86d9b..2f4c8ee2e33d 100644
--- a/games/freedink-data/files/patch-Makefile
+++ b/games/freedink-data/files/patch-Makefile
@@ -1,9 +1,9 @@
---- Makefile.orig	2013-08-14 12:38:50.000000000 -0700
-+++ Makefile	2013-08-14 12:40:16.000000000 -0700
+--- Makefile.orig	2015-01-25 00:56:07.000000000 -0800
++++ Makefile	2015-01-25 00:56:48.000000000 -0800
 @@ -1,5 +1,5 @@
  DESTDIR=
 -PREFIX=/usr/local
 +PREFIX=%%PREFIX%%
  DATADIR=$(PREFIX)/share
- version=1.08.`date +%Y%m%d`
+ version:=1.08.$(shell date +%Y%m%d)
  releasedir=freedink-data-$(version)
diff --git a/games/freedink-data/pkg-plist b/games/freedink-data/pkg-plist
index 912b3dde010b..747fa38f62ba 100644
--- a/games/freedink-data/pkg-plist
+++ b/games/freedink-data/pkg-plist
@@ -33,6 +33,8 @@ share/dink/dink/Sound/grunt2.wav
 share/dink/dink/Sound/grunt1.wav
 share/dink/dink/Sound/sword2.wav
 share/dink/dink/Sound/bhit.wav
+share/dink/dink/Sound/lovin.ogg
+share/dink/dink/Sound/open.wav
 share/dink/dink/Story/1GOLD.c
 share/dink/dink/Story/APOTION.c
 share/dink/dink/Story/BAR-DP.c
@@ -756,4 +758,8 @@ share/dink/dink/l10n/dink.pot
 share/dink/dink/l10n/hr.po
 share/dink/dink/l10n/nl.po
 share/dink/dink/l10n/eo.po
+share/dink/dink/l10n/ca.po
+share/dink/dink/l10n/ca/LC_MESSAGES/dink.mo
+share/dink/dink/l10n/hu.po
+share/dink/dink/l10n/hu/LC_MESSAGES/dink.mo
 share/dink/dink/preview.bmp
diff --git a/games/freedink-dfarc/Makefile b/games/freedink-dfarc/Makefile
index 202500a2b94a..00cbe1aadf83 100644
--- a/games/freedink-dfarc/Makefile
+++ b/games/freedink-dfarc/Makefile
@@ -2,18 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	freedink-dfarc
-PORTVERSION=	3.10
-PORTREVISION=	2
+PORTVERSION=	3.12
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	freedink
 DISTNAME=	dfarc-${PORTVERSION}
 
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Frontend and .dmod installer for GNU FreeDink
 
-USES=		desktop-file-utils gettext gmake shared-mime-info
-USE_WX=		2.8
+USES=		compiler:c++11-lib desktop-file-utils gettext gmake shared-mime-info
+USE_WX=		3.0
 WX_UNICODE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/games/freedink-dfarc/distinfo b/games/freedink-dfarc/distinfo
index 21a8ae23fc9b..07971c4e5259 100644
--- a/games/freedink-dfarc/distinfo
+++ b/games/freedink-dfarc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dfarc-3.10.tar.gz) = 072ef7938cf9dc35617dea3660bec459cfe6b1e376f2decb419f44b67222d280
-SIZE (dfarc-3.10.tar.gz) = 282667
+SHA256 (dfarc-3.12.tar.gz) = 222a84cc91967abce4d86fb4ed8ba43455b818aecdb8487b0fe52d76ade29a83
+SIZE (dfarc-3.12.tar.gz) = 329925
diff --git a/games/freedink-dfarc/files/patch-src_Tar.cpp b/games/freedink-dfarc/files/patch-src_Tar.cpp
new file mode 100644
index 000000000000..1a3038d849c9
--- /dev/null
+++ b/games/freedink-dfarc/files/patch-src_Tar.cpp
@@ -0,0 +1,65 @@
+--- src/Tar.cpp.orig	2015-01-24 23:59:53.000000000 -0800
++++ src/Tar.cpp	2015-01-25 00:51:23.000000000 -0800
+@@ -33,7 +33,7 @@
+ #include <wx/filename.h>
+ 
+ #include <math.h>
+-#include <ext/stdio_filebuf.h>
++#include <fstream>
+ #include <sstream>
+ #include <sys/types.h>
+ 
+@@ -477,9 +477,9 @@
+ 
+ 
+     // Open the file here so it doesn't error after changing.
+-    wxFile wx_In(mFilePath, wxFile::read);
++    std::ifstream f_In (mFilePath, std::ifstream::in | std::ifstream::binary);
+ 
+-    if(!wx_In.IsOpened())
++    if(!f_In.is_open())
+     {
+       lError = 1;
+       wxLogFatalError(_("Error: File '%s' not found!  Cannot extract data."), mFilePath.c_str());
+@@ -499,13 +499,11 @@
+     ::wxSetWorkingDirectory(destdir);
+ 
+     // Put the data in the directories.
+-    __gnu_cxx::stdio_filebuf<char> filebuf(wx_In.fd(), std::ios::in);
+-    std::istream f_In(&filebuf);
+     if (ExtractData(f_In, destdir, aProgressDialog) != 0)
+     {
+         lError = 1;
+     }
+-    wx_In.Close();
++    f_In.close();
+ 
+ 
+     // We're done.  Move back.
+@@ -571,15 +569,13 @@
+             if (lLastCharacter != '\\' && lLastCharacter != '/')
+             {
+                 // Open the file.
+-                wxFile wx_Out(lCurrentFilePath, wxFile::write);
+-		if (!wx_Out.IsOpened())
++                std::ofstream lStreamOut(lCurrentFilePath, std::ifstream::out | std::ifstream::binary);
++		if (!lStreamOut.is_open())
+                 {
+ 		    wxLogError(_("Error: Improperly archived file '%s'.  Skipping."), lCurrentFilePath);
+                     lError = 1;
+                     continue;
+                 }
+-		__gnu_cxx::stdio_filebuf<char> filebuf(wx_Out.fd(), std::ios::out);
+-		std::ostream lStreamOut(&filebuf);
+                 
+ 		aTarStreamIn.seekg(lCurrentTarRecord.iFilePosBegin, std::ios::beg);
+ 		long remaining = lCurrentTarRecord.iFileSize;
+@@ -595,7 +591,7 @@
+                 
+                 // Close up.
+                 lStreamOut.flush();
+-                wx_Out.Close();
++                lStreamOut.close();
+             }
+             
+             // Update progress
diff --git a/games/freedink-dfarc/pkg-plist b/games/freedink-dfarc/pkg-plist
index 5abbc976f81a..bdca80737652 100644
--- a/games/freedink-dfarc/pkg-plist
+++ b/games/freedink-dfarc/pkg-plist
@@ -17,3 +17,9 @@ share/locale/it/LC_MESSAGES/dfarc.mo
 share/locale/mk/LC_MESSAGES/dfarc.mo
 share/locale/nl/LC_MESSAGES/dfarc.mo
 share/locale/vi/LC_MESSAGES/dfarc.mo
+share/locale/ca/LC_MESSAGES/dfarc.mo
+share/locale/eo/LC_MESSAGES/dfarc.mo
+share/locale/hu/LC_MESSAGES/dfarc.mo
+share/locale/pt_BR/LC_MESSAGES/dfarc.mo
+share/locale/sr/LC_MESSAGES/dfarc.mo
+share/locale/tr/LC_MESSAGES/dfarc.mo
diff --git a/games/freedink-engine/Makefile b/games/freedink-engine/Makefile
index 90ca095bb5b1..be803ac2a43d 100644
--- a/games/freedink-engine/Makefile
+++ b/games/freedink-engine/Makefile
@@ -2,22 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	freedink
-PORTVERSION=	1.08.${PORTVER}
-PORTREVISION=	6
+PORTVERSION=	108.4
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	freedink
+MASTER_SITES=	GNU
 PKGNAMESUFFIX=	-engine
 
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Dink Smallwood RPG and RPG Construction Set
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libcheck.so:${PORTSDIR}/devel/libcheck
 
 USES=		gettext gmake pkgconfig
 USE_SDL=	sdl gfx ttf image mixer
 GNU_CONFIGURE=	yes
-PORTVER=	20121209
 CONFIGURE_ARGS=	--disable-static --disable-upx
 
 OPTIONS_DEFINE=	EMBEDDED
diff --git a/games/freedink-engine/distinfo b/games/freedink-engine/distinfo
index 91ddd1d6543a..bc941176f8e1 100644
--- a/games/freedink-engine/distinfo
+++ b/games/freedink-engine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freedink-1.08.20121209.tar.gz) = 196bfcc7b874c2fb9ac94d663f14fb759e644cc2400f77f734a098ca568dbda7
-SIZE (freedink-1.08.20121209.tar.gz) = 1853822
+SHA256 (freedink-108.4.tar.gz) = 82cfb2e019e78b6849395dc4750662b67087d14f406d004f6d9e39e96a0c8521
+SIZE (freedink-108.4.tar.gz) = 1897701
diff --git a/games/freedink-engine/files/patch-meminfo.c b/games/freedink-engine/files/patch-meminfo.c
deleted file mode 100644
index 7c8ce0d61da9..000000000000
--- a/games/freedink-engine/files/patch-meminfo.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/meminfo.c.orig	2013-08-14 02:51:44.000000000 -0700
-+++ src/meminfo.c	2013-08-14 02:51:55.000000000 -0700
-@@ -24,7 +24,7 @@
- #include <config.h>
- #endif
- 
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "log.h"
- 
diff --git a/games/freedink-engine/files/patch-src_Makefile.in b/games/freedink-engine/files/patch-src_Makefile.in
index b2789b316a85..bafa2c209dcc 100644
--- a/games/freedink-engine/files/patch-src_Makefile.in
+++ b/games/freedink-engine/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2012-12-09 09:12:48.000000000 -0800
-+++ src/Makefile.in	2014-05-24 21:29:13.000000000 -0700
-@@ -1541,16 +1541,20 @@
+--- src/Makefile.in.orig	2014-10-22 06:22:21.000000000 -0700
++++ src/Makefile.in	2015-01-25 01:10:44.000000000 -0800
+@@ -1687,15 +1687,19 @@
  @HAVE_UPX_TRUE@	-$(UPX) "$(DESTDIR)$(bindir)/freedinkedit$(EXEEXT)"
  # Bundle resources
  @HAVE_ZIP_TRUE@	zip -j res.zip $(resdir)/LiberationSans-Regular.ttf
@@ -10,9 +10,8 @@
  @HAVE_ZIP_TRUE@	zip -A "$(DESTDIR)$(bindir)/freedink$(EXEEXT)"
 +@HAVE_ZIP_TRUE@	chmod 0555 "$(DESTDIR)$(bindir)/freedink$(EXEEXT)"
  
- @HAVE_ZIP_TRUE@	zip -j res.zip $(resdir)/LiberationSans-Regular.ttf
- #	Not including $(resdir)/stop.wav $(resdir)/jump.wav until we
- #	replace them with free sounds
+ @HAVE_ZIP_TRUE@	zip -j res.zip $(resdir)/LiberationSans-Regular.ttf	\
+ @HAVE_ZIP_TRUE@		$(resdir)/stop.wav $(resdir)/jump.wav
 +@HAVE_ZIP_TRUE@	chmod 0755 "$(DESTDIR)$(bindir)/freedinkedit$(EXEEXT)"
  @HAVE_ZIP_TRUE@	cat res.zip >> "$(DESTDIR)$(bindir)/freedinkedit$(EXEEXT)"
  @HAVE_ZIP_TRUE@	rm -f res.zip
diff --git a/games/freedink-engine/pkg-plist b/games/freedink-engine/pkg-plist
index a5f32658d2d5..0eabc1e02e58 100644
--- a/games/freedink-engine/pkg-plist
+++ b/games/freedink-engine/pkg-plist
@@ -25,8 +25,6 @@ share/locale/de/LC_MESSAGES/freedink-gnulib.mo
 share/locale/de/LC_MESSAGES/freedink.mo
 share/locale/el/LC_MESSAGES/freedink-gnulib.mo
 share/locale/el/LC_MESSAGES/freedink.mo
-share/locale/en@boldquot/LC_MESSAGES/freedink.mo
-share/locale/en@quot/LC_MESSAGES/freedink.mo
 share/locale/eo/LC_MESSAGES/freedink.mo
 share/locale/es/LC_MESSAGES/freedink-gnulib.mo
 share/locale/es/LC_MESSAGES/freedink.mo
@@ -69,6 +67,9 @@ share/locale/vi/LC_MESSAGES/freedink-gnulib.mo
 share/locale/vi/LC_MESSAGES/freedink.mo
 share/locale/zh_CN/LC_MESSAGES/freedink-gnulib.mo
 share/locale/zh_TW/LC_MESSAGES/freedink-gnulib.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry %%DATADIR%%
+share/locale/eo/LC_MESSAGES/freedink-gnulib.mo
+share/locale/hu/LC_MESSAGES/freedink.mo
+share/locale/pt_BR/LC_MESSAGES/freedink.mo
+share/locale/ru/LC_MESSAGES/freedink.mo
+share/locale/sr/LC_MESSAGES/freedink-gnulib.mo
+share/appdata/freedink.appdata.xml
diff --git a/games/freedink/Makefile b/games/freedink/Makefile
index 22e715cef672..8bd4b4dcc14e 100644
--- a/games/freedink/Makefile
+++ b/games/freedink/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freedink
-PORTVERSION=	1.08.${PORTVER}
-PORTREVISION=	1
+PORTVERSION=	108.4
 CATEGORIES=	games
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -12,19 +11,16 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Metaport for FreeDink engine and data
 
-RUN_DEPENDS=	freedink:${PORTSDIR}/games/freedink-engine \
-		freedink-data>0:${PORTSDIR}/games/freedink-data \
-		dfarc:${PORTSDIR}/games/freedink-dfarc
+RUN_DEPENDS=	freedink>=${PORTVERSION}:${PORTSDIR}/games/freedink-engine \
+		freedink-data>=1.08.20140901:${PORTSDIR}/games/freedink-data \
+		dfarc>=3.12:${PORTSDIR}/games/freedink-dfarc
 
 NO_BUILD=	yes
-PORTVER=	20121209
 
 do-install:	# empty
 
 pre-everything::
 	@${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port."
 	@${ECHO_MSG} "It won't build and install all the parts until you have typed make install"
-	@${ECHO_MSG} "This port does not ensure things are upgraded; use portupgrade if you want to"
-	@${ECHO_MSG} "upgrade FreeDink."
 
 .include <bsd.port.mk>
diff --git a/games/freedink/pkg-descr b/games/freedink/pkg-descr
index c2f8223f39da..d5a8c42c9498 100644
--- a/games/freedink/pkg-descr
+++ b/games/freedink/pkg-descr
@@ -7,6 +7,6 @@ GNU FreeDink is a new and portable version of the game engine, which
 runs the original game as well as its D-Mods, with close
 compatibility, under multiple platforms.
 
-This package contains the game engine alone.
+This is a meta-port to install all the other freedink ports.
 
 WWW: http://www.gnu.org/software/freedink/