Index: head/games/diaspora/Makefile
===================================================================
--- head/games/diaspora/Makefile	(revision 459122)
+++ head/games/diaspora/Makefile	(revision 459123)
@@ -1,127 +1,128 @@
 # Created by: lightside <lightside@gmx.com>
 # $FreeBSD$
 
 PORTNAME=	diaspora
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://diaspora.fs2downloads.com/ \
 		http://www.freespacemods.net/e107_files/downloads/:freespacemods \
 		http://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/:intfiles \
 		http://ftp.tw.freebsd.org/distfiles/:twfiles
 DISTFILES=	Diaspora_R1_Linux.tar.lzma:freespacemods,DEFAULT \
 		Diaspora_R1_Patch_1.1.tar.lzma:intfiles,twfiles,DEFAULT \
 		Diaspora_R1_Patch_1.1.1.tar.lzma
 
 MAINTAINER=	lightside@gmx.com
 COMMENT=	Single and multiplayer space fighter combat game
 
 LICENSE=	CC-BY-NC-SA-3.0 VOLITION GPLv2
 LICENSE_COMB=	multi
 LICENSE_NAME_VOLITION=	Volition license
 LICENSE_FILE_CC-BY-NC-SA-3.0=	${WRKDIR_DIASPORA}/License.txt
 LICENSE_FILE_VOLITION=	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2=	${WRKDIR_DIASPORA}/wxlauncher/GPLv2.txt
 LICENSE_PERMS_VOLITION=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 LIB_DEPENDS=	libjansson.so:devel/jansson \
 		libpng.so:graphics/png \
 		libogg.so:audio/libogg \
 		libvorbisfile.so:audio/libvorbis \
 		libtheora.so:multimedia/libtheora
 
 USES=		autoreconf jpeg lua:51 openal pkgconfig tar:lzma
+USE_CXXSTD=	gnu++98
 USE_GL=		gl glu
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 
 WRKDIR_DIASPORA=${WRKDIR}/Diaspora_R1_Linux/Diaspora
 WRKSRC=		${WRKDIR_DIASPORA}/fs2_open
 
 PORTDATA=	data *.vp
 PORTDOCS=	*
 SUB_FILES=	fs2_open_${PORTNAME}
 PLIST_FILES=	bin/fs2_open_${PORTNAME} \
 		libexec/fs2_open_${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
 
 DESKTOP_ENTRIES="Diaspora" "${COMMENT}" \
 		"${PORTNAME}" "fs2_open_${PORTNAME}" \
 		"Game;Simulation;" false
 
 OPTIONS_DEFINE=		DOCS INCJOYBTNS SPEECH WXLAUNCHER
 OPTIONS_DEFAULT=	SPEECH WXLAUNCHER
 INCJOYBTNS_DESC=	Increase a number of joystick buttons from 32 to 98
 INCJOYBTNS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-increase_joy_buttons_fixed.patch
 SPEECH_DESC=		Text to speech
 SPEECH_CONFIGURE_ENABLE=	speech
 WXLAUNCHER_DESC=	Use wxlauncher to manage application profile
 WXLAUNCHER_DESKTOP_ENTRIES=	"Diaspora Launcher" "${COMMENT}" \
 			"${PORTNAME}" "fs2_open_${PORTNAME}_launcher" \
 			"Game;Simulation;" false
 WXLAUNCHER_PLIST_FILES=	bin/fs2_open_${PORTNAME}_launcher \
-			%%DATADIR%%/fs2_open_${PORTNAME}
+			${DATADIR}/fs2_open_${PORTNAME}
 WXLAUNCHER_RUN_DEPENDS=	wxlauncher:games/wxlauncher
 WXLAUNCHER_SUB_FILES=	fs2_open_${PORTNAME}_launcher
 WXLAUNCHER_VARS=	PORTDATA+="resources *.ini *.png *.bmp"
 
 POST_PLIST+=	build-plist-empty
 
 BROKEN_aarch64=		Fails to compile: cast from pointer to smaller type loses information
 
 post-extract: .SILENT
 .for v in 1.1 1.1.1
 	(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		Patch_Files.${v}.tar ${EXTRACT_AFTER_ARGS} -C ${WRKDIR_DIASPORA} \
 		&& ${RM} Patch_Files.${v}.tar)
 .endfor
 
 post-extract-WXLAUNCHER-on: .SILENT
 	(cd ${WRKDIR_DIASPORA} && ${CP} -f pro00099.template.ini pro00099.ini)
 # Backup data/cmdline_fso.cfg, because executable might merge it with
 # user settings
 	(cd ${WRKDIR_DIASPORA}/data && ${MV} -f cmdline_fso.cfg cmdline_fso.cfg.bak)
 
 post-patch: .SILENT
 	${REINPLACE_CMD} -e '/^AC_INIT/s/3\.7\.1/${PORTNAME}/ ; \
 		s/freebsd/${OPSYS:tl}/ ; \
 		s/ -m64 -march=athlon64 -ansi// ; \
 		s|/usr/local|${LOCALBASE}|' \
 		${CONFIGURE_WRKSRC}/configure.ac
 	${REINPLACE_CMD} -e 's|(640x480)x16|(1024x768)x32|' \
 		${BUILD_WRKSRC}/code/osapi/osapi_unix.cpp
 
 post-patch-WXLAUNCHER-on: .SILENT
 	${REINPLACE_CMD} -e \
 		's|/PATH/TO/YOUR/DIASPORA/FOLDER/HERE|${DATADIR}|' \
 		${WRKDIR_DIASPORA}/pro00099.ini
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/fs2_open_${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/code/fs2_open_${PORTNAME} \
 		${STAGEDIR}${PREFIX}/libexec
 	(cd ${WRKDIR_DIASPORA} && ${COPYTREE_SHARE} "${PORTDATA}" \
 		${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} ${WRKDIR_DIASPORA}/resources/modimg.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 do-install-DOCS-on:
 	(cd ${WRKDIR} && ${COPYTREE_SHARE} "README*.txt" ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKDIR_DIASPORA} && ${COPYTREE_SHARE} "*.pdf *.rtf README.txt" \
 		${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog" \
 		${STAGEDIR}${DOCSDIR})
 
 do-install-WXLAUNCHER-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/fs2_open_${PORTNAME}_launcher \
 		${STAGEDIR}${PREFIX}/bin
 # Create a symbolic link, which used by launcher
 	${LN} -sf ${PREFIX}/libexec/fs2_open_${PORTNAME} ${STAGEDIR}${DATADIR}
 
 build-plist-empty: .SILENT
 # Add required empty directories to TMPPLIST
 	${FIND} ${STAGEDIR}${DATADIR}/data -type d -empty | \
 		${SED} -e 's|^${STAGEDIR}|@dir |' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/games/diaspora/files/patch-code_globalincs_safe__strings.cpp
===================================================================
--- head/games/diaspora/files/patch-code_globalincs_safe__strings.cpp	(nonexistent)
+++ head/games/diaspora/files/patch-code_globalincs_safe__strings.cpp	(revision 459123)
@@ -0,0 +1,78 @@
+# Fixes for a couple of clang warnings
+# https://github.com/scp-fs2open/fs2open.github.com/commit/5bff2754c267f0e3e5af7d542f09a1760f24f17d
+
+--- code/globalincs/safe_strings.cpp.orig	2012-01-13 18:37:09 UTC
++++ code/globalincs/safe_strings.cpp
+@@ -22,11 +22,6 @@
+ 
+ #if !defined(NO_SAFE_STRINGS) && ( !defined( _MSC_VER ) || ( defined( _MSC_VER ) && _MSC_VER >= 1400 /* && !defined(NDEBUG) */ ))
+ 
+-/* We don't have this here - no standard library stuff included */
+-#ifndef NULL
+-#define NULL 0
+-#endif
+-
+ /* An implementation of strcpy_s 
+  * We're not going to actually fully behave like the MS debug version.
+  */
+@@ -39,14 +34,14 @@ errno_t scp_strcpy_s( const char* file, 
+ 	if ( !strDest || !strSource )
+ 	{
+ 		if ( strDest )
+-			*strDest = NULL;
++			*strDest = '\0';
+ 		__safe_strings_error_handler( EINVAL );
+ 		return EINVAL;
+ 	}
+ 
+ 	if ( sizeInBytes == 0 )
+ 	{
+-		*strDest = NULL;
++		*strDest = '\0';
+ 		__safe_strings_error_handler( ERANGE );
+ 		return ERANGE;
+ 	}
+@@ -58,7 +53,7 @@ errno_t scp_strcpy_s( const char* file, 
+ 
+ 	if ( bufferLeft == 0 )
+ 	{
+-		*strDest = NULL;
++		*strDest = '\0';
+ 		__safe_strings_error_handler( ERANGE );
+ 		return ERANGE;
+ 	}
+@@ -75,14 +70,14 @@ errno_t scp_strcat_s( const char* file, 
+ 	if ( !strDest || !strSource )
+ 	{
+ 		if ( strDest )
+-			*strDest = NULL;
++			*strDest = '\0';
+ 		__safe_strings_error_handler( EINVAL );
+ 		return EINVAL;
+ 	}
+ 
+ 	if ( bufferLeft == 0 )
+ 	{
+-		*strDest = NULL;
++		*strDest = '\0';
+ 		__safe_strings_error_handler( ERANGE );
+ 		return ERANGE;
+ 	}
+@@ -98,7 +93,7 @@ errno_t scp_strcat_s( const char* file, 
+ 
+ 	if ( bufferLeft == 0 )
+ 	{
+-		*strDest = NULL;
++		*strDest = '\0';
+ 		__safe_strings_error_handler( ERANGE );
+ 		return ERANGE;
+ 	}
+@@ -108,7 +103,7 @@ errno_t scp_strcat_s( const char* file, 
+ 
+ 	if ( bufferLeft == 0 )
+ 	{
+-		*strDest = NULL;
++		*strDest = '\0';
+ 		__safe_strings_error_handler( ERANGE );
+ 		return ERANGE;
+ 	}

Property changes on: head/games/diaspora/files/patch-code_globalincs_safe__strings.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property