svn commit: r319992 - in head/devel/sdl12: . files

[Marcus von Appen]

Author: mva
Date: Wed Jun  5 13:59:19 2013
New Revision: 319992
URL: http://svnweb.freebsd.org/changeset/ports/319992

Log:
  - Unbreak build for new libX11
  - Trim Makefile headers
  - OPTIONize DOCS and EXAMPLES

Added:
  head/devel/sdl12/files/patch-src_video_x11_SDL_x11sym.h   (contents, props changed)
Modified:
  head/devel/sdl12/Makefile

Modified: head/devel/sdl12/Makefile
==============================================================================
--- head/devel/sdl12/Makefile	Wed Jun  5 13:50:26 2013	(r319991)
+++ head/devel/sdl12/Makefile	Wed Jun  5 13:59:19 2013	(r319992)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	SDL
-# Date created:				1 April 2000
-# Whom:					Maxim Sobolev <sobomax at FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.15
@@ -22,11 +18,10 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-WANT_GNOME=	yes
 USES=		pathfix pkgconfig iconv
 CONFIGURE_ENV=	ac_cv_header_libusbhid_h=no
 
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=--disable-alsa --disable-alsatest
@@ -35,7 +30,8 @@ CONFIGURE_ARGS+=--disable-video-directfb
 EXAMPLES=	test/*.c test/*.bmp test/*.dat test/*.xbm test/*.wav
 DOCS=		BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html
 
-OPTIONS_DEFINE=		AALIB ARTS ESOUND GGI NAS OPENGL OSS PULSEAUDIO SVGALIB X11
+OPTIONS_DEFINE=		AALIB ARTS DOCS ESOUND EXAMPLES GGI NAS OPENGL OSS \
+			PULSEAUDIO SVGALIB X11
 OPTIONS_DEFAULT=	AALIB OPENGL OSS X11
 
 .if exists(/usr/lib/libvgl.so)
@@ -125,13 +121,13 @@ CONFIGURE_ARGS+=	--disable-video-x11
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR} &&\
 		${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ &&\
 	cd ${WRKSRC} &&\
 		${COPYTREE_SHARE} docs ${DOCSDIR}/ "! -regex .*/man3.*"
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR} &&\
 		${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/
 .endif

Added: head/devel/sdl12/files/patch-src_video_x11_SDL_x11sym.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/sdl12/files/patch-src_video_x11_SDL_x11sym.h	Wed Jun  5 13:59:19 2013	(r319992)
@@ -0,0 +1,11 @@
+--- src/video/x11/SDL_x11sym.h.orig	2013-06-05 11:06:34.000000000 +0200
++++ src/video/x11/SDL_x11sym.h	2013-06-05 11:08:02.000000000 +0200
+@@ -165,7 +165,7 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+