diff options
| author | mva <mva@FreeBSD.org> | 2013-06-05 21:59:19 +0800 |
|---|---|---|
| committer | mva <mva@FreeBSD.org> | 2013-06-05 21:59:19 +0800 |
| commit | 6921fa2ce262af16e8fd138da1ab57e591b55978 (patch) | |
| tree | d164b7134d7a46162ce34fa99db06655b198a48e /devel | |
| parent | 4e874bb57b4562a4990ad7e203feff0a0dc4ad7b (diff) | |
| download | freebsd-ports-gnome-6921fa2ce262af16e8fd138da1ab57e591b55978.tar.gz freebsd-ports-gnome-6921fa2ce262af16e8fd138da1ab57e591b55978.tar.zst freebsd-ports-gnome-6921fa2ce262af16e8fd138da1ab57e591b55978.zip | |
- Unbreak build for new libX11
- Trim Makefile headers
- OPTIONize DOCS and EXAMPLES
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/sdl12/Makefile | 16 | ||||
| -rw-r--r-- | devel/sdl12/files/patch-src_video_x11_SDL_x11sym.h | 11 |
2 files changed, 17 insertions, 10 deletions
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index dffe5c1a6240..cbef3fea89c0 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: SDL -# Date created: 1 April 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@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 diff --git a/devel/sdl12/files/patch-src_video_x11_SDL_x11sym.h b/devel/sdl12/files/patch-src_video_x11_SDL_x11sym.h new file mode 100644 index 000000000000..b20e07122d39 --- /dev/null +++ b/devel/sdl12/files/patch-src_video_x11_SDL_x11sym.h @@ -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 + |