Update the URL's for Neverwinter Nights (Original and Diamond editions)

data and client binaries due to them being moved again.

Since the available version of the Bink Player has changed and no
archives of the old copy exist, the ability to play movies in the game
is now experimental if and only if a newer version of the nwmovies.so
hook is compiled on Linux i386 and used.  The binary for the hook is not
currently provided, hence, it is experimental.  I am currently working
with the maintainer of that hook to make a release to add to the port to
bring back movie support.

Regenerate distinfo files to add TIMESTAMP.

Reviewed by:	lifanov, mat
Approved by:	lifanov
Differential Revision:	https://reviews.freebsd.org/D12960

6 files changed, 37 insertions, 21 deletions

diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile
index 842f551ca436..311056e57088 100644
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -3,13 +3,15 @@
 
 PORTNAME=	nwnclient
 PORTVERSION=	1.69
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games linux
-MASTER_SITES=	http://na.llnet.bioware.cdn.ea.com/u/f/eagames/bioware/neverwinternights/updates/linux/${PORTVERSION:S/.//}/:CLIENT \
-		http://nwdownloads.bioware.com/neverwinternights/linux/129/:ORIG \
-		http://nwdownloads.bioware.com/neverwinternights/linux/gold/:GOLD \
-		http://nwdownloads.bioware.com/neverwinternights/linux/161/:HOTU \
-		http://home.roadrunner.com/~nwmovies/nwmovies/:NWMOVIES \
+NWN_SITE_1=	http://na.llnet.bioware.cdn.ea.com/u/f/eagames/bioware/neverwinternights/updates/linux/
+NWN_SITE_2=	http://lvlt.bioware.cdn.ea.com/bioware/u/f/eagames/bioware/neverwinternights/updates/linux/
+MASTER_SITES=	${NWN_SITE_1}${PORTVERSION:S/.//}/:CLIENT \
+		${NWN_SITE_2}${PORTVERSION:S/.//}/:CLIENT \
+		${NWN_SITE_1}:ORIG,GOLD,HOTU \
+		${NWN_SITE_2}:ORIG,GOLD,HOTU \
+		https://github.com/nwnlinux/nwmovies/raw/master/:NWMOVIES \
 		http://www.radgametools.com/down/Bink/:BINK
 PKGNAMEPREFIX=	linux-
 DISTFILES=	${CLIENT_FILES} \
@@ -19,10 +21,6 @@ DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 MAINTAINER=	scf@FreeBSD.org
 COMMENT=	Neverwinter Nights Linux (x86) Client
 
-BROKEN=		does not fetch
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2017-11-09
-
 RUN_DEPENDS=	${LOCALBASE}/share/nwndata/docs/readme.txt:games/nwndata
 
 NO_BUILD=	yes
@@ -32,7 +30,7 @@ USE_LINUX=	dri sdl12 xorglibs
 NWNDATADIR=	${LOCALBASE}/share/nwndata
 
 OPTIONS_DEFINE=	NWMOVIES
-NWMOVIES_DESC=	Support for movies using BinkPlayer
+NWMOVIES_DESC=	Support for movies using BinkPlayer (experimental!)
 
 .include <bsd.port.options.mk>
 
@@ -43,10 +41,10 @@ CLIENT_FILES=	nwclientgold.tar.gz:GOLD \
 		English_linuxclient169_xp2.tar.gz:CLIENT
 .if ${PORT_OPTIONS:MNWMOVIES}
 NWMOVIESFILE=	nwmovies-v4-public.20090223.080954.tar.gz
-BINKPLAYERFILE=	BinkLinuxPlayer.zip
+BINKPLAYERFILE=	BinkLinuxPlayer.7z
 CLIENT_NWMOVIES=${NWMOVIESFILE}:NWMOVIES \
 		${BINKPLAYERFILE}:BINK
-USE_LINUX+=	mikmod sdlmixer
+USE_LINUX+=	sdlmixer
 PLIST_SUB+=	NWMOVIES=""
 .else
 PLIST_SUB+=	NWMOVIES="@comment "
diff --git a/games/linux-nwnclient/distinfo b/games/linux-nwnclient/distinfo
index 458eaa1f6ed6..2fedb591a5e0 100644
--- a/games/linux-nwnclient/distinfo
+++ b/games/linux-nwnclient/distinfo
@@ -1,3 +1,4 @@
+TIMESTAMP = 1510192086
 SHA256 (linux-nwnclient/English_linuxclient169_orig.tar.gz) = 50932f9647ea7968dbb8f7ab1fc6478035fff0826379a45762c1de8e46d1d2b0
 SIZE (linux-nwnclient/English_linuxclient169_orig.tar.gz) = 473297170
 SHA256 (linux-nwnclient/English_linuxclient169_xp2.tar.gz) = 09715e2b95c025ef7f00d218deec1b1edce501530d8cba51d61097c69699763f
@@ -10,5 +11,5 @@ SHA256 (linux-nwnclient/nwclienthotu.tar.gz) = 0a4ace1aacd69fb166d09bd249ce5ae98
 SIZE (linux-nwnclient/nwclienthotu.tar.gz) = 39611339
 SHA256 (linux-nwnclient/nwmovies-v4-public.20090223.080954.tar.gz) = 4ce60791183a0623d09b37c9f00ba42a2f7e7d953eba35b090a96cc891254f14
 SIZE (linux-nwnclient/nwmovies-v4-public.20090223.080954.tar.gz) = 137697
-SHA256 (linux-nwnclient/BinkLinuxPlayer.zip) = ba3102eb70627f7a97c82f3a9efaacbccef64d1f48dda2b4338b0f27d5f50418
-SIZE (linux-nwnclient/BinkLinuxPlayer.zip) = 85507
+SHA256 (linux-nwnclient/BinkLinuxPlayer.7z) = 055c9cc22acad954962159c1c5963772cb82a3c3b4a024659c20a027cbad24e1
+SIZE (linux-nwnclient/BinkLinuxPlayer.7z) = 826686
diff --git a/games/linux-nwnclient/files/nwn.sh b/games/linux-nwnclient/files/nwn.sh
index 1459b4f0549a..f4ffcc35c59f 100644
--- a/games/linux-nwnclient/files/nwn.sh
+++ b/games/linux-nwnclient/files/nwn.sh
@@ -6,6 +6,7 @@
 NWNDATADIR="%%NWNDATADIR%%"
 NWNCLIENTDIR="%%NWNCLIENTDIR%%"
 NWNUSERDIR="${HOME}/.nwn"
+NWNMOVIEDIR="${NWNUSERDIR}/nwmovies"
 LCDIRS="ambient data dmvault hak localvault music override portraits"
 
 set -e
@@ -91,7 +92,8 @@ cd "${NWNUSERDIR}"
 rm -f ${NWNUSERDIR}/nwmovies.log
 
 # Prevent flickering at beginning and ending of playing a movie.
-export NWMOVIES_GRAB_HACK=1
+# NOTE: this breaks using an external player (i.e., ffplay, mpv).
+#export NWMOVIES_GRAB_HACK=1
 
 # SDL settings
 export SDL_MOUSE_RELATIVE=0
@@ -105,7 +107,22 @@ export LD_LIBRARY_PATH="${NWNUSERDIR}/lib:${NWNUSERDIR}/miles"
 ulimit -c 0
 
 echo "Starting Neverwinter Nights..."
-if [ -e ./nwmovies/nwmovies.so ] ; then
-	export LD_PRELOAD=./nwmovies/nwmovies.so
+if [ -e ${NWNMOVIEDIR}/nwmovies.so ] ; then
+	if [ ! -e ${NWNUSERDIR}/lib/libdisasm.so ]
+	then
+		# Needed for generation of nwmovies.ini.  Linked here since the code
+		# calls dlopen() from the user directory.
+		ln -sf ${NWNMOVIEDIR}/libdis/libdisasm.so \
+			${NWNUSERDIR}/lib/libdisasm.so
+	fi
+
+	export LD_PRELOAD=${NWNMOVIEDIR}/nwmovies.so
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${NWNMOVIEDIR}"
+
+	# Support for newer nwmovies.so that can use an external application.
+	# Does not work all that well at the moment.
+	export NWMOVIES_PLAY_COMMAND="mpv --fullscreen --keep-open=no" \
+		"--no-config --no-input-cursor --no-osc --no-terminal" \
+		"--osd-level=0"
 fi
 ./nwmain "${@}"
diff --git a/games/nwndata/Makefile b/games/nwndata/Makefile
index 1cc9856cb0c0..b2922b2245d3 100644
--- a/games/nwndata/Makefile
+++ b/games/nwndata/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	nwndata
 PORTVERSION=	${NWNVER}
 PORTREVISION=	${NWNREV}
 CATEGORIES=	games
-MASTER_SITES=	http://files.bioware.com/neverwinternights/updates/linux/ \
-		http://nwdownloads.bioware.com/neverwinternights/linux/129/ \
+MASTER_SITES=	http://na.llnet.bioware.cdn.ea.com/u/f/eagames/bioware/neverwinternights/updates/linux/ \
 		http://lvlt.bioware.cdn.ea.com/bioware/u/f/eagames/bioware/neverwinternights/updates/linux/
 DISTNAME=	${NWRESOURCES}
 .if defined(CDROM_MOUNT) && exists(${CDROM_MOUNT}/KingmakerSetup.exe)
diff --git a/games/nwndata/distinfo b/games/nwndata/distinfo
index fb02a43a04a7..ce5339135571 100644
--- a/games/nwndata/distinfo
+++ b/games/nwndata/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1510192144
 SHA256 (nwresources129.tar.gz) = 4da35c38c63d7cbe40047833103fe0d56f417d1895fb572d52c23a873619f537
 SIZE (nwresources129.tar.gz) = 1212356127
diff --git a/games/nwndata/pkg-plist b/games/nwndata/pkg-plist
index 6e4060c7eb03..43c8aae0f516 100644
--- a/games/nwndata/pkg-plist
+++ b/games/nwndata/pkg-plist
@@ -365,5 +365,5 @@
 %%ORIGINAL%%%%DATADIR%%/dialog.tlk
 @dir %%DATADIR%%/servervault
 @dir %%DATADIR%%/saves
-@dir %%DATADIR%%/portraits
+%%ORIGINAL%%@dir %%DATADIR%%/portraits
 @dir %%DATADIR%%/hak