- Update devel/sdl12 to 1.2.15

- Update audio/sdl_mixer to 1.2.15 - Update graphics/sdl_image to 1.2.12 - Update graphics/sdl_ttf to 2.0.11 - Update graphics/sdl_gfx to 2.0.23 - Update net/sdl_net to 1.2.8 - Bump PORTREVISIONs on ports that depend on one or more packages due to ABI and shared library version changes - Update Mk/bsd.sdl.mk accordingly for the new shared library versions Tested by: exp-run by pav
svn path=/head/; revision=291667
2024-12-19 03:52:17 +00:00 · 2012-02-18 10:18:33 +00:00 · 2012-02-18 10:18:33 +00:00 · fbd0197639 · 2021-03-31 03:12:20 +00:00
commit fbd0197639
parent e25425a4ab
538 changed files with 610 additions and 450 deletions
--- a/Mk/bsd.sdl.mk
+++ b/Mk/bsd.sdl.mk
@ -66,7 +66,7 @@ _SUBDIR_image=	graphics
 _LIB_image=	SDL_image-1.2
 _REQUIRES_image=sdl

-_VERSION_mixer=	10
+_VERSION_mixer=	12
 _SUBDIR_mixer=	audio
 _LIB_mixer=	SDL_mixer-1.2
 _REQUIRES_mixer=sdl
@ -77,7 +77,7 @@ _LIB_mm=	SDLmm
 _PORTDIR_mm=	sdlmm
 _REQUIRES_mm=	sdl

-_VERSION_net=	0
+_VERSION_net=	8
 _SUBDIR_net=	net
 _LIB_net=	SDL_net-1.2
 _REQUIRES_net=	sdl
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	adplay
 PORTVERSION=	1.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/adplug/AdPlay_UNIX/${PORTVERSION}:main \
 		SF/adplug/Database/2006-07-06:db
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	amarok
 PORTVERSION=	1.4.10
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
--- a/audio/clunk/Makefile
+++ b/audio/clunk/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	clunk
 PORTVERSION=	1.2.130
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/clunk

--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	cuberok
 PORTVERSION=	0.0.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE

--- a/audio/drumpiler/Makefile
+++ b/audio/drumpiler/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	drumpiler
 PORTVERSION=	0.9.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF

--- a/audio/etcd/Makefile
+++ b/audio/etcd/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	etcd
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~gahr/distfiles/ \
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	festalon
 PORTVERSION=	0.5.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/festalon/ \
 		CRITICAL
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@ -8,6 +8,7 @@

 PORTNAME=	ksmp3play
 PORTVERSION=	0.5.2.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-0.5.2/0.5.2

--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	lmms
 PORTVERSION=	0.4.12
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@ -8,6 +8,7 @@

 PORTNAME=	mhwaveedit
 PORTVERSION=	1.4.21
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/mhwaveedit/

--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	milkytracker
 PORTVERSION=	0.90.85
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.milkytracker.org/files/ \
 		CRITICAL/${PORTNAME}/${PORTVERSION}/${PORTREVISION}
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	mp3blaster
 PORTVERSION=	3.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	mythmusic
 PORTVERSION=	0.24.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.osuosl.org/pub/mythtv/ \
 		http://ftp.osuosl.org/pub/mythtv/old_releases/ \
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	ocp
 PORTVERSION=	0.1.20
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://stian.cubic.org/ocp/ \
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	openal
 PORTVERSION=	20060211
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	http://openal.org/openal_webstf/downloads/
 DISTVERSION=	0.0.8
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	pysol-sound-server
 PORTVERSION=	3.01
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio games
 MASTER_SITES=	http://www.pysol.org/download/pysol/ \
 		ftp://ftp.is.co.za/linux/distributions/gentoo/distfiles/
--- a/audio/schism/Makefile
+++ b/audio/schism/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	schism
 PORTVERSION=	20100101
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://schismtracker.org/dl/ \
 		CRITICAL
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@ -6,8 +6,7 @@
 #

 PORTNAME=	sdl_mixer
-PORTVERSION=	1.2.11
-PORTREVISION=	2
+PORTVERSION=	1.2.12
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
--- a/audio/sdl_mixer/distinfo
+++ b/audio/sdl_mixer/distinfo
@ -1,2 +1,2 @@
-SHA256 (SDL_mixer-1.2.11.tar.gz) = 86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9
-SIZE (SDL_mixer-1.2.11.tar.gz) = 2690654
+SHA256 (SDL_mixer-1.2.12.tar.gz) = 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a
+SIZE (SDL_mixer-1.2.12.tar.gz) = 3707781
--- a/audio/sdl_mixer/pkg-plist
+++ b/audio/sdl_mixer/pkg-plist
@ -1,6 +1,6 @@
 include/SDL/SDL_mixer.h
 lib/libSDL_mixer-1.2.so
-lib/libSDL_mixer-1.2.so.10
+lib/libSDL_mixer-1.2.so.12
 lib/libSDL_mixer.a
 lib/libSDL_mixer.la
 lib/libSDL_mixer.so
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://offload1.icculus.org:9090/SDL_sound/downloads/ \
 		http://offload2.icculus.org:9090/SDL_sound/downloads/
--- a/audio/sidplayer/Makefile
+++ b/audio/sidplayer/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	sidplayer
 PORTVERSION=	4.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://sidplayer.cebix.net/downloads/ \
 		CRITICAL
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	soundtracker
 PORTVERSION=	0.6.8
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.soundtracker.org/dl/%SUBDIR%/
 MASTER_SITE_SUBDIR=	v${PORTVERSION:R}
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	tcd
 PORTVERSION=	2.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/audio/tempest_for_eliza/Makefile
+++ b/audio/tempest_for_eliza/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	tempest_for_eliza
 PORTVERSION=	1.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://www.erikyyy.de/tempest/

--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	xmms-kde
 PORTVERSION=	3.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio kde
 MASTER_SITES=	SF

--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@ -7,7 +7,7 @@

 PORTNAME?=	xmms2
 PORTVERSION=	0.7
-PORTREVISION?=	3
+PORTREVISION?=	4
 DISTVERSIONSUFFIX=DrNo
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	syncterm
 PORTVERSION=	0.9.${PORTVER}
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.9.4
 DISTNAME=	syncterm-src-${PORTVER}
--- a/comms/xmorse/Makefile
+++ b/comms/xmorse/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	xmorse
 PORTVERSION=	20041125
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://c2.com/morse/files/SourceCode/ \
 		http://www.525183.com/freebsd/xmorse/ \
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=      adasdl
 PORTVERSION=   20010504
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=    devel
 MASTER_SITES=  SF/${PORTNAME}/AdaSDL_${PORTVERSION}/AdaSDL_${PORTVERSION}
 DISTNAME=      AdaSDL_${PORTVERSION}
--- a/devel/bennugd-modules/Makefile
+++ b/devel/bennugd-modules/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	modules
 PORTVERSION=	r20091106
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel games
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMEPREFIX=	bennugd-
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	clanlib
 PORTVERSION=	0.8.1
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.clanlib.org/download/releases-0.8/
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	directfb
 PORTVERSION=	1.4.13
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.directfb.org/downloads/Core/${DISTNAME:R}/
 DISTNAME=	DirectFB-${PORTVERSION}
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	esdl
 PORTVERSION=	1.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	flatzebra
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	http://perso.b2b2c.ca/sarrazip/dev/

--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	guichan
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}

--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	kyra
 PORTVERSION=	2.0.7
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	love
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	http://cdn.bitbucket.org/rude/love/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
--- a/devel/love07/Makefile
+++ b/devel/love07/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	love
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	http://cdn.bitbucket.org/rude/love/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	love
 DISTVERSION=	0.5-0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	sdl
 PORTVERSION=	0.7.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	SF/ocaml${PORTNAME}/OCamlSDL/ocaml${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	ocaml-
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@ -5,7 +5,7 @@

 PORTNAME=	SDL
 PORTVERSION=	2.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=SDL
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	ptlib
 PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ptlib/2.4
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	ptlib
 PORTVERSION=	2.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/opalvoip/v3.6%20Lalande/Final/
 DISTNAME=	ptlib-${PORTVERSION}
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	pwlib
 PORTVERSION=	1.12.0
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES= 	SF/openh323/${PORTNAME}/${PORTVERSION}
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	game
 PORTVERSION=	1.8.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel python
 MASTER_SITES=	http://pygame.seul.org/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/ros-common/Makefile
+++ b/devel/ros-common/Makefile
@ -6,6 +6,7 @@

 PORTNAME=	ros-common
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/:rel \
 		http://pr.willowgarage.com/downloads/:pr \
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	rudl
 PORTVERSION=	0.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel ruby
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	sdl
 PORTVERSION=	1.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel graphics audio ruby
 MASTER_SITES=	http://www.kmc.gr.jp/~ohai/rubysdl/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
--- a/devel/rubygem-rubygame/Makefile
+++ b/devel/rubygem-rubygame/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	rubygame
 PORTVERSION=	2.6.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-sdl/Makefile
+++ b/devel/rubygem-sdl/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	sdl
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	devel graphics audio ruby
 MASTER_SITES=	RG
 DISTNAME=	rubysdl-${PORTVERSION}
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@ -6,8 +6,7 @@
 #

 PORTNAME=	sdl
-PORTVERSION=	1.2.14
-PORTREVISION=	2
+PORTVERSION=	1.2.15
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
@ -20,6 +19,7 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm

 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@ -1,2 +1,2 @@
-SHA256 (SDL-1.2.14.tar.gz) = 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
-SIZE (SDL-1.2.14.tar.gz) = 4014154
+SHA256 (SDL-1.2.15.tar.gz) = d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
+SIZE (SDL-1.2.15.tar.gz) = 3920622
--- a/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c
+++ b/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c
@ -1,16 +1,11 @@
--- src/joystick/bsd/SDL_sysjoystick.c.orig	2010-02-05 11:17:18.000000000 +0100
-+++ src/joystick/bsd/SDL_sysjoystick.c	2010-02-05 11:18:15.000000000 +0100
-@@ -303,11 +303,12 @@
- 		    strerror(errno));
- 		goto usberr;
- 	}
-+
-+	rep = &hw->inreport;
- #if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
-        rep->rid = hid_get_report_id(fd);
-        if (rep->rid < 0) {
- #else
-	rep = &hw->inreport;
- 	if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
- #endif
- 		rep->rid = -1; /* XXX */
+--- src/joystick/bsd/SDL_sysjoystick.c.orig	2012-01-28 12:07:18.000000000 +0100
+++ src/joystick/bsd/SDL_sysjoystick.c	2012-01-28 12:08:44.000000000 +0100
+@@ -148,7 +148,7 @@
+ static int	report_alloc(struct report *, struct report_desc *, int);
+ static void	report_free(struct report *);
+ 
+-#if defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__)
+#if defined(USBHID_UCR_DATA) || (defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version <= 800063)
+ #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
+ #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
+ #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
--- a/devel/sdl12/files/patch-src_video_mmx.h
+++ b/devel/sdl12/files/patch-src_video_mmx.h
@ -1,11 +0,0 @@
--- src/video/mmx.h	2009-10-12 23:07:15.000000000 +0000
-+++ src/video/mmx.h	2010-04-13 14:25:40.530735004 +0000
-@@ -355,7 +355,7 @@
- 
- #define	mmx_r2m(op, reg, mem) \
- 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
-			      : "=X" (mem) \
-+			      : "=m" (mem) \
- 			      : /* nothing */ )
- 
- #define	mmx_r2r(op, regs, regd) \
--- a/devel/sdl12/files/patch-src_video_x11_SDL_x11events.c
+++ b/devel/sdl12/files/patch-src_video_x11_SDL_x11events.c
@ -1,21 +0,0 @@
-
-
-Patch attached with submission follows:
-
--- src/video/x11/SDL_x11events.c.orig	2010-08-29 20:13:12.455316094 +0300
-+++ src/video/x11/SDL_x11events.c	2010-08-29 20:14:46.875763077 +0300
-@@ -441,8 +441,10 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
-		if ( xevent.xcrossing.detail != NotifyInferior ) {
-			if ( this->input_grab == SDL_GRAB_OFF ) {
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) &&
-+		     (xevent.xcrossing.detail != NotifyInferior) ) {
-+              		if ( this->input_grab == SDL_GRAB_OFF ) {
- 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
- 			} else {
- 				posted = SDL_PrivateMouseMotion(0, 0,
-
-
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@ -37,6 +37,7 @@ lib/libSDL-1.2.so.11
 lib/libSDL.la
 lib/libSDL.a
 lib/libSDLmain.a
+lib/libSDLmain.la
 libdata/pkgconfig/sdl.pc
 share/aclocal/sdl.m4
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
--- a/devel/sdl_console/Makefile
+++ b/devel/sdl_console/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	sdl_console
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/sdlconsole/sdlconsole-source/sdlconsole-${PORTVERSION}
 DISTNAME=	sdlconsole-${PORTVERSION}
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	sdl_sge
 PORTVERSION=	0.030809
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.digitalfanatics.org/cal/sge/files/ \
 		http://www.sourcefiles.org/Programming/Libraries/Graphics/
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	sdlmm
 PORTVERSION=	0.1.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/SDLmm/${PORTVERSION}
 DISTNAME=	SDLmm-${PORTVERSION}
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	upp
 PORTVERSION=	4193
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	textroom
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	SF

--- a/emulators/advancemame/Makefile
+++ b/emulators/advancemame/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	advancemame
 PORTVERSION=	0.106.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF

--- a/emulators/advancemenu/Makefile
+++ b/emulators/advancemenu/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	advancemenu
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/advancemame/${PORTNAME}/${PORTVERSION}

--- a/emulators/advancemess/Makefile
+++ b/emulators/advancemess/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	advancemess
 PORTVERSION=	0.102.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/advancemame/${PORTNAME}/${PORTVERSION}

--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	atari800
 PORTVERSION=	2.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	SF SF/${PORTNAME}/ROM/Original%20XL%20ROM:x
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip:x
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	bochs
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
--- a/emulators/bsnes/Makefile
+++ b/emulators/bsnes/Makefile
@ -6,6 +6,7 @@

 PORTNAME=	bsnes
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}
--- a/emulators/cygne-sdl/Makefile
+++ b/emulators/cygne-sdl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	cygne-sdl
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://sdlemu.ngemu.com/OpenProjects/
 DISTNAME=	Cygne-SDL-${PORTVERSION}-src
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	desmume
 PORTVERSION=	0.9.7
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF

--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	dgen-sdl
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/dgen/dgen/${PORTVERSION}

--- a/emulators/dolphin-emu-devel/Makefile
+++ b/emulators/dolphin-emu-devel/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	dolphin-emu
 PORTVERSION=	3.0.r${REVDATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	dosbox
 PORTVERSION=	0.74
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF

--- a/emulators/e-uae/Makefile
+++ b/emulators/e-uae/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	e-uae
 DISTVERSION=	0.8.29.w4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.rcdrummond.net/uae/${DISTNAME}/
 DISTNAME=	e-uae-0.8.29-WIP4
--- a/emulators/fceu-server/Makefile
+++ b/emulators/fceu-server/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	fceu-server
 PORTVERSION=	0.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fceultra/OldFiles

--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	fceux
 PORTVERSION=	2.1.4a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fceultra/Source%20Code/2.1.4%20src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	frodo
 PORTVERSION=	4.1b
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	emulators tk
 MASTER_SITES=	http://frodo.cebix.net/downloads/
 DISTNAME=	FrodoV4_1b.Src
--- a/emulators/gcube/Makefile
+++ b/emulators/gcube/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	gcube
 PORTVERSION=	0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.liquidx.org/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	generator
 PORTVERSION=	0.35.r4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.squish.net/generator/cbiere/generator/
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	generator
 PORTVERSION=	0.35
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.squish.net/generator/files/

--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	gens
 PORTVERSION=	2.12a
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Gens%20Source%20Code/Gens%20WIP%20linux
 DISTNAME=	Gens212a1SrcL
--- a/emulators/gngb/Makefile
+++ b/emulators/gngb/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	gngb
 PORTVERSION=	20060309
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	http://m.peponas.free.fr/gngb/download/

--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	gngeo
 PORTVERSION=	0.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	gnuboy
 PORTVERSION=	1.0.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators games
 MASTER_SITES=	http://www.sourcefiles.org/Emulators/Videogames/

--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	hatari
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	BERLIOS

--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	hugo
 PORTVERSION=	2.12
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zeograd.com/download/

--- a/emulators/joytran/Makefile
+++ b/emulators/joytran/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	joytran
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	BERLIOS GOOGLE_CODE
 MASTER_SITE_SUBDIR=	joytran
--- a/emulators/jzintv/Makefile
+++ b/emulators/jzintv/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	jzintv
 PORTVERSION=	1.0b3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://spatula-city.org/~im14u2c/intv/dl/
 DISTNAME=	jzintv-1.0-beta3-src
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@ -8,6 +8,7 @@
 PORTNAME=	mame
 PATCHLEVEL=	2
 PORTVERSION=	0.143${PATCHSUFFIX}
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/:src \
 		http://emumovies.com/aarongiles/releases/:src \
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	mednafen
 PORTVERSION=	0.8.B
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	emulators games
 MASTER_SITES=	SF/${PORTNAME}/Mednafen/${PORTVERSION}
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	mess
 PORTVERSION=	0.139
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.aarongiles.com/mirror/releases/:mame \
 		http://www.mess.org/files/:mess \
--- a/emulators/mupen64-base/Makefile
+++ b/emulators/mupen64-base/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	mupen64
 PORTVERSION?=	0.5
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/${MUPEN64VERSION}/ \
 		${MASTER_SITE_GENTOO:S|$|distfiles/|}
--- a/emulators/mupen64-glide/Makefile
+++ b/emulators/mupen64-glide/Makefile
@ -6,7 +6,7 @@
 #

 PORTVERSION=	0.7
-PORTREVISION=	6
+PORTREVISION=	7
 PKGNAMESUFFIX=	-glide

 COMMENT=	Glide64 graphics plugin for Mupen64
--- a/emulators/mupen64-gln64/Makefile
+++ b/emulators/mupen64-gln64/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	mupen64
 PORTVERSION=	0.4.1
-PORTREVISION=	7
+PORTREVISION=	8
 PKGNAMESUFFIX=	-gln64

 COMMENT=	The glN64 graphics plugin for Mupen64
--- a/emulators/mupen64-input/Makefile
+++ b/emulators/mupen64-input/Makefile
@ -5,6 +5,7 @@
 # $FreeBSD$
 #

+PORTREVISION=	1
 PKGNAMESUFFIX=	-input

 COMMENT=	Input plugin for Mupen64
--- a/emulators/mupen64-rice/Makefile
+++ b/emulators/mupen64-rice/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	mupen64
 PORTVERSION=	5.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/0.4/
 PKGNAMESUFFIX=	-rice
--- a/emulators/mupen64-sdlaudio/Makefile
+++ b/emulators/mupen64-sdlaudio/Makefile
@ -6,7 +6,7 @@
 #

 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	-sdlaudio

 COMMENT=	JttL's SDL audio plugin for Mupen64
--- a/emulators/mupen64-sdlinput/Makefile
+++ b/emulators/mupen64-sdlinput/Makefile
@ -6,7 +6,7 @@
 #

 PORTVERSION=	0.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	-sdlinput

 COMMENT=	Blight's SDL input plugin for Mupen64
--- a/emulators/mupen64-softgfx/Makefile
+++ b/emulators/mupen64-softgfx/Makefile
@ -5,6 +5,7 @@
 # $FreeBSD$
 #

+PORTREVISION=	1
 PKGNAMESUFFIX=	-softgfx

 COMMENT=	Soft gfx plugin for Mupen64
--- a/Show More
+++ b/Show More