Update to version 1.0.1.

PR:		15944
Submitted by:	Maxim Sobolev <sobomax@altavista.net>

16 files changed, 344 insertions, 116 deletions

diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile
index 3fffeff215a2..4cce49be3f54 100644
--- a/devel/sdl-devel/Makefile
+++ b/devel/sdl-devel/Makefile
@@ -1,30 +1,36 @@
 # New ports collection makefile for:	SDL
-# Version required:			0.10.0
+# Version required:			1.0.1
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-0.10.0
-PKGNAME=		sdl-0.10.0
-CATEGORIES=		devel
-MASTER_SITES=		http://www.devolution.com/~slouken/SDL/SDL-0.10/src/
+DISTNAME=		SDL-1.0.1
+PKGNAME=		sdl-1.0.1
+CATEGORIES=		devel audio
+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
 
-do-build:
-	@ cd ${WRKSRC}; ${GMAKE}
-	@ cd ${WRKSRC}; ${GMAKE}
+#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
 
 post-install:
-	@ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDL.so.0
-	@ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDLx11.so.0
 	@ ${MKDIR} ${PREFIX}/share/examples/SDL
 	@ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL
 .if !defined(NOPORTDOCS)
@@ -32,9 +38,8 @@ post-install:
 .for file in BUGS COPYING CREDITS README TODO WhatsNew docs.html
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL
 .endfor
-	@ cd ${WRKSRC}/docs; tar cf - * | \
+	@ cd ${WRKSRC}/docs; tar cf - audio cdrom events images index.html threads video | \
 		(cd ${PREFIX}/share/doc/SDL; tar --unlink -xf - )
 .endif
-	@ ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/sdl-devel/distinfo b/devel/sdl-devel/distinfo
index 6c4657d4b056..22a6b75dcb6e 100644
--- a/devel/sdl-devel/distinfo
+++ b/devel/sdl-devel/distinfo
@@ -1 +1 @@
-MD5 (SDL-0.10.0.tar.gz) = 7e468488d0c7d0b3e9af6c4a5a897b97
+MD5 (SDL-1.0.1.tar.gz) = 0bc636a2f96c6451a5046c5f20fa0536
diff --git a/devel/sdl-devel/files/patch-ac b/devel/sdl-devel/files/patch-ac
new file mode 100644
index 000000000000..cc87deaad1ad
--- /dev/null
+++ b/devel/sdl-devel/files/patch-ac
@@ -0,0 +1,42 @@
+--- configure.orig	Tue Dec 14 01:33:42 1999
++++ configure	Sat Jan  8 23:23:37 2000
+@@ -3030,7 +3030,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 @@
+ 
+     ac_save_libs="$LIBS"
+     case "$target" in
+-        *-*-freebsd*)
++        *-*-frebsd*)
+             pthread_lib="-lc_r"
+             ;;
+         *)
+-            pthread_lib="-lpthread"
++            pthread_lib="-L""$LOCALBASE""/lib -llthread"
+             ;;
+     esac
+     LIBS="$LIBS $pthread_lib"
+@@ -4371,7 +4371,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 -I""$LOCALBASE""/include/pthread/linuxthreads"
+             SDL_LIBS="$SDL_LIBS $pthread_lib"
+         fi
+     fi
+@@ -4851,6 +4851,7 @@
+         ;;
+     *-*-freebsd*)
+         ARCH=freebsd
++	CheckNASM
+         CheckESD
+         CheckX11
+         CheckPTHREAD
diff --git a/devel/sdl-devel/pkg-plist b/devel/sdl-devel/pkg-plist
index 8f1ed0e1c96c..f020ec999132 100644
--- a/devel/sdl-devel/pkg-plist
+++ b/devel/sdl-devel/pkg-plist
@@ -1,3 +1,4 @@
+bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
 include/SDL/SDL_audio.h
@@ -9,7 +10,7 @@ include/SDL/SDL_error.h
 include/SDL/SDL_events.h
 include/SDL/SDL_keyboard.h
 include/SDL/SDL_keysym.h
-include/SDL/SDL_mangle.h
+include/SDL/SDL_main.h
 include/SDL/SDL_mouse.h
 include/SDL/SDL_mutex.h
 include/SDL/SDL_quit.h
@@ -22,19 +23,21 @@ 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.0
 lib/libSDL.a
-lib/libSDL.so.0
-lib/libSDLx11.so.0.10
-lib/libSDLx11.so.0.10.0
+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/BUGS
 share/doc/SDL/COPYING
 share/doc/SDL/CREDITS
 share/doc/SDL/README
 share/doc/SDL/TODO
 share/doc/SDL/WhatsNew
-share/doc/SDL/docs.html
 share/doc/SDL/audio/examples.html
 share/doc/SDL/audio/funclist.html
 share/doc/SDL/audio/functions.html
@@ -43,11 +46,11 @@ 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/SDL_title.gif
 share/doc/SDL/images/rainbow.gif
 share/doc/SDL/index.html
 share/doc/SDL/threads/index.html
@@ -56,14 +59,21 @@ share/doc/SDL/video/funclist.html
 share/doc/SDL/video/functions.html
 share/doc/SDL/video/index.html
 share/examples/SDL/COPYING
-share/examples/SDL/GNUC.sh
-share/examples/SDL/GNUmake
-share/examples/SDL/Makefile
+share/examples/SDL/Makefile.am
+share/examples/SDL/Makefile.in
 share/examples/SDL/README
+share/examples/SDL/acinclude.m4
+share/examples/SDL/aclocal.m4
+share/examples/SDL/autogen.sh
 share/examples/SDL/checkkeys.c
+share/examples/SDL/configure
+share/examples/SDL/configure.in
 share/examples/SDL/graywin.c
 share/examples/SDL/icon.bmp
+share/examples/SDL/install-sh
 share/examples/SDL/loopwave.c
+share/examples/SDL/missing
+share/examples/SDL/mkinstalldirs
 share/examples/SDL/picture.xbm
 share/examples/SDL/sample.bmp
 share/examples/SDL/sample.wav
@@ -82,12 +92,12 @@ share/examples/SDL/testvidinfo.c
 share/examples/SDL/testwin.c
 share/examples/SDL/testwm.c
 share/examples/SDL/threadwin.c
-@dirrm include/SDL
-@dirrm share/doc/SDL/audio
-@dirrm share/doc/SDL/cdrom
-@dirrm share/doc/SDL/events
-@dirrm share/doc/SDL/images
-@dirrm share/doc/SDL/threads
+@dirrm share/examples/SDL
 @dirrm share/doc/SDL/video
+@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 share/examples/SDL
+@dirrm include/SDL
diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile
index 3fffeff215a2..4cce49be3f54 100644
--- a/devel/sdl/Makefile
+++ b/devel/sdl/Makefile
@@ -1,30 +1,36 @@
 # New ports collection makefile for:	SDL
-# Version required:			0.10.0
+# Version required:			1.0.1
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-0.10.0
-PKGNAME=		sdl-0.10.0
-CATEGORIES=		devel
-MASTER_SITES=		http://www.devolution.com/~slouken/SDL/SDL-0.10/src/
+DISTNAME=		SDL-1.0.1
+PKGNAME=		sdl-1.0.1
+CATEGORIES=		devel audio
+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
 
-do-build:
-	@ cd ${WRKSRC}; ${GMAKE}
-	@ cd ${WRKSRC}; ${GMAKE}
+#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
 
 post-install:
-	@ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDL.so.0
-	@ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDLx11.so.0
 	@ ${MKDIR} ${PREFIX}/share/examples/SDL
 	@ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL
 .if !defined(NOPORTDOCS)
@@ -32,9 +38,8 @@ post-install:
 .for file in BUGS COPYING CREDITS README TODO WhatsNew docs.html
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL
 .endfor
-	@ cd ${WRKSRC}/docs; tar cf - * | \
+	@ cd ${WRKSRC}/docs; tar cf - audio cdrom events images index.html threads video | \
 		(cd ${PREFIX}/share/doc/SDL; tar --unlink -xf - )
 .endif
-	@ ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/sdl/distinfo b/devel/sdl/distinfo
index 6c4657d4b056..22a6b75dcb6e 100644
--- a/devel/sdl/distinfo
+++ b/devel/sdl/distinfo
@@ -1 +1 @@
-MD5 (SDL-0.10.0.tar.gz) = 7e468488d0c7d0b3e9af6c4a5a897b97
+MD5 (SDL-1.0.1.tar.gz) = 0bc636a2f96c6451a5046c5f20fa0536
diff --git a/devel/sdl/files/patch-ac b/devel/sdl/files/patch-ac
new file mode 100644
index 000000000000..cc87deaad1ad
--- /dev/null
+++ b/devel/sdl/files/patch-ac
@@ -0,0 +1,42 @@
+--- configure.orig	Tue Dec 14 01:33:42 1999
++++ configure	Sat Jan  8 23:23:37 2000
+@@ -3030,7 +3030,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 @@
+ 
+     ac_save_libs="$LIBS"
+     case "$target" in
+-        *-*-freebsd*)
++        *-*-frebsd*)
+             pthread_lib="-lc_r"
+             ;;
+         *)
+-            pthread_lib="-lpthread"
++            pthread_lib="-L""$LOCALBASE""/lib -llthread"
+             ;;
+     esac
+     LIBS="$LIBS $pthread_lib"
+@@ -4371,7 +4371,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 -I""$LOCALBASE""/include/pthread/linuxthreads"
+             SDL_LIBS="$SDL_LIBS $pthread_lib"
+         fi
+     fi
+@@ -4851,6 +4851,7 @@
+         ;;
+     *-*-freebsd*)
+         ARCH=freebsd
++	CheckNASM
+         CheckESD
+         CheckX11
+         CheckPTHREAD
diff --git a/devel/sdl/pkg-plist b/devel/sdl/pkg-plist
index 8f1ed0e1c96c..f020ec999132 100644
--- a/devel/sdl/pkg-plist
+++ b/devel/sdl/pkg-plist
@@ -1,3 +1,4 @@
+bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
 include/SDL/SDL_audio.h
@@ -9,7 +10,7 @@ include/SDL/SDL_error.h
 include/SDL/SDL_events.h
 include/SDL/SDL_keyboard.h
 include/SDL/SDL_keysym.h
-include/SDL/SDL_mangle.h
+include/SDL/SDL_main.h
 include/SDL/SDL_mouse.h
 include/SDL/SDL_mutex.h
 include/SDL/SDL_quit.h
@@ -22,19 +23,21 @@ 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.0
 lib/libSDL.a
-lib/libSDL.so.0
-lib/libSDLx11.so.0.10
-lib/libSDLx11.so.0.10.0
+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/BUGS
 share/doc/SDL/COPYING
 share/doc/SDL/CREDITS
 share/doc/SDL/README
 share/doc/SDL/TODO
 share/doc/SDL/WhatsNew
-share/doc/SDL/docs.html
 share/doc/SDL/audio/examples.html
 share/doc/SDL/audio/funclist.html
 share/doc/SDL/audio/functions.html
@@ -43,11 +46,11 @@ 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/SDL_title.gif
 share/doc/SDL/images/rainbow.gif
 share/doc/SDL/index.html
 share/doc/SDL/threads/index.html
@@ -56,14 +59,21 @@ share/doc/SDL/video/funclist.html
 share/doc/SDL/video/functions.html
 share/doc/SDL/video/index.html
 share/examples/SDL/COPYING
-share/examples/SDL/GNUC.sh
-share/examples/SDL/GNUmake
-share/examples/SDL/Makefile
+share/examples/SDL/Makefile.am
+share/examples/SDL/Makefile.in
 share/examples/SDL/README
+share/examples/SDL/acinclude.m4
+share/examples/SDL/aclocal.m4
+share/examples/SDL/autogen.sh
 share/examples/SDL/checkkeys.c
+share/examples/SDL/configure
+share/examples/SDL/configure.in
 share/examples/SDL/graywin.c
 share/examples/SDL/icon.bmp
+share/examples/SDL/install-sh
 share/examples/SDL/loopwave.c
+share/examples/SDL/missing
+share/examples/SDL/mkinstalldirs
 share/examples/SDL/picture.xbm
 share/examples/SDL/sample.bmp
 share/examples/SDL/sample.wav
@@ -82,12 +92,12 @@ share/examples/SDL/testvidinfo.c
 share/examples/SDL/testwin.c
 share/examples/SDL/testwm.c
 share/examples/SDL/threadwin.c
-@dirrm include/SDL
-@dirrm share/doc/SDL/audio
-@dirrm share/doc/SDL/cdrom
-@dirrm share/doc/SDL/events
-@dirrm share/doc/SDL/images
-@dirrm share/doc/SDL/threads
+@dirrm share/examples/SDL
 @dirrm share/doc/SDL/video
+@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 share/examples/SDL
+@dirrm include/SDL
diff --git a/devel/sdl10/Makefile b/devel/sdl10/Makefile
index 3fffeff215a2..4cce49be3f54 100644
--- a/devel/sdl10/Makefile
+++ b/devel/sdl10/Makefile
@@ -1,30 +1,36 @@
 # New ports collection makefile for:	SDL
-# Version required:			0.10.0
+# Version required:			1.0.1
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-0.10.0
-PKGNAME=		sdl-0.10.0
-CATEGORIES=		devel
-MASTER_SITES=		http://www.devolution.com/~slouken/SDL/SDL-0.10/src/
+DISTNAME=		SDL-1.0.1
+PKGNAME=		sdl-1.0.1
+CATEGORIES=		devel audio
+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
 
-do-build:
-	@ cd ${WRKSRC}; ${GMAKE}
-	@ cd ${WRKSRC}; ${GMAKE}
+#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
 
 post-install:
-	@ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDL.so.0
-	@ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDLx11.so.0
 	@ ${MKDIR} ${PREFIX}/share/examples/SDL
 	@ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL
 .if !defined(NOPORTDOCS)
@@ -32,9 +38,8 @@ post-install:
 .for file in BUGS COPYING CREDITS README TODO WhatsNew docs.html
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL
 .endfor
-	@ cd ${WRKSRC}/docs; tar cf - * | \
+	@ cd ${WRKSRC}/docs; tar cf - audio cdrom events images index.html threads video | \
 		(cd ${PREFIX}/share/doc/SDL; tar --unlink -xf - )
 .endif
-	@ ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/sdl10/distinfo b/devel/sdl10/distinfo
index 6c4657d4b056..22a6b75dcb6e 100644
--- a/devel/sdl10/distinfo
+++ b/devel/sdl10/distinfo
@@ -1 +1 @@
-MD5 (SDL-0.10.0.tar.gz) = 7e468488d0c7d0b3e9af6c4a5a897b97
+MD5 (SDL-1.0.1.tar.gz) = 0bc636a2f96c6451a5046c5f20fa0536
diff --git a/devel/sdl10/files/patch-ac b/devel/sdl10/files/patch-ac
new file mode 100644
index 000000000000..cc87deaad1ad
--- /dev/null
+++ b/devel/sdl10/files/patch-ac
@@ -0,0 +1,42 @@
+--- configure.orig	Tue Dec 14 01:33:42 1999
++++ configure	Sat Jan  8 23:23:37 2000
+@@ -3030,7 +3030,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 @@
+ 
+     ac_save_libs="$LIBS"
+     case "$target" in
+-        *-*-freebsd*)
++        *-*-frebsd*)
+             pthread_lib="-lc_r"
+             ;;
+         *)
+-            pthread_lib="-lpthread"
++            pthread_lib="-L""$LOCALBASE""/lib -llthread"
+             ;;
+     esac
+     LIBS="$LIBS $pthread_lib"
+@@ -4371,7 +4371,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 -I""$LOCALBASE""/include/pthread/linuxthreads"
+             SDL_LIBS="$SDL_LIBS $pthread_lib"
+         fi
+     fi
+@@ -4851,6 +4851,7 @@
+         ;;
+     *-*-freebsd*)
+         ARCH=freebsd
++	CheckNASM
+         CheckESD
+         CheckX11
+         CheckPTHREAD
diff --git a/devel/sdl10/pkg-plist b/devel/sdl10/pkg-plist
index 8f1ed0e1c96c..f020ec999132 100644
--- a/devel/sdl10/pkg-plist
+++ b/devel/sdl10/pkg-plist
@@ -1,3 +1,4 @@
+bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
 include/SDL/SDL_audio.h
@@ -9,7 +10,7 @@ include/SDL/SDL_error.h
 include/SDL/SDL_events.h
 include/SDL/SDL_keyboard.h
 include/SDL/SDL_keysym.h
-include/SDL/SDL_mangle.h
+include/SDL/SDL_main.h
 include/SDL/SDL_mouse.h
 include/SDL/SDL_mutex.h
 include/SDL/SDL_quit.h
@@ -22,19 +23,21 @@ 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.0
 lib/libSDL.a
-lib/libSDL.so.0
-lib/libSDLx11.so.0.10
-lib/libSDLx11.so.0.10.0
+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/BUGS
 share/doc/SDL/COPYING
 share/doc/SDL/CREDITS
 share/doc/SDL/README
 share/doc/SDL/TODO
 share/doc/SDL/WhatsNew
-share/doc/SDL/docs.html
 share/doc/SDL/audio/examples.html
 share/doc/SDL/audio/funclist.html
 share/doc/SDL/audio/functions.html
@@ -43,11 +46,11 @@ 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/SDL_title.gif
 share/doc/SDL/images/rainbow.gif
 share/doc/SDL/index.html
 share/doc/SDL/threads/index.html
@@ -56,14 +59,21 @@ share/doc/SDL/video/funclist.html
 share/doc/SDL/video/functions.html
 share/doc/SDL/video/index.html
 share/examples/SDL/COPYING
-share/examples/SDL/GNUC.sh
-share/examples/SDL/GNUmake
-share/examples/SDL/Makefile
+share/examples/SDL/Makefile.am
+share/examples/SDL/Makefile.in
 share/examples/SDL/README
+share/examples/SDL/acinclude.m4
+share/examples/SDL/aclocal.m4
+share/examples/SDL/autogen.sh
 share/examples/SDL/checkkeys.c
+share/examples/SDL/configure
+share/examples/SDL/configure.in
 share/examples/SDL/graywin.c
 share/examples/SDL/icon.bmp
+share/examples/SDL/install-sh
 share/examples/SDL/loopwave.c
+share/examples/SDL/missing
+share/examples/SDL/mkinstalldirs
 share/examples/SDL/picture.xbm
 share/examples/SDL/sample.bmp
 share/examples/SDL/sample.wav
@@ -82,12 +92,12 @@ share/examples/SDL/testvidinfo.c
 share/examples/SDL/testwin.c
 share/examples/SDL/testwm.c
 share/examples/SDL/threadwin.c
-@dirrm include/SDL
-@dirrm share/doc/SDL/audio
-@dirrm share/doc/SDL/cdrom
-@dirrm share/doc/SDL/events
-@dirrm share/doc/SDL/images
-@dirrm share/doc/SDL/threads
+@dirrm share/examples/SDL
 @dirrm share/doc/SDL/video
+@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 share/examples/SDL
+@dirrm include/SDL
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 3fffeff215a2..4cce49be3f54 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -1,30 +1,36 @@
 # New ports collection makefile for:	SDL
-# Version required:			0.10.0
+# Version required:			1.0.1
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-0.10.0
-PKGNAME=		sdl-0.10.0
-CATEGORIES=		devel
-MASTER_SITES=		http://www.devolution.com/~slouken/SDL/SDL-0.10/src/
+DISTNAME=		SDL-1.0.1
+PKGNAME=		sdl-1.0.1
+CATEGORIES=		devel audio
+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
 
-do-build:
-	@ cd ${WRKSRC}; ${GMAKE}
-	@ cd ${WRKSRC}; ${GMAKE}
+#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
 
 post-install:
-	@ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDL.so.0
-	@ cd ${PREFIX}/lib; ${LN} -sf libSDLx11.so.0.10.0 libSDLx11.so.0
 	@ ${MKDIR} ${PREFIX}/share/examples/SDL
 	@ ${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL
 .if !defined(NOPORTDOCS)
@@ -32,9 +38,8 @@ post-install:
 .for file in BUGS COPYING CREDITS README TODO WhatsNew docs.html
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL
 .endfor
-	@ cd ${WRKSRC}/docs; tar cf - * | \
+	@ cd ${WRKSRC}/docs; tar cf - audio cdrom events images index.html threads video | \
 		(cd ${PREFIX}/share/doc/SDL; tar --unlink -xf - )
 .endif
-	@ ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/sdl12/distinfo b/devel/sdl12/distinfo
index 6c4657d4b056..22a6b75dcb6e 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1 +1 @@
-MD5 (SDL-0.10.0.tar.gz) = 7e468488d0c7d0b3e9af6c4a5a897b97
+MD5 (SDL-1.0.1.tar.gz) = 0bc636a2f96c6451a5046c5f20fa0536
diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac
new file mode 100644
index 000000000000..cc87deaad1ad
--- /dev/null
+++ b/devel/sdl12/files/patch-ac
@@ -0,0 +1,42 @@
+--- configure.orig	Tue Dec 14 01:33:42 1999
++++ configure	Sat Jan  8 23:23:37 2000
+@@ -3030,7 +3030,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 @@
+ 
+     ac_save_libs="$LIBS"
+     case "$target" in
+-        *-*-freebsd*)
++        *-*-frebsd*)
+             pthread_lib="-lc_r"
+             ;;
+         *)
+-            pthread_lib="-lpthread"
++            pthread_lib="-L""$LOCALBASE""/lib -llthread"
+             ;;
+     esac
+     LIBS="$LIBS $pthread_lib"
+@@ -4371,7 +4371,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 -I""$LOCALBASE""/include/pthread/linuxthreads"
+             SDL_LIBS="$SDL_LIBS $pthread_lib"
+         fi
+     fi
+@@ -4851,6 +4851,7 @@
+         ;;
+     *-*-freebsd*)
+         ARCH=freebsd
++	CheckNASM
+         CheckESD
+         CheckX11
+         CheckPTHREAD
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index 8f1ed0e1c96c..f020ec999132 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -1,3 +1,4 @@
+bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
 include/SDL/SDL_audio.h
@@ -9,7 +10,7 @@ include/SDL/SDL_error.h
 include/SDL/SDL_events.h
 include/SDL/SDL_keyboard.h
 include/SDL/SDL_keysym.h
-include/SDL/SDL_mangle.h
+include/SDL/SDL_main.h
 include/SDL/SDL_mouse.h
 include/SDL/SDL_mutex.h
 include/SDL/SDL_quit.h
@@ -22,19 +23,21 @@ 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.0
 lib/libSDL.a
-lib/libSDL.so.0
-lib/libSDLx11.so.0.10
-lib/libSDLx11.so.0.10.0
+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/BUGS
 share/doc/SDL/COPYING
 share/doc/SDL/CREDITS
 share/doc/SDL/README
 share/doc/SDL/TODO
 share/doc/SDL/WhatsNew
-share/doc/SDL/docs.html
 share/doc/SDL/audio/examples.html
 share/doc/SDL/audio/funclist.html
 share/doc/SDL/audio/functions.html
@@ -43,11 +46,11 @@ 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/SDL_title.gif
 share/doc/SDL/images/rainbow.gif
 share/doc/SDL/index.html
 share/doc/SDL/threads/index.html
@@ -56,14 +59,21 @@ share/doc/SDL/video/funclist.html
 share/doc/SDL/video/functions.html
 share/doc/SDL/video/index.html
 share/examples/SDL/COPYING
-share/examples/SDL/GNUC.sh
-share/examples/SDL/GNUmake
-share/examples/SDL/Makefile
+share/examples/SDL/Makefile.am
+share/examples/SDL/Makefile.in
 share/examples/SDL/README
+share/examples/SDL/acinclude.m4
+share/examples/SDL/aclocal.m4
+share/examples/SDL/autogen.sh
 share/examples/SDL/checkkeys.c
+share/examples/SDL/configure
+share/examples/SDL/configure.in
 share/examples/SDL/graywin.c
 share/examples/SDL/icon.bmp
+share/examples/SDL/install-sh
 share/examples/SDL/loopwave.c
+share/examples/SDL/missing
+share/examples/SDL/mkinstalldirs
 share/examples/SDL/picture.xbm
 share/examples/SDL/sample.bmp
 share/examples/SDL/sample.wav
@@ -82,12 +92,12 @@ share/examples/SDL/testvidinfo.c
 share/examples/SDL/testwin.c
 share/examples/SDL/testwm.c
 share/examples/SDL/threadwin.c
-@dirrm include/SDL
-@dirrm share/doc/SDL/audio
-@dirrm share/doc/SDL/cdrom
-@dirrm share/doc/SDL/events
-@dirrm share/doc/SDL/images
-@dirrm share/doc/SDL/threads
+@dirrm share/examples/SDL
 @dirrm share/doc/SDL/video
+@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 share/examples/SDL
+@dirrm include/SDL