kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from Maxim Sobolev's update to this port.

Browse source 
PR:		16498
Submitted by:	Maxim Sobolev <sobomax@altavista.net>
This commit is contained in:
Chris Piazza 2000-02-03 08:19:18 +00:00
parent 2bac28dbd6
commit f5ef155d0f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=25453
12 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
devel/sdl-devel/Makefile
View file

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

4
devel/sdl-devel/files/patch-ac
View file

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

5
devel/sdl-devel/pkg-plist
View file

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

10
devel/sdl/Makefile
View file

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

4
devel/sdl/files/patch-ac
View file

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

5
devel/sdl/pkg-plist
View file

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

10
devel/sdl10/Makefile
View file

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

4
devel/sdl10/files/patch-ac
View file

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

5
devel/sdl10/pkg-plist
View file

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

10
devel/sdl12/Makefile
View file

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

4
devel/sdl12/files/patch-ac
View file

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

5
devel/sdl12/pkg-plist
View file

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