From thierry@pompo.net  Wed Oct  1 13:17:38 2003
Return-Path: <thierry@pompo.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 32A6C16A4BF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  1 Oct 2003 13:17:38 -0700 (PDT)
Received: from postfix4-1.free.fr (postfix4-1.free.fr [213.228.0.62])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F227343FB1
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  1 Oct 2003 13:17:30 -0700 (PDT)
	(envelope-from thierry@pompo.net)
Received: from ws90bj.pompo.net (graf.pompo.net [81.56.186.139])
	by postfix4-1.free.fr (Postfix) with ESMTP id 79DB54F504
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  1 Oct 2003 22:15:24 +0200 (CEST)
Received: by ws90bj.pompo.net (Postfix, from userid 1001)
	id 1F3DF22BF14; Wed,  1 Oct 2003 22:14:37 +0200 (CEST)
Message-Id: <20031001201437.1F3DF22BF14@ws90bj.pompo.net>
Date: Wed,  1 Oct 2003 22:14:37 +0200 (CEST)
From: Thierry Thomas <thierry@pompo.net>
Reply-To: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: devel/sdl12: upgrading to 1.2.6 + some fixes.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         57475
>Category:       ports
>Synopsis:       devel/sdl12: upgrading to 1.2.6 + some fixes.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 01 13:20:15 PDT 2003
>Closed-Date:    Mon Mar 15 20:08:02 PST 2004
>Last-Modified:  Mon Mar 15 20:08:02 PST 2004
>Originator:     Thierry Thomas
>Release:        FreeBSD 5.1-RELEASE-p2 i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD ws90bj.pompo.net 5.1-RELEASE-p2 FreeBSD 5.1-RELEASE-p2 #1: Tue Aug 19 17:50:01 CEST 2003 thierry@ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-030610 i386


	
>Description:
	- upgrade to 1.2.6
	- add a knob WITH_NAS
	- fix dependences to aalib & svgalib
	- use standard DOCSDIR & EXAMPLESDIR
	- fix plist for NOPORTDOCS
	- distribute README-SDL.txt.

>How-To-Repeat:
	N/A.

>Fix:
	1) Please apply the following patches on devel/sdl12 and on
	   bsd.port.mk (to chase the shlib for USE_SDL);

	2) Bumps portrevision for all ports matching

	Removed files:
	- devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c
	- devel/sdl12/files/patch-src::video::SDL_stretch.c

--- sdl12.diff begins here ---
diff -urN devel/sdl12.orig/Makefile devel/sdl12/Makefile
--- devel/sdl12.orig/Makefile	Tue Jul 29 21:14:04 2003
+++ devel/sdl12/Makefile	Wed Oct  1 15:44:17 2003
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTVERSION=	1.2.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/ \
 		http://www.devolution.com/~slouken/SDL/release/
@@ -21,15 +20,17 @@
 
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_LIBTOOL=	yes
 WANT_GNOME=	yes
-CONFIGURE_ENV=	NASM="${LOCALBASE}/bin/nasm" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--enable-video-aalib \
-		--disable-nas
+CONFIGURE_ENV=	NASM="${LOCALBASE}/bin/nasm"		\
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
+		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
+		LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--enable-video-aalib
 
-CFLAGS+=	${PTHREAD_CFLAGS}
+CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if exists(/usr/lib/libvgl.so.3)
 CONFIGURE_ARGS+=--enable-video-vgl
@@ -40,6 +41,12 @@
 DISPLAY_MSG=	${DO_NADA}
 .endif
 
+.if defined(WITH_NAS)
+LIB_DEPENDS+=  audio.2:${PORTSDIR}/audio/nas
+.else
+CONFIGURE_ARGS+=--disable-nas
+.endif
+
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 .endif
@@ -82,6 +89,10 @@
 CONFIGURE_ARGS+=--disable-arts
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} 's|sdl-config|sdl11-config|g'	\
+		${WRKSRC}/test/configure
+
 pre-configure:
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${TOUCH}
 
@@ -93,15 +104,18 @@
 		${WRKSRC}/libtool
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/SDL11
-	${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL11
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/test/configure ${EXAMPLESDIR}
+	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/SDL11/docs
-.for file in BUGS COPYING CREDITS README WhatsNew docs.html
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL11
+	@${MKDIR} ${DOCSDIR}/docs
+.for doc in BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 	@cd ${WRKSRC}/docs; ${TAR} cf - `${ECHO_CMD} [^Mm]*` | \
-		(cd ${PREFIX}/share/doc/SDL11/docs; ${TAR} --unlink -xf - )
+		(cd ${DOCSDIR}/docs; ${TAR} --unlink -xf - )
+	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 	@${DISPLAY_MSG}
 
diff -urN devel/sdl12.orig/distinfo devel/sdl12/distinfo
--- devel/sdl12.orig/distinfo	Thu Jan  2 23:05:47 2003
+++ devel/sdl12/distinfo	Mon Sep 29 19:40:15 2003
@@ -1 +1 @@
-MD5 (SDL-1.2.5.tar.gz) = cacacf4e4cca546de168fedc23b9b44b
+MD5 (SDL-1.2.6.tar.gz) = 9011f147f23ec535515291d0c9c6904c
diff -urN devel/sdl12.orig/files/patch-ac devel/sdl12/files/patch-ac
--- devel/sdl12.orig/files/patch-ac	Tue Jul  1 21:42:16 2003
+++ devel/sdl12/files/patch-ac	Mon Sep 29 22:20:46 2003
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/devel/sdl12/files/patch-ac,v 1.27 2003/06/27 19:29:43 sobomax Exp $
-
---- configure.orig	Sun Oct  6 23:35:02 2002
-+++ configure	Fri Jun 27 22:19:43 2003
-@@ -674,9 +674,9 @@
+--- configure.orig	Sat Aug 30 21:13:23 2003
++++ configure	Mon Sep 29 22:20:16 2003
+@@ -676,9 +676,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -15,7 +12,7 @@
  
  
  
-@@ -2794,7 +2794,7 @@
+@@ -2832,7 +2832,7 @@
  
  
  SDL_CFLAGS=""
@@ -24,7 +21,7 @@
  
  
  case "$target" in
-@@ -5840,8 +5840,8 @@
+@@ -5966,8 +5966,8 @@
  #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              ;;
          *-*-freebsd*)
@@ -35,11 +32,11 @@
              ;;
          *-*-netbsd*)
              pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
-@@ -6946,7 +6946,9 @@
+@@ -7231,7 +7231,9 @@
              CFLAGS="$CFLAGS -DHAVE_USBHID_H"
          fi
          if test x$have_libusb_h = xyes; then
-+	    if x$have_libusbhid_h = xno; then
++	    if test x$have_libusbhid_h = xno; then
              CFLAGS="$CFLAGS -DHAVE_LIBUSB_H"
 +	    fi
          fi
diff -urN devel/sdl12.orig/files/patch-joystick::bsd::SDL_sysjoystick.c devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c
--- devel/sdl12.orig/files/patch-joystick::bsd::SDL_sysjoystick.c	Sun Jul 20 01:41:34 2003
+++ devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c	Thu Jan  1 01:00:00 1970
@@ -1,165 +0,0 @@
-
-$FreeBSD: ports/devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c,v 1.3 2003/07/14 18:14:53 sobomax Exp $
-
---- src/joystick/bsd/SDL_sysjoystick.c.orig	Sat Oct  5 08:32:49 2002
-+++ src/joystick/bsd/SDL_sysjoystick.c	Mon Jul 14 21:12:23 2003
-@@ -53,6 +53,11 @@
- #include <libusbhid.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#include <sys/joystick.h>
-+#endif
-+
- #include "SDL_error.h"
- #include "SDL_joystick.h"
- #include "SDL_sysjoystick.h"
-@@ -192,7 +197,18 @@
- 	joy->hwdata = hw;
- 	hw->fd = fd;
- 	hw->path = strdup(path);
--	hw->type = BSDJOY_UHID;
-+	if (! strncmp(path, "/dev/joy", 8))
-+	{
-+		hw->type = BSDJOY_JOY;
-+		joy->naxes = 2;
-+		joy->nbuttons = 2;
-+		joy->nhats = 0;
-+		joy->nballs = 0;
-+		joydevnames[joy->index] = strdup("Gameport joystick");
-+		goto usbend;
-+	}
-+	else
-+	  hw->type = BSDJOY_UHID;
- 	hw->repdesc = hid_get_report_desc(fd);
- 	if (hw->repdesc == NULL) {
- 		SDL_SetError("%s: USB_GET_REPORT_DESC: %s", hw->path,
-@@ -201,6 +217,7 @@
- 	}
- 
- 	rep = &hw->inreport;
-+	rep->rid = 0;
- 	if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {
- 		goto usberr;
- 	}
-@@ -210,7 +227,7 @@
- 		goto usberr;
- 	}
- 
--#ifdef USBHID_NEW
-+#if defined(USBHID_NEW) || (defined(__FreeBSD__) && __FreeBSD_version >= 500111)
- 	hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
- #else
- 	hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
-@@ -275,6 +292,7 @@
- 	}
- 	hid_end_parse(hdata);
- 
-+usbend:
- 	/* The poll blocks the event thread. */
- 	fcntl(fd, F_SETFL, O_NONBLOCK);
- 
-@@ -294,13 +312,62 @@
- 	struct report *rep;
- 	int nbutton, naxe = -1;
- 	Sint32 v;
-+	struct joystick gameport;
-+	static int x, y, xmin=0xffff, ymin=0xffff, xmax=0, ymax=0;
-+
-+	if (!strncmp(joy->hwdata->path, "/dev/joy", 8)) {
-+		if (read(joy->hwdata->fd, &gameport, sizeof(gameport)) != sizeof(gameport)) {
-+			return;
-+		}
-+		if (abs(x - gameport.x) > 8) {
-+			x = gameport.x;
-+			if (x < xmin) {
-+				xmin = x;
-+			}
-+			if (x > xmax) {
-+				xmax = x;
-+			}
-+			if (xmin == xmax) {
-+				xmin--;
-+				xmax++;
-+			}
-+			v = (Sint32)x;
-+			v -= (xmax + xmin + 1)/2;
-+			v *= 32768/((xmax - xmin + 1)/2);
-+			SDL_PrivateJoystickAxis(joy, 0, v);
-+		}
-+		if (abs(y - gameport.y) > 8) {
-+			y = gameport.y;
-+			if (y < ymin) {
-+				ymin = y;
-+			}
-+			if (y > ymax) {
-+				ymax = y;
-+			}
-+			if (ymin == ymax) {
-+				ymin--;
-+				ymax++;
-+			}
-+			v = (Sint32)y;
-+			v -= (ymax + ymin + 1)/2;
-+			v *= 32768/((ymax - ymin + 1)/2);
-+			SDL_PrivateJoystickAxis(joy, 1, v);
-+		}
-+		if (gameport.b1 != joy->buttons[0]) {
-+			SDL_PrivateJoystickButton(joy, 0, gameport.b1);
-+		}
-+		if (gameport.b2 != joy->buttons[1]) {
-+			SDL_PrivateJoystickButton(joy, 1, gameport.b2);
-+		}
-+		return;
-+	}
- 	
- 	rep = &joy->hwdata->inreport;
- 
- 	if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) {
- 		return;
- 	}
--#ifdef USBHID_NEW
-+#if defined(USBHID_NEW) || (defined(__FreeBSD__) && __FreeBSD_version >= 500111)
- 	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
- #else
- 	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
-@@ -370,8 +437,10 @@
- void
- SDL_SYS_JoystickClose(SDL_Joystick *joy)
- {
--	report_free(&joy->hwdata->inreport);
--	hid_dispose_report_desc(joy->hwdata->repdesc);
-+	if (strncmp(joy->hwdata->path, "/dev/joy", 8))	{
-+		report_free(&joy->hwdata->inreport);
-+		hid_dispose_report_desc(joy->hwdata->repdesc);
-+	}
- 	close(joy->hwdata->fd);
- 	free(joy->hwdata->path);
- 	free(joy->hwdata);
-@@ -399,11 +468,24 @@
- {
- 	int len;
- 
--#ifdef USBHID_NEW
-+#ifdef __FreeBSD__
-+# if (__FreeBSD_version >= 470000)
-+#  if ((__FreeBSD_version <= 500111) && (__FreeBSD_version >= 480000))
-+	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
-+#  else
-+	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
-+#  endif
-+# else
- 	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
-+#endif
- #else
-+# ifdef USBHID_NEW
-+	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
-+# else
- 	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
-+# endif
- #endif
-+
- 	if (len < 0) {
- 		SDL_SetError("Negative HID report size");
- 		return (-1);
diff -urN devel/sdl12.orig/files/patch-src::video::SDL_stretch.c devel/sdl12/files/patch-src::video::SDL_stretch.c
--- devel/sdl12.orig/files/patch-src::video::SDL_stretch.c	Mon Jul 14 20:19:40 2003
+++ devel/sdl12/files/patch-src::video::SDL_stretch.c	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
-
-$FreeBSD: ports/devel/sdl12/files/patch-src::video::SDL_stretch.c,v 1.1 2003/07/14 18:19:40 sobomax Exp $
-
---- src/video/SDL_stretch.c	2003/07/14 18:17:21	1.1
-+++ src/video/SDL_stretch.c	2003/07/14 18:18:39
-@@ -261,9 +261,9 @@
- 			break;
- 		    default:
- #ifdef __GNUC__
--			__asm__ __volatile__ ("
--				call _copy_row
--			"
-+			__asm__ __volatile__ (""
-+			"	call _copy_row"
-+			""
- 			: "=&D" (u1), "=&S" (u2)
- 			: "0" (dstp), "1" (srcp)
- 			: "memory" );
diff -urN devel/sdl12.orig/pkg-descr devel/sdl12/pkg-descr
--- devel/sdl12.orig/pkg-descr	Tue Jun  6 10:05:51 2000
+++ devel/sdl12/pkg-descr	Mon Sep 29 19:28:07 2003
@@ -1,5 +1,3 @@
-Unstable development version of the SDL library.
-
 This library is designed to make it easy to write games that run on UNIX,
 Win32 and BeOS using the various native high-performance media interfaces,
 (for video, audio, etc) and presenting a single source-code level API to
diff -urN devel/sdl12.orig/pkg-plist devel/sdl12/pkg-plist
--- devel/sdl12.orig/pkg-plist	Thu Jan  2 23:05:50 2003
+++ devel/sdl12/pkg-plist	Wed Oct  1 16:00:04 2003
@@ -12,6 +12,7 @@
 include/SDL11/SDL_joystick.h
 include/SDL11/SDL_keyboard.h
 include/SDL11/SDL_keysym.h
+include/SDL11/SDL_loadso.h
 include/SDL11/SDL_main.h
 include/SDL11/SDL_mouse.h
 include/SDL11/SDL_mutex.h
@@ -29,266 +30,269 @@
 include/SDL11/close_code.h
 lib/libSDL-1.1.a
 lib/libSDL-1.1.so
-lib/libSDL-1.1.so.5
+lib/libSDL-1.1.so.6
 lib/libSDLmain-1.1.a
 share/aclocal/sdl11.m4
-share/doc/SDL11/BUGS
-share/doc/SDL11/COPYING
-share/doc/SDL11/CREDITS
-share/doc/SDL11/README
-share/doc/SDL11/WhatsNew
-share/doc/SDL11/docs.html
-share/doc/SDL11/docs/html/Makefile
-share/doc/SDL11/docs/html/Makefile.am
-share/doc/SDL11/docs/html/Makefile.in
-share/doc/SDL11/docs/html/audio.html
-share/doc/SDL11/docs/html/cdrom.html
-share/doc/SDL11/docs/html/event.html
-share/doc/SDL11/docs/html/eventfunctions.html
-share/doc/SDL11/docs/html/eventstructures.html
-share/doc/SDL11/docs/html/general.html
-share/doc/SDL11/docs/html/guide.html
-share/doc/SDL11/docs/html/guideaboutsdldoc.html
-share/doc/SDL11/docs/html/guideaudioexamples.html
-share/doc/SDL11/docs/html/guidebasicsinit.html
-share/doc/SDL11/docs/html/guidecdromexamples.html
-share/doc/SDL11/docs/html/guidecredits.html
-share/doc/SDL11/docs/html/guideeventexamples.html
-share/doc/SDL11/docs/html/guideexamples.html
-share/doc/SDL11/docs/html/guideinput.html
-share/doc/SDL11/docs/html/guideinputkeyboard.html
-share/doc/SDL11/docs/html/guidepreface.html
-share/doc/SDL11/docs/html/guidethebasics.html
-share/doc/SDL11/docs/html/guidetimeexamples.html
-share/doc/SDL11/docs/html/guidevideo.html
-share/doc/SDL11/docs/html/guidevideoexamples.html
-share/doc/SDL11/docs/html/guidevideoopengl.html
-share/doc/SDL11/docs/html/index.html
-share/doc/SDL11/docs/html/joystick.html
-share/doc/SDL11/docs/html/reference.html
-share/doc/SDL11/docs/html/sdlactiveevent.html
-share/doc/SDL11/docs/html/sdladdtimer.html
-share/doc/SDL11/docs/html/sdlaudiocvt.html
-share/doc/SDL11/docs/html/sdlaudiospec.html
-share/doc/SDL11/docs/html/sdlblitsurface.html
-share/doc/SDL11/docs/html/sdlbuildaudiocvt.html
-share/doc/SDL11/docs/html/sdlcd.html
-share/doc/SDL11/docs/html/sdlcdclose.html
-share/doc/SDL11/docs/html/sdlcdeject.html
-share/doc/SDL11/docs/html/sdlcdname.html
-share/doc/SDL11/docs/html/sdlcdnumdrives.html
-share/doc/SDL11/docs/html/sdlcdopen.html
-share/doc/SDL11/docs/html/sdlcdpause.html
-share/doc/SDL11/docs/html/sdlcdplay.html
-share/doc/SDL11/docs/html/sdlcdplaytracks.html
-share/doc/SDL11/docs/html/sdlcdresume.html
-share/doc/SDL11/docs/html/sdlcdstatus.html
-share/doc/SDL11/docs/html/sdlcdstop.html
-share/doc/SDL11/docs/html/sdlcdtrack.html
-share/doc/SDL11/docs/html/sdlcloseaudio.html
-share/doc/SDL11/docs/html/sdlcolor.html
-share/doc/SDL11/docs/html/sdlcondbroadcast.html
-share/doc/SDL11/docs/html/sdlcondsignal.html
-share/doc/SDL11/docs/html/sdlcondwait.html
-share/doc/SDL11/docs/html/sdlcondwaittimeout.html
-share/doc/SDL11/docs/html/sdlconvertaudio.html
-share/doc/SDL11/docs/html/sdlconvertsurface.html
-share/doc/SDL11/docs/html/sdlcreatecond.html
-share/doc/SDL11/docs/html/sdlcreatecursor.html
-share/doc/SDL11/docs/html/sdlcreatemutex.html
-share/doc/SDL11/docs/html/sdlcreatergbsurface.html
-share/doc/SDL11/docs/html/sdlcreatergbsurfacefrom.html
-share/doc/SDL11/docs/html/sdlcreatesemaphore.html
-share/doc/SDL11/docs/html/sdlcreatethread.html
-share/doc/SDL11/docs/html/sdlcreateyuvoverlay.html
-share/doc/SDL11/docs/html/sdldelay.html
-share/doc/SDL11/docs/html/sdldestroycond.html
-share/doc/SDL11/docs/html/sdldestroymutex.html
-share/doc/SDL11/docs/html/sdldestroysemaphore.html
-share/doc/SDL11/docs/html/sdldisplayformat.html
-share/doc/SDL11/docs/html/sdldisplayformatalpha.html
-share/doc/SDL11/docs/html/sdldisplayyuvoverlay.html
-share/doc/SDL11/docs/html/sdlenablekeyrepeat.html
-share/doc/SDL11/docs/html/sdlenableunicode.html
-share/doc/SDL11/docs/html/sdlevent.html
-share/doc/SDL11/docs/html/sdleventstate.html
-share/doc/SDL11/docs/html/sdlexposeevent.html
-share/doc/SDL11/docs/html/sdlfillrect.html
-share/doc/SDL11/docs/html/sdlflip.html
-share/doc/SDL11/docs/html/sdlfreecursor.html
-share/doc/SDL11/docs/html/sdlfreesurface.html
-share/doc/SDL11/docs/html/sdlfreewav.html
-share/doc/SDL11/docs/html/sdlfreeyuvoverlay.html
-share/doc/SDL11/docs/html/sdlgetappstate.html
-share/doc/SDL11/docs/html/sdlgetaudiostatus.html
-share/doc/SDL11/docs/html/sdlgetcliprect.html
-share/doc/SDL11/docs/html/sdlgetcursor.html
-share/doc/SDL11/docs/html/sdlgeterror.html
-share/doc/SDL11/docs/html/sdlgeteventfilter.html
-share/doc/SDL11/docs/html/sdlgetgammaramp.html
-share/doc/SDL11/docs/html/sdlgetkeyname.html
-share/doc/SDL11/docs/html/sdlgetkeystate.html
-share/doc/SDL11/docs/html/sdlgetmodstate.html
-share/doc/SDL11/docs/html/sdlgetmousestate.html
-share/doc/SDL11/docs/html/sdlgetrelativemousestate.html
-share/doc/SDL11/docs/html/sdlgetrgb.html
-share/doc/SDL11/docs/html/sdlgetrgba.html
-share/doc/SDL11/docs/html/sdlgetthreadid.html
-share/doc/SDL11/docs/html/sdlgetticks.html
-share/doc/SDL11/docs/html/sdlgetvideoinfo.html
-share/doc/SDL11/docs/html/sdlgetvideosurface.html
-share/doc/SDL11/docs/html/sdlglattr.html
-share/doc/SDL11/docs/html/sdlglgetattribute.html
-share/doc/SDL11/docs/html/sdlglgetprocaddress.html
-share/doc/SDL11/docs/html/sdlglloadlibrary.html
-share/doc/SDL11/docs/html/sdlglsetattribute.html
-share/doc/SDL11/docs/html/sdlglswapbuffers.html
-share/doc/SDL11/docs/html/sdlinit.html
-share/doc/SDL11/docs/html/sdlinitsubsystem.html
-share/doc/SDL11/docs/html/sdljoyaxisevent.html
-share/doc/SDL11/docs/html/sdljoyballevent.html
-share/doc/SDL11/docs/html/sdljoybuttonevent.html
-share/doc/SDL11/docs/html/sdljoyhatevent.html
-share/doc/SDL11/docs/html/sdljoystickclose.html
-share/doc/SDL11/docs/html/sdljoystickeventstate.html
-share/doc/SDL11/docs/html/sdljoystickgetaxis.html
-share/doc/SDL11/docs/html/sdljoystickgetball.html
-share/doc/SDL11/docs/html/sdljoystickgetbutton.html
-share/doc/SDL11/docs/html/sdljoystickgethat.html
-share/doc/SDL11/docs/html/sdljoystickindex.html
-share/doc/SDL11/docs/html/sdljoystickname.html
-share/doc/SDL11/docs/html/sdljoysticknumaxes.html
-share/doc/SDL11/docs/html/sdljoysticknumballs.html
-share/doc/SDL11/docs/html/sdljoysticknumbuttons.html
-share/doc/SDL11/docs/html/sdljoysticknumhats.html
-share/doc/SDL11/docs/html/sdljoystickopen.html
-share/doc/SDL11/docs/html/sdljoystickopened.html
-share/doc/SDL11/docs/html/sdljoystickupdate.html
-share/doc/SDL11/docs/html/sdlkey.html
-share/doc/SDL11/docs/html/sdlkeyboardevent.html
-share/doc/SDL11/docs/html/sdlkeysym.html
-share/doc/SDL11/docs/html/sdlkillthread.html
-share/doc/SDL11/docs/html/sdllistmodes.html
-share/doc/SDL11/docs/html/sdlloadbmp.html
-share/doc/SDL11/docs/html/sdlloadwav.html
-share/doc/SDL11/docs/html/sdllockaudio.html
-share/doc/SDL11/docs/html/sdllocksurface.html
-share/doc/SDL11/docs/html/sdllockyuvoverlay.html
-share/doc/SDL11/docs/html/sdlmaprgb.html
-share/doc/SDL11/docs/html/sdlmaprgba.html
-share/doc/SDL11/docs/html/sdlmixaudio.html
-share/doc/SDL11/docs/html/sdlmousebuttonevent.html
-share/doc/SDL11/docs/html/sdlmousemotionevent.html
-share/doc/SDL11/docs/html/sdlmutexp.html
-share/doc/SDL11/docs/html/sdlmutexv.html
-share/doc/SDL11/docs/html/sdlnumjoysticks.html
-share/doc/SDL11/docs/html/sdlopenaudio.html
-share/doc/SDL11/docs/html/sdloverlay.html
-share/doc/SDL11/docs/html/sdlpalette.html
-share/doc/SDL11/docs/html/sdlpauseaudio.html
-share/doc/SDL11/docs/html/sdlpeepevents.html
-share/doc/SDL11/docs/html/sdlpixelformat.html
-share/doc/SDL11/docs/html/sdlpollevent.html
-share/doc/SDL11/docs/html/sdlpumpevents.html
-share/doc/SDL11/docs/html/sdlpushevent.html
-share/doc/SDL11/docs/html/sdlquit.html
-share/doc/SDL11/docs/html/sdlquitevent.html
-share/doc/SDL11/docs/html/sdlquitsubsystem.html
-share/doc/SDL11/docs/html/sdlrect.html
-share/doc/SDL11/docs/html/sdlremovetimer.html
-share/doc/SDL11/docs/html/sdlresizeevent.html
-share/doc/SDL11/docs/html/sdlsavebmp.html
-share/doc/SDL11/docs/html/sdlsempost.html
-share/doc/SDL11/docs/html/sdlsemtrywait.html
-share/doc/SDL11/docs/html/sdlsemvalue.html
-share/doc/SDL11/docs/html/sdlsemwait.html
-share/doc/SDL11/docs/html/sdlsemwaittimeout.html
-share/doc/SDL11/docs/html/sdlsetalpha.html
-share/doc/SDL11/docs/html/sdlsetcliprect.html
-share/doc/SDL11/docs/html/sdlsetcolorkey.html
-share/doc/SDL11/docs/html/sdlsetcolors.html
-share/doc/SDL11/docs/html/sdlsetcursor.html
-share/doc/SDL11/docs/html/sdlseteventfilter.html
-share/doc/SDL11/docs/html/sdlsetgamma.html
-share/doc/SDL11/docs/html/sdlsetgammaramp.html
-share/doc/SDL11/docs/html/sdlsetmodstate.html
-share/doc/SDL11/docs/html/sdlsetpalette.html
-share/doc/SDL11/docs/html/sdlsettimer.html
-share/doc/SDL11/docs/html/sdlsetvideomode.html
-share/doc/SDL11/docs/html/sdlshowcursor.html
-share/doc/SDL11/docs/html/sdlsurface.html
-share/doc/SDL11/docs/html/sdlsyswmevent.html
-share/doc/SDL11/docs/html/sdlthreadid.html
-share/doc/SDL11/docs/html/sdlunlockaudio.html
-share/doc/SDL11/docs/html/sdlunlocksurface.html
-share/doc/SDL11/docs/html/sdlunlockyuvoverlay.html
-share/doc/SDL11/docs/html/sdlupdaterect.html
-share/doc/SDL11/docs/html/sdlupdaterects.html
-share/doc/SDL11/docs/html/sdluserevent.html
-share/doc/SDL11/docs/html/sdlvideodrivername.html
-share/doc/SDL11/docs/html/sdlvideoinfo.html
-share/doc/SDL11/docs/html/sdlvideomodeok.html
-share/doc/SDL11/docs/html/sdlwaitevent.html
-share/doc/SDL11/docs/html/sdlwaitthread.html
-share/doc/SDL11/docs/html/sdlwarpmouse.html
-share/doc/SDL11/docs/html/sdlwasinit.html
-share/doc/SDL11/docs/html/sdlwmgetcaption.html
-share/doc/SDL11/docs/html/sdlwmgrabinput.html
-share/doc/SDL11/docs/html/sdlwmiconifywindow.html
-share/doc/SDL11/docs/html/sdlwmsetcaption.html
-share/doc/SDL11/docs/html/sdlwmseticon.html
-share/doc/SDL11/docs/html/sdlwmtogglefullscreen.html
-share/doc/SDL11/docs/html/thread.html
-share/doc/SDL11/docs/html/time.html
-share/doc/SDL11/docs/html/video.html
-share/doc/SDL11/docs/html/wm.html
-share/doc/SDL11/docs/index.html
-share/examples/SDL11/COPYING
-share/examples/SDL11/Makefile.am
-share/examples/SDL11/Makefile.in
-share/examples/SDL11/README
-share/examples/SDL11/acinclude.m4
-share/examples/SDL11/aclocal.m4
-share/examples/SDL11/autogen.sh
-share/examples/SDL11/checkkeys.c
-share/examples/SDL11/config.guess
-share/examples/SDL11/config.sub
-share/examples/SDL11/configure
-share/examples/SDL11/configure.in
-share/examples/SDL11/graywin.c
-share/examples/SDL11/icon.bmp
-share/examples/SDL11/install-sh
-share/examples/SDL11/loopwave.c
-share/examples/SDL11/missing
-share/examples/SDL11/mkinstalldirs
-share/examples/SDL11/picture.xbm
-share/examples/SDL11/sail.bmp
-share/examples/SDL11/sample.bmp
-share/examples/SDL11/sample.wav
-share/examples/SDL11/testalpha.c
-share/examples/SDL11/testbitmap.c
-share/examples/SDL11/testcdrom.c
-share/examples/SDL11/testerror.c
-share/examples/SDL11/testgamma.c
-share/examples/SDL11/testgl.c
-share/examples/SDL11/testhread.c
-share/examples/SDL11/testjoystick.c
-share/examples/SDL11/testkeys.c
-share/examples/SDL11/testlock.c
-share/examples/SDL11/testoverlay.c
-share/examples/SDL11/testpalette.c
-share/examples/SDL11/testsem.c
-share/examples/SDL11/testsprite.c
-share/examples/SDL11/testtimer.c
-share/examples/SDL11/testtypes.c
-share/examples/SDL11/testver.c
-share/examples/SDL11/testvidinfo.c
-share/examples/SDL11/testwin.c
-share/examples/SDL11/testwm.c
-share/examples/SDL11/threadwin.c
-share/examples/SDL11/torturethread.c
-@dirrm share/examples/SDL11
-@dirrm share/doc/SDL11/docs/html
-@dirrm share/doc/SDL11/docs
-@dirrm share/doc/SDL11
-@dirrm include/SDL11
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-SDL.txt
+%%PORTDOCS%%%%DOCSDIR%%/WhatsNew
+%%PORTDOCS%%%%DOCSDIR%%/docs.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/Makefile.am
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/Makefile.in
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/audio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/cdrom.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/event.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/eventfunctions.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/eventstructures.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/general.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideaboutsdldoc.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideaudioexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidebasicsinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidecdromexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidecredits.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideeventexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideinput.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideinputkeyboard.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidepreface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidethebasics.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidetimeexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideoexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideoopengl.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/joystick.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlactiveevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdladdtimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlaudiocvt.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlaudiospec.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlblitsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlbuildaudiocvt.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcd.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdclose.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdeject.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdnumdrives.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdopen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdpause.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdplay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdplaytracks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdresume.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdstatus.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdstop.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdtrack.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcloseaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcolor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondbroadcast.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondsignal.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondwait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondwaittimeout.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlconvertaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlconvertsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatecond.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatecursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatemutex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatergbsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatergbsurfacefrom.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatesemaphore.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatethread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreateyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldelay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroycond.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroymutex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroysemaphore.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayformat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayformatalpha.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenablekeyrepeat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenableunicode.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdleventstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlexposeevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfillrect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlflip.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreecursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreesurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreewav.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreeyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetappstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetaudiostatus.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetcliprect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgeterror.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgeteventfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetgammaramp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetkeyname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetkeystate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetmodstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetmousestate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrelativemousestate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrgb.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrgba.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetthreadid.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetticks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetvideoinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetvideosurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglattr.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglgetattribute.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglgetprocaddress.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglloadlibrary.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglsetattribute.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglswapbuffers.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlinitsubsystem.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyaxisevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyballevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoybuttonevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyhatevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickclose.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickeventstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetaxis.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetball.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgethat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickindex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumaxes.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumballs.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumbuttons.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumhats.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickopen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickopened.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkey.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkeyboardevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkeysym.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkillthread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllistmodes.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlloadbmp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlloadwav.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllockaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllocksurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllockyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmaprgb.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmaprgba.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmixaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmousebuttonevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmousemotionevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmutexp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmutexv.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlnumjoysticks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlopenaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdloverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpalette.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpauseaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpeepevents.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpixelformat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpollevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpumpevents.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpushevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquitevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquitsubsystem.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlrect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlremovetimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlresizeevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsavebmp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsempost.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemtrywait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemvalue.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemwait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemwaittimeout.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetalpha.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcliprect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcolorkey.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcolors.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlseteventfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetgamma.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetgammaramp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetmodstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetpalette.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsettimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetvideomode.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlshowcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsyswmevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlthreadid.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlockaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlocksurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlockyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlupdaterect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlupdaterects.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdluserevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideodrivername.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideoinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideomodeok.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwaitevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwaitthread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwarpmouse.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwasinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmgetcaption.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmgrabinput.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmiconifywindow.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmsetcaption.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmseticon.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmtogglefullscreen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/thread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/time.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/video.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/wm.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
+%%EXAMPLESDIR%%/COPYING
+%%EXAMPLESDIR%%/Makefile.am
+%%EXAMPLESDIR%%/Makefile.in
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/acinclude.m4
+%%EXAMPLESDIR%%/aclocal.m4
+%%EXAMPLESDIR%%/autogen.sh
+%%EXAMPLESDIR%%/checkkeys.c
+%%EXAMPLESDIR%%/config.guess
+%%EXAMPLESDIR%%/config.sub
+%%EXAMPLESDIR%%/configure
+%%EXAMPLESDIR%%/configure.in
+%%EXAMPLESDIR%%/graywin.c
+%%EXAMPLESDIR%%/icon.bmp
+%%EXAMPLESDIR%%/install-sh
+%%EXAMPLESDIR%%/loopwave.c
+%%EXAMPLESDIR%%/missing
+%%EXAMPLESDIR%%/mkinstalldirs
+%%EXAMPLESDIR%%/moose.dat
+%%EXAMPLESDIR%%/picture.xbm
+%%EXAMPLESDIR%%/sail.bmp
+%%EXAMPLESDIR%%/sample.bmp
+%%EXAMPLESDIR%%/sample.wav
+%%EXAMPLESDIR%%/testalpha.c
+%%EXAMPLESDIR%%/testbitmap.c
+%%EXAMPLESDIR%%/testcdrom.c
+%%EXAMPLESDIR%%/testerror.c
+%%EXAMPLESDIR%%/testgamma.c
+%%EXAMPLESDIR%%/testgl.c
+%%EXAMPLESDIR%%/testhread.c
+%%EXAMPLESDIR%%/testjoystick.c
+%%EXAMPLESDIR%%/testkeys.c
+%%EXAMPLESDIR%%/testlock.c
+%%EXAMPLESDIR%%/testoverlay.c
+%%EXAMPLESDIR%%/testoverlay2.c
+%%EXAMPLESDIR%%/testpalette.c
+%%EXAMPLESDIR%%/testsem.c
+%%EXAMPLESDIR%%/testsprite.c
+%%EXAMPLESDIR%%/testtimer.c
+%%EXAMPLESDIR%%/testtypes.c
+%%EXAMPLESDIR%%/testver.c
+%%EXAMPLESDIR%%/testvidinfo.c
+%%EXAMPLESDIR%%/testwin.c
+%%EXAMPLESDIR%%/testwm.c
+%%EXAMPLESDIR%%/threadwin.c
+%%EXAMPLESDIR%%/torturethread.c
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/include/SDL11 2>/dev/null || true
--- sdl12.diff ends here ---

--- bsd.port.mk.diff begins here ---
--- Mk/bsd.port.mk.orig	Tue Sep  9 22:40:06 2003
+++ Mk/bsd.port.mk	Wed Oct  1 20:13:20 2003
@@ -1408,7 +1408,7 @@
 .endif
 
 .if defined(USE_SDL)
-LIB_DEPENDS+=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
+LIB_DEPENDS+=	SDL-1.1.6:${PORTSDIR}/devel/sdl12
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
 MAKE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
--- bsd.port.mk.diff ends here ---

>Release-Note:
>Audit-Trail:

From: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/57475: devel/sdl12: upgrading to 1.2.6 + some fixes.
Date: Wed, 1 Oct 2003 22:27:15 +0200

 Le Mer  1 oct 03  22:14:37 +0200, Thierry Thomas <thierry@pompo.net>
  crivait:
 > 	2) Bumps portrevision for all ports matching
 
 Oops! this command is missing:
 
 find $PORTSDIR -name Makefile -exec grep -H '^USE_SDL' {} \;
 -- 
 Th. Thomas.

From: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/57475: devel/sdl12: upgrading to 1.2.6 + some fixes.
Date: Fri, 3 Oct 2003 00:24:36 +0200

 Le Mer  1 oct 03  22:14:37 +0200, Thierry Thomas <thierry@pompo.net>
  crivait:
 > 
 > >Number:         57475
 > >Category:       ports
 > >Synopsis:       devel/sdl12: upgrading to 1.2.6 + some fixes.
  
 ...
 
 > 	Removed files:
 > 	- devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c
 > 	- devel/sdl12/files/patch-src::video::SDL_stretch.c
 
 devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c was mostly
 included in this version, but there remains a problem: the joystick
 must be opened in read only. With the following patch, it works:
 
 --- devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c begins here ---
 --- src/joystick/bsd/SDL_sysjoystick.c.orig	Sat Aug 30 21:13:05 2003
 +++ src/joystick/bsd/SDL_sysjoystick.c	Thu Oct  2 23:18:12 2003
 @@ -234,7 +234,7 @@
  	struct report *rep;
  	int fd;
  
 -	fd = open(path, O_RDWR);
 +	fd = open(path, O_RDONLY);
  	if (fd == -1) {
  		SDL_SetError("%s: %s", path, strerror(errno));
  		return (-1);
 --- devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c ends here ---
 
 Thanks.
 -- 
 Th. Thomas.

From: Thierry Thomas <thierry@pompo.net>
To: Jens Rehsack <rehsack@liwing.de>,
	FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/57475: devel/sdl12: upgrading to 1.2.6 + some fixes.
Date: Tue, 4 Nov 2003 22:37:00 +0100

 Le Mar  4 nov 03  21:25:40 +0100, Jens Rehsack <rehsack@liwing.de>
  crivait:
 > Hi Thierry,
 
 Hello Jens,
 
 > can you submit an updated patch - the original one didn't applies
 > clearly.
 
 The following one has been updated against a recently cvsup'ed tree:
 
 --- sdl12.diff begins here ---
 diff -urN devel/sdl12.orig/Makefile devel/sdl12/Makefile
 --- devel/sdl12.orig/Makefile	Sun Nov  2 19:22:52 2003
 +++ devel/sdl12/Makefile	Tue Nov  4 22:24:37 2003
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	sdl
 -PORTVERSION=	1.2.5
 -PORTREVISION=	2
 +PORTVERSION=	1.2.6
  CATEGORIES=	devel
  MASTER_SITES=	http://www.libsdl.org/release/
  DISTNAME=	SDL-${PORTVERSION}
 @@ -20,15 +19,17 @@
  
  INSTALLS_SHLIB=	yes
  USE_REINPLACE=	yes
 +REINPLACE_ARGS=	-i ""
  USE_LIBTOOL=	yes
  WANT_GNOME=	yes
 -CONFIGURE_ENV=	NASM="${LOCALBASE}/bin/nasm" \
 -		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 -		PTHREAD_LIBS="${PTHREAD_LIBS}"
 -CONFIGURE_ARGS=	--enable-video-aalib \
 -		--disable-nas
 +CONFIGURE_ENV=	NASM="${LOCALBASE}/bin/nasm"		\
 +		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 +		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
 +		LDFLAGS="${LDFLAGS}"
 +CONFIGURE_ARGS=	--enable-video-aalib
  
 -CFLAGS+=	${PTHREAD_CFLAGS}
 +CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
  
  .if exists(/usr/lib/libvgl.so.3)
  CONFIGURE_ARGS+=--enable-video-vgl
 @@ -39,6 +40,12 @@
  DISPLAY_MSG=	${DO_NADA}
  .endif
  
 +.if defined(WITH_NAS)
 +LIB_DEPENDS+=  audio.2:${PORTSDIR}/audio/nas
 +.else
 +CONFIGURE_ARGS+=--disable-nas
 +.endif
 +
  .if !defined(WITHOUT_X11)
  USE_XLIB=	yes
  .endif
 @@ -81,6 +88,10 @@
  CONFIGURE_ARGS+=--disable-arts
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's|sdl-config|sdl11-config|g'	\
 +		${WRKSRC}/test/configure
 +
  pre-configure:
  	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${TOUCH}
  
 @@ -92,15 +103,18 @@
  		${WRKSRC}/libtool
  
  post-install:
 -	@${MKDIR} ${PREFIX}/share/examples/SDL11
 -	${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/SDL11
 +	@${MKDIR} ${EXAMPLESDIR}
 +	@${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR}
 +	@${INSTALL_SCRIPT} ${WRKSRC}/test/configure ${EXAMPLESDIR}
 +	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
  .if !defined(NOPORTDOCS)
 -	@${MKDIR} ${PREFIX}/share/doc/SDL11/docs
 -.for file in BUGS COPYING CREDITS README WhatsNew docs.html
 -	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL11
 +	@${MKDIR} ${DOCSDIR}/docs
 +.for doc in BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html
 +	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
  .endfor
  	@cd ${WRKSRC}/docs; ${TAR} cf - `${ECHO_CMD} [^Mm]*` | \
 -		(cd ${PREFIX}/share/doc/SDL11/docs; ${TAR} --unlink -xf - )
 +		(cd ${DOCSDIR}/docs; ${TAR} --unlink -xf - )
 +	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
  .endif
  	@${DISPLAY_MSG}
  
 diff -urN devel/sdl12.orig/distinfo devel/sdl12/distinfo
 --- devel/sdl12.orig/distinfo	Thu Jan  2 16:05:08 2003
 +++ devel/sdl12/distinfo	Mon Sep 29 19:40:15 2003
 @@ -1 +1 @@
 -MD5 (SDL-1.2.5.tar.gz) = cacacf4e4cca546de168fedc23b9b44b
 +MD5 (SDL-1.2.6.tar.gz) = 9011f147f23ec535515291d0c9c6904c
 diff -urN devel/sdl12.orig/files/patch-ac devel/sdl12/files/patch-ac
 --- devel/sdl12.orig/files/patch-ac	Fri Jun 27 21:29:43 2003
 +++ devel/sdl12/files/patch-ac	Mon Sep 29 22:20:46 2003
 @@ -1,9 +1,6 @@
 -
 -$FreeBSD: ports/devel/sdl12/files/patch-ac,v 1.27 2003/06/27 19:29:43 sobomax Exp $
 -
 ---- configure.orig	Sun Oct  6 23:35:02 2002
 -+++ configure	Fri Jun 27 22:19:43 2003
 -@@ -674,9 +674,9 @@
 +--- configure.orig	Sat Aug 30 21:13:23 2003
 ++++ configure	Mon Sep 29 22:20:16 2003
 +@@ -676,9 +676,9 @@
   
   # libtool versioning
   LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
 @@ -15,7 +12,7 @@
   
   
   
 -@@ -2794,7 +2794,7 @@
 +@@ -2832,7 +2832,7 @@
   
   
   SDL_CFLAGS=""
 @@ -24,7 +21,7 @@
   
   
   case "$target" in
 -@@ -5840,8 +5840,8 @@
 +@@ -5966,8 +5966,8 @@
   #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
               ;;
           *-*-freebsd*)
 @@ -35,11 +32,11 @@
               ;;
           *-*-netbsd*)
               pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
 -@@ -6946,7 +6946,9 @@
 +@@ -7231,7 +7231,9 @@
               CFLAGS="$CFLAGS -DHAVE_USBHID_H"
           fi
           if test x$have_libusb_h = xyes; then
 -+	    if x$have_libusbhid_h = xno; then
 ++	    if test x$have_libusbhid_h = xno; then
               CFLAGS="$CFLAGS -DHAVE_LIBUSB_H"
  +	    fi
           fi
 diff -urN devel/sdl12.orig/files/patch-joystick::bsd::SDL_sysjoystick.c devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c
 --- devel/sdl12.orig/files/patch-joystick::bsd::SDL_sysjoystick.c	Mon Jul 14 20:14:53 2003
 +++ devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c	Thu Jan  1 01:00:00 1970
 @@ -1,165 +0,0 @@
 -
 -$FreeBSD: ports/devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c,v 1.3 2003/07/14 18:14:53 sobomax Exp $
 -
 ---- src/joystick/bsd/SDL_sysjoystick.c.orig	Sat Oct  5 08:32:49 2002
 -+++ src/joystick/bsd/SDL_sysjoystick.c	Mon Jul 14 21:12:23 2003
 -@@ -53,6 +53,11 @@
 - #include <libusbhid.h>
 - #endif
 - 
 -+#ifdef __FreeBSD__
 -+#include <osreldate.h>
 -+#include <sys/joystick.h>
 -+#endif
 -+
 - #include "SDL_error.h"
 - #include "SDL_joystick.h"
 - #include "SDL_sysjoystick.h"
 -@@ -192,7 +197,18 @@
 - 	joy->hwdata = hw;
 - 	hw->fd = fd;
 - 	hw->path = strdup(path);
 --	hw->type = BSDJOY_UHID;
 -+	if (! strncmp(path, "/dev/joy", 8))
 -+	{
 -+		hw->type = BSDJOY_JOY;
 -+		joy->naxes = 2;
 -+		joy->nbuttons = 2;
 -+		joy->nhats = 0;
 -+		joy->nballs = 0;
 -+		joydevnames[joy->index] = strdup("Gameport joystick");
 -+		goto usbend;
 -+	}
 -+	else
 -+	  hw->type = BSDJOY_UHID;
 - 	hw->repdesc = hid_get_report_desc(fd);
 - 	if (hw->repdesc == NULL) {
 - 		SDL_SetError("%s: USB_GET_REPORT_DESC: %s", hw->path,
 -@@ -201,6 +217,7 @@
 - 	}
 - 
 - 	rep = &hw->inreport;
 -+	rep->rid = 0;
 - 	if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {
 - 		goto usberr;
 - 	}
 -@@ -210,7 +227,7 @@
 - 		goto usberr;
 - 	}
 - 
 --#ifdef USBHID_NEW
 -+#if defined(USBHID_NEW) || (defined(__FreeBSD__) && __FreeBSD_version >= 500111)
 - 	hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
 - #else
 - 	hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
 -@@ -275,6 +292,7 @@
 - 	}
 - 	hid_end_parse(hdata);
 - 
 -+usbend:
 - 	/* The poll blocks the event thread. */
 - 	fcntl(fd, F_SETFL, O_NONBLOCK);
 - 
 -@@ -294,13 +312,62 @@
 - 	struct report *rep;
 - 	int nbutton, naxe = -1;
 - 	Sint32 v;
 -+	struct joystick gameport;
 -+	static int x, y, xmin=0xffff, ymin=0xffff, xmax=0, ymax=0;
 -+
 -+	if (!strncmp(joy->hwdata->path, "/dev/joy", 8)) {
 -+		if (read(joy->hwdata->fd, &gameport, sizeof(gameport)) != sizeof(gameport)) {
 -+			return;
 -+		}
 -+		if (abs(x - gameport.x) > 8) {
 -+			x = gameport.x;
 -+			if (x < xmin) {
 -+				xmin = x;
 -+			}
 -+			if (x > xmax) {
 -+				xmax = x;
 -+			}
 -+			if (xmin == xmax) {
 -+				xmin--;
 -+				xmax++;
 -+			}
 -+			v = (Sint32)x;
 -+			v -= (xmax + xmin + 1)/2;
 -+			v *= 32768/((xmax - xmin + 1)/2);
 -+			SDL_PrivateJoystickAxis(joy, 0, v);
 -+		}
 -+		if (abs(y - gameport.y) > 8) {
 -+			y = gameport.y;
 -+			if (y < ymin) {
 -+				ymin = y;
 -+			}
 -+			if (y > ymax) {
 -+				ymax = y;
 -+			}
 -+			if (ymin == ymax) {
 -+				ymin--;
 -+				ymax++;
 -+			}
 -+			v = (Sint32)y;
 -+			v -= (ymax + ymin + 1)/2;
 -+			v *= 32768/((ymax - ymin + 1)/2);
 -+			SDL_PrivateJoystickAxis(joy, 1, v);
 -+		}
 -+		if (gameport.b1 != joy->buttons[0]) {
 -+			SDL_PrivateJoystickButton(joy, 0, gameport.b1);
 -+		}
 -+		if (gameport.b2 != joy->buttons[1]) {
 -+			SDL_PrivateJoystickButton(joy, 1, gameport.b2);
 -+		}
 -+		return;
 -+	}
 - 	
 - 	rep = &joy->hwdata->inreport;
 - 
 - 	if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) {
 - 		return;
 - 	}
 --#ifdef USBHID_NEW
 -+#if defined(USBHID_NEW) || (defined(__FreeBSD__) && __FreeBSD_version >= 500111)
 - 	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
 - #else
 - 	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
 -@@ -370,8 +437,10 @@
 - void
 - SDL_SYS_JoystickClose(SDL_Joystick *joy)
 - {
 --	report_free(&joy->hwdata->inreport);
 --	hid_dispose_report_desc(joy->hwdata->repdesc);
 -+	if (strncmp(joy->hwdata->path, "/dev/joy", 8))	{
 -+		report_free(&joy->hwdata->inreport);
 -+		hid_dispose_report_desc(joy->hwdata->repdesc);
 -+	}
 - 	close(joy->hwdata->fd);
 - 	free(joy->hwdata->path);
 - 	free(joy->hwdata);
 -@@ -399,11 +468,24 @@
 - {
 - 	int len;
 - 
 --#ifdef USBHID_NEW
 -+#ifdef __FreeBSD__
 -+# if (__FreeBSD_version >= 470000)
 -+#  if ((__FreeBSD_version <= 500111) && (__FreeBSD_version >= 480000))
 -+	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
 -+#  else
 -+	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
 -+#  endif
 -+# else
 - 	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
 -+#endif
 - #else
 -+# ifdef USBHID_NEW
 -+	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
 -+# else
 - 	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
 -+# endif
 - #endif
 -+
 - 	if (len < 0) {
 - 		SDL_SetError("Negative HID report size");
 - 		return (-1);
 diff -urN devel/sdl12.orig/files/patch-src::joystick::bsd::SDL_sysjoystick.c devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c
 --- devel/sdl12.orig/files/patch-src::joystick::bsd::SDL_sysjoystick.c	Thu Jan  1 01:00:00 1970
 +++ devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c	Fri Oct  3 00:07:04 2003
 @@ -0,0 +1,11 @@
 +--- src/joystick/bsd/SDL_sysjoystick.c.orig	Sat Aug 30 21:13:05 2003
 ++++ src/joystick/bsd/SDL_sysjoystick.c	Thu Oct  2 23:18:12 2003
 +@@ -234,7 +234,7 @@
 + 	struct report *rep;
 + 	int fd;
 + 
 +-	fd = open(path, O_RDWR);
 ++	fd = open(path, O_RDONLY);
 + 	if (fd == -1) {
 + 		SDL_SetError("%s: %s", path, strerror(errno));
 + 		return (-1);
 diff -urN devel/sdl12.orig/files/patch-src::video::SDL_stretch.c devel/sdl12/files/patch-src::video::SDL_stretch.c
 --- devel/sdl12.orig/files/patch-src::video::SDL_stretch.c	Mon Jul 14 20:19:40 2003
 +++ devel/sdl12/files/patch-src::video::SDL_stretch.c	Thu Jan  1 01:00:00 1970
 @@ -1,18 +0,0 @@
 -
 -$FreeBSD: ports/devel/sdl12/files/patch-src::video::SDL_stretch.c,v 1.1 2003/07/14 18:19:40 sobomax Exp $
 -
 ---- src/video/SDL_stretch.c	2003/07/14 18:17:21	1.1
 -+++ src/video/SDL_stretch.c	2003/07/14 18:18:39
 -@@ -261,9 +261,9 @@
 - 			break;
 - 		    default:
 - #ifdef __GNUC__
 --			__asm__ __volatile__ ("
 --				call _copy_row
 --			"
 -+			__asm__ __volatile__ (""
 -+			"	call _copy_row"
 -+			""
 - 			: "=&D" (u1), "=&S" (u2)
 - 			: "0" (dstp), "1" (srcp)
 - 			: "memory" );
 diff -urN devel/sdl12.orig/pkg-descr devel/sdl12/pkg-descr
 --- devel/sdl12.orig/pkg-descr	Tue Jun  6 10:05:51 2000
 +++ devel/sdl12/pkg-descr	Mon Sep 29 19:28:07 2003
 @@ -1,5 +1,3 @@
 -Unstable development version of the SDL library.
 -
  This library is designed to make it easy to write games that run on UNIX,
  Win32 and BeOS using the various native high-performance media interfaces,
  (for video, audio, etc) and presenting a single source-code level API to
 diff -urN devel/sdl12.orig/pkg-plist devel/sdl12/pkg-plist
 --- devel/sdl12.orig/pkg-plist	Thu Jan  2 16:05:08 2003
 +++ devel/sdl12/pkg-plist	Wed Oct  1 16:00:04 2003
 @@ -12,6 +12,7 @@
  include/SDL11/SDL_joystick.h
  include/SDL11/SDL_keyboard.h
  include/SDL11/SDL_keysym.h
 +include/SDL11/SDL_loadso.h
  include/SDL11/SDL_main.h
  include/SDL11/SDL_mouse.h
  include/SDL11/SDL_mutex.h
 @@ -29,266 +30,269 @@
  include/SDL11/close_code.h
  lib/libSDL-1.1.a
  lib/libSDL-1.1.so
 -lib/libSDL-1.1.so.5
 +lib/libSDL-1.1.so.6
  lib/libSDLmain-1.1.a
  share/aclocal/sdl11.m4
 -share/doc/SDL11/BUGS
 -share/doc/SDL11/COPYING
 -share/doc/SDL11/CREDITS
 -share/doc/SDL11/README
 -share/doc/SDL11/WhatsNew
 -share/doc/SDL11/docs.html
 -share/doc/SDL11/docs/html/Makefile
 -share/doc/SDL11/docs/html/Makefile.am
 -share/doc/SDL11/docs/html/Makefile.in
 -share/doc/SDL11/docs/html/audio.html
 -share/doc/SDL11/docs/html/cdrom.html
 -share/doc/SDL11/docs/html/event.html
 -share/doc/SDL11/docs/html/eventfunctions.html
 -share/doc/SDL11/docs/html/eventstructures.html
 -share/doc/SDL11/docs/html/general.html
 -share/doc/SDL11/docs/html/guide.html
 -share/doc/SDL11/docs/html/guideaboutsdldoc.html
 -share/doc/SDL11/docs/html/guideaudioexamples.html
 -share/doc/SDL11/docs/html/guidebasicsinit.html
 -share/doc/SDL11/docs/html/guidecdromexamples.html
 -share/doc/SDL11/docs/html/guidecredits.html
 -share/doc/SDL11/docs/html/guideeventexamples.html
 -share/doc/SDL11/docs/html/guideexamples.html
 -share/doc/SDL11/docs/html/guideinput.html
 -share/doc/SDL11/docs/html/guideinputkeyboard.html
 -share/doc/SDL11/docs/html/guidepreface.html
 -share/doc/SDL11/docs/html/guidethebasics.html
 -share/doc/SDL11/docs/html/guidetimeexamples.html
 -share/doc/SDL11/docs/html/guidevideo.html
 -share/doc/SDL11/docs/html/guidevideoexamples.html
 -share/doc/SDL11/docs/html/guidevideoopengl.html
 -share/doc/SDL11/docs/html/index.html
 -share/doc/SDL11/docs/html/joystick.html
 -share/doc/SDL11/docs/html/reference.html
 -share/doc/SDL11/docs/html/sdlactiveevent.html
 -share/doc/SDL11/docs/html/sdladdtimer.html
 -share/doc/SDL11/docs/html/sdlaudiocvt.html
 -share/doc/SDL11/docs/html/sdlaudiospec.html
 -share/doc/SDL11/docs/html/sdlblitsurface.html
 -share/doc/SDL11/docs/html/sdlbuildaudiocvt.html
 -share/doc/SDL11/docs/html/sdlcd.html
 -share/doc/SDL11/docs/html/sdlcdclose.html
 -share/doc/SDL11/docs/html/sdlcdeject.html
 -share/doc/SDL11/docs/html/sdlcdname.html
 -share/doc/SDL11/docs/html/sdlcdnumdrives.html
 -share/doc/SDL11/docs/html/sdlcdopen.html
 -share/doc/SDL11/docs/html/sdlcdpause.html
 -share/doc/SDL11/docs/html/sdlcdplay.html
 -share/doc/SDL11/docs/html/sdlcdplaytracks.html
 -share/doc/SDL11/docs/html/sdlcdresume.html
 -share/doc/SDL11/docs/html/sdlcdstatus.html
 -share/doc/SDL11/docs/html/sdlcdstop.html
 -share/doc/SDL11/docs/html/sdlcdtrack.html
 -share/doc/SDL11/docs/html/sdlcloseaudio.html
 -share/doc/SDL11/docs/html/sdlcolor.html
 -share/doc/SDL11/docs/html/sdlcondbroadcast.html
 -share/doc/SDL11/docs/html/sdlcondsignal.html
 -share/doc/SDL11/docs/html/sdlcondwait.html
 -share/doc/SDL11/docs/html/sdlcondwaittimeout.html
 -share/doc/SDL11/docs/html/sdlconvertaudio.html
 -share/doc/SDL11/docs/html/sdlconvertsurface.html
 -share/doc/SDL11/docs/html/sdlcreatecond.html
 -share/doc/SDL11/docs/html/sdlcreatecursor.html
 -share/doc/SDL11/docs/html/sdlcreatemutex.html
 -share/doc/SDL11/docs/html/sdlcreatergbsurface.html
 -share/doc/SDL11/docs/html/sdlcreatergbsurfacefrom.html
 -share/doc/SDL11/docs/html/sdlcreatesemaphore.html
 -share/doc/SDL11/docs/html/sdlcreatethread.html
 -share/doc/SDL11/docs/html/sdlcreateyuvoverlay.html
 -share/doc/SDL11/docs/html/sdldelay.html
 -share/doc/SDL11/docs/html/sdldestroycond.html
 -share/doc/SDL11/docs/html/sdldestroymutex.html
 -share/doc/SDL11/docs/html/sdldestroysemaphore.html
 -share/doc/SDL11/docs/html/sdldisplayformat.html
 -share/doc/SDL11/docs/html/sdldisplayformatalpha.html
 -share/doc/SDL11/docs/html/sdldisplayyuvoverlay.html
 -share/doc/SDL11/docs/html/sdlenablekeyrepeat.html
 -share/doc/SDL11/docs/html/sdlenableunicode.html
 -share/doc/SDL11/docs/html/sdlevent.html
 -share/doc/SDL11/docs/html/sdleventstate.html
 -share/doc/SDL11/docs/html/sdlexposeevent.html
 -share/doc/SDL11/docs/html/sdlfillrect.html
 -share/doc/SDL11/docs/html/sdlflip.html
 -share/doc/SDL11/docs/html/sdlfreecursor.html
 -share/doc/SDL11/docs/html/sdlfreesurface.html
 -share/doc/SDL11/docs/html/sdlfreewav.html
 -share/doc/SDL11/docs/html/sdlfreeyuvoverlay.html
 -share/doc/SDL11/docs/html/sdlgetappstate.html
 -share/doc/SDL11/docs/html/sdlgetaudiostatus.html
 -share/doc/SDL11/docs/html/sdlgetcliprect.html
 -share/doc/SDL11/docs/html/sdlgetcursor.html
 -share/doc/SDL11/docs/html/sdlgeterror.html
 -share/doc/SDL11/docs/html/sdlgeteventfilter.html
 -share/doc/SDL11/docs/html/sdlgetgammaramp.html
 -share/doc/SDL11/docs/html/sdlgetkeyname.html
 -share/doc/SDL11/docs/html/sdlgetkeystate.html
 -share/doc/SDL11/docs/html/sdlgetmodstate.html
 -share/doc/SDL11/docs/html/sdlgetmousestate.html
 -share/doc/SDL11/docs/html/sdlgetrelativemousestate.html
 -share/doc/SDL11/docs/html/sdlgetrgb.html
 -share/doc/SDL11/docs/html/sdlgetrgba.html
 -share/doc/SDL11/docs/html/sdlgetthreadid.html
 -share/doc/SDL11/docs/html/sdlgetticks.html
 -share/doc/SDL11/docs/html/sdlgetvideoinfo.html
 -share/doc/SDL11/docs/html/sdlgetvideosurface.html
 -share/doc/SDL11/docs/html/sdlglattr.html
 -share/doc/SDL11/docs/html/sdlglgetattribute.html
 -share/doc/SDL11/docs/html/sdlglgetprocaddress.html
 -share/doc/SDL11/docs/html/sdlglloadlibrary.html
 -share/doc/SDL11/docs/html/sdlglsetattribute.html
 -share/doc/SDL11/docs/html/sdlglswapbuffers.html
 -share/doc/SDL11/docs/html/sdlinit.html
 -share/doc/SDL11/docs/html/sdlinitsubsystem.html
 -share/doc/SDL11/docs/html/sdljoyaxisevent.html
 -share/doc/SDL11/docs/html/sdljoyballevent.html
 -share/doc/SDL11/docs/html/sdljoybuttonevent.html
 -share/doc/SDL11/docs/html/sdljoyhatevent.html
 -share/doc/SDL11/docs/html/sdljoystickclose.html
 -share/doc/SDL11/docs/html/sdljoystickeventstate.html
 -share/doc/SDL11/docs/html/sdljoystickgetaxis.html
 -share/doc/SDL11/docs/html/sdljoystickgetball.html
 -share/doc/SDL11/docs/html/sdljoystickgetbutton.html
 -share/doc/SDL11/docs/html/sdljoystickgethat.html
 -share/doc/SDL11/docs/html/sdljoystickindex.html
 -share/doc/SDL11/docs/html/sdljoystickname.html
 -share/doc/SDL11/docs/html/sdljoysticknumaxes.html
 -share/doc/SDL11/docs/html/sdljoysticknumballs.html
 -share/doc/SDL11/docs/html/sdljoysticknumbuttons.html
 -share/doc/SDL11/docs/html/sdljoysticknumhats.html
 -share/doc/SDL11/docs/html/sdljoystickopen.html
 -share/doc/SDL11/docs/html/sdljoystickopened.html
 -share/doc/SDL11/docs/html/sdljoystickupdate.html
 -share/doc/SDL11/docs/html/sdlkey.html
 -share/doc/SDL11/docs/html/sdlkeyboardevent.html
 -share/doc/SDL11/docs/html/sdlkeysym.html
 -share/doc/SDL11/docs/html/sdlkillthread.html
 -share/doc/SDL11/docs/html/sdllistmodes.html
 -share/doc/SDL11/docs/html/sdlloadbmp.html
 -share/doc/SDL11/docs/html/sdlloadwav.html
 -share/doc/SDL11/docs/html/sdllockaudio.html
 -share/doc/SDL11/docs/html/sdllocksurface.html
 -share/doc/SDL11/docs/html/sdllockyuvoverlay.html
 -share/doc/SDL11/docs/html/sdlmaprgb.html
 -share/doc/SDL11/docs/html/sdlmaprgba.html
 -share/doc/SDL11/docs/html/sdlmixaudio.html
 -share/doc/SDL11/docs/html/sdlmousebuttonevent.html
 -share/doc/SDL11/docs/html/sdlmousemotionevent.html
 -share/doc/SDL11/docs/html/sdlmutexp.html
 -share/doc/SDL11/docs/html/sdlmutexv.html
 -share/doc/SDL11/docs/html/sdlnumjoysticks.html
 -share/doc/SDL11/docs/html/sdlopenaudio.html
 -share/doc/SDL11/docs/html/sdloverlay.html
 -share/doc/SDL11/docs/html/sdlpalette.html
 -share/doc/SDL11/docs/html/sdlpauseaudio.html
 -share/doc/SDL11/docs/html/sdlpeepevents.html
 -share/doc/SDL11/docs/html/sdlpixelformat.html
 -share/doc/SDL11/docs/html/sdlpollevent.html
 -share/doc/SDL11/docs/html/sdlpumpevents.html
 -share/doc/SDL11/docs/html/sdlpushevent.html
 -share/doc/SDL11/docs/html/sdlquit.html
 -share/doc/SDL11/docs/html/sdlquitevent.html
 -share/doc/SDL11/docs/html/sdlquitsubsystem.html
 -share/doc/SDL11/docs/html/sdlrect.html
 -share/doc/SDL11/docs/html/sdlremovetimer.html
 -share/doc/SDL11/docs/html/sdlresizeevent.html
 -share/doc/SDL11/docs/html/sdlsavebmp.html
 -share/doc/SDL11/docs/html/sdlsempost.html
 -share/doc/SDL11/docs/html/sdlsemtrywait.html
 -share/doc/SDL11/docs/html/sdlsemvalue.html
 -share/doc/SDL11/docs/html/sdlsemwait.html
 -share/doc/SDL11/docs/html/sdlsemwaittimeout.html
 -share/doc/SDL11/docs/html/sdlsetalpha.html
 -share/doc/SDL11/docs/html/sdlsetcliprect.html
 -share/doc/SDL11/docs/html/sdlsetcolorkey.html
 -share/doc/SDL11/docs/html/sdlsetcolors.html
 -share/doc/SDL11/docs/html/sdlsetcursor.html
 -share/doc/SDL11/docs/html/sdlseteventfilter.html
 -share/doc/SDL11/docs/html/sdlsetgamma.html
 -share/doc/SDL11/docs/html/sdlsetgammaramp.html
 -share/doc/SDL11/docs/html/sdlsetmodstate.html
 -share/doc/SDL11/docs/html/sdlsetpalette.html
 -share/doc/SDL11/docs/html/sdlsettimer.html
 -share/doc/SDL11/docs/html/sdlsetvideomode.html
 -share/doc/SDL11/docs/html/sdlshowcursor.html
 -share/doc/SDL11/docs/html/sdlsurface.html
 -share/doc/SDL11/docs/html/sdlsyswmevent.html
 -share/doc/SDL11/docs/html/sdlthreadid.html
 -share/doc/SDL11/docs/html/sdlunlockaudio.html
 -share/doc/SDL11/docs/html/sdlunlocksurface.html
 -share/doc/SDL11/docs/html/sdlunlockyuvoverlay.html
 -share/doc/SDL11/docs/html/sdlupdaterect.html
 -share/doc/SDL11/docs/html/sdlupdaterects.html
 -share/doc/SDL11/docs/html/sdluserevent.html
 -share/doc/SDL11/docs/html/sdlvideodrivername.html
 -share/doc/SDL11/docs/html/sdlvideoinfo.html
 -share/doc/SDL11/docs/html/sdlvideomodeok.html
 -share/doc/SDL11/docs/html/sdlwaitevent.html
 -share/doc/SDL11/docs/html/sdlwaitthread.html
 -share/doc/SDL11/docs/html/sdlwarpmouse.html
 -share/doc/SDL11/docs/html/sdlwasinit.html
 -share/doc/SDL11/docs/html/sdlwmgetcaption.html
 -share/doc/SDL11/docs/html/sdlwmgrabinput.html
 -share/doc/SDL11/docs/html/sdlwmiconifywindow.html
 -share/doc/SDL11/docs/html/sdlwmsetcaption.html
 -share/doc/SDL11/docs/html/sdlwmseticon.html
 -share/doc/SDL11/docs/html/sdlwmtogglefullscreen.html
 -share/doc/SDL11/docs/html/thread.html
 -share/doc/SDL11/docs/html/time.html
 -share/doc/SDL11/docs/html/video.html
 -share/doc/SDL11/docs/html/wm.html
 -share/doc/SDL11/docs/index.html
 -share/examples/SDL11/COPYING
 -share/examples/SDL11/Makefile.am
 -share/examples/SDL11/Makefile.in
 -share/examples/SDL11/README
 -share/examples/SDL11/acinclude.m4
 -share/examples/SDL11/aclocal.m4
 -share/examples/SDL11/autogen.sh
 -share/examples/SDL11/checkkeys.c
 -share/examples/SDL11/config.guess
 -share/examples/SDL11/config.sub
 -share/examples/SDL11/configure
 -share/examples/SDL11/configure.in
 -share/examples/SDL11/graywin.c
 -share/examples/SDL11/icon.bmp
 -share/examples/SDL11/install-sh
 -share/examples/SDL11/loopwave.c
 -share/examples/SDL11/missing
 -share/examples/SDL11/mkinstalldirs
 -share/examples/SDL11/picture.xbm
 -share/examples/SDL11/sail.bmp
 -share/examples/SDL11/sample.bmp
 -share/examples/SDL11/sample.wav
 -share/examples/SDL11/testalpha.c
 -share/examples/SDL11/testbitmap.c
 -share/examples/SDL11/testcdrom.c
 -share/examples/SDL11/testerror.c
 -share/examples/SDL11/testgamma.c
 -share/examples/SDL11/testgl.c
 -share/examples/SDL11/testhread.c
 -share/examples/SDL11/testjoystick.c
 -share/examples/SDL11/testkeys.c
 -share/examples/SDL11/testlock.c
 -share/examples/SDL11/testoverlay.c
 -share/examples/SDL11/testpalette.c
 -share/examples/SDL11/testsem.c
 -share/examples/SDL11/testsprite.c
 -share/examples/SDL11/testtimer.c
 -share/examples/SDL11/testtypes.c
 -share/examples/SDL11/testver.c
 -share/examples/SDL11/testvidinfo.c
 -share/examples/SDL11/testwin.c
 -share/examples/SDL11/testwm.c
 -share/examples/SDL11/threadwin.c
 -share/examples/SDL11/torturethread.c
 -@dirrm share/examples/SDL11
 -@dirrm share/doc/SDL11/docs/html
 -@dirrm share/doc/SDL11/docs
 -@dirrm share/doc/SDL11
 -@dirrm include/SDL11
 +%%PORTDOCS%%%%DOCSDIR%%/BUGS
 +%%PORTDOCS%%%%DOCSDIR%%/COPYING
 +%%PORTDOCS%%%%DOCSDIR%%/CREDITS
 +%%PORTDOCS%%%%DOCSDIR%%/README
 +%%PORTDOCS%%%%DOCSDIR%%/README-SDL.txt
 +%%PORTDOCS%%%%DOCSDIR%%/WhatsNew
 +%%PORTDOCS%%%%DOCSDIR%%/docs.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/Makefile
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/Makefile.am
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/Makefile.in
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/audio.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/cdrom.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/event.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/eventfunctions.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/eventstructures.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/general.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guide.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideaboutsdldoc.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideaudioexamples.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidebasicsinit.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidecdromexamples.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidecredits.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideeventexamples.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideexamples.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideinput.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideinputkeyboard.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidepreface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidethebasics.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidetimeexamples.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideo.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideoexamples.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideoopengl.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/index.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/joystick.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/reference.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlactiveevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdladdtimer.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlaudiocvt.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlaudiospec.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlblitsurface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlbuildaudiocvt.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcd.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdclose.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdeject.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdname.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdnumdrives.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdopen.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdpause.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdplay.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdplaytracks.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdresume.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdstatus.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdstop.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdtrack.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcloseaudio.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcolor.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondbroadcast.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondsignal.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondwait.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondwaittimeout.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlconvertaudio.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlconvertsurface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatecond.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatecursor.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatemutex.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatergbsurface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatergbsurfacefrom.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatesemaphore.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatethread.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreateyuvoverlay.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldelay.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroycond.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroymutex.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroysemaphore.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayformat.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayformatalpha.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayyuvoverlay.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenablekeyrepeat.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenableunicode.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdleventstate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlexposeevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfillrect.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlflip.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreecursor.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreesurface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreewav.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreeyuvoverlay.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetappstate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetaudiostatus.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetcliprect.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetcursor.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgeterror.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgeteventfilter.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetgammaramp.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetkeyname.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetkeystate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetmodstate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetmousestate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrelativemousestate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrgb.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrgba.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetthreadid.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetticks.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetvideoinfo.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetvideosurface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglattr.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglgetattribute.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglgetprocaddress.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglloadlibrary.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglsetattribute.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglswapbuffers.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlinit.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlinitsubsystem.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyaxisevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyballevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoybuttonevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyhatevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickclose.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickeventstate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetaxis.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetball.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetbutton.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgethat.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickindex.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickname.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumaxes.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumballs.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumbuttons.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumhats.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickopen.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickopened.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickupdate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkey.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkeyboardevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkeysym.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkillthread.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllistmodes.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlloadbmp.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlloadwav.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllockaudio.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllocksurface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllockyuvoverlay.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmaprgb.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmaprgba.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmixaudio.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmousebuttonevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmousemotionevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmutexp.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmutexv.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlnumjoysticks.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlopenaudio.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdloverlay.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpalette.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpauseaudio.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpeepevents.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpixelformat.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpollevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpumpevents.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpushevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquit.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquitevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquitsubsystem.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlrect.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlremovetimer.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlresizeevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsavebmp.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsempost.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemtrywait.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemvalue.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemwait.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemwaittimeout.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetalpha.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcliprect.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcolorkey.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcolors.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcursor.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlseteventfilter.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetgamma.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetgammaramp.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetmodstate.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetpalette.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsettimer.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetvideomode.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlshowcursor.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsurface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsyswmevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlthreadid.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlockaudio.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlocksurface.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlockyuvoverlay.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlupdaterect.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlupdaterects.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdluserevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideodrivername.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideoinfo.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideomodeok.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwaitevent.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwaitthread.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwarpmouse.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwasinit.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmgetcaption.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmgrabinput.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmiconifywindow.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmsetcaption.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmseticon.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmtogglefullscreen.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/thread.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/time.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/video.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/html/wm.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
 +%%EXAMPLESDIR%%/COPYING
 +%%EXAMPLESDIR%%/Makefile.am
 +%%EXAMPLESDIR%%/Makefile.in
 +%%EXAMPLESDIR%%/README
 +%%EXAMPLESDIR%%/acinclude.m4
 +%%EXAMPLESDIR%%/aclocal.m4
 +%%EXAMPLESDIR%%/autogen.sh
 +%%EXAMPLESDIR%%/checkkeys.c
 +%%EXAMPLESDIR%%/config.guess
 +%%EXAMPLESDIR%%/config.sub
 +%%EXAMPLESDIR%%/configure
 +%%EXAMPLESDIR%%/configure.in
 +%%EXAMPLESDIR%%/graywin.c
 +%%EXAMPLESDIR%%/icon.bmp
 +%%EXAMPLESDIR%%/install-sh
 +%%EXAMPLESDIR%%/loopwave.c
 +%%EXAMPLESDIR%%/missing
 +%%EXAMPLESDIR%%/mkinstalldirs
 +%%EXAMPLESDIR%%/moose.dat
 +%%EXAMPLESDIR%%/picture.xbm
 +%%EXAMPLESDIR%%/sail.bmp
 +%%EXAMPLESDIR%%/sample.bmp
 +%%EXAMPLESDIR%%/sample.wav
 +%%EXAMPLESDIR%%/testalpha.c
 +%%EXAMPLESDIR%%/testbitmap.c
 +%%EXAMPLESDIR%%/testcdrom.c
 +%%EXAMPLESDIR%%/testerror.c
 +%%EXAMPLESDIR%%/testgamma.c
 +%%EXAMPLESDIR%%/testgl.c
 +%%EXAMPLESDIR%%/testhread.c
 +%%EXAMPLESDIR%%/testjoystick.c
 +%%EXAMPLESDIR%%/testkeys.c
 +%%EXAMPLESDIR%%/testlock.c
 +%%EXAMPLESDIR%%/testoverlay.c
 +%%EXAMPLESDIR%%/testoverlay2.c
 +%%EXAMPLESDIR%%/testpalette.c
 +%%EXAMPLESDIR%%/testsem.c
 +%%EXAMPLESDIR%%/testsprite.c
 +%%EXAMPLESDIR%%/testtimer.c
 +%%EXAMPLESDIR%%/testtypes.c
 +%%EXAMPLESDIR%%/testver.c
 +%%EXAMPLESDIR%%/testvidinfo.c
 +%%EXAMPLESDIR%%/testwin.c
 +%%EXAMPLESDIR%%/testwm.c
 +%%EXAMPLESDIR%%/threadwin.c
 +%%EXAMPLESDIR%%/torturethread.c
 +@dirrm %%EXAMPLESDIR%%
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/html
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 +@unexec rmdir %D/include/SDL11 2>/dev/null || true
 --- sdl12.diff ends here ---
 
 Regards,
 -- 
 Th. Thomas.
State-Changed-From-To: open->suspended 
State-Changed-By: linimon 
State-Changed-When: Sat Dec 20 16:08:42 PST 2003 
State-Changed-Why:  
Committed but then immediately backed out once I was informed 
how many ports are dependent on this one and we are in ports 
slush.  Apologies all around.  I'll take it to make sure that 
the Right Thing gets done after the slush is over.  And now, 
about that pointy hat collection ... 


Responsible-Changed-From-To: freebsd-ports-bugs->linimon 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat Dec 20 16:08:42 PST 2003 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=57475 

From: Edwin Groothuis <edwin@mavetju.org>
To: freebsd-gnats-submit@FreeBSD.org, thierry@pompo.net
Cc:  
Subject: Re: ports/57475 - devel/sdl12 upgrade
Date: Sat, 10 Jan 2004 22:01:04 +1100

 Please also have a look at ports/55494 to make life easier.
 
 -- 
 Edwin Groothuis      |            Personal website: http://www.mavetju.org
 edwin@mavetju.org    |          Weblog: http://weblog.barnet.com.au/edwin/
State-Changed-From-To: suspended->open 
State-Changed-By: linimon 
State-Changed-When: Sun Jan 25 01:23:18 PST 2004 
State-Changed-Why:  
I don't seem to be getting caught up on my PR backlog, so return 
this one to the wild so someone else can hopefully get to it faster. 


Responsible-Changed-From-To: linimon->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Jan 25 01:23:18 PST 2004 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=57475 
Responsible-Changed-From-To: freebsd-ports-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jan 25 14:23:24 PST 2004 
Responsible-Changed-Why:  
Let's do something with this when ports/61877 is commited. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57475 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Mon Mar 15 20:07:56 PST 2004 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57475 
>Unformatted:
