Index: branches/2017Q3/devel/sdl12/Makefile
===================================================================
--- branches/2017Q3/devel/sdl12/Makefile	(revision 445434)
+++ branches/2017Q3/devel/sdl12/Makefile	(revision 445435)
@@ -1,83 +1,83 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.15
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
 DISTNAME=	SDL-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross-platform multimedia development API
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		gmake iconv libtool localbase:ldflags pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_libusbhid_h=no
 CONFIGURE_ARGS=	--disable-alsa --disable-alsatest \
 		--disable-arts --disable-video-directfb --disable-video-ggi
 
 EXAMPLES=	test/*.c test/*.bmp test/*.dat test/*.xbm test/*.wav
 DOCS=		BUGS CREDITS README README-SDL.txt WhatsNew docs.html
 
 OPTIONS_DEFINE=		AALIB DOCS EXAMPLES OPENGL SVGALIB X11
 OPTIONS_DEFAULT=	AALIB OPENGL OSS X11
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ESOUND NAS OSS PULSEAUDIO SNDIO
 
 AUDIO_DESC=		Audio backend
 
 .if exists(/usr/lib/libvgl.so)
 OPTIONS_DEFINE+=	VGL
 VGL_DESC=		Video Graphics Lib support
 OPTIONS_DEFAULT+=	VGL
 .endif
 
 AALIB_CONFIGURE_ENABLE=		video-aalib
 AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
 ESOUND_USE=			GNOME=esound
 ESOUND_CONFIGURE_ENABLE=	esd esdtest
 NAS_CONFIGURE_ENABLE=		nas
 NAS_LIB_DEPENDS=		libaudio.so:audio/nas
 OPENGL_CONFIGURE_ENABLE=	video-opengl
 OPENGL_USE=			GL=yes
 OSS_CONFIGURE_ENABLE=		oss
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio
 SNDIO_CONFIGURE_ENABLE=		sndio
 SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
 SVGALIB_CONFIGURE_ENABLE=	video-svga
 SVGALIB_LIB_DEPENDS=		libvga.so:graphics/svgalib
 VGL_CONFIGURE_ENABLE=		video-vgl
 VGL_VARS=			PKGMESSAGE=pkg-message.vgl
 X11_CONFIGURE_ENABLE=		video-x11
 X11_USE=			XORG=x11,xrender,xrandr,xextproto
 
 post-patch:
 	@${REINPLACE_CMD} -e '/EXTRA_LDFLAGS/s/-liconv/${ICONV_LIB}/' \
 		${WRKSRC}/configure
 
 post-patch-SNDIO-on:
 	@${MKDIR} ${WRKSRC}/src/audio/sndio
 	@${CP} ${FILESDIR}/SDL_sndioaudio.* ${WRKSRC}/src/audio/sndio
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSDL-1.2.so.0.11.4
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/ "! -regex .*/man3.*"
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
Index: branches/2017Q3/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c
===================================================================
--- branches/2017Q3/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c	(nonexistent)
+++ branches/2017Q3/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c	(revision 445435)
@@ -0,0 +1,30 @@
+https://bugzilla.libsdl.org/show_bug.cgi?id=1427
+https://hg.libsdl.org/SDL/rev/57a55e457ef6
+
+--- src/video/x11/SDL_x11video.c.orig	2012-01-19 06:30:06 UTC
++++ src/video/x11/SDL_x11video.c
+@@ -418,16 +418,21 @@ static void create_aux_windows(_THIS)
+     }
+ 
+ 	{
+-		pid_t pid = getpid();
++		union align_pid {
++			pid_t pid;
++			long dummy;
++		} a_pid;
+ 		char hostname[256];
++		
++		a_pid.pid = getpid();
+ 
+-		if (pid > 0 && gethostname(hostname, sizeof(hostname)) > -1) {
++		if (a_pid.pid > 0 && gethostname(hostname, sizeof(hostname)) > -1) {
+ 			Atom _NET_WM_PID = XInternAtom(SDL_Display, "_NET_WM_PID", False);
+ 			Atom WM_CLIENT_MACHINE = XInternAtom(SDL_Display, "WM_CLIENT_MACHINE", False);
+ 			
+ 			hostname[sizeof(hostname)-1] = '\0';
+ 			XChangeProperty(SDL_Display, WMwindow, _NET_WM_PID, XA_CARDINAL, 32,
+-					PropModeReplace, (unsigned char *)&pid, 1);
++					PropModeReplace, (unsigned char *)&(a_pid.pid), 1);
+ 			XChangeProperty(SDL_Display, WMwindow, WM_CLIENT_MACHINE, XA_STRING, 8,
+ 					PropModeReplace, (unsigned char *)hostname, SDL_strlen(hostname));
+ 		}

Property changes on: branches/2017Q3/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c
___________________________________________________________________
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
Index: branches/2017Q3
===================================================================
--- branches/2017Q3	(revision 445434)
+++ branches/2017Q3	(revision 445435)

Property changes on: branches/2017Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r445140