sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-24 23:16:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Unbreak build for new libX11

Browse source 
- Trim Makefile headers
- OPTIONize DOCS and EXAMPLES
This commit is contained in:
Marcus von Appen 2013-06-05 13:59:19 +00:00
parent 4df1cde4ff
commit 3d895fa859
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=319992
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
devel/sdl12/Makefile
View file

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

11
devel/sdl12/files/patch-src_video_x11_SDL_x11sym.h Normal file
View file

@ -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