From ab5c49f7ecbe4f896d943b5b3592c8be84deb6c1 Mon Sep 17 00:00:00 2001 From: Thomas Gellekum Date: Thu, 20 Apr 2000 09:24:28 +0000 Subject: Use our libc_r instead of linuxthreads. Reviewed by: Maxim Sobolev --- devel/sdl12/Makefile | 9 +++------ devel/sdl12/files/patch-ac | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'devel/sdl12') diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 0c6772f8d8d6..ca82f50350e0 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -13,9 +13,7 @@ DISTNAME= SDL-${PORTVERSION} MAINTAINER= sobomax@altavista.net -#This port doesn't love FreeBSD pthread :( -LIB_DEPENDS= lthread.2:${PORTSDIR}/devel/linuxthreads \ - esd.2:${PORTSDIR}/audio/esound +LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_GMAKE= yes @@ -25,12 +23,11 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ LOCALBASE="${LOCALBASE}" -CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads \ - -D_THREAD_SAFE +CFLAGS+= -D_THREAD_SAFE post-install: @ ${MKDIR} ${PREFIX}/share/examples/SDL - @ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL + @ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL .if !defined(NOPORTDOCS) @ ${MKDIR} ${PREFIX}/share/doc/SDL .for file in BUGS COPYING CREDITS README WhatsNew docs.html diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac index 83ce50513875..8585592c74a6 100644 --- a/devel/sdl12/files/patch-ac +++ b/devel/sdl12/files/patch-ac @@ -17,7 +17,7 @@ case "$target" in *-*-freebsd*) - pthread_lib="-lc_r" -+ pthread_lib="-L""$LOCALBASE""/lib -llthread -llgcc_r" ++ pthread_lib="-pthread" ;; *-*-openbsd*) pthread_lib="-lc_r" @@ -26,7 +26,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 -D_THREAD_SAFE -I""$LOCALBASE""/include/pthread/linuxthreads" ++ SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT -D_THREAD_SAFE" SDL_LIBS="$SDL_LIBS $pthread_lib" fi fi -- cgit v1.2.3