Index: head/devel/sdl/Makefile =================================================================== --- head/devel/sdl/Makefile (revision 25628) +++ head/devel/sdl/Makefile (revision 25629) @@ -1,42 +1,42 @@ # New ports collection makefile for: SDL -# Version required: 1.0.3 +# Version required: 1.0.4 # Date created: 8 August 1999 # Whom: Andrey Zakhvatov # # $FreeBSD$ # -DISTNAME= SDL-1.0.3 -PKGNAME= sdl-1.0.3 +DISTNAME= SDL-1.0.4 +PKGNAME= sdl-1.0.4 CATEGORIES= devel MASTER_SITES= http://www.devolution.com/~slouken/SDL/release/ MAINTAINER= andy@icc.surw.chel.su #This port doesn't love FreeBSD pthread :( LIB_DEPENDS= lthread.2:${PORTSDIR}/devel/linuxthreads \ esd.2:${PORTSDIR}/audio/esound BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_GMAKE= yes USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ LOCALBASE="${LOCALBASE}" CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads \ -D_THREAD_SAFE post-install: @ ${MKDIR} ${PREFIX}/share/examples/SDL .if !defined(NOPORTDOCS) @ ${MKDIR} ${PREFIX}/share/doc/SDL .for file in BUGS COPYING CREDITS README WhatsNew docs.html @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL .endfor @ cd ${WRKSRC}/docs; tar cf - `/bin/ls | ${GREP} -v Makefile` | \ (cd ${PREFIX}/share/doc/SDL; ${TAR} --unlink -xf - ) .endif .include Property changes on: head/devel/sdl/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/devel/sdl/distinfo =================================================================== --- head/devel/sdl/distinfo (revision 25628) +++ head/devel/sdl/distinfo (revision 25629) @@ -1 +1 @@ -MD5 (SDL-1.0.3.tar.gz) = b5592e3ff5c35612a9295cf05a24ffbe +MD5 (SDL-1.0.4.tar.gz) = b90f4c9de63b4b3b82f65b6fe04fc76b Property changes on: head/devel/sdl/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/devel/sdl/files/patch-ac =================================================================== --- head/devel/sdl/files/patch-ac (revision 25628) +++ head/devel/sdl/files/patch-ac (revision 25629) @@ -1,42 +1,66 @@ ---- configure.orig Tue Dec 14 01:33:42 1999 -+++ configure Sat Jan 8 23:23:37 2000 -@@ -3030,7 +3030,7 @@ +--- configure.orig Tue Feb 8 03:53:58 2000 ++++ configure Tue Feb 8 11:31:03 2000 +@@ -3016,7 +3016,7 @@ echo "$ac_t""yes" 1>&6 CFLAGS="$CFLAGS -DESD_SUPPORT $ESD_CFLAGS" - SYSTEM_LIBS="$SYSTEM_LIBS -lesd" + SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS" else echo "$ac_t""no" 1>&6 -@@ -4333,11 +4333,11 @@ - +@@ -4326,7 +4326,7 @@ ac_save_libs="$LIBS" case "$target" in -- *-*-freebsd*) -+ *-*-frebsd*) - pthread_lib="-lc_r" - ;; - *) -- pthread_lib="-lpthread" + *-*-freebsd*) +- pthread_lib="-lc_r" + pthread_lib="-L""$LOCALBASE""/lib -llthread -llgcc_r" ;; - esac - LIBS="$LIBS $pthread_lib" -@@ -4371,7 +4371,7 @@ + *-*-openbsd*) + pthread_lib="-lc_r" +@@ -4366,7 +4366,7 @@ echo "$ac_t""$use_pthreads" 1>&6 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_LIBS="$SDL_LIBS $pthread_lib" fi fi -@@ -4851,6 +4851,7 @@ +@@ -4955,6 +4955,7 @@ ;; *-*-freebsd*) ARCH=freebsd + CheckNASM CheckESD CheckX11 CheckPTHREAD +@@ -5038,6 +5039,28 @@ + __EOF__ + cat >>$new <$old + ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.h -> src/audio/SDL_dspaudio.h" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.h" ++ new="$srcdir/src/audio/SDL_dspaudio.h" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.c -> src/audio/SDL_dspaudio.c" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.c" ++ new="$srcdir/src/audio/SDL_dspaudio.c" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then Property changes on: head/devel/sdl/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/sdl/pkg-plist =================================================================== --- head/devel/sdl/pkg-plist (revision 25628) +++ head/devel/sdl/pkg-plist (revision 25629) @@ -1,72 +1,75 @@ bin/sdl-config include/SDL/SDL.h include/SDL/SDL_active.h include/SDL/SDL_audio.h include/SDL/SDL_byteorder.h include/SDL/SDL_cdrom.h include/SDL/SDL_copying.h include/SDL/SDL_endian.h include/SDL/SDL_error.h include/SDL/SDL_events.h include/SDL/SDL_keyboard.h include/SDL/SDL_keysym.h include/SDL/SDL_main.h include/SDL/SDL_mouse.h include/SDL/SDL_mutex.h include/SDL/SDL_quit.h include/SDL/SDL_rwops.h include/SDL/SDL_syswm.h include/SDL/SDL_thread.h include/SDL/SDL_timer.h include/SDL/SDL_types.h include/SDL/SDL_version.h include/SDL/SDL_video.h include/SDL/begin_code.h include/SDL/close_code.h lib/libSDL-1.0.so lib/libSDL-1.0.so.2 lib/libSDL.a lib/libSDL.la lib/libSDL.so lib/libSDLmain.a @exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R share/aclocal/sdl.m4 +share/doc/SDL/.codeblock +share/doc/SDL/.header +share/doc/SDL/.macros share/doc/SDL/BUGS share/doc/SDL/COPYING share/doc/SDL/CREDITS share/doc/SDL/README share/doc/SDL/WhatsNew share/doc/SDL/audio/examples.html share/doc/SDL/audio/funclist.html share/doc/SDL/audio/functions.html share/doc/SDL/audio/index.html share/doc/SDL/cdrom/examples.html share/doc/SDL/cdrom/funclist.html share/doc/SDL/cdrom/functions.html share/doc/SDL/cdrom/index.html share/doc/SDL/docs.html share/doc/SDL/events/examples.html share/doc/SDL/events/functions.html share/doc/SDL/events/index.html 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 @dirrm share/doc/SDL/cdrom @dirrm share/doc/SDL/audio @dirrm share/doc/SDL @dirrm include/SDL Property changes on: head/devel/sdl/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/sdl-devel/Makefile =================================================================== --- head/devel/sdl-devel/Makefile (revision 25628) +++ head/devel/sdl-devel/Makefile (revision 25629) @@ -1,42 +1,42 @@ # New ports collection makefile for: SDL -# Version required: 1.0.3 +# Version required: 1.0.4 # Date created: 8 August 1999 # Whom: Andrey Zakhvatov # # $FreeBSD$ # -DISTNAME= SDL-1.0.3 -PKGNAME= sdl-1.0.3 +DISTNAME= SDL-1.0.4 +PKGNAME= sdl-1.0.4 CATEGORIES= devel MASTER_SITES= http://www.devolution.com/~slouken/SDL/release/ MAINTAINER= andy@icc.surw.chel.su #This port doesn't love FreeBSD pthread :( LIB_DEPENDS= lthread.2:${PORTSDIR}/devel/linuxthreads \ esd.2:${PORTSDIR}/audio/esound BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_GMAKE= yes USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ LOCALBASE="${LOCALBASE}" CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads \ -D_THREAD_SAFE post-install: @ ${MKDIR} ${PREFIX}/share/examples/SDL .if !defined(NOPORTDOCS) @ ${MKDIR} ${PREFIX}/share/doc/SDL .for file in BUGS COPYING CREDITS README WhatsNew docs.html @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL .endfor @ cd ${WRKSRC}/docs; tar cf - `/bin/ls | ${GREP} -v Makefile` | \ (cd ${PREFIX}/share/doc/SDL; ${TAR} --unlink -xf - ) .endif .include Property changes on: head/devel/sdl-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/devel/sdl-devel/distinfo =================================================================== --- head/devel/sdl-devel/distinfo (revision 25628) +++ head/devel/sdl-devel/distinfo (revision 25629) @@ -1 +1 @@ -MD5 (SDL-1.0.3.tar.gz) = b5592e3ff5c35612a9295cf05a24ffbe +MD5 (SDL-1.0.4.tar.gz) = b90f4c9de63b4b3b82f65b6fe04fc76b Property changes on: head/devel/sdl-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/devel/sdl-devel/files/patch-ac =================================================================== --- head/devel/sdl-devel/files/patch-ac (revision 25628) +++ head/devel/sdl-devel/files/patch-ac (revision 25629) @@ -1,42 +1,66 @@ ---- configure.orig Tue Dec 14 01:33:42 1999 -+++ configure Sat Jan 8 23:23:37 2000 -@@ -3030,7 +3030,7 @@ +--- configure.orig Tue Feb 8 03:53:58 2000 ++++ configure Tue Feb 8 11:31:03 2000 +@@ -3016,7 +3016,7 @@ echo "$ac_t""yes" 1>&6 CFLAGS="$CFLAGS -DESD_SUPPORT $ESD_CFLAGS" - SYSTEM_LIBS="$SYSTEM_LIBS -lesd" + SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS" else echo "$ac_t""no" 1>&6 -@@ -4333,11 +4333,11 @@ - +@@ -4326,7 +4326,7 @@ ac_save_libs="$LIBS" case "$target" in -- *-*-freebsd*) -+ *-*-frebsd*) - pthread_lib="-lc_r" - ;; - *) -- pthread_lib="-lpthread" + *-*-freebsd*) +- pthread_lib="-lc_r" + pthread_lib="-L""$LOCALBASE""/lib -llthread -llgcc_r" ;; - esac - LIBS="$LIBS $pthread_lib" -@@ -4371,7 +4371,7 @@ + *-*-openbsd*) + pthread_lib="-lc_r" +@@ -4366,7 +4366,7 @@ echo "$ac_t""$use_pthreads" 1>&6 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_LIBS="$SDL_LIBS $pthread_lib" fi fi -@@ -4851,6 +4851,7 @@ +@@ -4955,6 +4955,7 @@ ;; *-*-freebsd*) ARCH=freebsd + CheckNASM CheckESD CheckX11 CheckPTHREAD +@@ -5038,6 +5039,28 @@ + __EOF__ + cat >>$new <$old + ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.h -> src/audio/SDL_dspaudio.h" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.h" ++ new="$srcdir/src/audio/SDL_dspaudio.h" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.c -> src/audio/SDL_dspaudio.c" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.c" ++ new="$srcdir/src/audio/SDL_dspaudio.c" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then Property changes on: head/devel/sdl-devel/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/sdl-devel/pkg-plist =================================================================== --- head/devel/sdl-devel/pkg-plist (revision 25628) +++ head/devel/sdl-devel/pkg-plist (revision 25629) @@ -1,72 +1,75 @@ bin/sdl-config include/SDL/SDL.h include/SDL/SDL_active.h include/SDL/SDL_audio.h include/SDL/SDL_byteorder.h include/SDL/SDL_cdrom.h include/SDL/SDL_copying.h include/SDL/SDL_endian.h include/SDL/SDL_error.h include/SDL/SDL_events.h include/SDL/SDL_keyboard.h include/SDL/SDL_keysym.h include/SDL/SDL_main.h include/SDL/SDL_mouse.h include/SDL/SDL_mutex.h include/SDL/SDL_quit.h include/SDL/SDL_rwops.h include/SDL/SDL_syswm.h include/SDL/SDL_thread.h include/SDL/SDL_timer.h include/SDL/SDL_types.h include/SDL/SDL_version.h include/SDL/SDL_video.h include/SDL/begin_code.h include/SDL/close_code.h lib/libSDL-1.0.so lib/libSDL-1.0.so.2 lib/libSDL.a lib/libSDL.la lib/libSDL.so lib/libSDLmain.a @exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R share/aclocal/sdl.m4 +share/doc/SDL/.codeblock +share/doc/SDL/.header +share/doc/SDL/.macros share/doc/SDL/BUGS share/doc/SDL/COPYING share/doc/SDL/CREDITS share/doc/SDL/README share/doc/SDL/WhatsNew share/doc/SDL/audio/examples.html share/doc/SDL/audio/funclist.html share/doc/SDL/audio/functions.html share/doc/SDL/audio/index.html share/doc/SDL/cdrom/examples.html share/doc/SDL/cdrom/funclist.html share/doc/SDL/cdrom/functions.html share/doc/SDL/cdrom/index.html share/doc/SDL/docs.html share/doc/SDL/events/examples.html share/doc/SDL/events/functions.html share/doc/SDL/events/index.html 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 @dirrm share/doc/SDL/cdrom @dirrm share/doc/SDL/audio @dirrm share/doc/SDL @dirrm include/SDL Property changes on: head/devel/sdl-devel/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/sdl10/Makefile =================================================================== --- head/devel/sdl10/Makefile (revision 25628) +++ head/devel/sdl10/Makefile (revision 25629) @@ -1,42 +1,42 @@ # New ports collection makefile for: SDL -# Version required: 1.0.3 +# Version required: 1.0.4 # Date created: 8 August 1999 # Whom: Andrey Zakhvatov # # $FreeBSD$ # -DISTNAME= SDL-1.0.3 -PKGNAME= sdl-1.0.3 +DISTNAME= SDL-1.0.4 +PKGNAME= sdl-1.0.4 CATEGORIES= devel MASTER_SITES= http://www.devolution.com/~slouken/SDL/release/ MAINTAINER= andy@icc.surw.chel.su #This port doesn't love FreeBSD pthread :( LIB_DEPENDS= lthread.2:${PORTSDIR}/devel/linuxthreads \ esd.2:${PORTSDIR}/audio/esound BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_GMAKE= yes USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ LOCALBASE="${LOCALBASE}" CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads \ -D_THREAD_SAFE post-install: @ ${MKDIR} ${PREFIX}/share/examples/SDL .if !defined(NOPORTDOCS) @ ${MKDIR} ${PREFIX}/share/doc/SDL .for file in BUGS COPYING CREDITS README WhatsNew docs.html @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL .endfor @ cd ${WRKSRC}/docs; tar cf - `/bin/ls | ${GREP} -v Makefile` | \ (cd ${PREFIX}/share/doc/SDL; ${TAR} --unlink -xf - ) .endif .include Property changes on: head/devel/sdl10/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/devel/sdl10/distinfo =================================================================== --- head/devel/sdl10/distinfo (revision 25628) +++ head/devel/sdl10/distinfo (revision 25629) @@ -1 +1 @@ -MD5 (SDL-1.0.3.tar.gz) = b5592e3ff5c35612a9295cf05a24ffbe +MD5 (SDL-1.0.4.tar.gz) = b90f4c9de63b4b3b82f65b6fe04fc76b Property changes on: head/devel/sdl10/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/devel/sdl10/files/patch-ac =================================================================== --- head/devel/sdl10/files/patch-ac (revision 25628) +++ head/devel/sdl10/files/patch-ac (revision 25629) @@ -1,42 +1,66 @@ ---- configure.orig Tue Dec 14 01:33:42 1999 -+++ configure Sat Jan 8 23:23:37 2000 -@@ -3030,7 +3030,7 @@ +--- configure.orig Tue Feb 8 03:53:58 2000 ++++ configure Tue Feb 8 11:31:03 2000 +@@ -3016,7 +3016,7 @@ echo "$ac_t""yes" 1>&6 CFLAGS="$CFLAGS -DESD_SUPPORT $ESD_CFLAGS" - SYSTEM_LIBS="$SYSTEM_LIBS -lesd" + SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS" else echo "$ac_t""no" 1>&6 -@@ -4333,11 +4333,11 @@ - +@@ -4326,7 +4326,7 @@ ac_save_libs="$LIBS" case "$target" in -- *-*-freebsd*) -+ *-*-frebsd*) - pthread_lib="-lc_r" - ;; - *) -- pthread_lib="-lpthread" + *-*-freebsd*) +- pthread_lib="-lc_r" + pthread_lib="-L""$LOCALBASE""/lib -llthread -llgcc_r" ;; - esac - LIBS="$LIBS $pthread_lib" -@@ -4371,7 +4371,7 @@ + *-*-openbsd*) + pthread_lib="-lc_r" +@@ -4366,7 +4366,7 @@ echo "$ac_t""$use_pthreads" 1>&6 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_LIBS="$SDL_LIBS $pthread_lib" fi fi -@@ -4851,6 +4851,7 @@ +@@ -4955,6 +4955,7 @@ ;; *-*-freebsd*) ARCH=freebsd + CheckNASM CheckESD CheckX11 CheckPTHREAD +@@ -5038,6 +5039,28 @@ + __EOF__ + cat >>$new <$old + ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.h -> src/audio/SDL_dspaudio.h" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.h" ++ new="$srcdir/src/audio/SDL_dspaudio.h" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.c -> src/audio/SDL_dspaudio.c" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.c" ++ new="$srcdir/src/audio/SDL_dspaudio.c" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then Property changes on: head/devel/sdl10/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/sdl10/pkg-plist =================================================================== --- head/devel/sdl10/pkg-plist (revision 25628) +++ head/devel/sdl10/pkg-plist (revision 25629) @@ -1,72 +1,75 @@ bin/sdl-config include/SDL/SDL.h include/SDL/SDL_active.h include/SDL/SDL_audio.h include/SDL/SDL_byteorder.h include/SDL/SDL_cdrom.h include/SDL/SDL_copying.h include/SDL/SDL_endian.h include/SDL/SDL_error.h include/SDL/SDL_events.h include/SDL/SDL_keyboard.h include/SDL/SDL_keysym.h include/SDL/SDL_main.h include/SDL/SDL_mouse.h include/SDL/SDL_mutex.h include/SDL/SDL_quit.h include/SDL/SDL_rwops.h include/SDL/SDL_syswm.h include/SDL/SDL_thread.h include/SDL/SDL_timer.h include/SDL/SDL_types.h include/SDL/SDL_version.h include/SDL/SDL_video.h include/SDL/begin_code.h include/SDL/close_code.h lib/libSDL-1.0.so lib/libSDL-1.0.so.2 lib/libSDL.a lib/libSDL.la lib/libSDL.so lib/libSDLmain.a @exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R share/aclocal/sdl.m4 +share/doc/SDL/.codeblock +share/doc/SDL/.header +share/doc/SDL/.macros share/doc/SDL/BUGS share/doc/SDL/COPYING share/doc/SDL/CREDITS share/doc/SDL/README share/doc/SDL/WhatsNew share/doc/SDL/audio/examples.html share/doc/SDL/audio/funclist.html share/doc/SDL/audio/functions.html share/doc/SDL/audio/index.html share/doc/SDL/cdrom/examples.html share/doc/SDL/cdrom/funclist.html share/doc/SDL/cdrom/functions.html share/doc/SDL/cdrom/index.html share/doc/SDL/docs.html share/doc/SDL/events/examples.html share/doc/SDL/events/functions.html share/doc/SDL/events/index.html 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 @dirrm share/doc/SDL/cdrom @dirrm share/doc/SDL/audio @dirrm share/doc/SDL @dirrm include/SDL Property changes on: head/devel/sdl10/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/sdl12/Makefile =================================================================== --- head/devel/sdl12/Makefile (revision 25628) +++ head/devel/sdl12/Makefile (revision 25629) @@ -1,42 +1,42 @@ # New ports collection makefile for: SDL -# Version required: 1.0.3 +# Version required: 1.0.4 # Date created: 8 August 1999 # Whom: Andrey Zakhvatov # # $FreeBSD$ # -DISTNAME= SDL-1.0.3 -PKGNAME= sdl-1.0.3 +DISTNAME= SDL-1.0.4 +PKGNAME= sdl-1.0.4 CATEGORIES= devel MASTER_SITES= http://www.devolution.com/~slouken/SDL/release/ MAINTAINER= andy@icc.surw.chel.su #This port doesn't love FreeBSD pthread :( LIB_DEPENDS= lthread.2:${PORTSDIR}/devel/linuxthreads \ esd.2:${PORTSDIR}/audio/esound BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_GMAKE= yes USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ LOCALBASE="${LOCALBASE}" CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads \ -D_THREAD_SAFE post-install: @ ${MKDIR} ${PREFIX}/share/examples/SDL .if !defined(NOPORTDOCS) @ ${MKDIR} ${PREFIX}/share/doc/SDL .for file in BUGS COPYING CREDITS README WhatsNew docs.html @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL .endfor @ cd ${WRKSRC}/docs; tar cf - `/bin/ls | ${GREP} -v Makefile` | \ (cd ${PREFIX}/share/doc/SDL; ${TAR} --unlink -xf - ) .endif .include Property changes on: head/devel/sdl12/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/devel/sdl12/distinfo =================================================================== --- head/devel/sdl12/distinfo (revision 25628) +++ head/devel/sdl12/distinfo (revision 25629) @@ -1 +1 @@ -MD5 (SDL-1.0.3.tar.gz) = b5592e3ff5c35612a9295cf05a24ffbe +MD5 (SDL-1.0.4.tar.gz) = b90f4c9de63b4b3b82f65b6fe04fc76b Property changes on: head/devel/sdl12/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/devel/sdl12/files/patch-ac =================================================================== --- head/devel/sdl12/files/patch-ac (revision 25628) +++ head/devel/sdl12/files/patch-ac (revision 25629) @@ -1,42 +1,66 @@ ---- configure.orig Tue Dec 14 01:33:42 1999 -+++ configure Sat Jan 8 23:23:37 2000 -@@ -3030,7 +3030,7 @@ +--- configure.orig Tue Feb 8 03:53:58 2000 ++++ configure Tue Feb 8 11:31:03 2000 +@@ -3016,7 +3016,7 @@ echo "$ac_t""yes" 1>&6 CFLAGS="$CFLAGS -DESD_SUPPORT $ESD_CFLAGS" - SYSTEM_LIBS="$SYSTEM_LIBS -lesd" + SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS" else echo "$ac_t""no" 1>&6 -@@ -4333,11 +4333,11 @@ - +@@ -4326,7 +4326,7 @@ ac_save_libs="$LIBS" case "$target" in -- *-*-freebsd*) -+ *-*-frebsd*) - pthread_lib="-lc_r" - ;; - *) -- pthread_lib="-lpthread" + *-*-freebsd*) +- pthread_lib="-lc_r" + pthread_lib="-L""$LOCALBASE""/lib -llthread -llgcc_r" ;; - esac - LIBS="$LIBS $pthread_lib" -@@ -4371,7 +4371,7 @@ + *-*-openbsd*) + pthread_lib="-lc_r" +@@ -4366,7 +4366,7 @@ echo "$ac_t""$use_pthreads" 1>&6 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_LIBS="$SDL_LIBS $pthread_lib" fi fi -@@ -4851,6 +4851,7 @@ +@@ -4955,6 +4955,7 @@ ;; *-*-freebsd*) ARCH=freebsd + CheckNASM CheckESD CheckX11 CheckPTHREAD +@@ -5038,6 +5039,28 @@ + __EOF__ + cat >>$new <$old + ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.h -> src/audio/SDL_dspaudio.h" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.h" ++ new="$srcdir/src/audio/SDL_dspaudio.h" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ ++ ++ echo "Copying src/audio/linux/SDL_dspaudio.c -> src/audio/SDL_dspaudio.c" ++ old="$srcdir/src/audio/linux/SDL_dspaudio.c" ++ new="$srcdir/src/audio/SDL_dspaudio.c" ++ cat >$new <<__EOF__ ++/* WARNING: This file was automatically generated! ++ * Original: $old ++ */ ++__EOF__ ++ cat >>$new <$old ++ + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then Property changes on: head/devel/sdl12/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/sdl12/pkg-plist =================================================================== --- head/devel/sdl12/pkg-plist (revision 25628) +++ head/devel/sdl12/pkg-plist (revision 25629) @@ -1,72 +1,75 @@ bin/sdl-config include/SDL/SDL.h include/SDL/SDL_active.h include/SDL/SDL_audio.h include/SDL/SDL_byteorder.h include/SDL/SDL_cdrom.h include/SDL/SDL_copying.h include/SDL/SDL_endian.h include/SDL/SDL_error.h include/SDL/SDL_events.h include/SDL/SDL_keyboard.h include/SDL/SDL_keysym.h include/SDL/SDL_main.h include/SDL/SDL_mouse.h include/SDL/SDL_mutex.h include/SDL/SDL_quit.h include/SDL/SDL_rwops.h include/SDL/SDL_syswm.h include/SDL/SDL_thread.h include/SDL/SDL_timer.h include/SDL/SDL_types.h include/SDL/SDL_version.h include/SDL/SDL_video.h include/SDL/begin_code.h include/SDL/close_code.h lib/libSDL-1.0.so lib/libSDL-1.0.so.2 lib/libSDL.a lib/libSDL.la lib/libSDL.so lib/libSDLmain.a @exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R share/aclocal/sdl.m4 +share/doc/SDL/.codeblock +share/doc/SDL/.header +share/doc/SDL/.macros share/doc/SDL/BUGS share/doc/SDL/COPYING share/doc/SDL/CREDITS share/doc/SDL/README share/doc/SDL/WhatsNew share/doc/SDL/audio/examples.html share/doc/SDL/audio/funclist.html share/doc/SDL/audio/functions.html share/doc/SDL/audio/index.html share/doc/SDL/cdrom/examples.html share/doc/SDL/cdrom/funclist.html share/doc/SDL/cdrom/functions.html share/doc/SDL/cdrom/index.html share/doc/SDL/docs.html share/doc/SDL/events/examples.html share/doc/SDL/events/functions.html share/doc/SDL/events/index.html 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 @dirrm share/doc/SDL/cdrom @dirrm share/doc/SDL/audio @dirrm share/doc/SDL @dirrm include/SDL Property changes on: head/devel/sdl12/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property