diff options
| author | cpiazza <cpiazza@FreeBSD.org> | 2000-02-03 08:19:18 +0000 |
|---|---|---|
| committer | cpiazza <cpiazza@FreeBSD.org> | 2000-02-03 08:19:18 +0000 |
| commit | f091d346d2c2bcf60d295464143819369a571162 (patch) | |
| tree | b2734418f3b31f187519e22304c1edd40a1f132b /devel/sdl | |
| parent | b32c84c7f94fd6292ef59164617cd22d1ab0040b (diff) | |
| download | FreeBSD-ports-f091d346d2c2bcf60d295464143819369a571162.zip FreeBSD-ports-f091d346d2c2bcf60d295464143819369a571162.tar.gz | |
Merge changes from Maxim Sobolev's update to this port.
PR: 16498
Submitted by: Maxim Sobolev <sobomax@altavista.net>
Diffstat (limited to 'devel/sdl')
| -rw-r--r-- | devel/sdl/Makefile | 10 | ||||
| -rw-r--r-- | devel/sdl/files/patch-ac | 4 | ||||
| -rw-r--r-- | devel/sdl/pkg-plist | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile index c53b3d5..ab7b943 100644 --- a/devel/sdl/Makefile +++ b/devel/sdl/Makefile @@ -22,13 +22,11 @@ USE_GMAKE= yes USE_XLIB= yes GNU_CONFIGURE= yes -#DGA seems hosed, at least on my two 4.0 boxes (XFree86 3.3.5) -CONFIGURE_ARGS= --disable-video-x11-dga - CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ LOCALBASE="${LOCALBASE}" -CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads +CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads \ + -D_THREAD_SAFE post-install: @ ${MKDIR} ${PREFIX}/share/examples/SDL @@ -37,8 +35,8 @@ post-install: .for file in BUGS COPYING CREDITS README WhatsNew docs.html @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL .endfor - @ cd ${WRKSRC}/docs; tar cf - audio cdrom events images index.html threads video | \ - (cd ${PREFIX}/share/doc/SDL; tar --unlink -xf - ) + @ cd ${WRKSRC}/docs; tar cf - `/bin/ls | ${GREP} -v Makefile` | \ + (cd ${PREFIX}/share/doc/SDL; ${TAR} --unlink -xf - ) .endif .include <bsd.port.mk> diff --git a/devel/sdl/files/patch-ac b/devel/sdl/files/patch-ac index cc87dea..64f6440 100644 --- a/devel/sdl/files/patch-ac +++ b/devel/sdl/files/patch-ac @@ -19,7 +19,7 @@ ;; *) - pthread_lib="-lpthread" -+ pthread_lib="-L""$LOCALBASE""/lib -llthread" ++ pthread_lib="-L""$LOCALBASE""/lib -llthread -llgcc_r" ;; esac LIBS="$LIBS $pthread_lib" @@ -28,7 +28,7 @@ if test x$use_pthreads = xyes; then CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS" - SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT" -+ SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT -I""$LOCALBASE""/include/pthread/linuxthreads" ++ SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT -D_THREAD_SAFE -I""$LOCALBASE""/include/pthread/linuxthreads" SDL_LIBS="$SDL_LIBS $pthread_lib" fi fi diff --git a/devel/sdl/pkg-plist b/devel/sdl/pkg-plist index d4a9c78..a7c4b2e 100644 --- a/devel/sdl/pkg-plist +++ b/devel/sdl/pkg-plist @@ -53,11 +53,16 @@ share/doc/SDL/events/keysym.html share/doc/SDL/images/rainbow.gif share/doc/SDL/index.html share/doc/SDL/threads/index.html +share/doc/SDL/time/examples.html +share/doc/SDL/time/funclist.html +share/doc/SDL/time/functions.html +share/doc/SDL/time/index.html share/doc/SDL/video/examples.html share/doc/SDL/video/funclist.html share/doc/SDL/video/functions.html share/doc/SDL/video/index.html @dirrm share/doc/SDL/video +@dirrm share/doc/SDL/time @dirrm share/doc/SDL/threads @dirrm share/doc/SDL/images @dirrm share/doc/SDL/events |
