diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2006-09-20 11:21:59 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2006-09-20 11:21:59 +0000 |
| commit | 0d2725682b8325a08b11592d11062997bb9dc7f2 (patch) | |
| tree | 46ab0c86563bfc2fbab1ecc5f9dadffb47afe737 | |
| parent | 750f1f56ed3264341b911b1182fc2f3f4dd609c2 (diff) | |
| download | ports-0d2725682b8325a08b11592d11062997bb9dc7f2.tar.gz ports-0d2725682b8325a08b11592d11062997bb9dc7f2.zip | |
Notes
471 files changed, 1193 insertions, 1885 deletions
diff --git a/Mk/bsd.sdl.mk b/Mk/bsd.sdl.mk index ae1dc5bf5802..52e0adcbe313 100644 --- a/Mk/bsd.sdl.mk +++ b/Mk/bsd.sdl.mk @@ -56,7 +56,7 @@ _VERSION_gui= 0 _SUBDIR_gui= x11-toolkits _REQUIRES_gui= sdl image ttf -_VERSION_image= 10 +_VERSION_image= 1 _SUBDIR_image= graphics _REQUIRES_image=sdl @@ -74,17 +74,16 @@ _VERSION_net= 0 _SUBDIR_net= net _REQUIRES_net= sdl -_VERSION_sdl= 7 +_VERSION_sdl= 11 _SUBDIR_sdl= devel -_LIB_sdl= SDL-1.1 +_LIB_sdl= SDL _PORTDIR_sdl= sdl12 _VERSION_sound= 1 _SUBDIR_sound= audio -_LIB_sound= SDL_sound-1.0 _REQUIRES_sound=sdl -_VERSION_ttf= 3 +_VERSION_ttf= 6 _SUBDIR_ttf= graphics _REQUIRES_ttf= sdl @@ -171,7 +170,7 @@ LIB_DEPENDS+= ${_LIB_${component}}.${_VERSION_${component}}:${PORTSDIR}/${_SUBDI # "Normal" dependencies and variables # BUILD_DEPENDS+= ${SDL_CONFIG}:${PORTSDIR}/${_SUBDIR_sdl}/${_PORTDIR_sdl} -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG} MAKE_ENV+= SDL_CONFIG=${SDL_CONFIG} diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index 1c1882200f7e..f5ac6ccf592f 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -7,6 +7,7 @@ PORTNAME= stellarium PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile index 06bee6d1548c..61deec379e15 100644 --- a/audio/adplay/Makefile +++ b/audio/adplay/Makefile @@ -7,7 +7,7 @@ PORTNAME= adplay PORTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= adplug diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile index c6a8f241448b..346f86d7513e 100644 --- a/audio/amarok-kde4/Makefile +++ b/audio/amarok-kde4/Makefile @@ -6,7 +6,7 @@ PORTNAME= amarok PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index c6a8f241448b..346f86d7513e 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -6,7 +6,7 @@ PORTNAME= amarok PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src diff --git a/audio/drumpiler/Makefile b/audio/drumpiler/Makefile index a14c6406efd1..b4af194e5848 100644 --- a/audio/drumpiler/Makefile +++ b/audio/drumpiler/Makefile @@ -8,7 +8,7 @@ PORTNAME= drumpiler PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,9 +21,6 @@ CFLAGS+= `${SDL_CONFIG} --cflags` LIBS+= `${SDL_CONFIG} --libs` PLIST_FILES= bin/drumpiler -post-patch: - @${REINPLACE_CMD} -e "s|SDL.h|SDL11/SDL.h|" ${WRKSRC}/drumpiler.c - do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} -DUSESDL -o drumpiler drumpiler.c ${LIBS} diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile index 0434f9dca2fa..fe90ef867000 100644 --- a/audio/festalon/Makefile +++ b/audio/festalon/Makefile @@ -7,6 +7,7 @@ PORTNAME= festalon PORTVERSION= 0.5.5 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://projects.raphnet.net/festalon/ \ http://critical.ch/distfiles/ \ diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile index 1755914d0775..bba6e8fef753 100644 --- a/audio/ksmp3play/Makefile +++ b/audio/ksmp3play/Makefile @@ -8,7 +8,7 @@ PORTNAME= ksmp3play PORTVERSION= 0.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=ksmp3play diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile index 0b181a4a9857..a48a1c3376e5 100644 --- a/audio/mhwaveedit/Makefile +++ b/audio/mhwaveedit/Makefile @@ -8,6 +8,7 @@ PORTNAME= mhwaveedit PORTVERSION= 1.4.9 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://download.gna.org/mhwaveedit/ diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index ffe0bc4eaf56..fab854c2d3a2 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -7,6 +7,7 @@ PORTNAME= mp3blaster PORTVERSION= 3.2.3 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/openal/Makefile b/audio/openal/Makefile index ddc10cd3fa63..c77713687b3a 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -7,7 +7,7 @@ PORTNAME= openal PORTVERSION= 20060211 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://openal.org/openal_webstf/downloads/ DISTVERSION= 0.0.8 diff --git a/audio/phatbeat/Makefile b/audio/phatbeat/Makefile index 2b5c7c34e7b6..bd55744c437a 100644 --- a/audio/phatbeat/Makefile +++ b/audio/phatbeat/Makefile @@ -7,6 +7,7 @@ PORTNAME= phatbeat PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.postreal.org/files/ DISTNAME= PhatBeat-${PORTVERSION} diff --git a/audio/py-sdl_mixer/Makefile b/audio/py-sdl_mixer/Makefile index 1a166490a730..6cab526eec2c 100644 --- a/audio/py-sdl_mixer/Makefile +++ b/audio/py-sdl_mixer/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdl_mixer PORTVERSION= 0.0.3 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= http://download.gna.org/pysdlmixer/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -26,8 +27,6 @@ WRKSRC= ${WRKDIR}/pysdl_mixer-${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/py-sdl-mixer post-patch: - @${REINPLACE_CMD} -e 's,"SDL","SDL-1.1",g' ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e 's,SDL/SDL,SDL11/SDL,g' ${WRKSRC}/sdl_mixer.c @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile index 0f6e051f4586..bd8fec67745b 100644 --- a/audio/pysol-sound-server/Makefile +++ b/audio/pysol-sound-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= pysol-sound-server PORTVERSION= 3.01 -#PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= audio games MASTER_SITES= http://www.pysol.org/download/pysol/ \ ftp://ftp.is.co.za/linux/distributions/gentoo/distfiles/ diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile index 532c62c55fef..b980de68fed2 100644 --- a/audio/sdl_mixer/Makefile +++ b/audio/sdl_mixer/Makefile @@ -6,8 +6,8 @@ # PORTNAME= sdl_mixer -PORTVERSION= 1.2.6 -PORTREVISION= 2 +PORTVERSION= 1.2.7 +PORTREVISION= 0 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ DISTNAME= SDL_mixer-${PORTVERSION} @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes OPTIONS= MIKMOD "Enable MOD music via libMikMod" on \ VORBIS "Enable Ogg Vorbis music" on \ diff --git a/audio/sdl_mixer/distinfo b/audio/sdl_mixer/distinfo index 1edd13b542e6..2052714ba790 100644 --- a/audio/sdl_mixer/distinfo +++ b/audio/sdl_mixer/distinfo @@ -1,3 +1,3 @@ -MD5 (SDL_mixer-1.2.6.tar.gz) = 2b8beffad9179d80e598c22c80efb135 -SHA256 (SDL_mixer-1.2.6.tar.gz) = 89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a -SIZE (SDL_mixer-1.2.6.tar.gz) = 1147838 +MD5 (SDL_mixer-1.2.7.tar.gz) = 7959b89c8f8f1564ca90968f6c88fa1e +SHA256 (SDL_mixer-1.2.7.tar.gz) = bb3197285d8dc95a09068bbddefdf34c8b08ded8975bcc169050ff2bfded2ea4 +SIZE (SDL_mixer-1.2.7.tar.gz) = 1960614 diff --git a/audio/sdl_mixer/files/patch-Makefile.in b/audio/sdl_mixer/files/patch-Makefile.in new file mode 100644 index 000000000000..b4c7a8df98fb --- /dev/null +++ b/audio/sdl_mixer/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Thu Aug 31 14:23:43 2006 ++++ Makefile.in Thu Aug 31 14:23:54 2006 +@@ -41,7 +41,7 @@ + LT_CURRENT = @LT_CURRENT@ + LT_RELEASE = @LT_RELEASE@ + LT_REVISION = @LT_REVISION@ +-LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++LT_LDFLAGS = -no-undefined -rpath $(libdir) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + + all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE) + diff --git a/audio/sdl_mixer/files/patch-aa b/audio/sdl_mixer/files/patch-aa deleted file mode 100644 index 6ede2a503503..000000000000 --- a/audio/sdl_mixer/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig -+++ Makefile.in -@@ -254,7 +254,7 @@ - lib_LTLIBRARIES = libSDL_mixer.la - SUBDIRS = @MUSIC_SUBDIRS@ - DIST_SUBDIRS = mikmod timidity native_midi native_midi_gpl --libSDL_mixerincludedir = $(includedir)/SDL -+libSDL_mixerincludedir = $(includedir)/SDL11 - libSDL_mixerinclude_HEADERS = \ - SDL_mixer.h - -@@ -297,7 +297,6 @@ - - libSDL_mixer_la_LDFLAGS = \ - -no-undefined \ -- -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-symbols-regex Mix_.* - diff --git a/audio/sdl_mixer/files/patch-ab b/audio/sdl_mixer/files/patch-ab deleted file mode 100644 index 66de8aa6beec..000000000000 --- a/audio/sdl_mixer/files/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- configure 2001/12/19 12:37:01 1.1 -+++ configure 2001/12/19 12:37:51 -@@ -588,7 +588,7 @@ - - # libtool versioning - LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION --LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE` -+LT_CURRENT=2 - LT_REVISION=$INTERFACE_AGE - LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE` - diff --git a/audio/sdl_mixer/files/patch-ac b/audio/sdl_mixer/files/patch-ac deleted file mode 100644 index f4e45d1285e8..000000000000 --- a/audio/sdl_mixer/files/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ ---- timidity/config.h.orig Mon Jul 3 07:36:37 2000 -+++ timidity/config.h Sat Nov 18 18:47:45 2000 -@@ -159,6 +159,22 @@ - # endif - #endif /* linux */ - -+#ifdef __FreeBSD__ -+#include <errno.h> -+#include <machine/endian.h> -+#if BYTE_ORDER == LITTLE_ENDIAN -+#undef BIG_ENDIAN -+#undef PDP_ENDIAN -+#elif BYTE_ORDER == BIG_ENDIAN -+#undef LITTLE_ENDIAN -+#undef PDP_ENDIAN -+#else -+# error No valid byte sex defined -+#endif -+#define USE_LDEXP -+#define PI M_PI -+#endif -+ - /* Win32 on Intel machines */ - #ifdef __WIN32__ - # define LITTLE_ENDIAN diff --git a/audio/sdl_mixer/pkg-plist b/audio/sdl_mixer/pkg-plist index e9670914d848..2f5d237ac04d 100644 --- a/audio/sdl_mixer/pkg-plist +++ b/audio/sdl_mixer/pkg-plist @@ -1,5 +1,6 @@ -include/SDL11/SDL_mixer.h +include/SDL/SDL_mixer.h lib/libSDL_mixer.a lib/libSDL_mixer.la lib/libSDL_mixer.so lib/libSDL_mixer.so.2 +@dirrmtry include/SDL diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile index 247fb5e9920b..66c758d935a6 100644 --- a/audio/sdl_sound/Makefile +++ b/audio/sdl_sound/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdl_sound PORTVERSION= 1.0.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= http://www.icculus.org/SDL_sound/downloads/ DISTNAME= SDL_sound-${PORTVERSION} @@ -20,7 +20,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> @@ -90,8 +90,4 @@ pre-extract: @${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS." .endif -post-patch: - @${REINPLACE_CMD} -e 's|$$(includedir)/SDL|$$(includedir)/SDL11|' \ - ${WRKSRC}/Makefile.in - .include <bsd.port.post.mk> diff --git a/audio/sdl_sound/files/patch-Makefile.in b/audio/sdl_sound/files/patch-Makefile.in new file mode 100644 index 000000000000..75969df6c22f --- /dev/null +++ b/audio/sdl_sound/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Tue Sep 12 19:18:15 2006 ++++ Makefile.in Tue Sep 12 19:18:24 2006 +@@ -127,7 +127,6 @@ + @USE_MPGLIB_FALSE@MPGLIB_LIB = + + libSDL_sound_la_LDFLAGS = \ +- -release $(LT_RELEASE) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + + libSDL_sound_la_LIBADD = \ diff --git a/audio/sdl_sound/pkg-plist b/audio/sdl_sound/pkg-plist index 96ffa81ef647..1ad5f80848be 100644 --- a/audio/sdl_sound/pkg-plist +++ b/audio/sdl_sound/pkg-plist @@ -1,8 +1,7 @@ bin/playsound -include/SDL11/SDL_sound.h -lib/libSDL_sound-1.0.so.1 -lib/libSDL_sound-1.0.so +include/SDL/SDL_sound.h lib/libSDL_sound.a lib/libSDL_sound.la lib/libSDL_sound.so -@dirrmtry include/SDL11 +lib/libSDL_sound.so.1 +@dirrmtry include/SDL diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile index 077274a2e3f3..7e92256deecf 100644 --- a/audio/sidplayer/Makefile +++ b/audio/sidplayer/Makefile @@ -7,6 +7,7 @@ PORTNAME= sidplayer PORTVERSION= 4.4 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://sidplayer.cebix.net/downloads/ \ http://critical.ch/distfiles/ \ @@ -21,7 +22,7 @@ COMMENT= A C64 SID tune player USE_SDL= yes GNU_CONFIGURE= yes -SDLINCLUDEDIR= SDL11 +SDLINCLUDEDIR= SDL CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile index 3c536d1418e7..21c87a74c12a 100644 --- a/audio/soundtracker/Makefile +++ b/audio/soundtracker/Makefile @@ -7,7 +7,7 @@ PORTNAME= soundtracker PORTVERSION= 0.6.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= http://www.soundtracker.org/dl/%SUBDIR%/ MASTER_SITE_SUBDIR= v${PORTVERSION:R} diff --git a/audio/tempest_for_eliza/Makefile b/audio/tempest_for_eliza/Makefile index c3443ca1e651..0ec1fb2856ce 100644 --- 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= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.erikyyy.de/tempest/ diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index 150b508b2fd6..95938e300340 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -7,6 +7,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.2.d.6 +PORTREVISION= 1 CATEGORIES?= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile index b407e377c03c..618c8aeb9cbc 100644 --- a/devel/adasdl/Makefile +++ b/devel/adasdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= adasdl PORTVERSION= 20010504 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -30,7 +30,6 @@ do-patch: ${REINPLACE_CMD} \ -e 's,/usr/local,${LOCALBASE},g' \ -e 's,/usr/X11R6,${X11BASE},g' \ - -e 's,-lSDL\ ,-lSDL-1.1\ ,' \ -e 's,-lpthread,-pthread,' \ -e 's,-lGL,-L${X11BASE}/lib\ -lX11 -lXext -lGL,' \ $${i}; \ diff --git a/devel/adasdl/files/patch-AdaSDL-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL-make.conf_x11 index a0168a08878d..740144d50f13 100644 --- a/devel/adasdl/files/patch-AdaSDL-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL-make.conf_x11 @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL -pthread -lGL -lGLU GNATHTML=/usr/local/bin/gnathtml.pl PERL=/usr/bin/perl EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 index c6d993d6c330..f8fb309baef8 100644 --- a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_mixer -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile index c2bbf0a1cd8d..b0b4612b24ce 100644 --- a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile +++ b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile @@ -4,7 +4,7 @@ -INC+=-I../../AdaSDL/binding -I../../AdaGL/GL -I.. -include ../make.conf -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU + +INC+=-I${LOCALBASE}/lib/adaSDL -I${LOCALBASE}/lib/adaGL -I.. diff --git a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 index 1ad184efd798..ba7104bfd4f0 100644 --- a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_image -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_image -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_image -lSDL -pthread -lGL -lGLU EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 index 98ed13bc9468..c344fbf0ac34 100644 --- a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_mixer -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU EXE= diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile index ac33caa7f72a..e40862f6ee37 100644 --- a/devel/clanlib-devel/Makefile +++ b/devel/clanlib-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= clanlib PORTVERSION= 0.7.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index 7f251927fa28..80a70a51bac0 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -7,7 +7,7 @@ PORTNAME= directfb PORTVERSION= 0.9.16 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= http://www.directfb.org/downloads/Old/ DISTNAME= DirectFB-${PORTVERSION} diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile index 0061cbc01585..e8a35effab97 100644 --- a/devel/eboxy/Makefile +++ b/devel/eboxy/Makefile @@ -8,7 +8,7 @@ PORTNAME= eboxy PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile index 8704a9547c8c..8aebee25bb2d 100644 --- a/devel/esdl/Makefile +++ b/devel/esdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= esdl PORTVERSION= 0.95.0630 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile index a20cc46c66d7..3f00605c0efe 100644 --- a/devel/flatzebra/Makefile +++ b/devel/flatzebra/Makefile @@ -7,6 +7,7 @@ PORTNAME= flatzebra PORTVERSION= 0.1.1 +PORTREVISION= 1 CATEGORIES= devel games MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/ diff --git a/devel/flatzebra/files/patch-src__flatzebra__SoundMixer.h b/devel/flatzebra/files/patch-src__flatzebra__SoundMixer.h deleted file mode 100644 index 98e13eaf42c9..000000000000 --- a/devel/flatzebra/files/patch-src__flatzebra__SoundMixer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/flatzebra/SoundMixer.h.orig Tue Oct 18 12:13:19 2005 -+++ src/flatzebra/SoundMixer.h Tue Oct 18 12:13:24 2005 -@@ -23,7 +23,7 @@ - #ifndef _H_SoundMixer - #define _H_SoundMixer - --#include <SDL/SDL_mixer.h> -+#include <SDL11/SDL_mixer.h> - - #include <string> - diff --git a/devel/gauche-sdl/Makefile b/devel/gauche-sdl/Makefile index 525b0a340ed2..f7dc309bbf71 100644 --- a/devel/gauche-sdl/Makefile +++ b/devel/gauche-sdl/Makefile @@ -7,6 +7,7 @@ PORTNAME= gauche-sdl PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= devel scheme MASTER_SITES= http://michaelvess.com/files/ DISTNAME= ${PORTFAKENAME} diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile index af0e0e22aa64..ebfd563a0fac 100644 --- a/devel/gengameng/Makefile +++ b/devel/gengameng/Makefile @@ -7,7 +7,7 @@ PORTNAME= gengameng PORTVERSION= 4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://ftp.osuosl.org/pub/FreeBSD/distfiles/ diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile index 57573caeebaa..7c418eb136a0 100644 --- a/devel/guichan/Makefile +++ b/devel/guichan/Makefile @@ -7,7 +7,7 @@ PORTNAME= guichan PORTVERSION= 0.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --disable-allegro INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%LOCALBASE%%/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL11 \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL \ -I${X11BASE}/include" LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \ ${PTHREAD_LIBS}" diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile index 5d3e1f1f0695..2182dc7d124c 100644 --- a/devel/kyra/Makefile +++ b/devel/kyra/Makefile @@ -7,7 +7,7 @@ PORTNAME= kyra PORTVERSION= 2.0.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/kyra/files/patch-engine_namefield.h b/devel/kyra/files/patch-engine_namefield.h new file mode 100644 index 000000000000..03ab36ad2ba8 --- /dev/null +++ b/devel/kyra/files/patch-engine_namefield.h @@ -0,0 +1,10 @@ +--- engine/namefield.h.orig Tue Sep 12 19:06:04 2006 ++++ engine/namefield.h Tue Sep 12 19:07:20 2006 +@@ -31,6 +31,7 @@ + #include "../util/gltypes.h" + #include "../util/gllist.h" + #include "SDL_endian.h" ++#include "SDL_rwops.h" + + + diff --git a/devel/kyra/files/patch-util_gltypes.h b/devel/kyra/files/patch-util_gltypes.h new file mode 100644 index 000000000000..1b858a22e3e3 --- /dev/null +++ b/devel/kyra/files/patch-util_gltypes.h @@ -0,0 +1,13 @@ +--- util/gltypes.h.orig Tue Sep 12 19:01:55 2006 ++++ util/gltypes.h Tue Sep 12 19:02:26 2006 +@@ -40,8 +40,8 @@ + typedef Sint32 S32; + + #ifdef SDL_HAS_64BIT_TYPE +- typedef SDL_HAS_64BIT_TYPE S64; +- typedef unsigned SDL_HAS_64BIT_TYPE U64; ++ typedef Sint64 S64; ++ typedef Uint64 U64; + #else + #error No 64-bit integer. + #endif diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile index c704cb6e1c18..27961a703c38 100644 --- a/devel/ocaml-sdl/Makefile +++ b/devel/ocaml-sdl/Makefile @@ -8,7 +8,7 @@ PORTNAME= sdl PORTVERSION= 0.7.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ocamlsdl diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 83078e18a258..1024e2d288b2 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -5,7 +5,7 @@ PORTNAME= sdl PORTVERSION= 1.20.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://bloodgate.com/perl/sdl/pub/ PKGNAMEPREFIX= p5- diff --git a/devel/p5-SDL/files/patch-Makefile.freebsd b/devel/p5-SDL/files/patch-Makefile.freebsd index b35294b7189d..02d2fd55958a 100644 --- a/devel/p5-SDL/files/patch-Makefile.freebsd +++ b/devel/p5-SDL/files/patch-Makefile.freebsd @@ -1,5 +1,5 @@ ---- Makefile.freebsd.orig Thu Jan 1 02:38:22 2004 -+++ Makefile.freebsd Thu Jan 1 02:38:54 2004 +--- Makefile.freebsd.orig Wed Mar 12 03:38:56 2003 ++++ Makefile.freebsd Tue Sep 12 18:08:44 2006 @@ -1,6 +1,7 @@ #!/usr/bin/env perl @@ -8,6 +8,26 @@ use ExtUtils::MakeMaker; # +@@ -13,8 +14,8 @@ + # Configuration detection of Linux / Unix + # + +-chomp ($sdl_cflags = "-I/usr/X11R6/include " . `sdl11-config --cflags`); +-chomp ($sdl_libs = "-L/usr/X11R6/lib " . `sdl11-config --libs`); ++chomp ($sdl_cflags = "-I/usr/X11R6/include " . `sdl-config --cflags`); ++chomp ($sdl_libs = "-L/usr/X11R6/lib " . `sdl-config --libs`); + $sdl_libs =~ s/-Wl,-rpath,\/usr\/local\/lib//; # suppress the insanity + $sdl_libs =~ s/-pthread//; + +@@ -24,7 +25,7 @@ + + @dirs=( + '/usr/local/include', +- '/usr/local/include/SDL11', ++ '/usr/local/include/SDL', + '/usr/local/include/smpeg', + '/usr/X11R6/include', + '/usr/X11R6/include/GL', @@ -96,7 +97,7 @@ my %options = ( diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index 2dc55f742e35..b8c4f16abcb3 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= pwlib PORTVERSION= 1.10.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://www.voxgratia.org/releases/ diff --git a/devel/pwlib/files/patch-configureac b/devel/pwlib/files/patch-configureac index e8da151aa2d6..72d7c495d27b 100644 --- a/devel/pwlib/files/patch-configureac +++ b/devel/pwlib/files/patch-configureac @@ -124,7 +124,7 @@ + dnl FreeBSD SDL check if test "${HAS_SDL:-unset}" = "unset" ; then - AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1) -+ AC_CHECK_HEADER(SDL11/SDL.h, HAS_SDL=1) ++ AC_CHECK_HEADER(SDL/SDL.h, HAS_SDL=1) if test "${HAS_SDL:-unset}" != "unset" ; then SDLLIB=SDL-1.1 fi diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile index 444b655c80e3..811a2191de93 100644 --- a/devel/py-game/Makefile +++ b/devel/py-game/Makefile @@ -7,6 +7,7 @@ PORTNAME= game PORTVERSION= 1.7.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= http://pygame.seul.org/ftp/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-game/files/patch-config_unix.py b/devel/py-game/files/patch-config_unix.py index fb467e28e6d8..2bf13082c5fd 100644 --- a/devel/py-game/files/patch-config_unix.py +++ b/devel/py-game/files/patch-config_unix.py @@ -1,14 +1,5 @@ --- config_unix.py.orig Wed Aug 10 04:45:11 2005 +++ config_unix.py Wed Sep 14 09:12:44 2005 -@@ -4,7 +4,7 @@ - from glob import glob - from distutils.sysconfig import get_python_inc - --configcommand = os.environ.get('SDL_CONFIG', 'sdl-config',) -+configcommand = os.environ.get('SDL_CONFIG', 'sdl11-config',) - configcommand = configcommand + ' --version --cflags --libs' - localbase = os.environ.get('LOCALBASE', '') - @@ -52,6 +52,9 @@ self.cflags += f + ' ' elif f[:3] == '-Wl': @@ -19,21 +10,3 @@ except: print 'WARNING: "%s" failed!' % command self.found = 0 -@@ -137,7 +140,7 @@ - def main(): - print '\nHunting dependencies...' - DEPS = [ -- DependencyProg('SDL', 'SDL_CONFIG', 'sdl-config', '1.2', 'sdl'), -+ DependencyProg('SDL', 'SDL_CONFIG', 'sdl11-config', '1.2', 'sdl'), - Dependency('FONT', 'SDL_ttf.h', 'libSDL_ttf.so', 'SDL_ttf'), - Dependency('IMAGE', 'SDL_image.h', 'libSDL_image.so', 'SDL_image'), - Dependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer.so', 'SDL_mixer'), -@@ -146,7 +149,7 @@ - ] - - if not DEPS[0].found: -- print 'Unable to run "sdl-config". Please make sure a development version of SDL is installed.' -+ print 'Unable to run "sdl11-config". Please make sure a development version of SDL is installed.' - raise SystemExit - - if localbase: diff --git a/devel/ruby-game/Makefile b/devel/ruby-game/Makefile index 61311acab3dc..8149d33bef34 100644 --- a/devel/ruby-game/Makefile +++ b/devel/ruby-game/Makefile @@ -7,6 +7,7 @@ PORTNAME= game PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= devel ruby MASTER_SITES= http://rubygame.seul.org/files/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/devel/ruby-rudl/Makefile b/devel/ruby-rudl/Makefile index c7b55af7d9ec..73299a7bc111 100644 --- a/devel/ruby-rudl/Makefile +++ b/devel/ruby-rudl/Makefile @@ -7,6 +7,7 @@ PORTNAME= rudl PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= devel ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,7 +23,7 @@ USE_RUBY= yes USE_RUBY_EXTCONF= yes #NO_WRKSUBDIR= yes -CONFIGURE_ARGS= --with-sdl-config="sdl11-config" +CONFIGURE_ARGS= --with-sdl-config="sdl-config" INSTALL_TARGET= site-install DOCS= RUDL/audio.html \ diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile index f2eefbae6ce4..78bf64641c04 100644 --- a/devel/ruby-sdl/Makefile +++ b/devel/ruby-sdl/Makefile @@ -7,13 +7,14 @@ PORTNAME= sdl PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= devel graphics audio ruby MASTER_SITES= http://www.kmc.gr.jp/~ohai/rubysdl/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ruby${PORTNAME}-${PORTVERSION} DIST_SUBDIR= ruby -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ssedov@mbsd.msk.ru COMMENT= Ruby extension library to use SDL library BUILD_DEPENDS= ${NONEXISTENT}:${RUBY_OPENGL_PORTDIR}:patch @@ -25,7 +26,7 @@ USE_SDL= mixer image ttf sdl USE_RUBY= yes USE_RUBY_EXTCONF= yes -CONFIGURE_ARGS= --with-sdl-config="sdl11-config" \ +CONFIGURE_ARGS= --with-sdl-config="sdl-config" \ --enable-opengl --linkoglmodule \ --with-x11-dir="${X11BASE}" INSTALL_TARGET= site-install diff --git a/devel/rubygem-rubygame/Makefile b/devel/rubygem-rubygame/Makefile index 61311acab3dc..8149d33bef34 100644 --- a/devel/rubygem-rubygame/Makefile +++ b/devel/rubygem-rubygame/Makefile @@ -7,6 +7,7 @@ PORTNAME= game PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= devel ruby MASTER_SITES= http://rubygame.seul.org/files/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index cdf4f44f21c3..025f725ec74b 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -6,8 +6,8 @@ # PORTNAME= sdl -PORTVERSION= 1.2.9 -PORTREVISION= 2 +PORTVERSION= 1.2.11 +PORTREVISION= 0 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ @@ -21,11 +21,12 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_LDCONFIG= yes GNU_CONFIGURE= yes WANT_GNOME= yes +USE_GNOME= gnomehack gnometarget +USE_ICONV= yes CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -37,13 +38,20 @@ PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+=--disable-video-x11 .endif -.if !defined(NOPORTDOCS) -PORTDOCS= * -.endif +# XXX: exists untill it will be committed to bsd.port.mk +COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \ + ${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \ + ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- + +EXAMPLES= test/*.c test/*.bmp test/*.dat test/*.xbm test/*.wav +DOCS= BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html OPTIONS= NAS "Include support for the Network Audio System" Off \ + AALIB "Include support for AA-lib" On \ GL "Include support for OpenGL" On \ - AALIB "Include support for AA-lib" On + GGI "Include support for GGI" Off .include <bsd.port.pre.mk> @@ -62,24 +70,26 @@ LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas CONFIGURE_ARGS+=--disable-nas .endif +.if defined(WITH_GGI) +LIB_DEPENDS+= ggi.2:${PORTSDIR}/graphics/libggi +CONFIGURE_ARGS+=--enable-video-ggi +.else +CONFIGURE_ARGS+=--disable-video-ggi +.endif + .if defined(WITHOUT_GL) CONFIGURE_ARGS+=--disable-video-opengl .else USE_GL= yes CONFIGURE_ARGS+=--enable-video-opengl .endif + .if defined(WITHOUT_AALIB) CONFIGURE_ARGS+=--disable-video-aalib .else LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib CONFIGURE_ARGS+=--enable-video-aalib .endif -.if exists(/usr/include/libusbhid.h) -CONFIGURE_ENV+= USB_LIBS=-lusbhid -CFLAGS+= -DHAVE_LIBUSBHID_H -.else -CONFIGURE_ENV+= USB_LIBS=-lusb -.endif MAN3!= ${CAT} ${FILESDIR}/man3 @@ -105,34 +115,19 @@ CONFIGURE_ARGS+=--enable-arts CONFIGURE_ARGS+=--disable-arts .endif -post-patch: - @${REINPLACE_CMD} 's|sdl-config|sdl11-config|g' \ - ${WRKSRC}/test/configure - @${RM} ${WRKSRC}/test/configure.bak - pre-configure: @${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${TOUCH} -post-configure: - @cd ${WRKSRC} && \ - ${CP} sdl-config sdl11-config && \ - ${CP} sdl.m4 sdl11.m4 - @${REINPLACE_CMD} 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ - ${WRKSRC}/libtool - post-install: +.if !defined(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR} - @${INSTALL_SCRIPT} ${WRKSRC}/test/configure ${EXAMPLESDIR} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/ @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/docs -.for f in BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." - @cd ${WRKSRC}/docs; ${TAR} cf - `${ECHO_CMD} [^Mm]*` | \ - (cd ${DOCSDIR}/docs; ${TAR} --unlink -xf - ) + @(cd ${WRKSRC} && \ + ${COPYTREE_SHARE} docs ${DOCSDIR}/ "! -regex .*/man3.*") .endif @${DISPLAY_MSG} diff --git a/devel/sdl12/distinfo b/devel/sdl12/distinfo index c0b9ecd964e9..79b0ccd66e40 100644 --- a/devel/sdl12/distinfo +++ b/devel/sdl12/distinfo @@ -1,3 +1,3 @@ -MD5 (SDL-1.2.9.tar.gz) = 80919ef556425ff82a8555ff40a579a0 -SHA256 (SDL-1.2.9.tar.gz) = d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9 -SIZE (SDL-1.2.9.tar.gz) = 2688179 +MD5 (SDL-1.2.11.tar.gz) = 418b42956b7cd103bfab1b9077ccc149 +SHA256 (SDL-1.2.11.tar.gz) = 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730 +SIZE (SDL-1.2.11.tar.gz) = 2796407 diff --git a/devel/sdl12/files/patch-Makefile.in b/devel/sdl12/files/patch-Makefile.in new file mode 100644 index 000000000000..aa132d337790 --- /dev/null +++ b/devel/sdl12/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Wed Jul 5 00:58:18 2006 ++++ Makefile.in Wed Jul 5 01:06:48 2006 +@@ -44,7 +44,7 @@ + LT_CURRENT = @LT_CURRENT@ + LT_RELEASE = @LT_RELEASE@ + LT_REVISION = @LT_REVISION@ +-LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++LT_LDFLAGS = -no-undefined -rpath $(libdir) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + + all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) + diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac deleted file mode 100644 index 79afca277d61..000000000000 --- a/devel/sdl12/files/patch-ac +++ /dev/null @@ -1,39 +0,0 @@ ---- configure.orig Mon Feb 23 06:32:33 2004 -+++ configure Wed Mar 17 19:23:24 2004 -@@ -21171,7 +21171,7 @@ - - - SDL_CFLAGS="" --SDL_LIBS="-lSDL" -+SDL_LIBS="-lSDL-1.1" - - - case "$target" in -@@ -25926,8 +25926,8 @@ - # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" - ;; - *-*-freebsd*) -- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" -- pthread_lib="-pthread" -+ pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}" -+ pthread_lib="${PTHREAD_LIBS}" - ;; - *-*-netbsd*) - pthread_cflags="-I/usr/pkg/include -D_REENTRANT" -@@ -28394,14 +28394,13 @@ - fi - - -- if test x$have_usb_h = xyes; then -- CFLAGS="$CFLAGS -DHAVE_USB_H" -- fi - if test x$have_usbhid_h = xyes; then - CFLAGS="$CFLAGS -DHAVE_USBHID_H" - fi - if test x$have_libusb_h = xyes; then -+ if test x$have_libusbhid_h = xno; then - CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" -+ fi - fi - if test x$have_libusbhid_h = xyes; then - CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" diff --git a/devel/sdl12/files/patch-ag b/devel/sdl12/files/patch-ag deleted file mode 100644 index ac69a60f0726..000000000000 --- a/devel/sdl12/files/patch-ag +++ /dev/null @@ -1,26 +0,0 @@ ---- src/Makefile.in.orig Mon Feb 23 08:32:05 2004 -+++ src/Makefile.in Mon Mar 8 18:41:14 2004 -@@ -296,12 +296,12 @@ - DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS) - - # The SDL library target --lib_LTLIBRARIES = libSDL.la -+lib_LTLIBRARIES = libSDL-1.1.la - libSDL_la_SOURCES = $(GENERAL_SRCS) - libSDL_la_LDFLAGS = \ - -no-undefined \ -- -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+# -release $(LT_RELEASE) \ - - libSDL_la_LIBADD = \ - main/libarch.la \ -@@ -383,7 +383,7 @@ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --libSDL.la: $(libSDL_la_OBJECTS) $(libSDL_la_DEPENDENCIES) -+libSDL-1.1.la: $(libSDL_la_OBJECTS) $(libSDL_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libSDL_la_LDFLAGS) $(libSDL_la_OBJECTS) $(libSDL_la_LIBADD) $(LIBS) - - mostlyclean-compile: diff --git a/devel/sdl12/files/patch-ah b/devel/sdl12/files/patch-ah deleted file mode 100644 index 93855790593f..000000000000 --- a/devel/sdl12/files/patch-ah +++ /dev/null @@ -1,26 +0,0 @@ ---- src/main/Makefile.in.orig Mon Feb 23 08:32:20 2004 -+++ src/main/Makefile.in Mon Mar 8 15:59:18 2004 -@@ -319,7 +319,7 @@ - - - # Build a separate library containing the main() entry point. --lib_LIBRARIES = libSDLmain.a -+lib_LIBRARIES = libSDLmain-1.1.a - @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_FALSE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c - @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_TRUE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc - @TARGET_MACOSX_TRUE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h -@@ -393,10 +393,10 @@ - - clean-libLIBRARIES: - -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) --libSDLmain.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES) -- -rm -f libSDLmain.a -- $(libSDLmain_a_AR) libSDLmain.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD) -- $(RANLIB) libSDLmain.a -+libSDLmain-1.1.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES) -+ -rm -f libSDLmain-1.1.a -+ $(libSDLmain_a_AR) libSDLmain-1.1.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD) -+ $(RANLIB) libSDLmain-1.1.a - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) diff --git a/devel/sdl12/files/patch-ai b/devel/sdl12/files/patch-ai deleted file mode 100644 index 797e6bc54295..000000000000 --- a/devel/sdl12/files/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- include/Makefile.in.orig Mon Feb 23 08:32:04 2004 -+++ include/Makefile.in Mon Mar 8 16:00:11 2004 -@@ -256,7 +256,7 @@ - target_vendor = @target_vendor@ - - # The directory where the include files will be installed --libSDLincludedir = $(includedir)/SDL -+libSDLincludedir = $(includedir)/SDL11 - - # Which header files to install - libSDLinclude_HEADERS = \ diff --git a/devel/sdl12/files/patch-aj b/devel/sdl12/files/patch-aj deleted file mode 100644 index 057d3a9e88cd..000000000000 --- a/devel/sdl12/files/patch-aj +++ /dev/null @@ -1,60 +0,0 @@ ---- Makefile.in.orig Mon Feb 23 08:32:04 2004 -+++ Makefile.in Mon Mar 8 16:01:47 2004 -@@ -81,7 +81,7 @@ - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print --ACLOCAL = @ACLOCAL@ -+ACLOCAL = #@ACLOCAL@ - ALLOCA = @ALLOCA@ - AMDEP_FALSE = @AMDEP_FALSE@ - AMDEP_TRUE = @AMDEP_TRUE@ -@@ -93,9 +93,9 @@ - ASFLAGS = @ASFLAGS@ - AUDIO_DRIVERS = @AUDIO_DRIVERS@ - AUDIO_SUBDIRS = @AUDIO_SUBDIRS@ --AUTOCONF = @AUTOCONF@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ -+AUTOCONF = #@AUTOCONF@ -+AUTOHEADER = #@AUTOHEADER@ -+AUTOMAKE = #@AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ - CCAS = @CCAS@ -@@ -285,7 +285,7 @@ - DIST_SUBDIRS = $(SUBDIRS) - - # SDL runtime configuration script --bin_SCRIPTS = sdl-config -+bin_SCRIPTS = sdl11-config - - # All the rest of the distributed files - EXTRA_DIST = \ -@@ -321,7 +321,7 @@ - EpocBuildFiles.zip \ - WhatsNew \ - docs.html \ -- sdl.m4 \ -+ sdl11.m4 \ - SDL.spec \ - autogen.sh \ - strip_fPIC.sh -@@ -329,7 +329,7 @@ - - # M4 macro file for inclusion with autoconf - m4datadir = $(datadir)/aclocal --m4data_DATA = sdl.m4 -+m4data_DATA = sdl11.m4 - - # Create a CVS snapshot that people can run update -d on - CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs -@@ -369,7 +369,7 @@ - cd $(srcdir) && $(AUTOCONF) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) --sdl-config: $(top_builddir)/config.status $(srcdir)/sdl-config.in -+sdl11-config: $(top_builddir)/config.status $(srcdir)/sdl-config.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - SDL.spec: $(top_builddir)/config.status $(srcdir)/SDL.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ diff --git a/devel/sdl12/files/patch-ak b/devel/sdl12/files/patch-ak deleted file mode 100644 index 36e1616c3f76..000000000000 --- a/devel/sdl12/files/patch-ak +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- sdl-config.in.orig Mon Sep 9 08:28:06 2002 -+++ sdl-config.in Fri Jan 3 10:43:28 2003 -@@ -5,7 +5,7 @@ - exec_prefix_set=no - - usage="\ --Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" -+Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" - - if test $# -eq 0; then - echo "${usage}" 1>&2 -@@ -39,7 +39,7 @@ - echo @SDL_VERSION@ - ;; - --cflags) -- echo -I@includedir@/SDL @SDL_CFLAGS@ -+ echo -I@includedir@/SDL11 -I@includedir@ @SDL_CFLAGS@ - - # The portable way of including SDL is #include "SDL.h" - #if test @includedir@ != /usr/include ; then diff --git a/devel/sdl12/files/patch-configure b/devel/sdl12/files/patch-configure new file mode 100644 index 000000000000..6a5419d3f9cf --- /dev/null +++ b/devel/sdl12/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig Wed Jul 5 00:52:15 2006 ++++ configure Wed Jul 5 01:01:28 2006 +@@ -29772,8 +29772,8 @@ + # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" + ;; + *-*-freebsd*|*-*-dragonfly*) +- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" +- pthread_lib="-pthread" ++ pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}" ++ pthread_lib="${PTHREAD_LIBS}" + ;; + *-*-netbsd*) + pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" diff --git a/devel/sdl12/files/patch-sdl-config.in b/devel/sdl12/files/patch-sdl-config.in new file mode 100644 index 000000000000..d12cba743f80 --- /dev/null +++ b/devel/sdl12/files/patch-sdl-config.in @@ -0,0 +1,15 @@ +# +# Temporary hack to provide iconv include directory is well +# (sdl explicitly includes iconv.h) +# +--- sdl-config.in.orig Thu Aug 31 03:54:26 2006 ++++ sdl-config.in Thu Aug 31 03:54:39 2006 +@@ -41,7 +41,7 @@ + echo @SDL_VERSION@ + ;; + --cflags) +- echo -I@includedir@/SDL @SDL_CFLAGS@ ++ echo -I@includedir@/SDL -I@includedir@ @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) + @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ diff --git a/devel/sdl12/files/patch-sdl.pc.in b/devel/sdl12/files/patch-sdl.pc.in new file mode 100644 index 000000000000..2ba3a62f80e9 --- /dev/null +++ b/devel/sdl12/files/patch-sdl.pc.in @@ -0,0 +1,12 @@ +# +# Temporary hack to provide iconv include directory is well +# (sdl explicitly includes iconv.h) +# +--- sdl.pc.in.orig Thu Aug 31 03:47:07 2006 ++++ sdl.pc.in Thu Aug 31 03:47:19 2006 +@@ -11,4 +11,4 @@ + Requires: + Conflicts: + Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ +-Cflags: -I${includedir}/SDL @SDL_CFLAGS@ ++Cflags: -I${includedir}/SDL -I${includedir} @SDL_CFLAGS@ diff --git a/devel/sdl12/files/patch-src_hermes_HeadMMX.h b/devel/sdl12/files/patch-src_hermes_HeadMMX.h deleted file mode 100644 index d525149cc39f..000000000000 --- a/devel/sdl12/files/patch-src_hermes_HeadMMX.h +++ /dev/null @@ -1,39 +0,0 @@ - -$FreeBSD$ - ---- src/hermes/HeadMMX.h.orig -+++ src/hermes/HeadMMX.h -@@ -50,21 +50,19 @@ - extern "C" { - #endif - -- void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX"))); --#if 0 -- void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32"))); -- void ClearMMX_24(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_24"))); -- void ClearMMX_16(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_16"))); -- void ClearMMX_8(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_8"))); -- -- void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555"))); --#endif -+ extern void _ConvertMMX(HermesConverterInterface *); -+ extern void _ConvertMMXpII32_24RGB888(); -+ extern void _ConvertMMXpII32_16RGB565(); -+ extern void _ConvertMMXpII32_16BGR565(); -+ extern void _ConvertMMXpII32_16RGB555(); -+ extern void _ConvertMMXpII32_16BGR555(); - -- void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888"))); -- void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565"))); -- void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565"))); -- void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555"))); -- void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555"))); -+ #define ConvertMMX _ConvertMMX -+ #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888 -+ #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565 -+ #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565 -+ #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555 -+ #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555 - - #ifdef __cplusplus - } diff --git a/devel/sdl12/files/patch-src_hermes_HeadX86.h b/devel/sdl12/files/patch-src_hermes_HeadX86.h deleted file mode 100644 index 32bb694ac66f..000000000000 --- a/devel/sdl12/files/patch-src_hermes_HeadX86.h +++ /dev/null @@ -1,96 +0,0 @@ - -$FreeBSD$ - ---- src/hermes/HeadX86.h.orig -+++ src/hermes/HeadX86.h -@@ -79,56 +79,47 @@ - extern "C" { - #endif - -- int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU"))); -+ extern int _Hermes_X86_CPU(); - -- void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86"))); -+ extern void _ConvertX86(HermesConverterInterface *); - --#if 0 -- void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32"))); -- void ClearX86_24(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_24"))); -- void ClearX86_16(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_16"))); -- void ClearX86_8(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_8"))); --#endif -+ extern void _ConvertX86p32_32BGR888(); -+ extern void _ConvertX86p32_32RGBA888(); -+ extern void _ConvertX86p32_32BGRA888(); -+ extern void _ConvertX86p32_24RGB888(); -+ extern void _ConvertX86p32_24BGR888(); -+ extern void _ConvertX86p32_16RGB565(); -+ extern void _ConvertX86p32_16BGR565(); -+ extern void _ConvertX86p32_16RGB555(); -+ extern void _ConvertX86p32_16BGR555(); -+ extern void _ConvertX86p32_8RGB332(); - -- void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888"))); -- void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888"))); -- void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888"))); -- void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888"))); -- void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888"))); -- void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565"))); -- void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565"))); -- void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555"))); -- void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555"))); -- void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332"))); -+ extern void _ConvertX86p16_16BGR565(); -+ extern void _ConvertX86p16_16RGB555(); -+ extern void _ConvertX86p16_16BGR555(); -+ extern void _ConvertX86p16_8RGB332(); - --#if 0 -- void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888"))); -- void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888"))); -- void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888"))); -- void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888"))); -- void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888"))); -- void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888"))); --#endif -- void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565"))); -- void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555"))); -- void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555"))); -- void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332"))); - --#if 0 -- void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte"))); -- void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte"))); -- void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte"))); -- void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte"))); -+ #define Hermes_X86_CPU _Hermes_X86_CPU - -- void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32"))); -- void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24"))); -- void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16"))); -+ #define ConvertX86 _ConvertX86 -+ -+ #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888 -+ #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888 -+ #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888 -+ #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888 -+ #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888 -+ #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565 -+ #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565 -+ #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555 -+ #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555 -+ #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332 -+ -+ #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565 -+ #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555 -+ #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555 -+ #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332 - -- extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86"))); -- extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86"))); -- extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86"))); -- extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86"))); --#endif - - #ifdef __cplusplus - } diff --git a/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c b/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c index e9781d32f991..629ecd38b9c1 100644 --- a/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c +++ b/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c @@ -1,6 +1,6 @@ ---- src/joystick/bsd/SDL_sysjoystick.c.orig Fri Nov 12 22:24:46 2004 -+++ src/joystick/bsd/SDL_sysjoystick.c Tue Nov 8 20:19:38 2005 -@@ -122,6 +122,12 @@ +--- src/joystick/bsd/SDL_sysjoystick.c.orig Mon May 1 12:02:40 2006 ++++ src/joystick/bsd/SDL_sysjoystick.c Wed Jul 5 01:11:57 2006 +@@ -123,6 +123,12 @@ struct report_desc *repdesc; struct report inreport; int axis_map[JOYAXE_count]; /* map present JOYAXE_* to 0,1,..*/ @@ -13,7 +13,7 @@ }; static char *joynames[MAX_JOYS]; -@@ -255,6 +261,12 @@ +@@ -257,6 +263,12 @@ joy->hwdata = hw; hw->fd = fd; hw->path = strdup(path); @@ -23,12 +23,12 @@ + hw->ymin = 0xffff; + hw->xmax = 0; + hw->ymax = 0; - if (! strncmp(path, "/dev/joy", 8)) { + if (! SDL_strncmp(path, "/dev/joy", 8)) { hw->type = BSDJOY_JOY; joy->naxes = 2; -@@ -372,43 +384,42 @@ +@@ -380,43 +392,42 @@ - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + #if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H struct joystick gameport; - static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0; diff --git a/devel/sdl12/files/patch-src_video_SDL__yuv__mmx.c b/devel/sdl12/files/patch-src_video_SDL__yuv__mmx.c deleted file mode 100644 index 836b5ee181f2..000000000000 --- a/devel/sdl12/files/patch-src_video_SDL__yuv__mmx.c +++ /dev/null @@ -1,324 +0,0 @@ - -$FreeBSD$ - ---- src/video/SDL_yuv_mmx.c.orig -+++ src/video/SDL_yuv_mmx.c -@@ -30,42 +30,31 @@ - - #include "SDL_types.h" - --#if __GNUC__ > 2 --# undef GCC2_HACK --#else --# define GCC2_HACK --#endif -- -- --#if defined(GCC2_HACK) && defined (__ELF__) --#define ASM_VAR(X) _##X --#else --#define ASM_VAR(X) X --#endif -+#define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used)) - --static volatile unsigned int ASM_VAR(MMX_0080w)[] = {0x00800080, 0x00800080}; --static volatile unsigned int ASM_VAR(MMX_00FFw)[] = {0x00ff00ff, 0x00ff00ff}; --static volatile unsigned int ASM_VAR(MMX_FF00w)[] = {0xff00ff00, 0xff00ff00}; -+static unsigned int ASM_ARRAY(MMX_0080w) = {0x00800080, 0x00800080}; -+static unsigned int ASM_ARRAY(MMX_00FFw) = {0x00ff00ff, 0x00ff00ff}; -+static unsigned int ASM_ARRAY(MMX_FF00w) = {0xff00ff00, 0xff00ff00}; - --static volatile unsigned short ASM_VAR(MMX_Ycoeff)[] = {0x004a, 0x004a, 0x004a, 0x004a}; -+static unsigned short ASM_ARRAY(MMX_Ycoeff) = {0x004a, 0x004a, 0x004a, 0x004a}; - --static volatile unsigned short ASM_VAR(MMX_UbluRGB)[] = {0x0072, 0x0072, 0x0072, 0x0072}; --static volatile unsigned short ASM_VAR(MMX_VredRGB)[] = {0x0059, 0x0059, 0x0059, 0x0059}; --static volatile unsigned short ASM_VAR(MMX_UgrnRGB)[] = {0xffea, 0xffea, 0xffea, 0xffea}; --static volatile unsigned short ASM_VAR(MMX_VgrnRGB)[] = {0xffd2, 0xffd2, 0xffd2, 0xffd2}; -+static unsigned short ASM_ARRAY(MMX_UbluRGB) = {0x0072, 0x0072, 0x0072, 0x0072}; -+static unsigned short ASM_ARRAY(MMX_VredRGB) = {0x0059, 0x0059, 0x0059, 0x0059}; -+static unsigned short ASM_ARRAY(MMX_UgrnRGB) = {0xffea, 0xffea, 0xffea, 0xffea}; -+static unsigned short ASM_ARRAY(MMX_VgrnRGB) = {0xffd2, 0xffd2, 0xffd2, 0xffd2}; - --static volatile unsigned short ASM_VAR(MMX_Ublu5x5)[] = {0x0081, 0x0081, 0x0081, 0x0081}; --static volatile unsigned short ASM_VAR(MMX_Vred5x5)[] = {0x0066, 0x0066, 0x0066, 0x0066}; --static volatile unsigned short ASM_VAR(MMX_Ugrn555)[] = {0xffe7, 0xffe7, 0xffe7, 0xffe7}; --static volatile unsigned short ASM_VAR(MMX_Vgrn555)[] = {0xffcc, 0xffcc, 0xffcc, 0xffcc}; --static volatile unsigned short ASM_VAR(MMX_Ugrn565)[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8}; --static volatile unsigned short ASM_VAR(MMX_Vgrn565)[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; -+static unsigned short ASM_ARRAY(MMX_Ublu5x5) = {0x0081, 0x0081, 0x0081, 0x0081}; -+static unsigned short ASM_ARRAY(MMX_Vred5x5) = {0x0066, 0x0066, 0x0066, 0x0066}; -+static unsigned short ASM_ARRAY(MMX_Ugrn555) = {0xffe7, 0xffe7, 0xffe7, 0xffe7}; -+static unsigned short ASM_ARRAY(MMX_Vgrn555) = {0xffcc, 0xffcc, 0xffcc, 0xffcc}; -+static unsigned short ASM_ARRAY(MMX_Ugrn565) = {0xffe8, 0xffe8, 0xffe8, 0xffe8}; -+static unsigned short ASM_ARRAY(MMX_Vgrn565) = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; - --static volatile unsigned short ASM_VAR(MMX_red555)[] = {0x7c00, 0x7c00, 0x7c00, 0x7c00}; --static volatile unsigned short ASM_VAR(MMX_red565)[] = {0xf800, 0xf800, 0xf800, 0xf800}; --static volatile unsigned short ASM_VAR(MMX_grn555)[] = {0x03e0, 0x03e0, 0x03e0, 0x03e0}; --static volatile unsigned short ASM_VAR(MMX_grn565)[] = {0x07e0, 0x07e0, 0x07e0, 0x07e0}; --static volatile unsigned short ASM_VAR(MMX_blu5x5)[] = {0x001f, 0x001f, 0x001f, 0x001f}; -+static unsigned short ASM_ARRAY(MMX_red555) = {0x7c00, 0x7c00, 0x7c00, 0x7c00}; -+static unsigned short ASM_ARRAY(MMX_red565) = {0xf800, 0xf800, 0xf800, 0xf800}; -+static unsigned short ASM_ARRAY(MMX_grn555) = {0x03e0, 0x03e0, 0x03e0, 0x03e0}; -+static unsigned short ASM_ARRAY(MMX_grn565) = {0x07e0, 0x07e0, 0x07e0, 0x07e0}; -+static unsigned short ASM_ARRAY(MMX_blu5x5) = {0x001f, 0x001f, 0x001f, 0x001f}; - - /** - This MMX assembler is my first assembler/MMX program ever. -@@ -127,21 +116,12 @@ - "movd (%2), %%mm2\n" // 0 0 0 0 l3 l2 l1 l0 - "punpcklbw %%mm7,%%mm1\n" // 0 v3 0 v2 00 v1 00 v0 - "punpckldq %%mm1,%%mm1\n" // 00 v1 00 v0 00 v1 00 v0 --#ifdef GCC2_HACK - "psubw _MMX_0080w,%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 --#else -- "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 --#endif - - // create Cr_g (result in mm0) - "movq %%mm1,%%mm0\n" // r1 r1 r0 r0 r1 r1 r0 r0 --#ifdef GCC2_HACK - "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64 - "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64 --#else -- "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64 -- "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64 --#endif - "psraw $6, %%mm0\n" // red=red/64 - "psraw $6, %%mm1\n" // red=red/64 - -@@ -150,13 +130,8 @@ - "movq (%2,%4),%%mm3\n" // 0 0 0 0 L3 L2 L1 L0 - "punpckldq %%mm3,%%mm2\n" // L3 L2 L1 L0 l3 l2 l1 l0 - "movq %%mm2,%%mm4\n" // L3 L2 L1 L0 l3 l2 l1 l0 --#ifdef GCC2_HACK - "pand _MMX_FF00w,%%mm2\n" // L3 0 L1 0 l3 0 l1 0 - "pand _MMX_00FFw,%%mm4\n" // 0 L2 0 L0 0 l2 0 l0 --#else -- "pand %[_MMX_FF00w],%%mm2\n" // L3 0 L1 0 l3 0 l1 0 -- "pand %[_MMX_00FFw],%%mm4\n" // 0 L2 0 L0 0 l2 0 l0 --#endif - "psrlw $8,%%mm2\n" // 0 L3 0 L1 0 l3 0 l1 - - // create R (result in mm6) -@@ -173,20 +148,11 @@ - "movd (%1), %%mm1\n" // 0 0 0 0 u3 u2 u1 u0 - "punpcklbw %%mm7,%%mm1\n" // 0 u3 0 u2 00 u1 00 u0 - "punpckldq %%mm1,%%mm1\n" // 00 u1 00 u0 00 u1 00 u0 --#ifdef GCC2_HACK - "psubw _MMX_0080w,%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 --#else -- "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 --#endif - // create Cb_g (result in mm5) - "movq %%mm1,%%mm5\n" // u1 u1 u0 u0 u1 u1 u0 u0 --#ifdef GCC2_HACK - "pmullw _MMX_UgrnRGB,%%mm5\n" // blue*-109dec=1.7129*64 - "pmullw _MMX_UbluRGB,%%mm1\n" // blue*114dec=1.78125*64 --#else -- "pmullw %[_MMX_UgrnRGB],%%mm5\n" // blue*-109dec=1.7129*64 -- "pmullw %[_MMX_UbluRGB],%%mm1\n" // blue*114dec=1.78125*64 --#endif - "psraw $6, %%mm5\n" // blue=red/64 - "psraw $6, %%mm1\n" // blue=blue/64 - -@@ -268,17 +234,7 @@ - "popl %%ebx\n" - : - : "m" (cr), "r"(cb),"r"(lum), -- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod) --#ifndef GCC2_HACK -- ,[_MMX_0080w] "m" (*MMX_0080w), -- [_MMX_00FFw] "m" (*MMX_00FFw), -- [_MMX_FF00w] "m" (*MMX_FF00w), -- [_MMX_VgrnRGB] "m" (*MMX_VgrnRGB), -- [_MMX_VredRGB] "m" (*MMX_VredRGB), -- [_MMX_UgrnRGB] "m" (*MMX_UgrnRGB), -- [_MMX_UbluRGB] "m" (*MMX_UbluRGB) --#endif -- ); -+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)); - } - - void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix, -@@ -307,48 +263,21 @@ - "movd (%%ebx), %%mm1\n" // 4 Cr 0 0 0 0 v3 v2 v1 v0 - "punpcklbw %%mm7, %%mm0\n" // 4 W cb 0 u3 0 u2 0 u1 0 u0 - "punpcklbw %%mm7, %%mm1\n" // 4 W cr 0 v3 0 v2 0 v1 0 v0 --#ifdef GCC2_HACK - "psubw _MMX_0080w, %%mm0\n" - "psubw _MMX_0080w, %%mm1\n" --#else -- "psubw %[_MMX_0080w], %%mm0\n" -- "psubw %[_MMX_0080w], %%mm1\n" --#endif - "movq %%mm0, %%mm2\n" // Cb 0 u3 0 u2 0 u1 0 u0 - "movq %%mm1, %%mm3\n" // Cr --#ifdef GCC2_HACK - "pmullw _MMX_Ugrn565, %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0 --#else -- "pmullw %[_MMX_Ugrn565], %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0 --#endif - "movq (%2), %%mm6\n" // L1 l7 L6 L5 L4 L3 L2 L1 L0 --#ifdef GCC2_HACK - "pmullw _MMX_Ublu5x5, %%mm0\n" // Cb2blue - "pand _MMX_00FFw, %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0 - "pmullw _MMX_Vgrn565, %%mm3\n" // Cr2green --#else -- "pmullw %[_MMX_Ublu5x5], %%mm0\n" // Cb2blue -- "pand %[_MMX_00FFw], %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0 -- "pmullw %[_MMX_Vgrn565], %%mm3\n" // Cr2green --#endif - "movq (%2), %%mm7\n" // L2 --#ifdef GCC2_HACK - "pmullw _MMX_Vred5x5, %%mm1\n" // Cr2red --#else -- "pmullw %[_MMX_Vred5x5], %%mm1\n" // Cr2red --#endif - "psrlw $8, %%mm7\n" // L2 00 L7 00 L5 00 L3 00 L1 --#ifdef GCC2_HACK - "pmullw _MMX_Ycoeff, %%mm6\n" // lum1 --#else -- "pmullw %[_MMX_Ycoeff], %%mm6\n" // lum1 --#endif - "paddw %%mm3, %%mm2\n" // Cb2green + Cr2green == green --#ifdef GCC2_HACK - "pmullw _MMX_Ycoeff, %%mm7\n" // lum2 --#else -- "pmullw %[_MMX_Ycoeff], %%mm7\n" // lum2 --#endif - - "movq %%mm6, %%mm4\n" // lum1 - "paddw %%mm0, %%mm6\n" // lum1 +blue 00 B6 00 B4 00 B2 00 B0 -@@ -366,20 +295,11 @@ - "punpcklbw %%mm4, %%mm4\n" - "punpcklbw %%mm5, %%mm5\n" - --#ifdef GCC2_HACK - "pand _MMX_red565, %%mm4\n" --#else -- "pand %[_MMX_red565], %%mm4\n" --#endif - "psllw $3, %%mm5\n" // GREEN 1 - "punpcklbw %%mm6, %%mm6\n" --#ifdef GCC2_HACK - "pand _MMX_grn565, %%mm5\n" - "pand _MMX_red565, %%mm6\n" --#else -- "pand %[_MMX_grn565], %%mm5\n" -- "pand %[_MMX_red565], %%mm6\n" --#endif - "por %%mm5, %%mm4\n" // - "psrlw $11, %%mm6\n" // BLUE 1 - "movq %%mm3, %%mm5\n" // lum2 -@@ -393,44 +313,23 @@ - "packuswb %%mm3, %%mm3\n" - "packuswb %%mm5, %%mm5\n" - "packuswb %%mm7, %%mm7\n" --#ifdef GCC2_HACK - "pand _MMX_00FFw, %%mm6\n" // L3 --#else -- "pand %[_MMX_00FFw], %%mm6\n" // L3 --#endif - "punpcklbw %%mm3, %%mm3\n" - "punpcklbw %%mm5, %%mm5\n" --#ifdef GCC2_HACK - "pmullw _MMX_Ycoeff, %%mm6\n" // lum3 --#else -- "pmullw %[_MMX_Ycoeff], %%mm6\n" // lum3 --#endif - "punpcklbw %%mm7, %%mm7\n" - "psllw $3, %%mm5\n" // GREEN 2 --#ifdef GCC2_HACK - "pand _MMX_red565, %%mm7\n" - "pand _MMX_red565, %%mm3\n" --#else -- "pand %[_MMX_red565], %%mm7\n" -- "pand %[_MMX_red565], %%mm3\n" --#endif - "psrlw $11, %%mm7\n" // BLUE 2 --#ifdef GCC2_HACK - "pand _MMX_grn565, %%mm5\n" --#else -- "pand %[_MMX_grn565], %%mm5\n" --#endif - "por %%mm7, %%mm3\n" - "movq (%2,%4), %%mm7\n" // L4 load lum2 - "por %%mm5, %%mm3\n" // - "psrlw $8, %%mm7\n" // L4 - "movq %%mm4, %%mm5\n" - "punpcklwd %%mm3, %%mm4\n" --#ifdef GCC2_HACK - "pmullw _MMX_Ycoeff, %%mm7\n" // lum4 --#else -- "pmullw %[_MMX_Ycoeff], %%mm7\n" // lum4 --#endif - "punpckhwd %%mm3, %%mm5\n" - - "movq %%mm4, (%3)\n" // write row1 -@@ -457,20 +356,11 @@ - "punpcklbw %%mm5, %%mm5\n" - "punpcklbw %%mm6, %%mm6\n" - "psllw $3, %%mm5\n" // GREEN 3 --#ifdef GCC2_HACK - "pand _MMX_red565, %%mm4\n" --#else -- "pand %[_MMX_red565], %%mm4\n" --#endif - "psraw $6, %%mm3\n" // psr 6 - "psraw $6, %%mm0\n" --#ifdef GCC2_HACK - "pand _MMX_red565, %%mm6\n" // BLUE - "pand _MMX_grn565, %%mm5\n" --#else -- "pand %[_MMX_red565], %%mm6\n" // BLUE -- "pand %[_MMX_grn565], %%mm5\n" --#endif - "psrlw $11, %%mm6\n" // BLUE 3 - "por %%mm5, %%mm4\n" - "psraw $6, %%mm7\n" -@@ -481,20 +371,11 @@ - "punpcklbw %%mm3, %%mm3\n" - "punpcklbw %%mm0, %%mm0\n" - "punpcklbw %%mm7, %%mm7\n" --#ifdef GCC2_HACK - "pand _MMX_red565, %%mm3\n" - "pand _MMX_red565, %%mm7\n" // BLUE --#else -- "pand %[_MMX_red565], %%mm3\n" -- "pand %[_MMX_red565], %%mm7\n" // BLUE --#endif - "psllw $3, %%mm0\n" // GREEN 4 - "psrlw $11, %%mm7\n" --#ifdef GCC2_HACK - "pand _MMX_grn565, %%mm0\n" --#else -- "pand %[_MMX_grn565], %%mm0\n" --#endif - "por %%mm7, %%mm3\n" - "por %%mm0, %%mm3\n" - -@@ -526,21 +407,7 @@ - "popl %%ebx\n" - : - :"m" (cr), "r"(cb),"r"(lum), -- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod) --#ifndef GCC2_HACK -- ,[_MMX_0080w] "m" (*MMX_0080w), -- [_MMX_Ugrn565] "m" (*MMX_Ugrn565), -- [_MMX_Ublu5x5] "m" (*MMX_Ublu5x5), -- [_MMX_00FFw] "m" (*MMX_00FFw), -- [_MMX_Vgrn565] "m" (*MMX_Vgrn565), -- [_MMX_Vred5x5] "m" (*MMX_Vred5x5), -- [_MMX_Ycoeff] "m" (*MMX_Ycoeff), -- [_MMX_red565] "m" (*MMX_red565), -- [_MMX_grn565] "m" (*MMX_grn565) --#endif -- ); -+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)); - } -- --#undef GCC2_HACK - - #endif /* GCC i386 inline assembly */ diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist index 685526eba179..03d578e2c8cd 100644 --- a/devel/sdl12/pkg-plist +++ b/devel/sdl12/pkg-plist @@ -1,85 +1,301 @@ -bin/sdl11-config -include/SDL11/SDL.h -include/SDL11/SDL_active.h -include/SDL11/SDL_audio.h -include/SDL11/SDL_byteorder.h -include/SDL11/SDL_cdrom.h -include/SDL11/SDL_copying.h -include/SDL11/SDL_cpuinfo.h -include/SDL11/SDL_endian.h -include/SDL11/SDL_error.h -include/SDL11/SDL_events.h -include/SDL11/SDL_getenv.h -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 -include/SDL11/SDL_name.h -include/SDL11/SDL_opengl.h -include/SDL11/SDL_quit.h -include/SDL11/SDL_rwops.h -include/SDL11/SDL_syswm.h -include/SDL11/SDL_thread.h -include/SDL11/SDL_timer.h -include/SDL11/SDL_types.h -include/SDL11/SDL_version.h -include/SDL11/SDL_video.h -include/SDL11/begin_code.h -include/SDL11/close_code.h -lib/libSDL-1.1.a -lib/libSDL-1.1.la -lib/libSDL-1.1.so -lib/libSDL-1.1.so.7 -lib/libSDLmain-1.1.a -share/aclocal/sdl11.m4 -%%EXAMPLESDIR%%/COPYING -%%EXAMPLESDIR%%/Makefile.am -%%EXAMPLESDIR%%/Makefile.in -%%EXAMPLESDIR%%/README -%%EXAMPLESDIR%%/acinclude.m4 -%%EXAMPLESDIR%%/aclocal.m4 -%%EXAMPLESDIR%%/autogen.sh -%%EXAMPLESDIR%%/checkkeys.c -%%EXAMPLESDIR%%/configure -%%EXAMPLESDIR%%/configure.in -%%EXAMPLESDIR%%/graywin.c -%%EXAMPLESDIR%%/icon.bmp -%%EXAMPLESDIR%%/loopwave.c -%%EXAMPLESDIR%%/missing -%%EXAMPLESDIR%%/moose.dat -%%EXAMPLESDIR%%/picture.xbm -%%EXAMPLESDIR%%/sail.bmp -%%EXAMPLESDIR%%/sample.bmp -%%EXAMPLESDIR%%/sample.wav -%%EXAMPLESDIR%%/testalpha.c -%%EXAMPLESDIR%%/testbitmap.c -%%EXAMPLESDIR%%/testblitspeed.c -%%EXAMPLESDIR%%/testcdrom.c -%%EXAMPLESDIR%%/testcpuinfo.c -%%EXAMPLESDIR%%/testdyngl.c -%%EXAMPLESDIR%%/testendian.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%% -@dirrmtry include/SDL11 +bin/sdl-config +include/SDL/SDL.h +include/SDL/SDL_active.h +include/SDL/SDL_audio.h +include/SDL/SDL_byteorder.h +include/SDL/SDL_cdrom.h +include/SDL/SDL_config.h +include/SDL/SDL_config_amiga.h +include/SDL/SDL_config_dreamcast.h +include/SDL/SDL_config_macos.h +include/SDL/SDL_config_macosx.h +include/SDL/SDL_config_minimal.h +include/SDL/SDL_config_os2.h +include/SDL/SDL_config_win32.h +include/SDL/SDL_copying.h +include/SDL/SDL_cpuinfo.h +include/SDL/SDL_endian.h +include/SDL/SDL_error.h +include/SDL/SDL_events.h +include/SDL/SDL_getenv.h +include/SDL/SDL_joystick.h +include/SDL/SDL_keyboard.h +include/SDL/SDL_keysym.h +include/SDL/SDL_loadso.h +include/SDL/SDL_main.h +include/SDL/SDL_mouse.h +include/SDL/SDL_mutex.h +include/SDL/SDL_name.h +include/SDL/SDL_opengl.h +include/SDL/SDL_platform.h +include/SDL/SDL_quit.h +include/SDL/SDL_rwops.h +include/SDL/SDL_stdinc.h +include/SDL/SDL_syswm.h +include/SDL/SDL_thread.h +include/SDL/SDL_timer.h +include/SDL/SDL_types.h +include/SDL/SDL_version.h +include/SDL/SDL_video.h +include/SDL/begin_code.h +include/SDL/close_code.h +lib/libSDL.a +lib/libSDL.la +lib/libSDL.so +lib/libSDL.so.11 +lib/libSDLmain.a +libdata/pkgconfig/sdl.pc +share/aclocal/sdl.m4 +%%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/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/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/sdlenvvars.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/sdlpix%%PORTOBJFORMAT%%ormat.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/images/rainbow.gif +%%PORTDOCS%%%%DOCSDIR%%/docs/index.html +%%PORTDOCS%%%%EXAMPLESDIR%%/checkkeys.c +%%PORTDOCS%%%%EXAMPLESDIR%%/graywin.c +%%PORTDOCS%%%%EXAMPLESDIR%%/icon.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/loopwave.c +%%PORTDOCS%%%%EXAMPLESDIR%%/moose.dat +%%PORTDOCS%%%%EXAMPLESDIR%%/picture.xbm +%%PORTDOCS%%%%EXAMPLESDIR%%/sail.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/sample.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/sample.wav +%%PORTDOCS%%%%EXAMPLESDIR%%/testalpha.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testbitmap.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testblitspeed.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testcdrom.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testcursor.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testdyngl.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testerror.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testfile.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testgamma.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testgl.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testhread.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testiconv.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testjoystick.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testkeys.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testlock.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testoverlay.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testoverlay2.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testpalette.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testplatform.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testsem.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testsprite.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testtimer.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testver.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testvidinfo.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testwin.c +%%PORTDOCS%%%%EXAMPLESDIR%%/testwm.c +%%PORTDOCS%%%%EXAMPLESDIR%%/threadwin.c +%%PORTDOCS%%%%EXAMPLESDIR%%/torturethread.c +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs +%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm include/SDL diff --git a/devel/sdl_ldbad/Makefile b/devel/sdl_ldbad/Makefile index cda72ffc6fec..8648dd15a5a0 100644 --- a/devel/sdl_ldbad/Makefile +++ b/devel/sdl_ldbad/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdl_ldbad PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= # none DISTFILES= # none @@ -15,6 +15,10 @@ DISTFILES= # none MAINTAINER= ports@FreeBSD.org COMMENT= A SDL Linux Developer's BandAiD +BROKEN= incorrect pkg-plist and doesn't required anymore +DEPRECATED= ${BROKEN} +EXPIRATION_DATE=2006-10-17 + USE_SDL= sdl NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile index 00a1151a4e42..aec069a8d0aa 100644 --- a/devel/sdl_sge/Makefile +++ b/devel/sdl_sge/Makefile @@ -7,6 +7,7 @@ PORTNAME= sge PORTVERSION= 0.030809 +PORTREVISION= 1 CATEGORIES= devel graphics MASTER_SITES= http://www.etek.chalmers.se/~e8cal1/sge/files/ \ http://www.digitalfanatics.org/cal/sge/files/ @@ -53,7 +54,7 @@ post-patch: @${REINPLACE_CMD} -e 's|#USE_FT = n|USE_FT = y|g' ${WRKSRC}/Makefile.conf .endif @${REINPLACE_CMD} -e 's|PREFIX =PREFIX|PREFIX =${PREFIX}|g' ${WRKSRC}/Makefile.conf - @${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL11|g' ${WRKSRC}/Makefile.conf + @${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL|g' ${WRKSRC}/Makefile.conf @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf post-install: diff --git a/devel/sdl_sge/pkg-plist b/devel/sdl_sge/pkg-plist index 43f4391742c4..312ed4f6dcff 100644 --- a/devel/sdl_sge/pkg-plist +++ b/devel/sdl_sge/pkg-plist @@ -1,16 +1,16 @@ -include/SDL11/sge.h -include/SDL11/sge_blib.h -include/SDL11/sge_bm_text.h -include/SDL11/sge_collision.h -include/SDL11/sge_config.h -include/SDL11/sge_internal.h -include/SDL11/sge_misc.h -include/SDL11/sge_primitives.h -include/SDL11/sge_rotation.h -include/SDL11/sge_shape.h -include/SDL11/sge_surface.h -include/SDL11/sge_textpp.h -include/SDL11/sge_tt_text.h +include/SDL/sge.h +include/SDL/sge_blib.h +include/SDL/sge_bm_text.h +include/SDL/sge_collision.h +include/SDL/sge_config.h +include/SDL/sge_internal.h +include/SDL/sge_misc.h +include/SDL/sge_primitives.h +include/SDL/sge_rotation.h +include/SDL/sge_shape.h +include/SDL/sge_surface.h +include/SDL/sge_textpp.h +include/SDL/sge_tt_text.h lib/libSGE.a lib/libSGE.so lib/libSGE.so.0 @@ -59,6 +59,6 @@ lib/libSGE.so.0.030809 %%PORTDOCS%%%%EXAMPLESDIR%%/sprite2.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/ttf_readme %%PORTDOCS%%%%EXAMPLESDIR%%/tux.bmp -@dirrmtry include/SDL11 +@dirrmtry include/SDL %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile index 98a9043639a3..82cfce0ce690 100644 --- a/devel/sdlmm/Makefile +++ b/devel/sdlmm/Makefile @@ -8,7 +8,7 @@ PORTNAME= sdlmm PORTVERSION= 0.1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/sge/Makefile b/devel/sge/Makefile index 00a1151a4e42..aec069a8d0aa 100644 --- a/devel/sge/Makefile +++ b/devel/sge/Makefile @@ -7,6 +7,7 @@ PORTNAME= sge PORTVERSION= 0.030809 +PORTREVISION= 1 CATEGORIES= devel graphics MASTER_SITES= http://www.etek.chalmers.se/~e8cal1/sge/files/ \ http://www.digitalfanatics.org/cal/sge/files/ @@ -53,7 +54,7 @@ post-patch: @${REINPLACE_CMD} -e 's|#USE_FT = n|USE_FT = y|g' ${WRKSRC}/Makefile.conf .endif @${REINPLACE_CMD} -e 's|PREFIX =PREFIX|PREFIX =${PREFIX}|g' ${WRKSRC}/Makefile.conf - @${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL11|g' ${WRKSRC}/Makefile.conf + @${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL|g' ${WRKSRC}/Makefile.conf @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf post-install: diff --git a/devel/sge/pkg-plist b/devel/sge/pkg-plist index 43f4391742c4..312ed4f6dcff 100644 --- a/devel/sge/pkg-plist +++ b/devel/sge/pkg-plist @@ -1,16 +1,16 @@ -include/SDL11/sge.h -include/SDL11/sge_blib.h -include/SDL11/sge_bm_text.h -include/SDL11/sge_collision.h -include/SDL11/sge_config.h -include/SDL11/sge_internal.h -include/SDL11/sge_misc.h -include/SDL11/sge_primitives.h -include/SDL11/sge_rotation.h -include/SDL11/sge_shape.h -include/SDL11/sge_surface.h -include/SDL11/sge_textpp.h -include/SDL11/sge_tt_text.h +include/SDL/sge.h +include/SDL/sge_blib.h +include/SDL/sge_bm_text.h +include/SDL/sge_collision.h +include/SDL/sge_config.h +include/SDL/sge_internal.h +include/SDL/sge_misc.h +include/SDL/sge_primitives.h +include/SDL/sge_rotation.h +include/SDL/sge_shape.h +include/SDL/sge_surface.h +include/SDL/sge_textpp.h +include/SDL/sge_tt_text.h lib/libSGE.a lib/libSGE.so lib/libSGE.so.0 @@ -59,6 +59,6 @@ lib/libSGE.so.0.030809 %%PORTDOCS%%%%EXAMPLESDIR%%/sprite2.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/ttf_readme %%PORTDOCS%%%%EXAMPLESDIR%%/tux.bmp -@dirrmtry include/SDL11 +@dirrmtry include/SDL %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/devel/upp/Makefile b/devel/upp/Makefile index 90c40c6a1168..3dce953e6451 100644 --- a/devel/upp/Makefile +++ b/devel/upp/Makefile @@ -7,6 +7,7 @@ PORTNAME= upp PORTVERSION= 605 +PORTREVISION= 1 CATEGORIES= devel x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index 8dca233d37d2..f66de44ad9af 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -7,6 +7,7 @@ PORTNAME= atari800 PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/cygne-sdl/Makefile b/emulators/cygne-sdl/Makefile index 7525bbaa4926..3f71a915d874 100644 --- a/emulators/cygne-sdl/Makefile +++ b/emulators/cygne-sdl/Makefile @@ -7,6 +7,7 @@ PORTNAME= cygne-sdl PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://sdlemu.ngemu.com/OpenProjects/ DISTNAME= Cygne-SDL-${PORTVERSION}-src diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile index e132f080392c..926ffda6628f 100644 --- a/emulators/dgen-sdl/Makefile +++ b/emulators/dgen-sdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= dgen-sdl PORTVERSION= 1.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://pknet.com/~joe/ diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile index dea4fce93db6..a079ed5b10e1 100644 --- a/emulators/dosbox/Makefile +++ b/emulators/dosbox/Makefile @@ -7,6 +7,7 @@ PORTNAME= dosbox PORTVERSION= 0.65 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile index c752d7075bc0..366809b7b1cd 100644 --- a/emulators/fceu/Makefile +++ b/emulators/fceu/Makefile @@ -7,6 +7,7 @@ PORTNAME= fceu PORTVERSION= 0.98.13 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://bsd-unix.org/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile index c752d7075bc0..366809b7b1cd 100644 --- a/emulators/fceux/Makefile +++ b/emulators/fceux/Makefile @@ -7,6 +7,7 @@ PORTNAME= fceu PORTVERSION= 0.98.13 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://bsd-unix.org/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile index fc46d3580475..0227521dd274 100644 --- a/emulators/frodo/Makefile +++ b/emulators/frodo/Makefile @@ -7,7 +7,7 @@ PORTNAME= frodo PORTVERSION= 4.1b -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators tk84 MASTER_SITES= http://frodo.cebix.net/downloads/ DISTNAME= FrodoV4_1b.Src diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index f2765e77884f..51d76ca63a02 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -7,7 +7,7 @@ PORTNAME= fuse PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= fuse-emulator diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile index 101686fa3dd5..fbaae17f4c9c 100644 --- a/emulators/gcube/Makefile +++ b/emulators/gcube/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcube PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://gcube.exemu.net/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -30,9 +31,6 @@ FIXME= general.h keys_sdl.h thpview.h video_sdl.c audio_sdl.c hw_gx.c gx.c \ gx_texture.c gx_transform.c post-patch: -.for i in ${FIXME} - ${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/${i} -.endfor ${REINPLACE_CMD} \ -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile.rules ${REINPLACE_CMD} \ diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile index 693a159e016e..03707a2518c2 100644 --- a/emulators/generator-cbiere/Makefile +++ b/emulators/generator-cbiere/Makefile @@ -7,7 +7,7 @@ PORTNAME= generator PORTVERSION= 0.35.r2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= http://www.ghostwhitecrab.com/generator/ \ diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile index 67f0e5ea3355..556eff914c08 100644 --- a/emulators/generator/Makefile +++ b/emulators/generator/Makefile @@ -7,7 +7,7 @@ PORTNAME= generator PORTVERSION= 0.35 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators MASTER_SITES= http://www.squish.net/generator/files/ diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile index 021d740c402e..cf434611eafc 100644 --- a/emulators/gens/Makefile +++ b/emulators/gens/Makefile @@ -7,7 +7,7 @@ PORTNAME= gens PORTVERSION= 2.12a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile index 4555fcc54c8b..de8a1c44302e 100644 --- a/emulators/gngb/Makefile +++ b/emulators/gngb/Makefile @@ -7,6 +7,7 @@ PORTNAME= gngb PORTVERSION= 20060309 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://m.peponas.free.fr/gngb/download/ @@ -45,7 +46,6 @@ post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|"$$SDL_CONFIG" = yes|-n "$$SDL_CONFIG"|g ; \ s|sdl-config |$$SDL_CONFIG |g ; \ - s|-lSDL|-lSDL-1.1|g ; \ s|$$OPT||g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile index a84b4506f921..b41f8a61e76b 100644 --- a/emulators/gngeo/Makefile +++ b/emulators/gngeo/Makefile @@ -7,6 +7,7 @@ PORTNAME= gngeo PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile index 62b2a328d2d1..ab29959db131 100644 --- a/emulators/gnuboy/Makefile +++ b/emulators/gnuboy/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnuboy PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators games MASTER_SITES= http://gnuboy.unix-fu.org/src/ \ http://brightrain.aerifal.cx/~laguna/src/ @@ -32,9 +32,6 @@ PORTDOCS= * PLIST_FILES= bin/sdlgnuboy bin/sgnuboy bin/xgnuboy post-patch: -.for file in sys/sdl/sdl.c sys/sdl/keymap.c - @${REINPLACE_CMD} -e "s|SDL/|SDL11/|g" ${WRKSRC}/${file} -.endfor do-install: .for file in sdlgnuboy sgnuboy xgnuboy diff --git a/emulators/gnuboy/files/patch-configure.in b/emulators/gnuboy/files/patch-configure.in index 2d0e6f9aae3a..a928b9d32aac 100644 --- a/emulators/gnuboy/files/patch-configure.in +++ b/emulators/gnuboy/files/patch-configure.in @@ -12,8 +12,8 @@ INCS="$INCS $SDL_CFLAGS" -AC_CHECK_LIB(SDL, SDL_Init, [ -AC_CHECK_HEADERS(SDL/SDL.h, ,[ -+AC_CHECK_LIB(SDL-1.1, SDL_Init, [ -+AC_CHECK_HEADERS(SDL11/SDL.h, ,[ ++AC_CHECK_LIB(SDL, SDL_Init, [ ++AC_CHECK_HEADERS(SDL/SDL.h, ,[ AC_MSG_WARN(SDL found but headers are missing!!) with_sdl=no ])], [with_sdl=no], $SDL_LIBS) diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile index c910f6f08f69..28d5e8b7d4a4 100644 --- a/emulators/hatari/Makefile +++ b/emulators/hatari/Makefile @@ -7,6 +7,7 @@ PORTNAME= hatari PORTVERSION= 0.70 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile index a407b2f38cad..5b7e7bc18adf 100644 --- a/emulators/hugo/Makefile +++ b/emulators/hugo/Makefile @@ -7,6 +7,7 @@ PORTNAME= hugo PORTVERSION= 2.12 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://www.zeograd.com/download/ diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile index d815dbed44f0..5a6b1c6e1055 100644 --- a/emulators/mednafen/Makefile +++ b/emulators/mednafen/Makefile @@ -7,6 +7,7 @@ PORTNAME= mednafen PORTVERSION= 0.6.5 +PORTREVISION= 1 CATEGORIES= emulators games MASTER_SITES= http://mednafen.com/releases/files/ diff --git a/emulators/mupen64-base/Makefile b/emulators/mupen64-base/Makefile index d677cbc4c92d..2489690b290f 100644 --- a/emulators/mupen64-base/Makefile +++ b/emulators/mupen64-base/Makefile @@ -7,7 +7,7 @@ PORTNAME= mupen64 PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= emulators MASTER_SITES= http://mupen64.emulation64.com/files/${PORTVERSION}/ PKGNAMESUFFIX= -base diff --git a/emulators/mupen64-glide/Makefile b/emulators/mupen64-glide/Makefile index 645256004211..d23dd23aa1cf 100644 --- a/emulators/mupen64-glide/Makefile +++ b/emulators/mupen64-glide/Makefile @@ -7,7 +7,7 @@ PORTNAME= mupen64 PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= emulators MASTER_SITES= http://mupen64.emulation64.com/files/0.4/ PKGNAMESUFFIX= -glide diff --git a/emulators/mupen64-gln64/Makefile b/emulators/mupen64-gln64/Makefile index 3b94f6d9644b..ba90c9f4176e 100644 --- a/emulators/mupen64-gln64/Makefile +++ b/emulators/mupen64-gln64/Makefile @@ -7,7 +7,7 @@ PORTNAME= mupen64 PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= emulators MASTER_SITES= http://mupen64.emulation64.com/files/0.4/ PKGNAMESUFFIX= -gln64 diff --git a/emulators/mupen64-input/Makefile b/emulators/mupen64-input/Makefile index 26605bc89e76..c524f90602a4 100644 --- a/emulators/mupen64-input/Makefile +++ b/emulators/mupen64-input/Makefile @@ -7,7 +7,7 @@ PORTNAME= mupen64 PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= emulators MASTER_SITES= http://mupen64.emulation64.com/files/${PORTVERSION}/ PKGNAMESUFFIX= -input diff --git a/emulators/mupen64-rice/Makefile b/emulators/mupen64-rice/Makefile index 931a5a64e119..5b9f46aee4c8 100644 --- a/emulators/mupen64-rice/Makefile +++ b/emulators/mupen64-rice/Makefile @@ -7,7 +7,7 @@ PORTNAME= mupen64 PORTVERSION= 5.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= emulators MASTER_SITES= http://mupen64.emulation64.com/files/0.4/ PKGNAMESUFFIX= -rice diff --git a/emulators/mupen64-sdlaudio/Makefile b/emulators/mupen64-sdlaudio/Makefile index 639f3bc4c2eb..87eac4044f73 100644 --- a/emulators/mupen64-sdlaudio/Makefile +++ b/emulators/mupen64-sdlaudio/Makefile @@ -7,7 +7,7 @@ PORTNAME= mupen64 PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= emulators MASTER_SITES= http://mupen64.emulation64.com/files/0.4/ PKGNAMESUFFIX= -sdlaudio diff --git a/emulators/mupen64-sdlinput/Makefile b/emulators/mupen64-sdlinput/Makefile index 221514ddb8be..0a3c129b10c8 100644 --- a/emulators/mupen64-sdlinput/Makefile +++ b/emulators/mupen64-sdlinput/Makefile @@ -7,6 +7,7 @@ PORTNAME= mupen64 PORTVERSION= 0.0.8 +PORTREVISION= 1 CATEGORIES+= emulators MASTER_SITES= http://mupen64.emulation64.com/files/0.4/ PKGNAMESUFFIX= -sdlinput diff --git a/emulators/nonpareil/Makefile b/emulators/nonpareil/Makefile index 243a27da816d..d1bf99fad769 100644 --- a/emulators/nonpareil/Makefile +++ b/emulators/nonpareil/Makefile @@ -7,6 +7,7 @@ PORTNAME= nonpareil PORTVERSION= 0.77 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://nonpareil.brouhaha.com/download/ diff --git a/emulators/nonpareil/files/patch-src_SConscript b/emulators/nonpareil/files/patch-src_SConscript index 36573db5fad5..c2e97cc66f9e 100644 --- a/emulators/nonpareil/files/patch-src_SConscript +++ b/emulators/nonpareil/files/patch-src_SConscript @@ -5,7 +5,7 @@ pkg_config_cmd += ' --cflags --libs ' -sdl_pkg_config_cmd = 'sdl-config --cflags --libs' -+sdl_pkg_config_cmd = 'sdl11-config --cflags --libs' ++sdl_pkg_config_cmd = 'sdl-config --cflags --libs' build_env.Append (CPPPATH = ['.']) build_env.Append (CPPPATH = ['#/build/common']) # generated includes diff --git a/emulators/nonpareil/files/patch-src_sound.c b/emulators/nonpareil/files/patch-src_sound.c deleted file mode 100644 index b7d7482cc91b..000000000000 --- a/emulators/nonpareil/files/patch-src_sound.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src.orig/sound.c Mon Jul 24 14:38:57 2006 -+++ src/sound.c Mon Jul 24 14:39:06 2006 -@@ -24,7 +24,7 @@ - #include <stdlib.h> - #include <string.h> - --#include "SDL/SDL_audio.h" -+#include "SDL11/SDL_audio.h" - - #include "util.h" - #include "sound.h" diff --git a/emulators/openmsx/files/patch-build_platform-freebsd.mk b/emulators/openmsx/files/patch-build_platform-freebsd.mk new file mode 100644 index 000000000000..3a4bf8d45c14 --- /dev/null +++ b/emulators/openmsx/files/patch-build_platform-freebsd.mk @@ -0,0 +1,11 @@ +--- ./build/platform-freebsd.mk.orig Tue Sep 12 17:34:24 2006 ++++ ./build/platform-freebsd.mk Tue Sep 12 17:34:38 2006 +@@ -45,7 +45,7 @@ + # Meta-port "sdl_ldbad" makes symlink to sdl11-config as sdl-config. + # But for users who use packages only, here use sdl11-config from ports/packages "sdl12". + # Why "11" even "sdl12" ? We don't know. Ask to maintainer of "sdl12" ports/packages... +-SDLCONFIGSCRIPT?=$(PKGBASE)/bin/sdl11-config ++SDLCONFIGSCRIPT?=$(PKGBASE)/bin/sdl-config + + SDL_CFLAGS:=`$(SDLCONFIGSCRIPT) --cflags 2>> $(LOG)` + diff --git a/emulators/osmose/Makefile b/emulators/osmose/Makefile index b0e5ba44692e..e3f57868231b 100644 --- a/emulators/osmose/Makefile +++ b/emulators/osmose/Makefile @@ -7,6 +7,7 @@ PORTNAME= osmose PORTVERSION= 0.6.30 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile index e2ae8774befa..d8178a622622 100644 --- a/emulators/pearpc/Makefile +++ b/emulators/pearpc/Makefile @@ -7,6 +7,7 @@ PORTNAME= pearpc PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index f5029fc801ee..8b7463b59818 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= qemu PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ http://people.fruitsalad.org/nox/qemu/:snapshot \ diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index f5029fc801ee..8b7463b59818 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -7,7 +7,7 @@ PORTNAME= qemu PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ http://people.fruitsalad.org/nox/qemu/:snapshot \ diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile index fe4f327c8533..a8a1757f85dd 100644 --- a/emulators/raine/Makefile +++ b/emulators/raine/Makefile @@ -7,6 +7,7 @@ PORTNAME= raine PORTVERSION= 0.43.3 +PORTREVISION= 1 CATEGORIES= emulators games MASTER_SITES= http://www.rainemu.com/html/archive/ DISTNAME= ${PORTNAME}s-${PORTVERSION} diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile index b9f75b9c5383..a6661f2580e9 100644 --- a/emulators/stella/Makefile +++ b/emulators/stella/Makefile @@ -7,6 +7,7 @@ PORTNAME= stella PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile index a2555561ff3d..ce4f54f7833d 100644 --- a/emulators/vba/Makefile +++ b/emulators/vba/Makefile @@ -6,7 +6,7 @@ PORTNAME= vba PORTVERSION= 1.7.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index f4b8d3410ea5..45d1c24831c8 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -6,6 +6,7 @@ PORTNAME= vice PORTVERSION= 1.20 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \ http://fresh.t-systems-sfr.com/linux/src/ \ diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 33f9f5dd1870..85d2879e4b19 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -7,6 +7,7 @@ PORTNAME?= xmame PORTVERSION?= 0.106 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://www.franksworld.org/dist/xmame/:xmame \ http://x.mame.net/download/:xmame \ diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile index 24f97cc99a57..7f01b963b2a1 100644 --- a/emulators/xsystem35/Makefile +++ b/emulators/xsystem35/Makefile @@ -7,7 +7,7 @@ PORTNAME= xsystem35 PORTVERSION= 1.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://8ne.sakura.ne.jp:20008/chika/unitbase/xsys35/down/ diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile index 48582eeb81ea..aa7a0b6c2278 100644 --- a/emulators/yabause/Makefile +++ b/emulators/yabause/Makefile @@ -7,6 +7,7 @@ PORTNAME= yabause PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= SF diff --git a/emulators/yape/Makefile b/emulators/yape/Makefile index a4983af296fb..6270c267ff8e 100644 --- a/emulators/yape/Makefile +++ b/emulators/yape/Makefile @@ -7,6 +7,7 @@ PORTNAME= yape PORTVERSION= 0.32.4 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://yape.homeserver.hu/download/ DISTNAME= ${PORTNAME}SDL-${PORTVERSION} diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index 803e3b5c083c..61e862ea0d93 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -7,7 +7,7 @@ PORTNAME= zsnes PORTVERSION= 1.42 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/games/54321/Makefile b/games/54321/Makefile index f69b9f1f1f74..07d0a003fc31 100644 --- a/games/54321/Makefile +++ b/games/54321/Makefile @@ -7,7 +7,7 @@ PORTNAME= 54321 PORTVERSION= 1.0.2001.11.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.nklein.com/products/54321/${PORTVERSION}/ DISTNAME= ${PORTNAME} diff --git a/games/54321/files/variables.GNU b/games/54321/files/variables.GNU index f6d1e4a617a4..e2fea19aeccb 100644 --- a/games/54321/files/variables.GNU +++ b/games/54321/files/variables.GNU @@ -8,11 +8,11 @@ MKDIR_CMD = test -d $(@D) || mkdir -p $(@D) SDL := ${LOCALBASE} SDL_IMAGE := ${LOCALBASE} -CPPFLAGS += -I${SDL}/include/SDL11 -I${SDL_IMAGE}/include/SDL11 +CPPFLAGS += -I${SDL}/include/SDL -I${SDL}/include -I${SDL_IMAGE}/include/SDL LDFLAGS += \ -L${SDL_IMAGE}/lib -Wl,-rpath -Wl,${SDL_IMAGE}/lib \ -L${SDL}/lib -Wl,-rpath -Wl,${SDL}/lib \ - -lSDL_image -lSDL-1.1 -lSDLmain-1.1 -pthread -lpng + -lSDL_image -lSDL -lSDLmain -pthread -lpng prog: Release/54321-$(OPSYS) diff --git a/games/abe/Makefile b/games/abe/Makefile index 297aa3e00f36..2b358fc327f5 100644 --- a/games/abe/Makefile +++ b/games/abe/Makefile @@ -7,6 +7,7 @@ PORTNAME= abe PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile index f7504b5bd24f..e823100fa795 100644 --- a/games/abuse_sdl/Makefile +++ b/games/abuse_sdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= abuse_sdl PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.labyrinth.net.au/~trandor/abuse/files/ diff --git a/games/adgali/Makefile b/games/adgali/Makefile index 3d2ef4b06cdc..fa501e1b7d44 100644 --- a/games/adgali/Makefile +++ b/games/adgali/Makefile @@ -8,7 +8,7 @@ PORTNAME= adgali PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games devel MASTER_SITES= http://adgali.apiou.org/download/ diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile index d080bece70b1..054895e6907e 100644 --- a/games/adonthell/Makefile +++ b/games/adonthell/Makefile @@ -7,6 +7,7 @@ PORTNAME= adonthell PORTVERSION= 0.3.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -36,9 +37,6 @@ BROKEN= Does not build on sparc64 .endif post-extract: -.for f in configure src/fileops.cc src/gametime.cc src/image.cc src/win_types.h - @${REINPLACE_CMD} -e 's@SDL/SDL@SDL11/SDL@g' ${WRKSRC}/$f -.endfor post-install: cd ${WRKDIR}/wastesedge-${PORTVERSION} && \ diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile index 08d941814757..b5c864e07770 100644 --- a/games/afternoonstalker/Makefile +++ b/games/afternoonstalker/Makefile @@ -7,7 +7,7 @@ PORTNAME= afternoonstalker PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/ diff --git a/games/agame/Makefile b/games/agame/Makefile index cab4a770d265..1b2cabb4bfb1 100644 --- a/games/agame/Makefile +++ b/games/agame/Makefile @@ -7,6 +7,7 @@ PORTNAME= agame PORTVERSION= 1577 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://zevv.nl/code/game/ \ http://critical.ch/distfiles/ \ diff --git a/games/airrox/Makefile b/games/airrox/Makefile index c8bd355ec133..8172f412d98a 100644 --- a/games/airrox/Makefile +++ b/games/airrox/Makefile @@ -7,7 +7,7 @@ PORTNAME= airrox PORTVERSION= 0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/alephone/Makefile b/games/alephone/Makefile index 793a9c4e1554..e3dc865efe22 100644 --- a/games/alephone/Makefile +++ b/games/alephone/Makefile @@ -7,6 +7,7 @@ PORTNAME= alephone PORTVERSION= 20060701 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= marathon diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index b56c095a3df0..576440686ba5 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -7,6 +7,7 @@ PORTNAME= alienarena PORTVERSION= 2007 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.alienarena.org/downloads/ \ http://www.forsakenweb.com/gamepage/loaders/games/ diff --git a/games/alienblaster/Makefile b/games/alienblaster/Makefile index 7f6e14e08a71..10336a47c28a 100644 --- a/games/alienblaster/Makefile +++ b/games/alienblaster/Makefile @@ -7,6 +7,7 @@ PORTNAME= alienblaster PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.informatik.uni-bremen.de/~schwardt/alienblaster/ EXTRACT_SUFX= .tgz diff --git a/games/amphetamine/Makefile b/games/amphetamine/Makefile index 4f9d5e318858..3e032a5ec12b 100644 --- a/games/amphetamine/Makefile +++ b/games/amphetamine/Makefile @@ -7,7 +7,7 @@ PORTNAME= amphetamine PORTVERSION= 0.8.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://n.ethz.ch/student/loehrerl/amph/files/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/games/anagramarama/Makefile b/games/anagramarama/Makefile index e063fff6d9f6..5c474e965a18 100644 --- a/games/anagramarama/Makefile +++ b/games/anagramarama/Makefile @@ -7,7 +7,7 @@ PORTNAME= anagramarama PORTVERSION= 0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.omega.clara.net/anagramarama/dist/ diff --git a/games/annelid/Makefile b/games/annelid/Makefile index 236756026951..2f4d1ce99017 100644 --- a/games/annelid/Makefile +++ b/games/annelid/Makefile @@ -7,7 +7,7 @@ PORTNAME= annelid PORTVERSION= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.garthgillespie.com/annelid/ \ ${MASTER_SITE_LOCAL} diff --git a/games/apoolGL/Makefile b/games/apoolGL/Makefile index 343af6229203..907ab4e6691d 100644 --- a/games/apoolGL/Makefile +++ b/games/apoolGL/Makefile @@ -7,6 +7,7 @@ PORTNAME= apoolGL PORTVERSION= 0.99.22 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.planetjahn.de/files/ DISTNAME= ${PORTNAME}-099-pre22 diff --git a/games/aqbubble/Makefile b/games/aqbubble/Makefile index 1b23762feb15..29fa64abff7f 100644 --- a/games/aqbubble/Makefile +++ b/games/aqbubble/Makefile @@ -7,6 +7,7 @@ PORTNAME= aqbubble PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/juegos/aqbubble/descargas/ @@ -37,12 +38,10 @@ PLIST_SUB+= NLS="" .endif post-extract: - @${FIND} -E ${WRKSRC}/src/ -type f -iregex ".*\.(cpp|h)" \ - -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's/<SDL/<SDL11/' - @${REINPLACE_CMD} -e 's/-lSDL /`sdl11-config --libs`/g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's/-lSDL /`sdl-config --libs`/g' ${WRKSRC}/configure post-configure: - @${REINPLACE_CMD} -e 's/-lSDL /`sdl11-config --libs` -lintl /g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's/-lSDL /`sdl-config --libs` -lintl /g' ${WRKSRC}/src/Makefile do-install: ${MKDIR} ${DATADIR} diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile index caa2c80b66b7..e35b03340aa2 100644 --- a/games/armagetron/Makefile +++ b/games/armagetron/Makefile @@ -8,6 +8,7 @@ PORTNAME= armagetron PORTVERSION= 0.2.7.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= armagetronad diff --git a/games/asc/Makefile b/games/asc/Makefile index eb65dfbdca93..daa13508bf7c 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -7,6 +7,7 @@ PORTNAME= asc PORTVERSION= 1.16.3.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= asc-hq diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile index 83c018f1c4f0..675dfd2c8ec8 100644 --- a/games/atr3d/Makefile +++ b/games/atr3d/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ glut.4:${PORTSDIR}/graphics/libglut \ alut.1:${PORTSDIR}/audio/freealut -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/games/atris/Makefile b/games/atris/Makefile index cd7924f63d79..289454486046 100644 --- a/games/atris/Makefile +++ b/games/atris/Makefile @@ -7,6 +7,7 @@ PORTNAME= atris PORTVERSION= 1.0.7 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.cs.berkeley.edu/~weimer/atris/ diff --git a/games/balazar/Makefile b/games/balazar/Makefile index 8a14985e41fa..db33282e55be 100644 --- a/games/balazar/Makefile +++ b/games/balazar/Makefile @@ -7,7 +7,7 @@ PORTNAME= balazar PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games python MASTER_SITES= http://download.gna.org/balazar/ DISTNAME= Balazar-${PORTVERSION} diff --git a/games/barrage/Makefile b/games/barrage/Makefile index c3cc105b169c..e68d22485cbe 100644 --- a/games/barrage/Makefile +++ b/games/barrage/Makefile @@ -7,6 +7,7 @@ PORTNAME= barrage PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lgames diff --git a/games/biloba/Makefile b/games/biloba/Makefile index 92876f2f44dc..6464ef9b888b 100644 --- a/games/biloba/Makefile +++ b/games/biloba/Makefile @@ -7,6 +7,7 @@ PORTNAME= biloba PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,6 +23,5 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/src/Makefile.server - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/games/bitefusion/Makefile b/games/bitefusion/Makefile index 3f70bdf7c845..86d76e9e34af 100644 --- a/games/bitefusion/Makefile +++ b/games/bitefusion/Makefile @@ -7,6 +7,7 @@ PORTNAME= bitefusion PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.junoplay.com/files/ @@ -25,7 +26,6 @@ PLIST_FILES= bin/bitefusion .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/*.c @${REINPLACE_CMD} -e 's|-linux-gnu|-portbld-freebsd|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lSDL||' ${WRKSRC}/Makefile.in diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile index 85e48359fdec..cfa9a594a160 100644 --- a/games/blinkensisters/Makefile +++ b/games/blinkensisters/Makefile @@ -7,6 +7,7 @@ PORTNAME= blinkensisters PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,7 +22,7 @@ USE_SDL= sdl mixer image ttf WRKSRC= ${WRKDIR}/LostPixels_${PORTVERSION} -MAKE_ARGS= CC="${CC}" +MAKE_ARGS= CC="${CXX}" PORTDOCS= AUTHORS HOWTOPLAY INSTALL README SCRIPTING diff --git a/games/blobandconquer/files/patch-src_headers.h b/games/blobandconquer/files/patch-src_headers.h index 6a9e3bc1fb9d..55ba4cdd8393 100644 --- a/games/blobandconquer/files/patch-src_headers.h +++ b/games/blobandconquer/files/patch-src_headers.h @@ -8,20 +8,3 @@ #include "stdlib.h" #include "stdio.h" #include "string.h" -@@ -30,11 +31,11 @@ - - #include "zlib.h" - --#include "SDL/SDL.h" --#include "SDL/SDL_image.h" --#include "SDL/SDL_mixer.h" --#include "SDL/SDL_ttf.h" --#include "SDL/SDL_endian.h" -+#include "SDL11/SDL.h" -+#include "SDL11/SDL_image.h" -+#include "SDL11/SDL_mixer.h" -+#include "SDL11/SDL_ttf.h" -+#include "SDL11/SDL_endian.h" - - #include "GL/gl.h" - #include "GL/glu.h" diff --git a/games/bloboats/Makefile b/games/bloboats/Makefile index 5f4a02cc49d2..a03cc2bcd78d 100644 --- a/games/bloboats/Makefile +++ b/games/bloboats/Makefile @@ -7,6 +7,7 @@ PORTNAME= bloboats PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://mirror.kapsi.fi/bloboats.dy.fi/ \ http://koti.mbnet.fi/makegho/c/blobtrox/ \ diff --git a/games/bloboats/files/patch-Makefile b/games/bloboats/files/patch-Makefile index cc6d8adae4b1..22e6282cc0a0 100644 --- a/games/bloboats/files/patch-Makefile +++ b/games/bloboats/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Aug 3 01:05:54 2006 -+++ Makefile Sun Sep 17 00:19:51 2006 +--- Makefile.orig Thu Aug 3 03:05:54 2006 ++++ Makefile Mon Sep 18 20:46:22 2006 @@ -7,16 +7,16 @@ ### Installation directory (Installation prefix) # If you don't have root privileges, set this to /home/tentacleman/bloboats/ @@ -29,7 +29,7 @@ ### Only some random settings below -@@ -60,7 +60,7 @@ +@@ -60,12 +60,12 @@ CXX_MACOSX = g++ CXX_CROSS = i586-mingw32msvc-g++ @@ -38,6 +38,12 @@ ### SDL-Config in your system + SDLCONFIG_DEFAULT = sdl-config +-SDLCONFIG_FREEBSD = sdl11-config ++SDLCONFIG_FREEBSD = sdl-config + SDLCONFIG_NETBSD = sdl-config + SDLCONFIG_MACOSX = sdl-config + SDLCONFIG_CROSS = i586-mingw32msvc-sdl-config @@ -74,7 +74,7 @@ ### Libs diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile index e55cc0f6e8a3..3fec8f312b71 100644 --- a/games/blobwars/Makefile +++ b/games/blobwars/Makefile @@ -28,10 +28,6 @@ PORTDOCS= * post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/makefile -.for f in src/headers.h src/CFileData.cpp src/CPak.cpp src/pak.h - @${REINPLACE_CMD} -e 's|SDL/SDL\([_a-z]*\)\.h|SDL11/SDL\1.h|' \ - ${WRKSRC}/${f} -.endfor .if !defined(NOPORTDOCS) post-install: diff --git a/games/bloodfrontier/Makefile b/games/bloodfrontier/Makefile index 29250c6da657..2d7da99514b5 100644 --- a/games/bloodfrontier/Makefile +++ b/games/bloodfrontier/Makefile @@ -7,6 +7,7 @@ PORTNAME= sauerbraten PORTVERSION= 20060912 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile index 12f47e287b6f..393b5ec65d7b 100644 --- a/games/bomberclone/Makefile +++ b/games/bomberclone/Makefile @@ -7,6 +7,7 @@ PORTNAME= bomberclone PORTVERSION= 0.11.7 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile index 0ed73dfe33c4..5c2b421c433f 100644 --- a/games/bomberinstinct/Makefile +++ b/games/bomberinstinct/Makefile @@ -7,7 +7,7 @@ PORTNAME= bomberinstinct PORTVERSION= 0.8.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/bomns/Makefile b/games/bomns/Makefile index 6b24e670b797..2ba65e6b092e 100644 --- a/games/bomns/Makefile +++ b/games/bomns/Makefile @@ -7,7 +7,7 @@ PORTNAME= bomns PORTVERSION= 0.99.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= greenridge diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile index 6ec1f8610f77..41c8b2391b5e 100644 --- a/games/briquolo/Makefile +++ b/games/briquolo/Makefile @@ -7,6 +7,7 @@ PORTNAME= briquolo PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://briquolo.free.fr/download/ diff --git a/games/bugsquish/Makefile b/games/bugsquish/Makefile index 62a72149b8a5..c780c377bc09 100644 --- a/games/bugsquish/Makefile +++ b/games/bugsquish/Makefile @@ -7,6 +7,7 @@ PORTNAME= bugsquish PORTVERSION= 0.0.6 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/bugsquish/src/ diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile index c196ecf7b71a..9423216dac41 100644 --- a/games/burgerspace/Makefile +++ b/games/burgerspace/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= gengameng.4:${PORTSDIR}/devel/gengameng \ USE_GETOPT_LONG=yes GNU_CONFIGURE= yes -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib CCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 7a3db4c291d6..9b13e248db4d 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -7,6 +7,7 @@ PORTNAME= bzflag PORTVERSION= 2.0.8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile index 427fae260b85..1c29b98910ac 100644 --- a/games/ceferino/Makefile +++ b/games/ceferino/Makefile @@ -7,6 +7,7 @@ PORTNAME= ceferino PORTVERSION= 0.97.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/juegos/ceferino/descargas/ @@ -42,9 +43,7 @@ BROKEN= Does not compile .endif post-extract: - @${FIND} -E ${WRKSRC}/src/ -type f -iregex ".*\.(cc|h)" \ - -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's/<SDL/<SDL11/' - @${REINPLACE_CMD} -e 's/-lSDL /`sdl11-config --libs`/g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's/-lSDL /`sdl-config --libs`/g' ${WRKSRC}/configure post-configure: @${REINPLACE_CMD} -e 's/-pthread/-pthread -lintl/g' ${WRKSRC}/src/Makefile diff --git a/games/chanta/Makefile b/games/chanta/Makefile index c2d0cbbfd42d..3504ea35bb0a 100644 --- a/games/chanta/Makefile +++ b/games/chanta/Makefile @@ -7,6 +7,7 @@ PORTNAME= chanta PORTVERSION= 0.15 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/juegos/chanta/descargas/ @@ -24,12 +25,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CHANTADIRS= data ima -post-extract: - @${FIND} -E ${WRKSRC}/src/ -type f -iregex ".*\.(cpp|h)" \ - -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's/<SDL/<SDL11/' - post-configure: - @${REINPLACE_CMD} -e 's|-lSDL |`sdl11-config --libs` |g' ${WRKSRC}/src/${MAKEFILE} + @${REINPLACE_CMD} -e 's|-lSDL |`sdl-config --libs` |g' ${WRKSRC}/src/${MAKEFILE} @${REINPLACE_CMD} -e 's|^CXXFLAGS|^CXXFLAGS?|g' ${WRKSRC}/src/${MAKEFILE} do-install: diff --git a/games/chanta/files/patch-configure b/games/chanta/files/patch-configure index 15b0d999b59e..3ba9c082eb1e 100644 --- a/games/chanta/files/patch-configure +++ b/games/chanta/files/patch-configure @@ -5,7 +5,7 @@ else ac_check_lib_save_LIBS=$LIBS -LIBS="-lSDL $LIBS" -+LIBS="`sdl11-config --libs` $LIBS" ++LIBS="`sdl-config --libs` $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14,7 +14,7 @@ else ac_check_lib_save_LIBS=$LIBS -LIBS="-lSDL_mixer $LIBS" -+LIBS="-lSDL_mixer `sdl11-config --libs` $LIBS" ++LIBS="-lSDL_mixer `sdl-config --libs` $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23,7 +23,7 @@ else ac_check_lib_save_LIBS=$LIBS -LIBS="-lSDL_image $LIBS" -+LIBS="-lSDL_image `sdl11-config --libs` $LIBS" ++LIBS="-lSDL_image `sdl-config --libs` $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF diff --git a/games/chromium-bsu/scripts/configure b/games/chromium-bsu/scripts/configure index 0db67b050ac7..71a956abd488 100644 --- a/games/chromium-bsu/scripts/configure +++ b/games/chromium-bsu/scripts/configure @@ -1,5 +1,5 @@ -SDL_CONFIG=sdl11-config +SDL_CONFIG=sdl-config SMPEG_CONFIG=smpeg-config OPENAL_CONFIG_OPTS="./configure --enable-sdl --enable-smpeg --enable-vorbis" SDL_LIBS="\`\$(SDL_CONFIG) --libs\`" diff --git a/games/chromium/scripts/configure b/games/chromium/scripts/configure index 0db67b050ac7..71a956abd488 100644 --- a/games/chromium/scripts/configure +++ b/games/chromium/scripts/configure @@ -1,5 +1,5 @@ -SDL_CONFIG=sdl11-config +SDL_CONFIG=sdl-config SMPEG_CONFIG=smpeg-config OPENAL_CONFIG_OPTS="./configure --enable-sdl --enable-smpeg --enable-vorbis" SDL_LIBS="\`\$(SDL_CONFIG) --libs\`" diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile index f67663d8d21d..97289d722e5f 100644 --- a/games/circuslinux/Makefile +++ b/games/circuslinux/Makefile @@ -7,7 +7,7 @@ PORTNAME= circuslinux PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/circus-linux/src/ diff --git a/games/columns/Makefile b/games/columns/Makefile index 330979e081dd..3898704f0fbd 100644 --- a/games/columns/Makefile +++ b/games/columns/Makefile @@ -7,7 +7,7 @@ PORTNAME= columns PORTVERSION= 1.2b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games # mastersite disappeared in December 2000 MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/games/concentration/Makefile b/games/concentration/Makefile index 81441b44e338..0c33dda51016 100644 --- a/games/concentration/Makefile +++ b/games/concentration/Makefile @@ -7,6 +7,7 @@ PORTNAME= concentration PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.shiftygames.com/concentration/ @@ -25,7 +26,6 @@ CONFIGURE_ENV= LDFLAGS="`${SDL_CONFIG} --libs`" \ MAN6= concentration.6 post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' ${WRKSRC}/configure ${WRKSRC}/src/sound.c @${REINPLACE_CMD} -e 's|-std=gnu99 ||g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile index 0f27e92e1cb2..881620c7ee2f 100644 --- a/games/connectfive/Makefile +++ b/games/connectfive/Makefile @@ -7,6 +7,7 @@ PORTNAME= connectfive PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= connectfive @@ -28,7 +29,6 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/connectFive post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/*.cpp ${WRKSRC}/*.h @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile.linux @${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/connect.cpp diff --git a/games/crimson/Makefile b/games/crimson/Makefile index 0ab664cb3620..f18939cc4500 100644 --- a/games/crimson/Makefile +++ b/games/crimson/Makefile @@ -6,6 +6,7 @@ PORTNAME= crimson PORTVERSION= 0.4.9 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://crimson.seul.org/files/ PKGNAMESUFFIX= -fields diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index 65199912026b..af4888cf71b9 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -7,6 +7,7 @@ PORTNAME= criticalmass PORTVERSION= 1.0.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile index 0bd0b8cf21c6..030ec3ae16a9 100644 --- a/games/crossfire-client/Makefile +++ b/games/crossfire-client/Makefile @@ -7,6 +7,7 @@ PORTNAME= crossfire-client PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.ifi.uio.no/pub/crossfire/ \ diff --git a/games/csmash/Makefile b/games/csmash/Makefile index a954d38d6408..d5be1d2ea0c0 100644 --- a/games/csmash/Makefile +++ b/games/csmash/Makefile @@ -8,7 +8,7 @@ PORTNAME= csmash PORTVERSION= 0.6.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cannonsmash diff --git a/games/cube/Makefile b/games/cube/Makefile index ffc57023a9ca..5cefd03ea1c7 100644 --- a/games/cube/Makefile +++ b/games/cube/Makefile @@ -7,6 +7,7 @@ PORTNAME= cube PORTVERSION= 2005.08.29 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/d2x/Makefile b/games/d2x/Makefile index 322ecf7ae6e2..79dfdc420c64 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -7,6 +7,7 @@ PORTNAME= d2x PORTVERSION= 0.2.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.icculus.org/d2x/src/ diff --git a/games/dangen/Makefile b/games/dangen/Makefile index 103e1a7a0c8b..5e5b3278ff02 100644 --- a/games/dangen/Makefile +++ b/games/dangen/Makefile @@ -7,6 +7,7 @@ PORTNAME= dangen PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.interq.or.jp/libra/oohara/dangen/ diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile index c319f2fd1b11..8ba602faeaf2 100644 --- a/games/dangerdeep/Makefile +++ b/games/dangerdeep/Makefile @@ -7,7 +7,7 @@ PORTNAME= dangerdeep PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= dangerdeep diff --git a/games/dangerdeep/files/patch-SConstruct b/games/dangerdeep/files/patch-SConstruct index b0e95e2a6a1e..c4045dce0d1d 100644 --- a/games/dangerdeep/files/patch-SConstruct +++ b/games/dangerdeep/files/patch-SConstruct @@ -1,6 +1,11 @@ ---- SConstruct Fri Apr 14 05:13:03 2006 -+++ SConstruct Fri Apr 14 16:18:12 2006 -@@ -81,6 +81,7 @@ +--- SConstruct.orig Fri Apr 14 14:13:03 2006 ++++ SConstruct Tue Sep 12 18:18:20 2006 +@@ -77,10 +77,11 @@ + SDL_CONFIG = os.environ['SDL_CONFIG'] + env.Replace(CC = os.environ['CC']) + env.Replace(CXX = os.environ['CXX']) +- env.Append(CPPPATH = [LOCALBASE + '/include', LOCALBASE + '/include/SDL11', X11BASE + '/include', X11BASE + '/include/GL']) ++ env.Append(CPPPATH = [LOCALBASE + '/include', LOCALBASE + '/include/SDL', X11BASE + '/include', X11BASE + '/include/GL']) libpath = [LOCALBASE + '/lib', X11BASE + '/lib'] gllibs = ['GL', 'GLU'] sdllibs = ['SDL_image'] diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile index e6a69666b798..e825bfe68fd2 100644 --- a/games/darkplaces/Makefile +++ b/games/darkplaces/Makefile @@ -7,6 +7,7 @@ PORTNAME= darkplaces PORTVERSION= 20060725 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org/twilight/darkplaces/files/ DISTNAME= ${PORTNAME}engine${PORTVERSION} diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile index 2a830a919285..b1e5d843e934 100644 --- a/games/defendguin/Makefile +++ b/games/defendguin/Makefile @@ -7,6 +7,7 @@ PORTNAME= defendguin PORTVERSION= 0.0.11 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/defendguin/src/ diff --git a/games/demonquake/Makefile b/games/demonquake/Makefile index 6c5508b0e849..64eda021ce22 100644 --- a/games/demonquake/Makefile +++ b/games/demonquake/Makefile @@ -7,6 +7,7 @@ PORTNAME= demonquake PORTVERSION= 0.16 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/ DISTNAME= DemonQuake-v${PORTVERSION}-bin-src.linux diff --git a/games/deng/Makefile b/games/deng/Makefile index cae63d793757..28e3d608b825 100644 --- a/games/deng/Makefile +++ b/games/deng/Makefile @@ -7,6 +7,7 @@ PORTNAME= deng PORTVERSION= 1.9.0b4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/-beta/} diff --git a/games/diameter/Makefile b/games/diameter/Makefile index 3a42987d0bf2..fd3255910ba0 100644 --- a/games/diameter/Makefile +++ b/games/diameter/Makefile @@ -36,7 +36,6 @@ BROKEN= Does not build on FreeBSD 4.x .endif post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/src/snd/snd.h @${REINPLACE_CMD} -e '/PKG_CONFIG/ s|libpng|libpng12|' \ -e 's|sdl-config|$$SDL_CONFIG|' \ -e '/LIBS/ s|-lSDL |`$$SDL_CONFIG --libs` |' \ diff --git a/games/digger-vgl/Makefile b/games/digger-vgl/Makefile index 08a52350d2b0..a85487168abd 100644 --- a/games/digger-vgl/Makefile +++ b/games/digger-vgl/Makefile @@ -7,6 +7,7 @@ PORTNAME= digger PORTVERSION= 20020314 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.digger.org/ DISTNAME= ${PORTNAME}-${PORTVERSION} diff --git a/games/dodgindiamond2/Makefile b/games/dodgindiamond2/Makefile index 2d10048638eb..2165e37cab7f 100644 --- a/games/dodgindiamond2/Makefile +++ b/games/dodgindiamond2/Makefile @@ -7,7 +7,7 @@ PORTNAME= dodgindiamond2 PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.usebox.net/jjm/dd2/releases/ DISTNAME= dd2-${PORTVERSION} diff --git a/games/doomlegacy/files/patch-makefile b/games/doomlegacy/files/patch-makefile index 8065bec76ad6..0fc1b1128c4d 100644 --- a/games/doomlegacy/files/patch-makefile +++ b/games/doomlegacy/files/patch-makefile @@ -28,7 +28,7 @@ ifdef FBSD_SDL INTERFACE=sdl - OPTS := -DLINUX -DFREEBSD -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -I/usr/local/include/SDL11 -I/usr/X11R6/include -Wall -+ OPTS := -DLINUX -DFREEBSD -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -I/usr/local/include/SDL11 -I/usr/X11R6/include ++ OPTS := -DLINUX -DFREEBSD -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -I/usr/local/include/SDL -I/usr/local/include -I/usr/X11R6/include SFLAGS=-g $(OPTS) OBJS=$(O)/i_video.o $(O)/dosstr.o $(O)/endtxt.o \ $(O)/hw_bsp.o $(O)/hw_draw.o $(O)/hw_light.o $(O)/hw_main.o \ @@ -37,7 +37,7 @@ LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib - LIBS=-lm -lSDL-1.1 -lSDL_mixer -lGL -lGLU -lipx -lkvm -pthread -+ LIBS=-lm -lSDL-1.1 -lSDL_mixer -lGL -lGLU -lipx -lkvm ${PTHREAD_LIBS} ++ LIBS=-lm -lSDL -lSDL_mixer -lGL -lGLU -lipx -lkvm ${PTHREAD_LIBS} + CFLAGS+=${PTHREAD_CFLAGS} DEBUGLIBS=$(LIBS) diff --git a/games/duel/Makefile b/games/duel/Makefile index 850c2227210b..5497788e8903 100644 --- a/games/duel/Makefile +++ b/games/duel/Makefile @@ -7,7 +7,7 @@ PORTNAME= duel PORTVERSION= 0.98 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.personal.rdg.ac.uk/~sir03me/ DISTNAME= lin${PORTNAME} diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index c99cc3b62d1f..27a081de175a 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -6,6 +6,7 @@ PORTNAME= eduke32 PORTVERSION= 20060718 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/egoboo/Makefile b/games/egoboo/Makefile index 8cbf08b8244d..5608d01b6a56 100644 --- a/games/egoboo/Makefile +++ b/games/egoboo/Makefile @@ -6,7 +6,7 @@ PORTNAME= egoboo PORTVERSION= 2.22 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=${PORTNAME} diff --git a/games/einstein/Makefile b/games/einstein/Makefile index dce3003a4d59..b49da94178b7 100644 --- a/games/einstein/Makefile +++ b/games/einstein/Makefile @@ -7,6 +7,7 @@ PORTNAME= einstein PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://games.flowix.com/files/einstein/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/games/el/files/patch-Makefile.bsdg b/games/el/files/patch-Makefile.bsdg index f33e7a43fa36..156834c39a68 100644 --- a/games/el/files/patch-Makefile.bsdg +++ b/games/el/files/patch-Makefile.bsdg @@ -25,13 +25,13 @@ -_CFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) -CXXFLAGS=$(PLATFORM) $(CPPWARN) -O -ggdb -pipe -I/usr/local/include $(OPTIONS) -_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) -+CFLAGS+=$(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/ -+_CFLAGS=$(CFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) ++CFLAGS+=$(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/ ++_CFLAGS=$(CFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) +CXXFLAGS+=-I/usr/local/include $(OPTIONS) +_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math $(OPTIONS) -LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng -+LDFLAGS+=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lopenal $(XDIR) -lalut -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng ++LDFLAGS+=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lopenal $(XDIR) -lalut -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng _LDFLAGS=$(XDIR) -lGL -lpthread -lz STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a diff --git a/games/ember/Makefile b/games/ember/Makefile index 7a686b7c27ff..a04cf763cb6b 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -7,6 +7,7 @@ PORTNAME= ember PORTVERSION= 0.4.1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://amber.worldforge.org/ember/releases/stable/ diff --git a/games/enigma/Makefile b/games/enigma/Makefile index 8c33648d3237..606c9bbfcfcd 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -7,6 +7,7 @@ PORTNAME= enigma PORTVERSION= 0.92 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= enigma diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile index 178318372cf4..72044bb067ef 100644 --- a/games/etuxracer/Makefile +++ b/games/etuxracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuxracer PORTVERSION= 0.61 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=tuxracer diff --git a/games/excido/Makefile b/games/excido/Makefile index 6be04cfc1bc7..ad5eabf3dc5b 100644 --- a/games/excido/Makefile +++ b/games/excido/Makefile @@ -7,7 +7,7 @@ PORTNAME= excido PORTVERSION= 0.1.5c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org/excido/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/games/exult/Makefile b/games/exult/Makefile index 061fee2c30d6..d65c1b35b0bf 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -7,6 +7,7 @@ PORTNAME= exult PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile index ba70a644fc6f..46c7f10d5797 100644 --- a/games/falconseye/Makefile +++ b/games/falconseye/Makefile @@ -7,7 +7,7 @@ PORTNAME= falconseye PORTVERSION= 1.9.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= falconseye diff --git a/games/falconseye/files/patch-sys_unix_Makefile_src b/games/falconseye/files/patch-sys_unix_Makefile_src index 575868e7b02e..5c6c3efbef95 100644 --- a/games/falconseye/files/patch-sys_unix_Makefile_src +++ b/games/falconseye/files/patch-sys_unix_Makefile_src @@ -24,7 +24,7 @@ # necessary compile and link flags. # -JTPINC=$(shell sdl-config --cflags) -+JTPINC=`sdl11-config --cflags` ++JTPINC=`sdl-config --cflags` # flags for debugging: # CFLAGS = -g -I../include @@ -53,7 +53,7 @@ # SDL libraries for Falcon's Eye -WINJTPLIB = $(shell sdl-config --libs) -+WINJTPLIB = `sdl11-config --libs` ++WINJTPLIB = `sdl-config --libs` # # libraries for X11 diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile index 92286143fbc0..e0401867cc72 100644 --- a/games/fillets-ng/Makefile +++ b/games/fillets-ng/Makefile @@ -7,7 +7,7 @@ PORTNAME= fillets-ng PORTVERSION= 0.7.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= fillets diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile index 786045faba17..f269e13c9d7e 100644 --- a/games/fishsupper/Makefile +++ b/games/fishsupper/Makefile @@ -7,6 +7,7 @@ PORTNAME= fishsupper PORTVERSION= 0.1.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/flobopuyo/Makefile b/games/flobopuyo/Makefile index 671d8e026802..2543a63cbfcd 100644 --- a/games/flobopuyo/Makefile +++ b/games/flobopuyo/Makefile @@ -7,6 +7,7 @@ PORTNAME= flobopuyo PORTVERSION= 0.20 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.ios-software.com/flobopuyo/ EXTRACT_SUFX= .tgz @@ -20,7 +21,6 @@ USE_SDL= sdl mixer image USE_GCC= 3.4+ post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/audio.h ${WRKSRC}/glSDL.h ${WRKSRC}/main.cpp @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|' ${WRKSRC}/Makefile diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index aee76eb81081..7e2253e84930 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -7,7 +7,7 @@ PORTNAME= foobillard PORTVERSION= 2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://foobillard.sunsite.dk/dnl/ diff --git a/games/formido/Makefile b/games/formido/Makefile index 0265f1a64376..37df28e227e8 100644 --- a/games/formido/Makefile +++ b/games/formido/Makefile @@ -7,6 +7,7 @@ PORTNAME= formido PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://koti.mbnet.fi/lsoft/formido/ diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile index fc466320bcfe..f1abfc270bb7 100644 --- a/games/freedroid/Makefile +++ b/games/freedroid/Makefile @@ -7,7 +7,7 @@ PORTNAME= freedroid PORTVERSION= 1.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= freedroid diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile index 7f847e3260ae..e5137ecf88e9 100644 --- a/games/freedroidrpg/Makefile +++ b/games/freedroidrpg/Makefile @@ -7,7 +7,7 @@ PORTNAME= freedroidrpg PORTVERSION= 0.9.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= freedroid diff --git a/games/freesci/Makefile b/games/freesci/Makefile index 48c7a94aa12c..29fb30c1b843 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -7,6 +7,7 @@ PORTNAME= freesci PORTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= games emulators MASTER_SITES= http://www-plan.cs.colorado.edu/creichen/${PORTNAME}/ \ http://teksolv.de/~jameson/ diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile index f09e45878d20..f11b28f12e72 100644 --- a/games/frozenbubble/Makefile +++ b/games/frozenbubble/Makefile @@ -7,7 +7,7 @@ PORTNAME= frozenbubble PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://zarb.org/~gc/fb/ DISTNAME= frozen-bubble-${PORTVERSION} @@ -31,9 +31,6 @@ USE_PERL5= yes PERL_CONFIGURE= yes post-patch: -.for file in fb_c_stuff.xs Makefile.PL - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' ${WRKSRC}/${file} -.endfor @${REINPLACE_CMD} -e 's|sdl-config|\${SDL_CONFIG}|g' ${WRKSRC}/Makefile.PL @${RM} ${WRKSRC}/lib/FBLE.pm.orig diff --git a/games/fwp/Makefile b/games/fwp/Makefile index f5aa0e0d1d83..80ed646ed068 100644 --- a/games/fwp/Makefile +++ b/games/fwp/Makefile @@ -7,6 +7,7 @@ PORTNAME= fwp PORTVERSION= 0.0.8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= fightwinprevail diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile index 114434bdf4e1..a65f5534ae06 100644 --- a/games/galaxyhack/Makefile +++ b/games/galaxyhack/Makefile @@ -7,6 +7,7 @@ PORTNAME= galaxyhack PORTVERSION= 1.69 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 4e5033de7c51..9ece92328569 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcompris PORTVERSION= 7.4 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gcompris diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile index 9b2a89d4f775..6ee50a11ac53 100644 --- a/games/gemdropx/Makefile +++ b/games/gemdropx/Makefile @@ -7,7 +7,7 @@ PORTNAME= gemdropx PORTVERSION= 0.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/gemdropx/src/ diff --git a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile index 8bbd09338f8e..b1eaa044f2cb 100644 --- a/games/ggz-sdl-games/Makefile +++ b/games/ggz-sdl-games/Makefile @@ -8,6 +8,7 @@ PORTNAME= ggz-sdl-games PORTVERSION= 0.0.13 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://mirrors.dotsrc.org/ggzgamingzone/ggz/%SUBDIR%/ \ http://ftp.ggzgamingzone.org/pub/ggz/%SUBDIR%/ @@ -28,17 +29,4 @@ CONFIGURE_ARGS= --disable-debug CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -post-patch: - @${REINPLACE_CMD} -e \ - 's|SDL/SDL.h|SDL11/SDL.h|; \ - s|SDL/SDL_image.h|SDL11/SDL_image.h|; \ - s|SDL/SDL_mixer.h|SDL11/SDL_mixer.h|; \ - s|SDL/SDL_syswm.h|SDL11/SDL_syswm.h|; \ - s|SDL/SDL_ttf.h|SDL11/SDL_ttf.h|' \ - ${WRKSRC}/configure \ - ${WRKSRC}/geekgame/intro.c \ - ${WRKSRC}/geekgame/main.c \ - ${WRKSRC}/ttt3d/display.c \ - ${WRKSRC}/ttt3d/main.c - .include <bsd.port.mk> diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile index 4eb79bbda53d..a91c7ff4cc62 100644 --- a/games/gl-117/Makefile +++ b/games/gl-117/Makefile @@ -8,7 +8,7 @@ PORTNAME= gl-117 PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/gl-117/files/patch-configure b/games/gl-117/files/patch-configure index 04c87239cbb4..a7c80462a182 100644 --- a/games/gl-117/files/patch-configure +++ b/games/gl-117/files/patch-configure @@ -1,257 +1,5 @@ --- configure.orig Sat Jun 12 01:44:13 2004 +++ configure Mon Jun 14 11:14:35 2004 -@@ -6154,7 +6154,7 @@ - path="" - for tmp in /usr/local /usr/X11R6 /usr $with_sdl_dir - do -- if test -f $tmp/include/SDL/SDL.h ; then -+ if test -f $tmp/include/SDL11/SDL.h ; then - path=$tmp - fi - done -@@ -6164,8 +6164,8 @@ - else - echo "$as_me:$LINENO: result: $path" >&5 - echo "${ECHO_T}$path" >&6 -- CPPFLAGS="$CPPFLAGS -I$path/include" -- CXXFLAGS="$CXXFLAGS -I$path/include" -+ CPPFLAGS="$CPPFLAGS -I$path/include -I$path/include/SDL11" -+ CXXFLAGS="$CXXFLAGS -I$path/include -I$path/include/SDL11" - LIBS="$LIBS -L$path/lib" - fi - -@@ -6871,8 +6871,8 @@ - - - if test "${ac_cv_header_SDL_SDL_h+set}" = set; then -- echo "$as_me:$LINENO: checking for SDL/SDL.h" >&5 --echo $ECHO_N "checking for SDL/SDL.h... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5 -+echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6 - if test "${ac_cv_header_SDL_SDL_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi -@@ -6880,8 +6880,8 @@ - echo "${ECHO_T}$ac_cv_header_SDL_SDL_h" >&6 - else - # Is the header compilable? --echo "$as_me:$LINENO: checking SDL/SDL.h usability" >&5 --echo $ECHO_N "checking SDL/SDL.h usability... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking SDL11/SDL.h usability" >&5 -+echo $ECHO_N "checking SDL11/SDL.h usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6889,7 +6889,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#include <SDL/SDL.h> -+#include <SDL.h> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -6925,15 +6925,15 @@ - echo "${ECHO_T}$ac_header_compiler" >&6 - - # Is the header present? --echo "$as_me:$LINENO: checking SDL/SDL.h presence" >&5 --echo $ECHO_N "checking SDL/SDL.h presence... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking SDL11/SDL.h presence" >&5 -+echo $ECHO_N "checking SDL11/SDL.h presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <SDL/SDL.h> -+#include <SDL11/SDL.h> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -6967,25 +6967,25 @@ - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: SDL/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: SDL/SDL.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: SDL/SDL.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: SDL/SDL.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: SDL/SDL.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: SDL/SDL.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: SDL/SDL.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: SDL11/SDL.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: SDL11/SDL.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: SDL11/SDL.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: SDL11/SDL.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: SDL11/SDL.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX - ## ------------------------------------------ ## -@@ -6996,8 +6996,8 @@ - sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for SDL/SDL.h" >&5 --echo $ECHO_N "checking for SDL/SDL.h... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5 -+echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6 - if test "${ac_cv_header_SDL_SDL_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7019,8 +7019,8 @@ - - - if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then -- echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5 --echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for SDL11/SDL_mixer.h" >&5 -+echo $ECHO_N "checking for SDL11/SDL_mixer.h... $ECHO_C" >&6 - if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi -@@ -7028,8 +7028,8 @@ - echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6 - else - # Is the header compilable? --echo "$as_me:$LINENO: checking SDL/SDL_mixer.h usability" >&5 --echo $ECHO_N "checking SDL/SDL_mixer.h usability... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking SDL11/SDL_mixer.h usability" >&5 -+echo $ECHO_N "checking SDL11/SDL_mixer.h usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -7037,7 +7037,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#include <SDL/SDL_mixer.h> -+#include <SDL11/SDL_mixer.h> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -7073,15 +7073,15 @@ - echo "${ECHO_T}$ac_header_compiler" >&6 - - # Is the header present? --echo "$as_me:$LINENO: checking SDL/SDL_mixer.h presence" >&5 --echo $ECHO_N "checking SDL/SDL_mixer.h presence... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking SDL11/SDL_mixer.h presence" >&5 -+echo $ECHO_N "checking SDL11/SDL_mixer.h presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <SDL/SDL_mixer.h> -+#include <SDL11/SDL_mixer.h> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -7115,25 +7115,25 @@ - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: SDL11/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: SDL11/SDL_mixer.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: SDL/SDL_mixer.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: SDL/SDL_mixer.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: SDL/SDL_mixer.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: SDL11/SDL_mixer.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: SDL11/SDL_mixer.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: SDL11/SDL_mixer.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: SDL11/SDL_mixer.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: SDL11/SDL_mixer.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX - ## ------------------------------------------ ## -@@ -7144,8 +7144,8 @@ - sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5 --echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for SDL11/SDL_mixer.h" >&5 -+echo $ECHO_N "checking for SDL11/SDL_mixer.h... $ECHO_C" >&6 - if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7380,13 +7380,13 @@ - echo "$as_me: WARNING: GLUT not found - please install GLUT or MesaGLUT" >&2;} - fi - --echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5 --echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for SDL_Init in -lSDL-1.1" >&5 -+echo $ECHO_N "checking for SDL_Init in -lSDL-1.1... $ECHO_C" >&6 - if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lSDL -lpthread $LIBS" -+LIBS="-lSDL-1.1 -lpthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -7445,7 +7445,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5 - echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6 - if test $ac_cv_lib_SDL_SDL_Init = yes; then -- LIBS="$LIBS -lSDL -lSDLmain" -+ LIBS="$LIBS -lSDL-1.1 -lSDLmain-1.1" - else - { echo "$as_me:$LINENO: WARNING: SDL not found - please install SDL" >&5 - echo "$as_me: WARNING: SDL not found - please install SDL" >&2;} @@ -7524,7 +7524,7 @@ diff --git a/games/gl-117/files/patch-src_common.h b/games/gl-117/files/patch-src_common.h deleted file mode 100644 index 2dfa6a09e020..000000000000 --- a/games/gl-117/files/patch-src_common.h +++ /dev/null @@ -1,38 +0,0 @@ ---- src/common.h.orig Sun Jun 13 11:17:16 2004 -+++ src/common.h Sun Jun 13 11:17:43 2004 -@@ -22,13 +22,13 @@ - // APPLE path is different (thanks Minami)
- #ifdef __APPLE__
- #include <GLUT/glut.h>
--#include "SDL/SDL.h"
--#include "SDL/SDL_thread.h"
-+#include "SDL11/SDL.h"
-+#include "SDL11/SDL_thread.h"
- #ifdef HAVE_SDL_MIXER
--#include "SDL/SDL_mixer.h"
-+#include "SDL11/SDL_mixer.h"
- #endif
- #ifdef HAVE_SDL_NET
--#include "SDL/SDL_net.h"
-+#include "SDL11/SDL_net.h"
- #endif
- #endif
- #ifndef __APPLE__
-@@ -36,13 +36,13 @@ - #include <GL/glut.h>
- #else
- #include <GL/glut.h>
--#include "SDL/SDL.h"
--#include "SDL/SDL_thread.h"
-+#include "SDL11/SDL.h"
-+#include "SDL11/SDL_thread.h"
- #ifdef HAVE_SDL_MIXER
--#include "SDL/SDL_mixer.h"
-+#include "SDL11/SDL_mixer.h"
- #endif
- #ifdef HAVE_SDL_NET
--#include "SDL/SDL_net.h"
-+#include "SDL11/SDL_net.h"
- #endif
- #endif
- #endif // __APPLE__
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index 215c0a223098..30d99e3bdbe7 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -7,6 +7,7 @@ PORTNAME= glaxium PORTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://xhosxe.free.fr/glaxium/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/games/glest/Makefile b/games/glest/Makefile index 7ff4867cb0f8..25aac3032e7f 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -7,7 +7,7 @@ PORTNAME= glest PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/glmaze/Makefile b/games/glmaze/Makefile index c91ff2de80b5..d768ce0abc78 100644 --- a/games/glmaze/Makefile +++ b/games/glmaze/Makefile @@ -6,7 +6,7 @@ PORTNAME= glmaze PORTVERSION= 1.1a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/glmaze/files/patch-Makefile b/games/glmaze/files/patch-Makefile index b6f31c8badd8..e6423f4c62ae 100644 --- a/games/glmaze/files/patch-Makefile +++ b/games/glmaze/files/patch-Makefile @@ -18,8 +18,8 @@ -SDL_FLAGS=`sdl-config --cflags` -SDL_LIBS=`sdl-config --libs` -+SDL_FLAGS=`sdl11-config --cflags` -+SDL_LIBS=`sdl11-config --libs` ++SDL_FLAGS=`sdl-config --cflags` ++SDL_LIBS=`sdl-config --libs` # comment the follwing if you don't want sound CC += -DSOUND diff --git a/games/glob2/Makefile b/games/glob2/Makefile index 44adf06574eb..eba00d812001 100644 --- a/games/glob2/Makefile +++ b/games/glob2/Makefile @@ -7,6 +7,7 @@ PORTNAME= glob2 PORTVERSION= 0.8.21 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://globulation2.org/releases/${PORTVERSION}/ diff --git a/games/glpuzzle/Makefile b/games/glpuzzle/Makefile index 2b8c748612e5..16200d77b4cd 100644 --- a/games/glpuzzle/Makefile +++ b/games/glpuzzle/Makefile @@ -7,6 +7,7 @@ PORTNAME= glpuzzle PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.iua.upf.es/~mdeboer/resorama/glpuzzle/ EXTRACT_SUFX= .tgz diff --git a/games/gltron/Makefile b/games/gltron/Makefile index b20b7f556e9e..b1834bd434de 100644 --- a/games/gltron/Makefile +++ b/games/gltron/Makefile @@ -7,7 +7,7 @@ PORTNAME= gltron PORTVERSION= 0.70 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/hangman/Makefile b/games/hangman/Makefile index fac7769aa51a..01a6be44d2b2 100644 --- a/games/hangman/Makefile +++ b/games/hangman/Makefile @@ -7,6 +7,7 @@ PORTNAME= hangman PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.shiftygames.com/hangman/ @@ -49,7 +50,6 @@ pre-configure: .endif post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/share/dict/words|${DICTIONARY}|g' ${WRKSRC}/src/hangman.c @${REINPLACE_CMD} -e 's|-std=gnu99||g' ${WRKSRC}/configure diff --git a/games/heretic/Makefile b/games/heretic/Makefile index 3e5c2403be89..352b557a646d 100644 --- a/games/heretic/Makefile +++ b/games/heretic/Makefile @@ -7,7 +7,7 @@ PORTNAME= heretic PORTVERSION= 1.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://heretic.linuxgames.com/heretic/src/:source \ http://heretic.linuxgames.com/wad/:wad diff --git a/games/heroes/Makefile b/games/heroes/Makefile index 31147543e9a3..9a8c9bde5b90 100644 --- a/games/heroes/Makefile +++ b/games/heroes/Makefile @@ -7,7 +7,7 @@ PORTNAME= heroes PORTVERSION= 0.21 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile index a8549a89f31c..7b0430af25d1 100644 --- a/games/hex-a-hop/Makefile +++ b/games/hex-a-hop/Makefile @@ -7,6 +7,7 @@ PORTNAME= hex-a-hop PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://ftp.bishopston.net/freebsd/distfiles/ \ ftp://ftp.bishopston.net/freebsd/distfiles/ \ diff --git a/games/hex-a-hop/files/patch-Makefile.FreeBSD b/games/hex-a-hop/files/patch-Makefile.FreeBSD new file mode 100644 index 000000000000..e3dd561de9a7 --- /dev/null +++ b/games/hex-a-hop/files/patch-Makefile.FreeBSD @@ -0,0 +1,19 @@ +--- Makefile.FreeBSD.orig Tue Sep 12 17:28:37 2006 ++++ Makefile.FreeBSD Tue Sep 12 17:28:53 2006 +@@ -11,13 +11,13 @@ + .endif + + hex-a-hop: gfx.o hex_puzzzle.o +- $(CXX) $(CXXFLAGS) gfx.o hex_puzzzle.o `sdl11-config --libs` -lm -o hex-a-hop ++ $(CXX) $(CXXFLAGS) gfx.o hex_puzzzle.o `sdl-config --libs` -lm -o hex-a-hop + + gfx.o: gfx.cpp state.h +- $(CC) $(CXXFLAGS) `sdl11-config --cflags` -c -o $@ $< ++ $(CC) $(CXXFLAGS) `sdl-config --cflags` -c -o $@ $< + + hex_puzzzle.o: hex_puzzzle.cpp *.h +- $(CC) $(CXXFLAGS) `sdl11-config --cflags` -c -o $@ $< ++ $(CC) $(CXXFLAGS) `sdl-config --cflags` -c -o $@ $< + + clean : + rm -f gfx.o hex_puzzzle.o hex-a-hop diff --git a/games/hex-a-hop/files/patch-state.h b/games/hex-a-hop/files/patch-state.h new file mode 100644 index 000000000000..bf81412910e9 --- /dev/null +++ b/games/hex-a-hop/files/patch-state.h @@ -0,0 +1,11 @@ +--- state.h.orig Tue Sep 12 17:30:34 2006 ++++ state.h Tue Sep 12 17:30:40 2006 +@@ -22,7 +22,7 @@ + + // LINUX: SDL/ + #ifdef __FreeBSD__ +-#include <SDL11/SDL.h> ++#include <SDL/SDL.h> + #else + #include <SDL/SDL.h> + #endif diff --git a/games/highmoon/Makefile b/games/highmoon/Makefile index bf9cb5d15569..197a65033611 100644 --- a/games/highmoon/Makefile +++ b/games/highmoon/Makefile @@ -7,6 +7,7 @@ PORTNAME= highmoon PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://highmoon.gerdsmeier.net/ diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile index d6e02ce382b3..df456c03e37b 100644 --- a/games/holotz-castle/Makefile +++ b/games/holotz-castle/Makefile @@ -7,6 +7,7 @@ PORTNAME= holotz-castle PORTVERSION= 1.3.8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile index 727aad9c3d71..cd9e5b003b41 100644 --- a/games/icebreaker/Makefile +++ b/games/icebreaker/Makefile @@ -7,7 +7,7 @@ PORTNAME= icebreaker PORTVERSION= 1.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://mattdm.org/icebreaker/1.2.x/ EXTRACT_SUFX= .tgz diff --git a/games/interlogic/Makefile b/games/interlogic/Makefile index 69d157251a6f..eea4cad8b9a0 100644 --- a/games/interlogic/Makefile +++ b/games/interlogic/Makefile @@ -7,6 +7,7 @@ PORTNAME= interlogic PORTVERSION= 0.30 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= interlogic diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile index 7bd59b9a226e..fd80ee2aa988 100644 --- a/games/ioquake3/Makefile +++ b/games/ioquake3/Makefile @@ -7,6 +7,7 @@ PORTNAME= ioquake3 PORTVERSION= 1.33.${SVN_REV} +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= alepulver diff --git a/games/iourbanterror/Makefile b/games/iourbanterror/Makefile index 7bd59b9a226e..fd80ee2aa988 100644 --- a/games/iourbanterror/Makefile +++ b/games/iourbanterror/Makefile @@ -7,6 +7,7 @@ PORTNAME= ioquake3 PORTVERSION= 1.33.${SVN_REV} +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= alepulver diff --git a/games/ivan/Makefile b/games/ivan/Makefile index 812231a599f9..0062269d928b 100644 --- a/games/ivan/Makefile +++ b/games/ivan/Makefile @@ -7,6 +7,7 @@ PORTNAME= ivan PORTVERSION= 0.50 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ivan diff --git a/games/jfduke3d/Makefile b/games/jfduke3d/Makefile index d00385f5d9b5..44603ed6e3a6 100644 --- a/games/jfduke3d/Makefile +++ b/games/jfduke3d/Makefile @@ -6,6 +6,7 @@ PORTNAME= jfduke3d PORTVERSION= 20051009 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ftp://dialup.edgefiles.com/edgenetwork.org/jonof/buildport/ \ ftp://ftp1.edgefiles.com/edgenetwork.org/jonof/buildport/ \ diff --git a/games/jfk/Makefile b/games/jfk/Makefile index 5c2e6c2f6c9d..fb6e711e7ebc 100644 --- a/games/jfk/Makefile +++ b/games/jfk/Makefile @@ -7,7 +7,7 @@ PORTNAME= jfk PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://relax.ath.cx/jfk/ diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile index 2b8c748612e5..16200d77b4cd 100644 --- a/games/jigzo/Makefile +++ b/games/jigzo/Makefile @@ -7,6 +7,7 @@ PORTNAME= glpuzzle PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.iua.upf.es/~mdeboer/resorama/glpuzzle/ EXTRACT_SUFX= .tgz diff --git a/games/jumpnbump/Makefile b/games/jumpnbump/Makefile index cad1315959f2..4d0f5b542b0a 100644 --- a/games/jumpnbump/Makefile +++ b/games/jumpnbump/Makefile @@ -7,7 +7,7 @@ PORTNAME= jumpnbump PORTVERSION= 1.41 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.jumpbump.mine.nu/port/ \ http://www.vlaadworld.net/jumpnbump/ \ diff --git a/games/jumpnbump/files/patch-Makefile b/games/jumpnbump/files/patch-Makefile index 50e9b91f0cdb..52255d53874f 100644 --- a/games/jumpnbump/files/patch-Makefile +++ b/games/jumpnbump/files/patch-Makefile @@ -6,8 +6,8 @@ -CFLAGS = -Wall -O2 -ffast-math -funroll-loops -Dstricmp=strcasecmp \ - -Dstrnicmp=strncasecmp -DUSE_SDL -DNDEBUG -I. $(SDL_CFLAGS) -DUSE_NET -LIBS = -lm $(SDL_LIBS) -lSDL_mixer -lSDL_net -+SDL_CFLAGS = `sdl11-config --cflags` -+SDL_LIBS = `sdl11-config --libs` ++SDL_CFLAGS = `sdl-config --cflags` ++SDL_LIBS = `sdl-config --libs` +CFLAGS += -Wall -ffast-math -funroll-loops -Dstricmp=strcasecmp \ + -Dstrnicmp=strncasecmp -DUSE_SDL -DNDEBUG -I. $(SDL_CFLAGS) +LIBS += -lm $(SDL_LIBS) -lSDL_mixer diff --git a/games/jumpnbump/files/patch-sdl::Makefile b/games/jumpnbump/files/patch-sdl::Makefile index 20c05c45793c..5b68e00b218d 100644 --- a/games/jumpnbump/files/patch-sdl::Makefile +++ b/games/jumpnbump/files/patch-sdl::Makefile @@ -3,7 +3,7 @@ @@ -1,8 +1,8 @@ -SDL_CFLAGS = `sdl-config --cflags` -CFLAGS = -Wall -ansi -pedantic -O2 -ffast-math -funroll-loops \ -+SDL_CFLAGS = `sdl11-config --cflags` ++SDL_CFLAGS = `sdl-config --cflags` +CFLAGS += -Wall -ansi -pedantic -ffast-math -funroll-loops \ -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DNDEBUG \ - -I. -I.. $(SDL_CFLAGS) -DUSE_SDL -DUSE_NET diff --git a/games/kiki/Makefile b/games/kiki/Makefile index 02dc211ca7e6..d8af4a96e6c8 100644 --- a/games/kiki/Makefile +++ b/games/kiki/Makefile @@ -7,7 +7,7 @@ PORTNAME= kiki PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/kmquake2/Makefile b/games/kmquake2/Makefile index 593f241f250e..bd6fa831bec8 100644 --- a/games/kmquake2/Makefile +++ b/games/kmquake2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmquake2 PORTVERSION= 0.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/KMQuake2/:src \ http://qexpo2005.quakedev.com/uploaded/54/:data \ diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index 9acaa4241958..760d798f440e 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -7,7 +7,7 @@ PORTNAME= lbreakout PORTVERSION= 010315 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lgames diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile index b057240ec132..e281781c99c9 100644 --- a/games/lgeneral/Makefile +++ b/games/lgeneral/Makefile @@ -7,7 +7,7 @@ PORTNAME= lgeneral PORTVERSION= 1.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lgeneral diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile index 4a6920795920..c2fb9afe4323 100644 --- a/games/lincity-ng/Makefile +++ b/games/lincity-ng/Makefile @@ -7,6 +7,7 @@ PORTNAME= lincity-ng PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile index c68aba414a8b..972f50aef358 100644 --- a/games/lmarbles/Makefile +++ b/games/lmarbles/Makefile @@ -7,6 +7,7 @@ PORTNAME= lmarbles PORTVERSION= 1.0.7 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lgames diff --git a/games/ltris/Makefile b/games/ltris/Makefile index 4a176c570494..820a384646d1 100644 --- a/games/ltris/Makefile +++ b/games/ltris/Makefile @@ -7,6 +7,7 @@ PORTNAME= ltris PORTVERSION= 1.0.11 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/games/luola/Makefile b/games/luola/Makefile index 304702c53003..a526cccf5e5f 100644 --- a/games/luola/Makefile +++ b/games/luola/Makefile @@ -7,6 +7,7 @@ PORTNAME= luola PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.luolamies.org/software/luola/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -40,8 +41,7 @@ USE_SDL+= mixer .endif post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/src/audio.c ${WRKSRC}/src/startup.c ${WRKSRC}/tools/lcmaptool.c - @${REINPLACE_CMD} -e '/LIBS=.*-lSDL_/ s|\(SDL_[a-z]*\)|\1 `sdl11-config --libs`|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/LIBS=.*-lSDL_/ s|\(SDL_[a-z]*\)|\1 `sdl-config --libs`|' ${WRKSRC}/configure post-install: @${INSTALL_DATA} ${WRKDIR}/*.lev ${WRKDIR}/*.png ${DATADIR}/levels diff --git a/games/madbomber/Makefile b/games/madbomber/Makefile index 384bf6a61428..e2394ebeb0fb 100644 --- a/games/madbomber/Makefile +++ b/games/madbomber/Makefile @@ -7,7 +7,7 @@ PORTNAME= madbomber PORTVERSION= 0.2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/madbomber/src/ diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile index 7764a58e25a0..d1006b846828 100644 --- a/games/maelstrom/Makefile +++ b/games/maelstrom/Makefile @@ -7,7 +7,7 @@ PORTNAME= maelstrom PORTVERSION= 3.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.devolution.com/~slouken/projects/Maelstrom/src/ DISTNAME= Maelstrom-${PORTVERSION} diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile index 26eba0dd9258..dcc4297510e3 100644 --- a/games/marsnomercy/Makefile +++ b/games/marsnomercy/Makefile @@ -7,6 +7,7 @@ PORTNAME= marsnomercy PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mars diff --git a/games/marsnomercy/files/patch-SConstruct b/games/marsnomercy/files/patch-SConstruct index e2581d1bd8b6..4031b4f9d3ae 100644 --- a/games/marsnomercy/files/patch-SConstruct +++ b/games/marsnomercy/files/patch-SConstruct @@ -1,5 +1,5 @@ ---- SConstruct Mon Jul 24 18:19:52 2006 -+++ SConstruct Fri Sep 1 18:41:23 2006 +--- SConstruct.orig Tue Jul 25 03:19:52 2006 ++++ SConstruct Tue Sep 12 18:56:39 2006 @@ -1,3 +1,5 @@ +import os +import sys @@ -52,15 +52,15 @@ print ":: Checking for libs" conf = Configure(env) - if not conf.CheckLibWithHeader('libSDL', 'SDL.h', 'c', 'SDL_Init(SDL_INIT_VIDEO);', autoadd = 0): -+ if not conf.CheckLibWithHeader('libSDL-1.1', 'SDL11/SDL.h', 'c', 'SDL_Init(SDL_INIT_VIDEO);', autoadd = 0): ++ if not conf.CheckLibWithHeader('libSDL', 'SDL/SDL.h', 'c', 'SDL_Init(SDL_INIT_VIDEO);', autoadd = 0): print 'Did not find libSDL, exiting!' Exit(1) - if not conf.CheckLibWithHeader('libSDL_image', 'SDL_image.h', 'c', 'IMG_GetError();'): -+ if not conf.CheckLibWithHeader('libSDL_image', 'SDL11/SDL_image.h', 'c', 'IMG_GetError();'): ++ if not conf.CheckLibWithHeader('libSDL_image', 'SDL/SDL_image.h', 'c', 'IMG_GetError();'): print 'Did not find libSDL_image, exiting!' Exit(1) - if not conf.CheckLibWithHeader('libSDL_ttf', 'SDL_ttf.h', 'c', 'TTF_Init();'): -+ if not conf.CheckLibWithHeader('libSDL_ttf', 'SDL11/SDL_ttf.h', 'c', 'TTF_Init();'): ++ if not conf.CheckLibWithHeader('libSDL_ttf', 'SDL/SDL_ttf.h', 'c', 'TTF_Init();'): print 'Did not find libSDL_ttf, exiting!' Exit(1) if int(env['with_opengl']): diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index 18d6d5343ee8..b0f3f39ee1b8 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -7,6 +7,7 @@ PORTNAME= mirrormagic PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/ diff --git a/games/moonlander/Makefile b/games/moonlander/Makefile index 0e97e85ed07d..07726c5dece3 100644 --- a/games/moonlander/Makefile +++ b/games/moonlander/Makefile @@ -7,7 +7,7 @@ PORTNAME= moonlander PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR=pool/main/m/moon-lander diff --git a/games/moonlander/files/patch-Makefile b/games/moonlander/files/patch-Makefile index be81ec3162e7..d0f935659ad3 100644 --- a/games/moonlander/files/patch-Makefile +++ b/games/moonlander/files/patch-Makefile @@ -4,11 +4,11 @@ # Makefile for test program for game_libs - lunar lander -CFLAGS=-Wall `sdl-config --libs --cflags` -CC=gcc -+CFLAGS+=`sdl11-config --cflags` ++CFLAGS+=`sdl-config --cflags` +#CC=gcc -LIBS=SDL_image -+LIBS=`sdl11-config --libs` -lSDL_image -lSDL_mixer ++LIBS=`sdl-config --libs` -lSDL_image -lSDL_mixer C_FILES=moon_lander.c game_lib.c DT_drawtext.c OBJ_FILES=moon_lander.o game_lib.o DT_drawtext.o diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile index 54162d0eb6f5..093e43d3bccf 100644 --- a/games/nazghul/Makefile +++ b/games/nazghul/Makefile @@ -7,6 +7,7 @@ PORTNAME= nazghul PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile index 69ce3c86c75d..21cae46057b3 100644 --- a/games/nehquake/Makefile +++ b/games/nehquake/Makefile @@ -7,6 +7,7 @@ PORTNAME= nehquake PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/ DISTNAME= NehQuake-bjp-bin-src.linux diff --git a/games/netpanzer-data/Makefile b/games/netpanzer-data/Makefile index 7e00a9c50c0a..d0decdd1fe19 100644 --- a/games/netpanzer-data/Makefile +++ b/games/netpanzer-data/Makefile @@ -7,7 +7,7 @@ PORTNAME= data PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX:S/-//} diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile index ba126bbd5b05..80df8562cfe3 100644 --- a/games/netpanzer/Makefile +++ b/games/netpanzer/Makefile @@ -7,7 +7,7 @@ PORTNAME= netpanzer PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://download.berlios.de/netpanzer/ diff --git a/games/neverball/Makefile b/games/neverball/Makefile index e9d1c6fcb1ce..827a06698206 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -7,6 +7,7 @@ PORTNAME= neverball PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org/neverball/ diff --git a/games/newvox/Makefile b/games/newvox/Makefile index 73a90d4f843b..3167b8f9f5a4 100644 --- a/games/newvox/Makefile +++ b/games/newvox/Makefile @@ -7,7 +7,7 @@ PORTNAME= newvox PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.libsdl.org/projects/newvox/src/ diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile index 6377f2f5c03f..638c4948c5df 100644 --- a/games/nexuiz/Makefile +++ b/games/nexuiz/Makefile @@ -7,6 +7,7 @@ PORTNAME= nexuiz PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/njam/Makefile b/games/njam/Makefile index ae73dfb92f72..beee8f73fd13 100644 --- a/games/njam/Makefile +++ b/games/njam/Makefile @@ -7,6 +7,7 @@ PORTNAME= njam PORTVERSION= 1.21 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/njam/files/patch-Makefile b/games/njam/files/patch-Makefile index 50e5241c9fb0..0f46e5cf3365 100644 --- a/games/njam/files/patch-Makefile +++ b/games/njam/files/patch-Makefile @@ -14,7 +14,7 @@ # If you hate warnings under Cygwin use these flags instead # MY_CFLAGS = -I/usr/local/include/SDL -Dmain=SDL_main -DWIN32 -Uunix -mno-cygwin -MY_CFLAGS = `sdl-config --cflags` -+MY_CFLAGS += `sdl11-config --cflags` ++MY_CFLAGS += `sdl-config --cflags` %.o: %.cpp - $(CC) -O3 -c $(MY_CFLAGS) $< -o $@ @@ -24,7 +24,7 @@ $(PROGRAM): $(OBJECTS) - $(CC) `sdl-config --libs` -o$(PROGRAM) $(OBJECTS) -lSDL -lSDL_mixer -lSDL_net -lSDL_image -+ $(CC) `sdl11-config --libs` -o$(PROGRAM) $(OBJECTS) -lSDL_mixer -lSDL_net -lSDL_image ++ $(CC) `sdl-config --libs` -o$(PROGRAM) $(OBJECTS) -lSDL_mixer -lSDL_net -lSDL_image clean: $(RM) *.o diff --git a/games/noegnud-littlehack/Makefile b/games/noegnud-littlehack/Makefile index 894b2eb172ab..0636a78609e5 100644 --- a/games/noegnud-littlehack/Makefile +++ b/games/noegnud-littlehack/Makefile @@ -7,6 +7,7 @@ PORTNAME= noegnud PORTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \ ${MASTER_SITE_SOURCEFORGE:S/$/:nethack/} diff --git a/games/noegnud-nethack-deet/Makefile b/games/noegnud-nethack-deet/Makefile index e5b2dcfcda3e..ccdb1306074b 100644 --- a/games/noegnud-nethack-deet/Makefile +++ b/games/noegnud-nethack-deet/Makefile @@ -7,6 +7,7 @@ PORTNAME= noegnud PORTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \ ${MASTER_SITE_SOURCEFORGE:S/$/:nethack/} diff --git a/games/noegnud-nethack/Makefile b/games/noegnud-nethack/Makefile index 55eec5d9ce9a..20a6972c83ba 100644 --- a/games/noegnud-nethack/Makefile +++ b/games/noegnud-nethack/Makefile @@ -7,6 +7,7 @@ PORTNAME= noegnud PORTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \ ${MASTER_SITE_SOURCEFORGE:S/$/:nethack/} diff --git a/games/noegnud-slashem/Makefile b/games/noegnud-slashem/Makefile index 3bf7b146dca4..c9eabeb76fdd 100644 --- a/games/noegnud-slashem/Makefile +++ b/games/noegnud-slashem/Makefile @@ -7,6 +7,7 @@ PORTNAME= noegnud PORTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \ ${MASTER_SITE_SOURCEFORGE:S/$/:slashem/} diff --git a/games/nuclearchess/Makefile b/games/nuclearchess/Makefile index 8671159c7454..39d09c328f0f 100644 --- a/games/nuclearchess/Makefile +++ b/games/nuclearchess/Makefile @@ -7,6 +7,7 @@ PORTNAME= nuclearchess PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://user.cs.tu-berlin.de/~karlb/${PORTNAME}/ \ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ diff --git a/games/oilwar/Makefile b/games/oilwar/Makefile index 31a76c16c768..4550d9c2fcfa 100644 --- a/games/oilwar/Makefile +++ b/games/oilwar/Makefile @@ -7,7 +7,7 @@ PORTNAME= oilwar PORTVERSION= 1.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.2ndpoint.fi/projektit/filut/ DISTNAME= OilWar-${PORTVERSION} diff --git a/games/oolite/Makefile b/games/oolite/Makefile index f9fbf3c1c98d..f0aae328c74c 100644 --- a/games/oolite/Makefile +++ b/games/oolite/Makefile @@ -7,6 +7,7 @@ PORTNAME= oolite PORTVERSION= 1.65 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://download.berlios.de/oolite-linux/ \ http://download2.berlios.de/oolite-linux/ \ diff --git a/games/openglad/Makefile b/games/openglad/Makefile index a0384d975f3c..5eddf056981e 100644 --- a/games/openglad/Makefile +++ b/games/openglad/Makefile @@ -7,7 +7,7 @@ PORTNAME= openglad PORTVERSION= 0.98 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= snowstorm diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile index f187be3c2ad0..0993676b806d 100644 --- a/games/openmortal/Makefile +++ b/games/openmortal/Makefile @@ -7,6 +7,7 @@ PORTNAME= openmortal PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,11 +26,6 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|sdl-config|sdl11-config|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC}/src -name "*.cpp" | ${XARGS} \ - ${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' -e 's|<malloc.h>|<stdlib.h>|g' - @${FIND} ${WRKSRC} -name "*.h" | ${XARGS} \ - ${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' -e 's|<malloc.h>|<stdlib.h>|g' .include <bsd.port.pre.mk> diff --git a/games/openmortal/files/patch-src_gfx.cpp b/games/openmortal/files/patch-src_gfx.cpp new file mode 100644 index 000000000000..c1c21476c0a1 --- /dev/null +++ b/games/openmortal/files/patch-src_gfx.cpp @@ -0,0 +1,11 @@ +--- src/gfx.cpp.orig Tue Sep 12 18:28:52 2006 ++++ src/gfx.cpp Tue Sep 12 18:29:04 2006 +@@ -7,7 +7,7 @@ + ***************************************************************************/
+
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+
+ #include "SDL.h"
diff --git a/games/openmortal/files/patch-src_sge_tt_text.cpp b/games/openmortal/files/patch-src_sge_tt_text.cpp new file mode 100644 index 000000000000..0df428b3db45 --- /dev/null +++ b/games/openmortal/files/patch-src_sge_tt_text.cpp @@ -0,0 +1,10 @@ +--- src/sge_tt_text.cpp.orig Tue Sep 12 18:29:07 2006 ++++ src/sge_tt_text.cpp Tue Sep 12 18:29:12 2006 +@@ -26,7 +26,6 @@ + + #include "SDL.h" + #include <stdlib.h> +-#include <malloc.h> + #include <memory.h> + #include <string.h> + #include <stdarg.h> diff --git a/games/openttd/Makefile b/games/openttd/Makefile index e676a1e67611..440ad1b9d701 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -7,6 +7,7 @@ PORTNAME= openttd PORTVERSION= 0.4.8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/openttd/files/patch-makefiledir_Makefile.libdetection b/games/openttd/files/patch-makefiledir_Makefile.libdetection new file mode 100644 index 000000000000..ad0916959195 --- /dev/null +++ b/games/openttd/files/patch-makefiledir_Makefile.libdetection @@ -0,0 +1,14 @@ +--- makefiledir/Makefile.libdetection.orig Tue Sep 12 17:21:19 2006 ++++ makefiledir/Makefile.libdetection Tue Sep 12 17:22:35 2006 +@@ -51,11 +51,7 @@ + endif + + # FreeBSD uses sdl11 instead of sdl +-ifdef FREEBSD +-SDL_CONFIG:=sdl11-config +-else + SDL_CONFIG:=sdl-config +-endif + + # set libpng-config to the default value + LIBPNG_CONFIG :=libpng-config diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile index 30a472e5e40f..7ddc38f47ca7 100644 --- a/games/orbital_eunuchs_sniper/Makefile +++ b/games/orbital_eunuchs_sniper/Makefile @@ -7,7 +7,7 @@ PORTNAME= orbital_eunuchs_sniper PORTVERSION= 1.29 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://filesingularity.timedoctor.org/ diff --git a/games/pachi/Makefile b/games/pachi/Makefile index c7ec8b1b6db9..57fd0ecc701f 100644 --- a/games/pachi/Makefile +++ b/games/pachi/Makefile @@ -7,6 +7,7 @@ PORTNAME= pachi PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= dragontech @@ -31,7 +32,6 @@ SCOREDIR= /var/games/pachi SCOREFILE= ${SCOREDIR}/scores.dat post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/src/faes.cpp @${REINPLACE_CMD} -e 's|/var/lib/games/$$PACKAGE|${SCOREDIR}|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|SCOREDIR[^,]*|"${SCOREFILE}"|' \ diff --git a/games/pengpong/Makefile b/games/pengpong/Makefile index 846e2dc9177c..1e1f899483c3 100644 --- a/games/pengpong/Makefile +++ b/games/pengpong/Makefile @@ -7,7 +7,7 @@ PORTNAME= pengpong PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile index 8b4d8ba79b42..41c3d7a4340b 100644 --- a/games/penguin-command/Makefile +++ b/games/penguin-command/Makefile @@ -7,6 +7,7 @@ PORTNAME= penguin-command PORTVERSION= 1.6.10 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/pengupop/Makefile b/games/pengupop/Makefile index 863c86fc5217..315c031253a1 100644 --- a/games/pengupop/Makefile +++ b/games/pengupop/Makefile @@ -7,6 +7,7 @@ PORTNAME= pengupop PORTVERSION= 2.1.6 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.junoplay.com/files/ @@ -29,7 +30,6 @@ BROKEN= does not build on FreeBSD 4.x: lack of swprintf .endif post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/*.c @${REINPLACE_CMD} -e 's|-lSDL||' ${WRKSRC}/Makefile.in .include <bsd.port.post.mk> diff --git a/games/pinball/Makefile b/games/pinball/Makefile index c5afb47781fa..ace724564962 100644 --- a/games/pinball/Makefile +++ b/games/pinball/Makefile @@ -7,7 +7,7 @@ PORTNAME= pinball PORTVERSION= 0.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/pipenightdreams/Makefile b/games/pipenightdreams/Makefile index fc1fae1f59f8..4ba4bc138d61 100644 --- a/games/pipenightdreams/Makefile +++ b/games/pipenightdreams/Makefile @@ -7,7 +7,7 @@ PORTNAME= pipenightdreams PORTVERSION= 0.10.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.libsdl.org/projects/pipenightdreams/packages/ diff --git a/games/pipepanic/Makefile b/games/pipepanic/Makefile index 02d4b2570adf..6df9c88ca76f 100644 --- a/games/pipepanic/Makefile +++ b/games/pipepanic/Makefile @@ -7,6 +7,7 @@ PORTNAME= pipepanic PORTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.users.waitrose.com/~thunor/pipepanic/dload/ \ ${MASTER_SITE_LOCAL} @@ -23,7 +24,6 @@ DATAFILES= ascii15.bmp ascii30.bmp digits24.bmp \ digits48.bmp tiles24.bmp tiles48.bmp post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/main.c @${REINPLACE_CMD} \ -e '/^#define DATADIR/ s|.*|#define DATADIR "${DATADIR}/"|' \ ${WRKSRC}/main.h diff --git a/games/pmars-sdl/Makefile b/games/pmars-sdl/Makefile index 18f86a23cb74..aac52a481b04 100644 --- a/games/pmars-sdl/Makefile +++ b/games/pmars-sdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= pmars PORTVERSION= 0.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.cs.helsinki.fi/u/jpihlaja/cw/pmars-sdl/ PKGNAMESUFFIX= -sdl diff --git a/games/pongix/Makefile b/games/pongix/Makefile index 418dc2ca900c..e5df0830f64e 100644 --- a/games/pongix/Makefile +++ b/games/pongix/Makefile @@ -7,6 +7,7 @@ PORTNAME= pongix PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/juegos/pongix/descargas/ @@ -22,10 +23,6 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -post-extract: - @${FIND} -E ${WRKSRC}/src/ -type f -iregex ".*\.(c|h)" \ - -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's/<SDL/<SDL11/g' - do-install: ${MKDIR} ${DATADIR} @cd ${WRKSRC}/src && \ diff --git a/games/pongix/files/patch-configure b/games/pongix/files/patch-configure index d6e13f3e28d5..13b7608d47a0 100644 --- a/games/pongix/files/patch-configure +++ b/games/pongix/files/patch-configure @@ -5,7 +5,7 @@ else ac_check_lib_save_LIBS=$LIBS -LIBS="-lSDL $LIBS" -+LIBS="`sdl11-config --libs` $LIBS" ++LIBS="`sdl-config --libs` $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14,7 +14,7 @@ _ACEOF - LIBS="-lSDL $LIBS" -+ LIBS="`sdl11-config --libs` $LIBS" ++ LIBS="`sdl-config --libs` $LIBS" else \ diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile index 7bf694be8469..98d07f54b467 100644 --- a/games/pouetchess/Makefile +++ b/games/pouetchess/Makefile @@ -7,6 +7,7 @@ PORTNAME= pouetchess PORTVERSION= 0.1.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -36,7 +37,6 @@ post-patch: -o -name config.ini \) -exec ${REINPLACE_CMD} -e \ "s|$$(${PRINTF} '\r')$$||" {} \; - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/src/*.cpp ${WRKSRC}/src/*.h @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e '/^LIBS/ s|$$| -L${X11BASE}/lib|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e '/CXX / d' ${WRKSRC}/Makefile diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile index 68fdee37dc62..46c00257ad98 100644 --- a/games/powermanga/Makefile +++ b/games/powermanga/Makefile @@ -7,7 +7,7 @@ PORTNAME= powermanga PORTVERSION= 0.79 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://linux.tlk.fr/games/Powermanga/download/ EXTRACT_SUFX= .tgz diff --git a/games/prboom/Makefile b/games/prboom/Makefile index 71626fb8161a..5b0c9b2eff2f 100644 --- a/games/prboom/Makefile +++ b/games/prboom/Makefile @@ -7,6 +7,7 @@ PORTNAME= prboom PORTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/primateplunge/Makefile b/games/primateplunge/Makefile index 2498be5a8ea8..af3b68af8b9a 100644 --- a/games/primateplunge/Makefile +++ b/games/primateplunge/Makefile @@ -7,6 +7,7 @@ PORTNAME= primateplunge PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.ecs.soton.ac.uk/~njh/primateplunge/ diff --git a/games/q3base/Makefile b/games/q3base/Makefile index 21e5f4ad6ff2..89c0413a94d9 100644 --- a/games/q3base/Makefile +++ b/games/q3base/Makefile @@ -7,6 +7,7 @@ PORTNAME= q3base PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://quake3.quakesrc.org/files/quake3/q3base/ diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index 92a751384508..cec67f1967ed 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -7,7 +7,7 @@ PORTNAME= quake2forge PORTVERSION= 0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.galgenberg.net/distfiles/ DISTNAME= quake2-${PORTVERSION} diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile index 50452eeb3141..c467e9d8ca5d 100644 --- a/games/quake2lnx/Makefile +++ b/games/quake2lnx/Makefile @@ -7,7 +7,7 @@ PORTNAME= quake2lnx PORTVERSION= 0.16.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org/quake2/files/:icc \ http://www.icculus.org/quake2/files/:icc diff --git a/games/quake2max/Makefile b/games/quake2max/Makefile index e74d07bddf6e..101d70fe7172 100644 --- a/games/quake2max/Makefile +++ b/games/quake2max/Makefile @@ -7,6 +7,7 @@ PORTNAME= quake2max PORTVERSION= 0.44 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/Quake2MaX/:src \ ${MASTER_SITE_LOCAL:S/$/:data/} diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 64e00340c860..c55614aff17a 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -7,7 +7,7 @@ PORTNAME= quakeforge PORTVERSION= 0.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} MASTER_SITE_SUBDIR= quake/:sf diff --git a/games/qudos/Makefile b/games/qudos/Makefile index 82a2786b13a1..f4ca750aa6c2 100644 --- a/games/qudos/Makefile +++ b/games/qudos/Makefile @@ -7,7 +7,7 @@ PORTNAME= qudos PORTVERSION= 0.40.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/QuDos/ DISTNAME= QuDos-${PORTVERSION}-src diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile index a49183b68f12..d14795480b35 100644 --- a/games/quetoo/Makefile +++ b/games/quetoo/Makefile @@ -7,7 +7,7 @@ PORTNAME= quetoo PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://jdolan.dyndns.org/jaydolan/files/ \ http://freebsd.nsu.ru/distfiles/ diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile index dd5ee4f6ff39..a1dca0401099 100644 --- a/games/r1q2/Makefile +++ b/games/r1q2/Makefile @@ -7,7 +7,7 @@ PORTNAME= r1q2 PORTVERSION= 6557 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.r1ch.net/stuff/r1q2/src/ DISTNAME= ${PORTNAME}-b${PORTVERSION}-src diff --git a/games/race/Makefile b/games/race/Makefile index f759a5b769de..b3bb76a0f302 100644 --- a/games/race/Makefile +++ b/games/race/Makefile @@ -8,7 +8,7 @@ PORTNAME= race PORTVERSION= 0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ftp://users.freebsd.org.uk/pub/foobar2k/ diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile index 29250c6da657..2d7da99514b5 100644 --- a/games/redeclipse/Makefile +++ b/games/redeclipse/Makefile @@ -7,6 +7,7 @@ PORTNAME= sauerbraten PORTVERSION= 20060912 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/reminiscence/Makefile b/games/reminiscence/Makefile index 10a8e12b5f88..8a2439669c20 100644 --- a/games/reminiscence/Makefile +++ b/games/reminiscence/Makefile @@ -7,6 +7,7 @@ PORTNAME= REminiscence PORTVERSION= 0.1.8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://membres.lycos.fr/cyxdown/reminiscence/ diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile index 6cb3cf876c20..e3a53c55ed8a 100644 --- a/games/ri-li/Makefile +++ b/games/ri-li/Makefile @@ -7,6 +7,7 @@ PORTNAME= Ri-li PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ri-li @@ -22,7 +23,6 @@ USE_SDL= sdl mixer CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/src/*.cc ${WRKSRC}/src/*.h @${REINPLACE_CMD} -e 's|-lSDL |`${SDL_CONFIG} --libs`|' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/strcpy.*DefPath/ s|.*|strcpy(DefPath,"${DATADIR}/");|' ${WRKSRC}/src/main.cc diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile index 15e011e5673f..937123ea70ca 100644 --- a/games/rockdodger/Makefile +++ b/games/rockdodger/Makefile @@ -7,7 +7,7 @@ PORTNAME= rockdodger PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= spacerocks @@ -22,7 +22,6 @@ GAMESDIR?= /var/games pre-patch: @${REINPLACE_CMD} \ - -e "s%sdl-config%sdl11-config%" \ -e "s%/usr/share/rockdodger/.highscore%${GAMESDIR}/rockdodger.highscore%" \ -e "s%/usr/share/rockdodger%${PREFIX}/share/rockdodger%" \ -e "s%/usr/games%${PREFIX}/bin%" \ diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 5871a0139bc5..3c2374af2010 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -7,6 +7,7 @@ PORTNAME= rocksndiamonds PORTVERSION= 3.2.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \ http://homepages.compuserve.de/rocksndiamonds/ diff --git a/games/rottdc/Makefile b/games/rottdc/Makefile index 7d7f42ddf410..bf065f35d804 100644 --- a/games/rottdc/Makefile +++ b/games/rottdc/Makefile @@ -7,6 +7,7 @@ PORTNAME= rottdc PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sdl-dc diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile index 29250c6da657..2d7da99514b5 100644 --- a/games/sauerbraten/Makefile +++ b/games/sauerbraten/Makefile @@ -7,6 +7,7 @@ PORTNAME= sauerbraten PORTVERSION= 20060912 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index 2def909beefd..a5d0026ba72d 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= scorched3d PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= scorched3d @@ -51,33 +51,6 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \ .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -E 's,#include.*<SDL/(SDL.*\.h)>,#include <SDL11/\1>,g' \ - ${WRKSRC}/configure.ac \ - ${WRKSRC}/src/GLEXT/GLBitmap.cpp \ - ${WRKSRC}/src/GLEXT/GLState.h \ - ${WRKSRC}/src/GLEXT/GLStateExtension.cpp \ - ${WRKSRC}/src/client/ClientMain.cpp \ - ${WRKSRC}/src/client/SoftwareMouse.cpp \ - ${WRKSRC}/src/client/UniqueIdStore.cpp \ - ${WRKSRC}/src/common/Clock.cpp \ - ${WRKSRC}/src/common/Display.h \ - ${WRKSRC}/src/common/Gamma.cpp \ - ${WRKSRC}/src/common/Gamma.h \ - ${WRKSRC}/src/common/KeyStateTranslate.h \ - ${WRKSRC}/src/common/KeyTranslate.h \ - ${WRKSRC}/src/common/KeyboardHistory.h \ - ${WRKSRC}/src/common/Logger.cpp \ - ${WRKSRC}/src/common/Mouse.h \ - ${WRKSRC}/src/common/RandomGenerator.cpp \ - ${WRKSRC}/src/coms/NetBuffer.cpp \ - ${WRKSRC}/src/coms/NetBuffer.h \ - ${WRKSRC}/src/coms/NetMessageHandler.h \ - ${WRKSRC}/src/coms/NetMessagePool.h \ - ${WRKSRC}/src/engine/MainLoop.cpp \ - ${WRKSRC}/src/scorched/MainDialog.cpp \ - ${WRKSRC}/src/scorched/main.cpp \ - ${WRKSRC}/src/server/ServerBrowserInfo.h \ - ${WRKSRC}/src/server/ServerMain.cpp @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,g' \ ${WRKSRC}/src/3dsparse/aseFile.tab.cpp \ ${WRKSRC}/src/ode/config.h diff --git a/games/scourge/Makefile b/games/scourge/Makefile index 551c15399bed..dfc4c96b4235 100644 --- a/games/scourge/Makefile +++ b/games/scourge/Makefile @@ -7,6 +7,7 @@ PORTNAME= scourge PORTVERSION= 0.15 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/scramble/Makefile b/games/scramble/Makefile index a905fed7d983..b4dac1552844 100644 --- a/games/scramble/Makefile +++ b/games/scramble/Makefile @@ -7,6 +7,7 @@ PORTNAME= scramble PORTVERSION= 0.9.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.shiftygames.com/scramble/ @@ -53,7 +54,7 @@ pre-configure: .endif post-patch: - @${REINPLACE_CMD} -e 's|-std=gnu99 ||g' -e 's|SDL/|SDL11/|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-std=gnu99 ||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/share/dict/words|${DICTIONARY}|g' ${WRKSRC}/src/scramble.c .include <bsd.port.post.mk> diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index b053d4edf82d..b99778ce8358 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -7,6 +7,7 @@ PORTNAME= scummvm PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= games emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/sdb/Makefile b/games/sdb/Makefile index f1ad290e2953..bbc80e67826a 100644 --- a/games/sdb/Makefile +++ b/games/sdb/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdb PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://sdb.gamecreation.org/ diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile index 6966fc9b1fc1..c9d15a25a7a2 100644 --- a/games/sdlquake2/Makefile +++ b/games/sdlquake2/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdlquake2 PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://koti.mbnet.fi/~turol/sdlquake2/ diff --git a/games/sdlroids/Makefile b/games/sdlroids/Makefile index 863dcadbc0d3..64523850c66b 100644 --- a/games/sdlroids/Makefile +++ b/games/sdlroids/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdlroids PORTVERSION= 1.3.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/sdlsand/Makefile b/games/sdlsand/Makefile index 8be58ebb5fbb..891e55f72d82 100644 --- a/games/sdlsand/Makefile +++ b/games/sdlsand/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdlsand PORTVERSION= 20060207 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/senken/Makefile b/games/senken/Makefile index 165cdef5d77c..aa15368d43ee 100644 --- a/games/senken/Makefile +++ b/games/senken/Makefile @@ -6,7 +6,7 @@ PORTNAME= senken PORTVERSION= 0.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile index 467781891a5f..49475e5ff44e 100644 --- a/games/shaaft/Makefile +++ b/games/shaaft/Makefile @@ -7,7 +7,7 @@ PORTNAME= shaaft PORTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= criticalmass diff --git a/games/shootingstar/Makefile b/games/shootingstar/Makefile index 56cfc277e458..9fe2e0bb0869 100644 --- a/games/shootingstar/Makefile +++ b/games/shootingstar/Makefile @@ -7,6 +7,7 @@ PORTNAME= shootingstar PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.2ndpoint.fi/projektit.xml/shootingstar/files/ diff --git a/games/slune/Makefile b/games/slune/Makefile index db8b3f2a0fa9..453c0ba86326 100644 --- a/games/slune/Makefile +++ b/games/slune/Makefile @@ -7,7 +7,7 @@ PORTNAME= slune PORTVERSION= 1.0.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games python MASTER_SITES= http://download.gna.org/slune/ DISTNAME= Slune-${PORTVERSION} diff --git a/games/solarconquest/Makefile b/games/solarconquest/Makefile index 465793067cd7..5ff0e59bc5cb 100644 --- a/games/solarconquest/Makefile +++ b/games/solarconquest/Makefile @@ -7,6 +7,7 @@ PORTNAME= solarconquest PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://games.sajthelper.com/ \ ${MASTER_SITE_LOCAL} diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile index a2cca9e6dfac..6f76fd3f8c50 100644 --- a/games/sopwith/Makefile +++ b/games/sopwith/Makefile @@ -7,7 +7,7 @@ PORTNAME= sopwith PORTVERSION= 1.7.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sdl-sopwith diff --git a/games/ssc/Makefile b/games/ssc/Makefile index 55c3b4b6875a..fcd705a7d9d2 100644 --- a/games/ssc/Makefile +++ b/games/ssc/Makefile @@ -7,7 +7,7 @@ PORTNAME= ssc PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}x diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile index 2bcc7a1d1714..2c818da93e88 100644 --- a/games/starfighter/Makefile +++ b/games/starfighter/Makefile @@ -7,7 +7,7 @@ PORTNAME= starfighter DISTVERSION= 1.1-1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.parallelrealities.co.uk/download.php?type=zip&file= diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index 55a8cacfe212..beeb135d74c1 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -7,7 +7,7 @@ PORTNAME= stratagus PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/supertux/Makefile b/games/supertux/Makefile index 0c8e0b65fcfa..97b7667bd377 100644 --- a/games/supertux/Makefile +++ b/games/supertux/Makefile @@ -7,6 +7,7 @@ PORTNAME= supertux PORTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,8 +26,4 @@ CONFIGURE_ARGS= --disable-debug .include <bsd.port.pre.mk> -post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' \ - ${WRKSRC}/src/type.h - .include <bsd.port.post.mk> diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile index a6c908296456..af67921ced88 100644 --- a/games/tecnoballz/Makefile +++ b/games/tecnoballz/Makefile @@ -7,6 +7,7 @@ PORTNAME= tecnoballz PORTVERSION= 0.90 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://linux.tlk.fr/games/TecnoballZ/download/ EXTRACT_SUFX= .tgz diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile index ad4f16f981e9..c0c092e5a14e 100644 --- a/games/tenebrae/Makefile +++ b/games/tenebrae/Makefile @@ -7,7 +7,7 @@ PORTNAME= tenebrae PORTVERSION= 1.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://tenebrae.sourceforge.net/downloads/ DISTFILES= ${PORTNAME}_src${EXTRACT_SUFX} \ diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile index dabf8dbc195c..3b49d575d71f 100644 --- a/games/thevalley/Makefile +++ b/games/thevalley/Makefile @@ -6,6 +6,7 @@ PORTNAME= thevalley PORTVERSION= 0.98 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.autismuk.freeserve.co.uk/ DISTNAME= valley-${PORTVERSION} diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile index b9bb35e63d9f..52ed05818206 100644 --- a/games/tileworld/Makefile +++ b/games/tileworld/Makefile @@ -7,6 +7,7 @@ PORTNAME= tileworld PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.muppetlabs.com/~breadbox/pub/software/tworld/ DISTNAME= tworld-${PORTVERSION} @@ -24,6 +25,5 @@ MAN6= tworld.6 post-patch: @${REINPLACE_CMD} -e 's|make|$${MAKE}|g; s|cp -i|cp|' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|sdl-config|sdl11-config|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/games/tmw/Makefile b/games/tmw/Makefile index 20261ae65a31..03dcbb7e7ba5 100644 --- a/games/tmw/Makefile +++ b/games/tmw/Makefile @@ -7,6 +7,7 @@ PORTNAME= tmw PORTVERSION= 0.0.20 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= themanaworld @@ -25,6 +26,7 @@ GNU_CONFIGURE= yes USE_SDL= sdl image mixer net CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -I${X11BASE}/include" \ + CFLAGS="`${SDL_CONFIG} --cflags`" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ CXXFLAGS="${PTHREAD_LIBS}" diff --git a/games/tmw/files/patch-configure b/games/tmw/files/patch-configure deleted file mode 100644 index 62b4bd64b7b3..000000000000 --- a/games/tmw/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig Tue Sep 5 13:47:45 2006 -+++ configure Tue Sep 5 13:48:14 2006 -@@ -7533,7 +7533,7 @@ - - # Search for sdl-config - # Extract the first word of "sdl-config", so it can be a program name with args. --set dummy sdl-config; ac_word=$2 -+set dummy sdl11-config; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_LIBSDL_CONFIG+set}" = set; then -@@ -7590,8 +7590,8 @@ - #define HAVE_LIBSDL 0 - _ACEOF - -- { { echo "$as_me:$LINENO: error: Could not find sdl-config, check http://www.libsdl.org" >&5 --echo "$as_me: error: Could not find sdl-config, check http://www.libsdl.org" >&2;} -+ { { echo "$as_me:$LINENO: error: Could not find sdl11-config, check http://www.libsdl.org" >&5 -+echo "$as_me: error: Could not find sdl11-config, check http://www.libsdl.org" >&2;} - { (exit 1); exit 1; }; } - fi - diff --git a/games/tomatoes/Makefile b/games/tomatoes/Makefile index 1c1c7971552a..ffd20ce3b04a 100644 --- a/games/tomatoes/Makefile +++ b/games/tomatoes/Makefile @@ -7,7 +7,7 @@ PORTNAME= tomatoes PORTVERSION= 1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/toppler/Makefile b/games/toppler/Makefile index ebdd21ebfdf7..3e013c447bfd 100644 --- a/games/toppler/Makefile +++ b/games/toppler/Makefile @@ -7,6 +7,7 @@ PORTNAME= toppler PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= toppler diff --git a/games/torrent/Makefile b/games/torrent/Makefile index 4d9fe0cfe352..0e767eb5d156 100644 --- a/games/torrent/Makefile +++ b/games/torrent/Makefile @@ -7,6 +7,7 @@ PORTNAME= torrent PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.shiftygames.com/torrent/ @@ -29,6 +30,6 @@ post-extract: ${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|g; s|-std=gnu99 ||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-std=gnu99 ||g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/games/toycars/Makefile b/games/toycars/Makefile index 4156964a648f..4ba47123ded3 100644 --- a/games/toycars/Makefile +++ b/games/toycars/Makefile @@ -7,6 +7,7 @@ PORTNAME= toycars PORTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= toycars diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile index f54ced630149..ca96b04c8834 100644 --- a/games/trackballs/Makefile +++ b/games/trackballs/Makefile @@ -7,6 +7,7 @@ PORTNAME= trackballs PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/tremor/Makefile b/games/tremor/Makefile index 4c38d594f4a8..45ce92d07479 100644 --- a/games/tremor/Makefile +++ b/games/tremor/Makefile @@ -7,6 +7,7 @@ PORTNAME= tremor PORTVERSION= 3.2.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/:src \ http://tremor.quakedev.com/:data diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile index c8df870fc9e7..a6bc6f2c2ed0 100644 --- a/games/tremulous/Makefile +++ b/games/tremulous/Makefile @@ -7,6 +7,7 @@ PORTNAME= tremulous PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S|$|${PORTNAME}/|} \ http://0day.icculus.org/mirrors/tremulous/ \ diff --git a/games/trigger/Makefile b/games/trigger/Makefile index 8207d6b3579b..2f3eb9011fe0 100644 --- a/games/trigger/Makefile +++ b/games/trigger/Makefile @@ -7,7 +7,7 @@ PORTNAME= trigger PORTVERSION= 0.5.1c -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://0day.icculus.org/mirrors/trigger/ DISTFILES= trigger-${PORTVERSION}-src${EXTRACT_SUFX} \ diff --git a/games/trimines/Makefile b/games/trimines/Makefile index ceeff20321d8..ef6472409121 100644 --- a/games/trimines/Makefile +++ b/games/trimines/Makefile @@ -7,6 +7,7 @@ PORTNAME= trimines PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.freewebs.com/trimines/ diff --git a/games/ttt/Makefile b/games/ttt/Makefile index 654e4025f39f..8b15d72bc227 100644 --- a/games/ttt/Makefile +++ b/games/ttt/Makefile @@ -7,7 +7,7 @@ PORTNAME= ttt PORTVERSION= 2003.03.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/ttt/ diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile index 489e810bae92..837a8dd27901 100644 --- a/games/tuxpaint/Makefile +++ b/games/tuxpaint/Makefile @@ -7,6 +7,7 @@ PORTNAME= tuxpaint PORTVERSION= 0.9.15b +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/tuxpaint/files/patch-Makefile b/games/tuxpaint/files/patch-Makefile index 3d4b7e793b77..a213b75f34f8 100644 --- a/games/tuxpaint/files/patch-Makefile +++ b/games/tuxpaint/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Oct 15 00:22:36 2005 -+++ Makefile Mon Nov 28 16:17:07 2005 +--- Makefile.orig Sun Nov 27 09:44:15 2005 ++++ Makefile Tue Sep 12 18:22:27 2006 @@ -17,7 +17,6 @@ # Where to install things: @@ -22,7 +22,7 @@ # Libraries, paths, and flags: -SDL_LIBS=$(shell sdl-config --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB) -+SDL_LIBS=$(shell ${SDL_CONFIG} --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB) ++SDL_LIBS=$(shell ${SDL_CONFIG} --libs) -lSDL_image -lSDL_ttf -lpng $(SDL_MIXER_LIB) SDL_MIXER_LIB=-lSDL_mixer -SDL_CFLAGS=$(shell sdl-config --cflags) +SDL_CFLAGS=$(shell ${SDL_CONFIG} --cflags) diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile index 8300edbc5c25..49ec7f2b1070 100644 --- a/games/tuxpuck/Makefile +++ b/games/tuxpuck/Makefile @@ -8,7 +8,7 @@ PORTNAME= tuxpuck PORTVERSION= 0.8.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://users.student.lth.se/d00jkr/tuxpuck/ diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile index 178318372cf4..72044bb067ef 100644 --- a/games/tuxracer/Makefile +++ b/games/tuxracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuxracer PORTVERSION= 0.61 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=tuxracer diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile index 21173af316e4..505846f05655 100644 --- a/games/tuxtype/Makefile +++ b/games/tuxtype/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuxtype PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/uhexen/Makefile b/games/uhexen/Makefile index 5f05d8d07047..f30e384cedc5 100644 --- a/games/uhexen/Makefile +++ b/games/uhexen/Makefile @@ -7,7 +7,7 @@ PORTNAME= uhexen PORTVERSION= 0.601 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://uhexen.sourceforge.net/ DISTNAME= ${PORTNAME}-latest diff --git a/games/uqm/Makefile b/games/uqm/Makefile index 198d4c775ac4..d6ce2f93f136 100644 --- a/games/uqm/Makefile +++ b/games/uqm/Makefile @@ -14,6 +14,7 @@ PORTNAME= uqm PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sc2 diff --git a/games/uqm/files/patch-build-unix-config_proginfo_host b/games/uqm/files/patch-build-unix-config_proginfo_host index 68871e58640e..01ad3adb441d 100644 --- a/games/uqm/files/patch-build-unix-config_proginfo_host +++ b/games/uqm/files/patch-build-unix-config_proginfo_host @@ -1,5 +1,18 @@ ---- build/unix/config_proginfo_host.orig Tue Feb 7 03:45:58 2006 -+++ build/unix/config_proginfo_host Tue Feb 7 03:48:21 2006 +--- build/unix/config_proginfo_host.orig Thu Jan 19 22:13:38 2006 ++++ build/unix/config_proginfo_host Tue Sep 12 19:12:07 2006 +@@ -55,9 +55,9 @@ + LIB_SDL_NAME="Simple DirectMedia Layer" + case "$HOST_SYSTEM" in + FreeBSD) +- LIB_SDL_CFLAGS='$(sdl11-config --cflags)' +- LIB_SDL_LDFLAGS='$(sdl11-config --libs)' +- LIB_SDL_VERSION='$(sdl11-config --version)' ++ LIB_SDL_CFLAGS='$(sdl-config --cflags)' ++ LIB_SDL_LDFLAGS='$(sdl-config --libs)' ++ LIB_SDL_VERSION='$(sdl-config --version)' + ;; + Darwin) + LIB_SDL_CFLAGS='' @@ -102,7 +102,7 @@ LIB_openal_CFLAGS="" case "$HOST_SYSTEM" in diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile index c0d77c95b2ae..89abb7f5f88f 100644 --- a/games/vavoom/Makefile +++ b/games/vavoom/Makefile @@ -7,6 +7,7 @@ PORTNAME= vavoom PORTVERSION= 1.21.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile index 05832acb7185..32b8d5822adb 100644 --- a/games/vdrift/Makefile +++ b/games/vdrift/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdrift PORTVERSION= 20060708 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -61,10 +62,7 @@ BROKEN= Does not compile on sparc64 .endif post-patch: - @${FIND} ${WRKSRC}/src/* -type f -exec ${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' "{}" \; - @${FIND} ${WRKSRC}/include/* -type f -exec ${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' "{}" \; @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/SConstruct - @${REINPLACE_CMD} -e 's|sdl-config|sdl11-config|g' ${WRKSRC}/src/SConscript @${REINPLACE_CMD} -e "s|'openal'|'openal','alut'|g" ${WRKSRC}/SConstruct do-build: diff --git a/games/vdrift/files/patch-SConstruct b/games/vdrift/files/patch-SConstruct index 89d701992c1d..03c735ce9304 100644 --- a/games/vdrift/files/patch-SConstruct +++ b/games/vdrift/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct Fri Jul 21 16:43:04 2006 -+++ SConstruct Fri Jul 21 16:43:49 2006 -@@ -42,7 +42,7 @@ +--- SConstruct.orig Sun Jul 9 03:05:30 2006 ++++ SConstruct Tue Sep 12 19:16:12 2006 +@@ -42,10 +42,10 @@ env = Environment(ENV = os.environ, CPPPATH = ['#include',LOCALBASE + '/include', LOCALBASE + '/include/AL',X11BASE + '/include'], LIBPATH = ['.', '#lib', LOCALBASE + '/lib', X11BASE + '/lib'], @@ -8,4 +8,8 @@ + LINKFLAGS = ['-pthread','-lintl'], options = opts) - check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL11/SDL.h', 'SDL11/SDL_image.h', 'SDL11/SDL_net.h'] +- check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL11/SDL.h', 'SDL11/SDL_image.h', 'SDL11/SDL_net.h'] ++ check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_net.h'] + + env.Replace(CC = os.environ['CC']) + env.Replace(CXX = os.environ['CXX']) diff --git a/games/vdrift/files/patch-src_sound.cpp b/games/vdrift/files/patch-src_sound.cpp new file mode 100644 index 000000000000..8819c41a060a --- /dev/null +++ b/games/vdrift/files/patch-src_sound.cpp @@ -0,0 +1,14 @@ +--- src/sound.cpp.orig Tue Sep 12 19:39:38 2006 ++++ src/sound.cpp Tue Sep 12 19:41:19 2006 +@@ -282,9 +282,9 @@ + alutLoadWAVFile((ALbyte*)(filename).c_str(), &format, &data, &size, &freq); + #else + #ifdef OLD_OPENAL +- alutLoadWAVFile((ALbyte*)(filename).c_str(), &format, &data, &size, &freq, &loop); ++ alutLoadWAVFile(filename.c_str(), &format, &data, &size, &freq, &loop); + #else +- data = alutLoadMemoryFromFile((ALbyte*)(filename).c_str(), &format, &size, &freq); ++ data = alutLoadMemoryFromFile(filename.c_str(), &format, &size, &freq); + #endif + #endif + //bool err = LoadWave(filename, &format, &data, &size, &freq, &loop); diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile index 6d6e984a940d..1af95f17b4b1 100644 --- a/games/vectoroids/Makefile +++ b/games/vectoroids/Makefile @@ -7,7 +7,7 @@ PORTNAME= vectoroids PORTVERSION= 1.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/vectoroids/src/ diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile index a4d425203792..7c92b7fe73e0 100644 --- a/games/volleyball/Makefile +++ b/games/volleyball/Makefile @@ -7,6 +7,7 @@ PORTNAME= volleyball PORTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.losersjuegos.com.ar/juegos/volleyball/descargas/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/games/vor/Makefile b/games/vor/Makefile index 223746522f4f..c6de6ca6dcd1 100644 --- a/games/vor/Makefile +++ b/games/vor/Makefile @@ -7,6 +7,7 @@ PORTNAME= vor PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://qualdan.com/vor/ diff --git a/games/vultures-claw/Makefile b/games/vultures-claw/Makefile index d4437e3bb5f8..bac856874a2e 100644 --- a/games/vultures-claw/Makefile +++ b/games/vultures-claw/Makefile @@ -7,7 +7,7 @@ PORTNAME= vultures PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/vultures/downloads/${PORTVERSION}/ PKGNAMESUFFIX= -claw diff --git a/games/vultures-claw/files/patch-sys_unix_Makefile.src b/games/vultures-claw/files/patch-sys_unix_Makefile.src new file mode 100644 index 000000000000..ec4c1d866d60 --- /dev/null +++ b/games/vultures-claw/files/patch-sys_unix_Makefile.src @@ -0,0 +1,31 @@ +--- sys/unix/Makefile.src.orig Tue Sep 12 18:50:59 2006 ++++ sys/unix/Makefile.src Tue Sep 12 18:51:23 2006 +@@ -147,13 +147,8 @@ + + # VULTURESCFLAGS will be passed to the sub-makefile for vultures + OS = $(shell uname -s) +-ifeq ($(OS),FreeBSD) +- SDL_CONFIG = sdl11-config +- SDLMAIN = -lSDLmain-1.1 +-else +- SDL_CONFIG = sdl-config +- SDLMAIN = -lSDLmain +-endif ++SDL_CONFIG = sdl-config ++SDLMAIN = -lSDLmain + VULTURESCFLAGS = -Wall -O -g + CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags) + LFLAGS = +@@ -362,11 +357,7 @@ + # necessary compile and link flags. + # + OS = $(shell uname -s) +-ifeq ($(OS),FreeBSD) +- SDL = sdl11-config +-else +- SDL = sdl-config +-endif ++SDL = sdl-config + WINVULTURESLIB = `$(SDL) --libs` $(SDLMAIN) -lSDL_mixer -lSDL_ttf -lpng -lz + + ifeq ($(OS),Darwin) diff --git a/games/vultures-eye/Makefile b/games/vultures-eye/Makefile index 35f03b084fc2..a33e822a4dea 100644 --- a/games/vultures-eye/Makefile +++ b/games/vultures-eye/Makefile @@ -7,7 +7,7 @@ PORTNAME= vultures PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.darkarts.co.za/projects/vultures/downloads/${PORTVERSION}/ PKGNAMESUFFIX= -eye diff --git a/games/vultures-eye/files/patch-sys-unix-Makefile.sys b/games/vultures-eye/files/patch-sys-unix-Makefile.sys index b44f4afee53f..078cab809fbc 100644 --- a/games/vultures-eye/files/patch-sys-unix-Makefile.sys +++ b/games/vultures-eye/files/patch-sys-unix-Makefile.sys @@ -1,18 +1,20 @@ ---- sys/unix/Makefile.src.orig Thu Apr 6 02:59:04 2006 -+++ sys/unix/Makefile.src Thu May 25 01:24:10 2006 -@@ -154,21 +154,21 @@ +--- sys/unix/Makefile.src.orig Tue Jun 6 23:23:32 2006 ++++ sys/unix/Makefile.src Tue Sep 12 18:31:34 2006 +@@ -153,22 +153,17 @@ + # VULTURESCFLAGS will be passed to the sub-makefile for vultures OS = $(shell uname -s) - ifeq ($(OS),FreeBSD) +-ifeq ($(OS),FreeBSD) - SDL_CONFIG = sdl11-config -+# SDL_CONFIG = sdl11-config - SDLMAIN = -lSDLmain-1.1 - else - SDL_CONFIG = sdl-config - SDLMAIN = -lSDLmain - endif +- SDLMAIN = -lSDLmain-1.1 +-else +- SDL_CONFIG = sdl-config +- SDLMAIN = -lSDLmain +-endif -VULTURESCFLAGS = -Wall -g -CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags) ++SDL_CONFIG = sdl-config ++SDLMAIN = -lSDLmain +VULTURESCFLAGS = ${CFLAGS} +CFLAGS += -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags) LFLAGS = @@ -27,7 +29,7 @@ #LINK=g++ # For cross-compiling, eg. with gcc on Linux (see also CC further up): #CXX=arm-linux-g++ -@@ -480,7 +480,7 @@ +@@ -480,7 +475,7 @@ @rm -f $(MAKEDEFS) ../win/vultures/build_n/vultures.o: objects.o monst.o ../include/date.h ../win/vultures/* ../win/vultures/util/* diff --git a/games/warsow/Makefile b/games/warsow/Makefile index 791f0d60626b..28d5836f4c87 100644 --- a/games/warsow/Makefile +++ b/games/warsow/Makefile @@ -7,7 +7,7 @@ PORTNAME= warsow PORTVERSION= 0.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://warsow.aditsystems.com/ \ http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \ diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile index 8a0611e87258..b31e3523d092 100644 --- a/games/wesnoth-devel/Makefile +++ b/games/wesnoth-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= wesnoth PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.wesnoth.org/files/ diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 8a0611e87258..b31e3523d092 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -7,6 +7,7 @@ PORTNAME= wesnoth PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.wesnoth.org/files/ diff --git a/games/wolf3d/Makefile b/games/wolf3d/Makefile index 68d60ae41eb9..39beef6a6eb0 100644 --- a/games/wolf3d/Makefile +++ b/games/wolf3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= wolf3d PORTVERSION= 20011028 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.icculus.org/wolf3d/:wolf \ http://cvsup.theplanet.com/distfiles/:wolf \ diff --git a/games/wop/Makefile b/games/wop/Makefile index ba22394da0e6..915ce4d58840 100644 --- a/games/wop/Makefile +++ b/games/wop/Makefile @@ -7,6 +7,7 @@ PORTNAME= wop PORTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://wormsofprey.org/download/ DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \ diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 07bc5fdb09f5..c8d9980c4641 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmoto PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile index 6377f2f5c03f..638c4948c5df 100644 --- a/games/xonotic/Makefile +++ b/games/xonotic/Makefile @@ -7,6 +7,7 @@ PORTNAME= nexuiz PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile index b283934588f5..0b729965349b 100644 --- a/games/xpilot-ng-server/Makefile +++ b/games/xpilot-ng-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= xpilot-ng PORTVERSION= 4.7.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xpilot @@ -87,8 +88,6 @@ PLIST_SUB+= SOUND="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's,#include "SDL/,#include "SDL11/,g' \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|mapconvert\.py||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|xpilot-ng-server\.man||' \ ${WRKSRC}/doc/man/Makefile.in diff --git a/games/xpired/Makefile b/games/xpired/Makefile index 4f7208e3a225..dc2577dfbf64 100644 --- a/games/xpired/Makefile +++ b/games/xpired/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpired PORTVERSION= 1.22 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xpired diff --git a/games/xpired/files/patch-Makefile b/games/xpired/files/patch-Makefile deleted file mode 100644 index 877c0dd7bb22..000000000000 --- a/games/xpired/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig Mon Aug 5 14:41:31 2002 -+++ Makefile Mon Aug 5 14:43:38 2002 -@@ -1,8 +1,6 @@ --PREFIX=/usr/local - SHARE_PREFIX=$(PREFIX)/share/xpired --CFLAGS=`sdl-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\" --LDFLAGS=`sdl-config --libs` -lSDL -lSDL_mixer -lSDL_image -lSDL_gfx --CC=gcc -+CFLAGS=`sdl11-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\" -+LDFLAGS=`sdl11-config --libs` -lSDL_mixer -lSDL_image -lSDL_gfx - - BINARIES = xpired xpiredit - diff --git a/games/xrick/Makefile b/games/xrick/Makefile index 626069845ff6..530c57c71932 100644 --- a/games/xrick/Makefile +++ b/games/xrick/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrick PORTVERSION= 021212 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.bigorno.net/xrick/ EXTRACT_SUFX= .tgz diff --git a/games/xrick/files/patch-Makefile b/games/xrick/files/patch-Makefile deleted file mode 100644 index ec3c5a003615..000000000000 --- a/games/xrick/files/patch-Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.orig Tue Dec 24 18:58:26 2002 -+++ Makefile Mon Mar 31 22:28:45 2003 -@@ -15,7 +15,7 @@ - # Vars - # - --SDLVERSION=$(shell sdl-config --version 2>/dev/null) -+SDLVERSION=$(shell sdl11-config --version 2>/dev/null) - ROOTDIR=$(shell pwd) - TARGET=$(shell uname -s | tr [a-z] [A-Z]) - -@@ -71,8 +71,8 @@ - all: - @echo "ROOTDIR=$(ROOTDIR)" > Makefile.global - @echo "XOBJ=$(XOBJ)" >> Makefile.global -- @echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global -- @echo "LDFLAGS=-lz $(shell sdl-config --libs)" >> Makefile.global -+ @echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl11-config --cflags)" >> Makefile.global -+ @echo "LDFLAGS=-lz $(shell sdl11-config --libs)" >> Makefile.global - @echo "CC=gcc" >> Makefile.global - @echo "CPP=gcc -E" >> Makefile.global - $(MAKE) -C src all diff --git a/games/xye/Makefile b/games/xye/Makefile index 61a340c1ca4a..5cf1132eb3ed 100644 --- a/games/xye/Makefile +++ b/games/xye/Makefile @@ -7,6 +7,7 @@ PORTNAME= xye PORTVERSION= 0.7.6.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,7 +26,4 @@ USE_GMAKE= yes BROKEN= does not build on FreeBSD 4.x .endif -post-patch: - @${REINPLACE_CMD} -E 's,#include.*<SDL/(SDL.*\.h)>,#include <SDL11/\1>,g' ${WRKSRC}/src/vxsdl.h - .include <bsd.port.post.mk> diff --git a/games/zatacka/Makefile b/games/zatacka/Makefile index e547ff29ac58..8736bfae9e5a 100644 --- a/games/zatacka/Makefile +++ b/games/zatacka/Makefile @@ -7,6 +7,7 @@ PORTNAME= zatacka PORTVERSION= 0.1.6 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,8 +27,6 @@ PORTDOCS= README post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|font.ttf|${DATADIR}/font.ttf|' ${WRKSRC}/fx.h - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/SDL_prim.h \ - ${WRKSRC}/fx.h @${REINPLACE_CMD} -e 's|barrier.jpg|${DATADIR}/barrier.jpg|' \ ${WRKSRC}/fx.cpp @${REINPLACE_CMD} -e 's|main_screen.jpg|${DATADIR}/main_screen.jpg|' \ diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile index fd2b3182346a..9b8b8a7d7ad4 100644 --- a/graphics/blender-devel/Makefile +++ b/graphics/blender-devel/Makefile @@ -6,6 +6,7 @@ PORTNAME= blender PORTVERSION= 2.40 +PORTREVISION= 1 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ ftp://ftp.cs.umn.edu/pub/blender.org/source/ \ diff --git a/graphics/blender-devel/files/patch-SConstruct b/graphics/blender-devel/files/patch-SConstruct index ff4a549de732..13e53113a878 100644 --- a/graphics/blender-devel/files/patch-SConstruct +++ b/graphics/blender-devel/files/patch-SConstruct @@ -1,5 +1,5 @@ ---- SConstruct.orig Tue Dec 20 10:56:12 2005 -+++ SConstruct Fri Dec 30 16:43:44 2005 +--- SConstruct.orig Tue Dec 20 18:56:12 2005 ++++ SConstruct Tue Sep 12 17:15:19 2006 @@ -735,7 +735,7 @@ openal_libpath = ['/usr/lib'] openal_include = ['/usr/include'] @@ -9,7 +9,7 @@ print "Building for FreeBSD" use_international = 'false' use_gameengine = 'false' -@@ -773,6 +773,10 @@ +@@ -773,13 +773,17 @@ jpeg_lib = ['jpeg'] jpeg_libpath = ['/usr/local/lib'] jpeg_include = ['/usr/local/include'] @@ -20,3 +20,11 @@ # OpenGL library information opengl_lib = ['GL', 'GLU'] opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a'] + opengl_libpath = ['/usr/lib', '/usr/X11R6/lib'] + opengl_include = ['/usr/X11R6/include/'] + # SDL library information +- sdl_env.ParseConfig ('sdl11-config --cflags --libs') ++ sdl_env.ParseConfig ('sdl-config --cflags --libs') + sdl_cflags = sdl_env.Dictionary()['CCFLAGS'] + sdl_include = sdl_env.Dictionary()['CPPPATH'] + sdl_libpath = ['/usr/local/include/SDL11'] diff --git a/graphics/bmp2html/Makefile b/graphics/bmp2html/Makefile index 9fe002e85086..7729e632fcd3 100644 --- a/graphics/bmp2html/Makefile +++ b/graphics/bmp2html/Makefile @@ -7,6 +7,7 @@ PORTNAME= bmp2html PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://critical.ch/distfiles/ \ http://energy.critical.ch/distfiles/ \ @@ -19,8 +20,8 @@ COMMENT= A bmp to html converter USE_SDL= yes LDFLAGS+= -L${LOCALBASE}/lib -SDL_FLAGS= -I${LOCALBASE}/include/SDL11 -EXTRA_LDFLAGS= -lSDL-1.1 -pthread +SDL_FLAGS= -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include +EXTRA_LDFLAGS= -lSDL -pthread DEFINES= -D_REENTRANT PLIST_FILES= bin/bmp2html diff --git a/graphics/crystalspace-devel/Makefile b/graphics/crystalspace-devel/Makefile index 168e42d3d3e9..df962a524920 100644 --- a/graphics/crystalspace-devel/Makefile +++ b/graphics/crystalspace-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= crystalspace PORTVERSION= 20060710 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://alex.foxybanana.com/freebsd/ PKGNAMESUFFIX= -devel diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile index 1437e9e4accc..0352d896bb03 100644 --- a/graphics/crystalspace/Makefile +++ b/graphics/crystalspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= crystalspace PORTVERSION= 0.99 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= crystal diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile index 646b7626407f..e1d896e774aa 100644 --- a/graphics/demeter/Makefile +++ b/graphics/demeter/Makefile @@ -7,7 +7,7 @@ PORTNAME= demeter PORTVERSION= 3.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile index 0ff86d54737a..ce2108f08e0b 100644 --- a/graphics/devil/Makefile +++ b/graphics/devil/Makefile @@ -7,7 +7,7 @@ PORTNAME= devil PORTVERSION= 1.6.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= openil diff --git a/graphics/gephex/Makefile b/graphics/gephex/Makefile index a4f38ddeb4d6..60a544fd02cd 100644 --- a/graphics/gephex/Makefile +++ b/graphics/gephex/Makefile @@ -7,7 +7,7 @@ PORTNAME= gephex PORTVERSION= 0.4.3b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.gephex.org/download/src/ diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile index f2f201ff790d..9dc6e080ce0e 100644 --- a/graphics/gnash-devel/Makefile +++ b/graphics/gnash-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnash PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} @@ -29,7 +30,8 @@ USE_GCC= 3.4+ PLUGIN_DIR= ${PREFIX}/lib/browser_plugins -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -Wl,--rpath,${PREFIX}/lib/gnash" +CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -Wl,--rpath,${PREFIX}/lib/gnash" \ + CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" CONFIGURE_ARGS= --libdir="${PREFIX}/lib/gnash" \ --with-plugindir=${PLUGIN_DIR} diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index f2f201ff790d..9dc6e080ce0e 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnash PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} @@ -29,7 +30,8 @@ USE_GCC= 3.4+ PLUGIN_DIR= ${PREFIX}/lib/browser_plugins -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -Wl,--rpath,${PREFIX}/lib/gnash" +CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -Wl,--rpath,${PREFIX}/lib/gnash" \ + CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" CONFIGURE_ARGS= --libdir="${PREFIX}/lib/gnash" \ --with-plugindir=${PLUGIN_DIR} diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile index 4772f55f5de5..15cb5f044ef9 100644 --- a/graphics/guilib/Makefile +++ b/graphics/guilib/Makefile @@ -7,6 +7,7 @@ PORTNAME= guilib PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/GUIlib/src/ DISTNAME= GUIlib-${PORTVERSION} diff --git a/graphics/ogre312/Makefile b/graphics/ogre312/Makefile index ba96f5fe2da1..8bfba13ce4ba 100644 --- a/graphics/ogre312/Makefile +++ b/graphics/ogre312/Makefile @@ -7,6 +7,7 @@ PORTNAME= ogre3d PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=ogre diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile index ba96f5fe2da1..8bfba13ce4ba 100644 --- a/graphics/ogre3d/Makefile +++ b/graphics/ogre3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= ogre3d PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=ogre diff --git a/graphics/ogre3d12/Makefile b/graphics/ogre3d12/Makefile index ba96f5fe2da1..8bfba13ce4ba 100644 --- a/graphics/ogre3d12/Makefile +++ b/graphics/ogre3d12/Makefile @@ -7,6 +7,7 @@ PORTNAME= ogre3d PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=ogre diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index 7672ceed7fd0..7828b35cd347 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -55,8 +55,6 @@ STDINTFLAG= true .endif post-patch: - @cd ${WRKSRC} && \ - ${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e 's|SDL/|SDL11/|g' "{}" \; @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e \ diff --git a/graphics/py-soya3d/files/patch-setup.py b/graphics/py-soya3d/files/patch-setup.py index 70e12375091a..a7dff9ece576 100644 --- a/graphics/py-soya3d/files/patch-setup.py +++ b/graphics/py-soya3d/files/patch-setup.py @@ -1,22 +1,5 @@ --- setup.py Mon Aug 21 00:22:53 2006 +++ setup.py Mon Aug 21 00:24:52 2006 -@@ -37,6 +37,7 @@ - "/usr/include/freetype2", - "/usr/local/include/freetype2", - "/usr/include/cal3d", -+ "/usr/local/include/SDL11", - "/usr/local/include/cal3d", - "/sw/include", # For Mac OS X "fink" - "/opt/local/include", # For Mac OS X "darwin port" -@@ -80,7 +81,7 @@ - LIBS = ["m", "glew32", "SDL", "freetype", "cal3d", "stdc++"] - else: - #LIBS = ["m", "GLEW", "GL", "GLU", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++"] -- LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++"] -+ LIBS = ["m", "GLEW", "SDL-1.1", "freetype", "cal3d", "stdc++"] - - SOYA_PYREX_SOURCES = ["_soya.pyx", "matrix.c", "chunk.c" ] - SOYA_C_SOURCES = ["_soya.c" , "matrix.c", "chunk.c" ] @@ -99,6 +100,7 @@ if USE_OPENAL: print "Sound support (with OpenAL) enabled..." diff --git a/graphics/sage/Makefile b/graphics/sage/Makefile index 06d4319b1af5..210df0f54c35 100644 --- a/graphics/sage/Makefile +++ b/graphics/sage/Makefile @@ -7,7 +7,7 @@ PORTNAME= sage PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= worldforge diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile index 9f037eaed623..5f6f932e5504 100644 --- a/graphics/sdl_gfx/Makefile +++ b/graphics/sdl_gfx/Makefile @@ -8,7 +8,7 @@ PORTNAME= sdl_gfx PORTVERSION= 2.0.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.ferzkopp.net/Software/%SUBDIR%/ \ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ @@ -22,7 +22,7 @@ USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --includedir=${PREFIX}/include/SDL11 \ +CONFIGURE_ARGS= --includedir=${PREFIX}/include \ --disable-mmx MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" @@ -34,10 +34,4 @@ USE_LDCONFIG= yes CFLAGS+= -DUSE_MMX .endif -post-patch: - @${GREP} -lR "<SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ - 's|<SDL/SDL|<SDL|g' - @${REINPLACE_CMD} -e \ - 's|$$(includedir)/SDL|$$(includedir)|g' ${WRKSRC}/Makefile.in - .include <bsd.port.post.mk> diff --git a/graphics/sdl_gfx/pkg-plist b/graphics/sdl_gfx/pkg-plist index a9caa69b654d..3d7963133e8d 100644 --- a/graphics/sdl_gfx/pkg-plist +++ b/graphics/sdl_gfx/pkg-plist @@ -1,9 +1,10 @@ -include/SDL11/SDL_framerate.h -include/SDL11/SDL_gfxPrimitives.h -include/SDL11/SDL_gfxPrimitives_font.h -include/SDL11/SDL_imageFilter.h -include/SDL11/SDL_rotozoom.h +include/SDL/SDL_framerate.h +include/SDL/SDL_gfxPrimitives.h +include/SDL/SDL_gfxPrimitives_font.h +include/SDL/SDL_imageFilter.h +include/SDL/SDL_rotozoom.h lib/libSDL_gfx.a lib/libSDL_gfx.la lib/libSDL_gfx.so lib/libSDL_gfx.so.13 +@dirrmtry include/SDL diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile index 2cddb43cb7ed..a2ebc5459a9f 100644 --- a/graphics/sdl_image/Makefile +++ b/graphics/sdl_image/Makefile @@ -6,8 +6,8 @@ # PORTNAME= sdl_image -PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTVERSION= 1.2.5 +PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ DISTNAME= SDL_image-${PORTVERSION} @@ -26,7 +26,6 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" CONFIGURE_ARGS= --enable-tif --enable-xcf -MAKE_ARGS= LT_CURRENT=10 LT_REVISION=0 LT_AGE=0 USE_LDCONFIG= yes post-install: diff --git a/graphics/sdl_image/distinfo b/graphics/sdl_image/distinfo index 6b10c7c2c16c..c87f0303c66a 100644 --- a/graphics/sdl_image/distinfo +++ b/graphics/sdl_image/distinfo @@ -1,3 +1,3 @@ -MD5 (SDL_image-1.2.4.tar.gz) = 70bf617f99e51a2c94550fc79d542f0b -SHA256 (SDL_image-1.2.4.tar.gz) = c295b5fdb8c51fd363a351b9ca66b1d3c50f99d5610a0629d719757a35139032 -SIZE (SDL_image-1.2.4.tar.gz) = 841885 +MD5 (SDL_image-1.2.5.tar.gz) = cd006109a73bf7dcc93e1c3ed15ee782 +SHA256 (SDL_image-1.2.5.tar.gz) = 8a665d136fb17cc9fedcd8e42d21fcab553bd7ab67b6cafea2c6c7efe1adb308 +SIZE (SDL_image-1.2.5.tar.gz) = 1308637 diff --git a/graphics/sdl_image/files/patch-ab b/graphics/sdl_image/files/patch-ab index 34ba119ef93d..97f04da26e83 100644 --- a/graphics/sdl_image/files/patch-ab +++ b/graphics/sdl_image/files/patch-ab @@ -3,15 +3,6 @@ $FreeBSD$ --- Makefile.in.orig +++ Makefile.in -@@ -225,7 +225,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - lib_LTLIBRARIES = libSDL_image.la --libSDL_imageincludedir = $(includedir)/SDL -+libSDL_imageincludedir = $(includedir)/SDL11 - libSDL_imageinclude_HEADERS = \ - SDL_image.h - @@ -255,7 +255,6 @@ libSDL_image_la_LDFLAGS = \ diff --git a/graphics/sdl_image/pkg-plist b/graphics/sdl_image/pkg-plist index 614f04815917..6762a1e3d345 100644 --- a/graphics/sdl_image/pkg-plist +++ b/graphics/sdl_image/pkg-plist @@ -1,6 +1,7 @@ bin/showimage -include/SDL11/SDL_image.h +include/SDL/SDL_image.h lib/libSDL_image.a lib/libSDL_image.la lib/libSDL_image.so -lib/libSDL_image.so.10 +lib/libSDL_image.so.1 +@dirrmtry include/SDL diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile index ae116d263136..2bf22d3c1113 100644 --- a/graphics/sdl_ttf/Makefile +++ b/graphics/sdl_ttf/Makefile @@ -6,8 +6,8 @@ # PORTNAME= sdl_ttf -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 +PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/ DISTNAME= SDL_ttf-${PORTVERSION} @@ -24,7 +24,6 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAKE_ARGS= LT_CURRENT=3 LT_REVISION=0 LT_AGE=0 USE_LDCONFIG= yes post-install: diff --git a/graphics/sdl_ttf/distinfo b/graphics/sdl_ttf/distinfo index 5c3a4abdee45..1b5687245165 100644 --- a/graphics/sdl_ttf/distinfo +++ b/graphics/sdl_ttf/distinfo @@ -1,3 +1,3 @@ -MD5 (SDL_ttf-2.0.7.tar.gz) = 0f6ee1a502e6913a412aac353dc75bbc -SHA256 (SDL_ttf-2.0.7.tar.gz) = 6dee151cee5f421828c9a20d19a3f06037c4e9eb9456f5143f02aa1ea17de3bc -SIZE (SDL_ttf-2.0.7.tar.gz) = 1889705 +MD5 (SDL_ttf-2.0.8.tar.gz) = 094b6c08769e9842dbe1dfb5efa22df7 +SHA256 (SDL_ttf-2.0.8.tar.gz) = 6f57c879c0d15211f468aac48ed43653103bbe701a3f1cff462107ad1f74c5bc +SIZE (SDL_ttf-2.0.8.tar.gz) = 2457385 diff --git a/graphics/sdl_ttf/files/patch-aa b/graphics/sdl_ttf/files/patch-aa index 08f10d948489..95d4ef7aa306 100644 --- a/graphics/sdl_ttf/files/patch-aa +++ b/graphics/sdl_ttf/files/patch-aa @@ -3,15 +3,6 @@ $FreeBSD$ --- Makefile.in.orig +++ Makefile.in -@@ -225,7 +225,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - lib_LTLIBRARIES = libSDL_ttf.la --libSDL_ttfincludedir = $(includedir)/SDL -+libSDL_ttfincludedir = $(includedir)/SDL11 - libSDL_ttfinclude_HEADERS = \ - SDL_ttf.h - @@ -243,7 +243,6 @@ libSDL_ttf_la_LDFLAGS = \ diff --git a/graphics/sdl_ttf/pkg-plist b/graphics/sdl_ttf/pkg-plist index b209949084f6..7f20ac88523e 100644 --- a/graphics/sdl_ttf/pkg-plist +++ b/graphics/sdl_ttf/pkg-plist @@ -1,7 +1,8 @@ bin/glfont bin/showfont -include/SDL11/SDL_ttf.h +include/SDL/SDL_ttf.h lib/libSDL_ttf.a lib/libSDL_ttf.la lib/libSDL_ttf.so -lib/libSDL_ttf.so.3 +lib/libSDL_ttf.so.6 +@dirrmtry include/SDL diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile index ff6fb97a6c75..294ce956f0c9 100644 --- a/graphics/swfdec/Makefile +++ b/graphics/swfdec/Makefile @@ -8,7 +8,7 @@ PORTNAME= swfdec PORTVERSION= 0.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.schleef.org/swfdec/download/ diff --git a/graphics/synaesthesia/Makefile b/graphics/synaesthesia/Makefile index 3180c76cc930..0df902a37222 100644 --- a/graphics/synaesthesia/Makefile +++ b/graphics/synaesthesia/Makefile @@ -7,6 +7,7 @@ PORTNAME= synaesthesia PORTVERSION= 2.4 +PORTREVISION= 1 CATEGORIES= graphics audio MASTER_SITES= http://www.logarithmic.net/pfh-files/synaesthesia/ CSME diff --git a/graphics/teddy/Makefile b/graphics/teddy/Makefile index 0416d4a50030..68aaec5585cb 100644 --- a/graphics/teddy/Makefile +++ b/graphics/teddy/Makefile @@ -8,6 +8,7 @@ PORTNAME= teddy PORTVERSION= 1.81.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/timeless/Makefile b/graphics/timeless/Makefile index 80ea0edd8bfc..2753cc10caa6 100644 --- a/graphics/timeless/Makefile +++ b/graphics/timeless/Makefile @@ -7,6 +7,7 @@ PORTNAME= timeless PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile index f852514be468..05fa1882d924 100644 --- a/graphics/vp/Makefile +++ b/graphics/vp/Makefile @@ -7,6 +7,7 @@ PORTNAME= vp PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://math.missouristate.edu/~erik/files/ diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile index 42e47f17c853..185f304716c7 100644 --- a/graphics/white_dune/Makefile +++ b/graphics/white_dune/Makefile @@ -8,7 +8,7 @@ PORTNAME= white_dune PORTVERSION= 0.28.11 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://vrml.cip.ica.uni-stuttgart.de/dune/ diff --git a/graphics/xmms-dancingparticles/Makefile b/graphics/xmms-dancingparticles/Makefile index ac6a5e2ce6e2..ddf65fd66ad0 100644 --- a/graphics/xmms-dancingparticles/Makefile +++ b/graphics/xmms-dancingparticles/Makefile @@ -7,7 +7,7 @@ PORTNAME= dancingparticles PORTVERSION= 0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://tardyp.free.fr/dancingparticles/ PKGNAMEPREFIX= xmms- diff --git a/graphics/xmms-infinity/Makefile b/graphics/xmms-infinity/Makefile index 1e8222531863..242e56522354 100644 --- a/graphics/xmms-infinity/Makefile +++ b/graphics/xmms-infinity/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-infinity PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://julien.carme.free.fr/ DISTNAME= infinity-${PORTVERSION} @@ -26,8 +26,4 @@ USE_GMAKE= yes USE_GNOME= gtk12 USE_X_PREFIX= yes -pre-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' ${WRKSRC}/*.[ch] \ - ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/graphics/xmms-jess/Makefile b/graphics/xmms-jess/Makefile index 4f52f83c430c..fa17d5be6433 100644 --- a/graphics/xmms-jess/Makefile +++ b/graphics/xmms-jess/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-jess PORTVERSION= 2.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://arquier.free.fr/ DISTNAME= JESS-${PORTVERSION} diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile index c7f1394dce9a..aefb393457eb 100644 --- a/graphics/xmms-nebulus/Makefile +++ b/graphics/xmms-nebulus/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-nebulus PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://nebulus.tuxfamily.org/ @@ -28,16 +28,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" post-patch: - @${REINPLACE_CMD} -E -e \ - 's|SDL/SDL.h|SDL11/SDL.h|; \ - s|SDL/SDL_opengl.h|SDL11/SDL_opengl.h|; \ - s|SDL/SDL_thread.h|SDL11/SDL_thread.h|' \ - ${WRKSRC}/src/nebulus.h \ - ${WRKSRC}/src/nebulus.c \ - ${WRKSRC}/src/face_data.c \ - ${WRKSRC}/src/child_data.c \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ 's|-Wall||' \ ${WRKSRC}/src/Makefile.in diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile index e1446373b3da..fe96c6f38ea4 100644 --- a/graphics/xmms-paranormal/Makefile +++ b/graphics/xmms-paranormal/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-paranormal PORTVERSION= 0.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= paranormal @@ -30,8 +30,4 @@ USE_GNOME= gtk12 USE_GMAKE= yes USE_X_PREFIX= yes -post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|g' \ - ${BUILD_WRKSRC}/xmms.c - .include <bsd.port.mk> diff --git a/graphics/xmms-plazma/Makefile b/graphics/xmms-plazma/Makefile index af4b1e94034b..ce939918d0a8 100644 --- a/graphics/xmms-plazma/Makefile +++ b/graphics/xmms-plazma/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-plazma DISTVERSION= 0.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://membres.lycos.fr/diablolight/ diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile index 5680829db1d4..e7e065da06bd 100644 --- a/lang/gambas/Makefile +++ b/lang/gambas/Makefile @@ -6,6 +6,7 @@ PORTNAME= gambas PORTVERSION= 1.0.17 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile index 4bc317f185d8..0dd40106bb86 100644 --- a/lang/kroc/Makefile +++ b/lang/kroc/Makefile @@ -7,6 +7,7 @@ PORTNAME= kroc PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.cs.kent.ac.uk/projects/ofa/kroc/ \ http://www.frmb.org/download/ diff --git a/lang/lush/Makefile b/lang/lush/Makefile index 0cd5fcdef062..2a4f8f533539 100644 --- a/lang/lush/Makefile +++ b/lang/lush/Makefile @@ -6,7 +6,7 @@ PORTNAME= lush PORTVERSION= 0.99 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lush @@ -41,10 +41,7 @@ post-patch: s|-pthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/configure - @${FIND} ${WRKSRC} | \ - ${XARGS} ${EGREP} -l '(SDL/SDL)' | \ - ${XARGS} ${REINPLACE_CMD} -e \ - 's|SDL/SDL|SDL11/SDL|; \ - s|"libSDL"|\"libSDL-1.1.so.5\"|' +pre-install: + @${FIND} ${WRKSRC}/ -name "*.bak" -delete .include <bsd.port.post.mk> diff --git a/lang/lush/pkg-plist b/lang/lush/pkg-plist index 5bebd6b9ad8b..966976b20090 100644 --- a/lang/lush/pkg-plist +++ b/lang/lush/pkg-plist @@ -462,19 +462,16 @@ share/lush/packages/python/pytype.lsh share/lush/packages/python/pyunicode.lsh share/lush/packages/python/pyweakref.lsh share/lush/packages/sdl/SDL.lsh -share/lush/packages/sdl/SDL.lsh.bak share/lush/packages/sdl/SDL_active.lsh share/lush/packages/sdl/SDL_audio.lsh share/lush/packages/sdl/SDL_byteorder.lsh share/lush/packages/sdl/SDL_cdrom.lsh share/lush/packages/sdl/SDL_copying.lsh share/lush/packages/sdl/SDL_endian.lsh -share/lush/packages/sdl/SDL_endian.lsh.bak share/lush/packages/sdl/SDL_error.lsh share/lush/packages/sdl/SDL_events.lsh share/lush/packages/sdl/SDL_getenv.lsh share/lush/packages/sdl/SDL_image.lsh -share/lush/packages/sdl/SDL_image.lsh.bak share/lush/packages/sdl/SDL_joystick.lsh share/lush/packages/sdl/SDL_keyboard.lsh share/lush/packages/sdl/SDL_keysym.lsh @@ -484,9 +481,7 @@ share/lush/packages/sdl/SDL_mutex.lsh share/lush/packages/sdl/SDL_quit.lsh share/lush/packages/sdl/SDL_rwops.lsh share/lush/packages/sdl/SDL_syswm.lsh -share/lush/packages/sdl/SDL_syswm.lsh.bak share/lush/packages/sdl/SDL_thread.lsh -share/lush/packages/sdl/SDL_thread.lsh.bak share/lush/packages/sdl/SDL_timer.lsh share/lush/packages/sdl/SDL_types.lsh share/lush/packages/sdl/SDL_version.lsh @@ -502,9 +497,7 @@ share/lush/packages/sdl/demos/sdlgl-demo-01.lsh share/lush/packages/sdl/demos/tutorial.lsh share/lush/packages/sdl/libgames.lsh share/lush/packages/sdl/libsdl.lsh -share/lush/packages/sdl/libsdl.lsh.bak share/lush/packages/sdl/sdl-config.lsh -share/lush/packages/sdl/sdl-config.lsh.bak share/lush/packages/sdl/sdl-tutorial.hlp share/lush/packages/sdl/sdl.hlp share/lush/packages/sdlgames/lander/bullet.png @@ -530,7 +523,6 @@ share/lush/packages/sdlgames/slimevolley/net.png share/lush/packages/sdlgames/slimevolley/slime-blue.png share/lush/packages/sdlgames/slimevolley/slime-red.png share/lush/packages/sdlgames/slimevolley/slime.lsh -share/lush/packages/sdlgames/slimevolley/slime.lsh.bak share/lush/packages/sn28/README share/lush/packages/sn28/examples/bptool/NetMASK.sn share/lush/packages/sn28/examples/bptool/README @@ -638,7 +630,6 @@ share/lush/packages/video/libdc/libdc.hlp share/lush/packages/video/libdc/libdc.lsh share/lush/packages/video4linux/demos/effect-demo.lsh share/lush/packages/video4linux/demos/effect-sdl-demo.lsh -share/lush/packages/video4linux/demos/effect-sdl-demo.lsh.bak share/lush/packages/video4linux/demos/jabba-320x240.jpg share/lush/packages/video4linux/demos/jabba-640x480.jpg share/lush/packages/video4linux/demos/v4l-demo.lsh diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile index 055b2088f65c..bd09b4e35873 100644 --- a/lang/parrot/Makefile +++ b/lang/parrot/Makefile @@ -7,6 +7,7 @@ PORTNAME= parrot PORTVERSION= 0.4.5 +PORTREVISION= 1 CATEGORIES= lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/L/LT/LTOETSCH diff --git a/misc/explosions/Makefile b/misc/explosions/Makefile index 3dde53cc863b..8752f00ee8cc 100644 --- a/misc/explosions/Makefile +++ b/misc/explosions/Makefile @@ -7,7 +7,7 @@ PORTNAME= explosions PORTVERSION= 0.2005.07.31 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= ftp://ftp.billsgames.com/unix/x/explosions/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/^0.//} diff --git a/misc/instant-tinderbox/Makefile b/misc/instant-tinderbox/Makefile index 0bfd25b343bf..f1928acd0c57 100644 --- a/misc/instant-tinderbox/Makefile +++ b/misc/instant-tinderbox/Makefile @@ -7,7 +7,7 @@ PORTNAME= instant-tinderbox PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc DISTFILES= diff --git a/misc/kdeaddons3/Makefile.split b/misc/kdeaddons3/Makefile.split index 4df36d447955..9d5bbd7aa28c 100644 --- a/misc/kdeaddons3/Makefile.split +++ b/misc/kdeaddons3/Makefile.split @@ -54,7 +54,7 @@ KSIG_PKGNAME= ${KSIG_PORTNAME}-${KSIG_PORTVERSION} NOATUNPLUG_PORTNAME= ${KDE_SPLIT_DIST}-noatun-plugins NOATUNPLUG_PORTVERSION= ${KDE_VERSION} -NOATUNPLUG_PORTREVISION= 0 +NOATUNPLUG_PORTREVISION= 1 NOATUNPLUG_PORTEPOCH= 0 NOATUNPLUG_PKGNAME= ${NOATUNPLUG_PORTNAME}-${NOATUNPLUG_PORTVERSION} diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile index 2443a0dfb525..b89fe79aedbe 100644 --- a/multimedia/avidemux2/Makefile +++ b/multimedia/avidemux2/Makefile @@ -7,7 +7,7 @@ PORTNAME= avidemux2 PORTVERSION= 2.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://fixounet.free.fr/avidemux/ \ ${MASTER_SITE_BERLIOS} diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index 022a3c7f4486..b453ad136ce6 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -7,7 +7,7 @@ PORTNAME= avifile PORTVERSION= 0.7.43 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile index e6341120f1f9..85d85dd42895 100644 --- a/multimedia/dumpmpeg/Makefile +++ b/multimedia/dumpmpeg/Makefile @@ -8,7 +8,7 @@ PORTNAME= dumpmpeg PORTVERSION= 0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/enjoympeg/Makefile b/multimedia/enjoympeg/Makefile index 219b9670b8ba..0d05bc2e51a8 100644 --- a/multimedia/enjoympeg/Makefile +++ b/multimedia/enjoympeg/Makefile @@ -8,7 +8,7 @@ PORTNAME= enjoympeg PORTVERSION= 0.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://people.freenet.de/for_Ki/ diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index e1fcc5cfa566..946c54c9a756 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 0.4.9.cvs.${RELEASE_DATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} # http://mplayerhq.hu/MPlayer/cvs/ diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 80c6355906c4..ad42a25c0872 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 0.4.9-pre1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia audio net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ffmpeg diff --git a/multimedia/kbtv/Makefile b/multimedia/kbtv/Makefile index 5f2bfcceafdf..10e5bd8624ee 100644 --- a/multimedia/kbtv/Makefile +++ b/multimedia/kbtv/Makefile @@ -71,7 +71,7 @@ post-patch: @${REINPLACE_CMD} -e 's|FROMPORT = False|FROMPORT = True|' \ ${WRKSRC}/installprefs.py @${REINPLACE_CMD} -e 's|sdl11-config|${SDL_CONFIG}|g' \ - ${WRKSRC}/do_build.py + ${WRKSRC}/do_build.py ${WRKSRC}/do_configure.py .if defined(WITH_PWC) @${REINPLACE_CMD} -e 's|WITH_PWC = False|WITH_PWC = True|' \ ${WRKSRC}/buildprefs.py diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index eef7b6913494..fe9c1f9948f2 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -7,7 +7,7 @@ PORTNAME= libdv PORTVERSION= 0.104 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile index 6a4607eb772a..9e4d955b4e57 100644 --- a/multimedia/libmovtar/Makefile +++ b/multimedia/libmovtar/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmovtar PORTVERSION= 0.1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mjpeg @@ -43,9 +43,6 @@ CONFIGURE_ARGS+= --without-jpeg-mmx .endif post-patch: - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' \ - ${WRKSRC}/rtjpeg/rtjshow.c \ - ${WRKSRC}/movtar_play.c # Add library patch when using -ljpeg # Use proper locations when using -ljpeg-mmx @${REINPLACE_CMD} -E \ diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile index 237cafd26976..d136b552b7b4 100644 --- a/multimedia/libmpeg2/Makefile +++ b/multimedia/libmpeg2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmpeg2 PORTVERSION= 0.4.0b -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://libmpeg2.sourceforge.net/files/ DISTNAME= mpeg2dec-${PORTVERSION} diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index d849b2258946..1ac3d02b184e 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,7 +7,7 @@ PORTNAME= xine PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index daa9da1f5d4a..c65d4d59d68d 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -7,7 +7,7 @@ PORTNAME= mjpegtools DISTVERSION= 1.8.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mjpeg diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index baa7699a3a32..bc7f468de8f1 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpeg4ip PORTVERSION= 1.5.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -32,7 +32,7 @@ USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL11 -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-ffmpeg=${LOCALBASE} \ --enable-mp4live \ @@ -167,7 +167,6 @@ post-patch: 's|<stdint.h>|<inttypes.h>|; \ s|mp4v2/mp4.h|mp4.h|; \ s|<malloc.h>|<stdlib.h>|; \ - s|<SDL/|<SDL11/|; \ s|<strstream.h>|<iostream>|' # replacing distfile's libs with ports' versions # SDL related fixes diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile index 8a3a8a2cc059..7c9388989059 100644 --- a/multimedia/mplayerxp/Makefile +++ b/multimedia/mplayerxp/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplayerxp PORTVERSION= 0.1.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -247,7 +247,6 @@ post-patch: # win32 codec location @${FIND} ${WRKSRC} -type f | \ ${XARGS} -x -n 10 ${REINPLACE_CMD} -E -e \ - 's|SDL/|SDL11/|; \ s|-lpthread|${PTHREAD_LIBS}|; \ s|/usr/local/lib/win32|${WIN32_CODEC_PREFIX}|' # win32 codec location diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile index 2ae053087b0a..2c9472c9be5a 100644 --- a/multimedia/oqtplayer/Makefile +++ b/multimedia/oqtplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= OQTPlayer PORTVERSION= 0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= openquicktime diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile index 959d7cf872d9..a875ba8c033b 100644 --- a/multimedia/pwcbsd/Makefile +++ b/multimedia/pwcbsd/Makefile @@ -7,7 +7,7 @@ PORTNAME= pwcbsd PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia sysutils MASTER_SITES= http://raaf.atspace.org/ @@ -48,11 +48,6 @@ PLIST_SUB+= PROGRAMS="" PLIST_SUB+= PROGRAMS="@comment " .endif -post-patch: -.if !defined(WITHOUT_PROGRAMS) - @${REINPLACE_CMD} -e 's|sdl11-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile -.endif - post-install: ${MKDIR} ${PREFIX}/include/linux ${INSTALL_MAN} ${MAN4:S|^|${WRKSRC}/|} ${PREFIX}/man/man4 diff --git a/multimedia/slideshow/Makefile b/multimedia/slideshow/Makefile index 8f6c6d4faf2b..371eae4e77e1 100644 --- a/multimedia/slideshow/Makefile +++ b/multimedia/slideshow/Makefile @@ -7,7 +7,7 @@ PORTNAME= slideshow PORTVERSION= 0.8.0.p5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://ftp.osuosl.org/pub/FreeBSD/distfiles/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-pre/} @@ -25,7 +25,11 @@ USE_AUTOTOOLS= libtool:15 USE_PYTHON= yes USE_SDL= image ttf CONFIGURE_ARGS+= --disable-gtk-gui -CONFIGURE_ENV+= LDFLAGS="-lstdc++" +CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lstdc++ -lpng" + +BROKEN= dead project and doesn't work with recent sdl +DEPRECATED= ${BROKEN} +EXPIRATION_DATE=2006-10-17 .include <bsd.port.pre.mk> diff --git a/multimedia/slideshow/files/patch-src::Makefile.in b/multimedia/slideshow/files/patch-src::Makefile.in index 5a0092030a6d..152e8c3dc3fc 100644 --- a/multimedia/slideshow/files/patch-src::Makefile.in +++ b/multimedia/slideshow/files/patch-src::Makefile.in @@ -1,11 +1,11 @@ ---- src/Makefile.in.orig Mon Aug 4 19:21:52 2003 -+++ src/Makefile.in Mon Aug 4 19:22:15 2003 -@@ -844,8 +844,6 @@ - else \ - echo "WARNING: You need swig in order to re-build slideshow_wrap.cxx"; \ - fi; --SDL_defines.i : $(SDL_SDL_video_H) -- egrep '#define SDL_.*[[:space:]]0x[0-9]{8}' $(SDL_SDL_video_H) | grep -v OVERLAY | sed -e 's,[[:space:]]*/\*.*$$,,' >SDL_defines.i +--- src/Makefile.in.orig Tue Sep 12 20:06:57 2006 ++++ src/Makefile.in Tue Sep 12 20:07:19 2006 +@@ -269,7 +269,7 @@ + # + # Regenerate SDL_defines.i if needed + # +-SDL_SDL_video_H = $(shell echo $(SDL_CFLAGS) | sed -e 's/.*-I\([[:alnum:][:punct:]]*\)\>.*/\1/')/SDL_video.h ++SDL_SDL_video_H = ${LOCALBASE}/include/SDL/SDL_video.h - # MgpLoaderLex.cpp \ - # MgpLoaderYacc.cpp + _slideshow_la_SOURCES = \ + slideshow_wrap.cxx diff --git a/multimedia/slideshow/files/patch-src_slideshow.i b/multimedia/slideshow/files/patch-src_slideshow.i new file mode 100644 index 000000000000..a31c520e0d19 --- /dev/null +++ b/multimedia/slideshow/files/patch-src_slideshow.i @@ -0,0 +1,10 @@ +--- src/slideshow.i.orig Tue Sep 12 20:15:43 2006 ++++ src/slideshow.i Tue Sep 12 20:15:46 2006 +@@ -20,7 +20,6 @@ + %include "XmlLoader.i" + %include "Mpeg.i" + %include "AutoSlide.i" +-%include "Spinner.i" + %include "GradientAnimated.i" + %include "UpDown.i" + %include "SDL_defines.i" diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile index 0a15ef01a4b1..1eb658145cda 100644 --- a/multimedia/smpeg-xmms/Makefile +++ b/multimedia/smpeg-xmms/Makefile @@ -7,7 +7,7 @@ PORTNAME= smpeg-xmms PORTVERSION= 0.3.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia gnome MASTER_SITES= http://www.xmms.org/files/%SUBDIR%/ \ ftp://ftp.sunet.se/pub/multimedia/xmms/%SUBDIR%/ diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index fbd21b6eccb3..830fa2ad5b1b 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= smpeg PORTVERSION= 0.4.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \ ${MASTER_SITE_GENTOO} diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 36383d289d0e..56a162d06278 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -7,7 +7,7 @@ PORTNAME= transcode PORTVERSION= 1.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://dl.fkb.wormulon.net/transcode/ \ http://dl.kel.wormulon.net/transcode/ \ diff --git a/multimedia/transcode/files/patch-configure b/multimedia/transcode/files/patch-configure index 59d32c00fcdd..078c40269e72 100644 --- a/multimedia/transcode/files/patch-configure +++ b/multimedia/transcode/files/patch-configure @@ -35,61 +35,6 @@ else tc_pkg_err="yes" -@@ -40561,14 +40561,14 @@ - echo "${ECHO_T}$pkg_config_sdl" >&6 - - -- if test x"sdl-config" != x"no" ; then -+ if test x"sdl11-config" != x"no" ; then - if test x"$w_sdl_p" != x"" ; then -- if test -x $w_sdl_p/bin/sdl-config ; then -- sdl_config="$w_sdl_p/bin/sdl-config" -+ if test -x $w_sdl_p/bin/sdl11-config ; then -+ sdl_config="$w_sdl_p/bin/sdl11-config" - fi - fi -- # Extract the first word of "sdl-config", so it can be a program name with args. --set dummy sdl-config; ac_word=$2 -+ # Extract the first word of "sdl11-config", so it can be a program name with args. -+set dummy sdl11-config; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_path_sdl_config+set}" = set; then -@@ -40856,7 +40856,7 @@ - for l in $sdl_ll ; do - case $l in - -L*) lpaths="$lpaths $l" ;; -- -l*) test x"$l" != x"-lSDL" && xlibs="$xlibs $l" ;; -+ -l*) test x"$l" != x"-lSDL-1.1" && xlibs="$xlibs $l" ;; - *) xlf="$xlf $l" ;; - esac - done -@@ -40872,13 +40872,13 @@ - if test x"SDL" != x"none" ; then - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $sdl_ll" -- echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5 --echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for SDL_Init in -lSDL-1.1" >&5 -+echo $ECHO_N "checking for SDL_Init in -lSDL-1.1... $ECHO_C" >&6 - if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lSDL $SDL_EXTRA_LIBS $LIBS" -+LIBS="-lSDL-1.1 $SDL_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -40937,7 +40937,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5 - echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6 - if test $ac_cv_lib_SDL_SDL_Init = yes; then -- SDL_LIBS="$sdl_ll -lSDL $SDL_EXTRA_LIBS" -+ SDL_LIBS="$sdl_ll -lSDL-1.1 $SDL_EXTRA_LIBS" - else - - tc_pkg_err="yes" @@ -41429,7 +41429,7 @@ for l in $gtk_ll ; do case $l in diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 016950869970..ec2aef2e3943 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -10,7 +10,7 @@ PORTNAME= vlc DISTVERSION= 0.8.6.20060621 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://nightlies.videolan.org/build/source/ # http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 9cf00079a03d..3ad329fcbc11 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -10,7 +10,7 @@ PORTNAME= vlc DISTVERSION= 0.8.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \ diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile index 9ffe1bf46116..d729f685e8bc 100644 --- a/multimedia/xmms-avi/Makefile +++ b/multimedia/xmms-avi/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-avi PORTVERSION= 1.2.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://www.xmms.org/files/plugins/avi-xmms/ \ ftp://ftp.sunet.se/pub/multimedia/xmms/plugins/avi-xmms/ \ diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile index 433489fe9124..24a0b7d7e294 100644 --- a/multimedia/xmps/Makefile +++ b/multimedia/xmps/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmps PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia gnome # per distfile survey, site disappeared in June 2003 # http://xmps.sourceforge.net/sources/ diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile index 1bdea0c84a12..03685147765c 100644 --- a/multimedia/xtheater/Makefile +++ b/multimedia/xtheater/Makefile @@ -8,7 +8,7 @@ PORTNAME= xtheater PORTVERSION= 1.0.0.p1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index 20b2bdcb8a07..85f1b99aa456 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -7,7 +7,7 @@ PORTNAME= ekiga PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile index 54efb1b9aa6f..2f5d630d87f0 100644 --- a/net/sdl_net/Makefile +++ b/net/sdl_net/Makefile @@ -6,8 +6,8 @@ # PORTNAME= sdl_net -PORTVERSION= 1.2.5 -PORTREVISION= 3 +PORTVERSION= 1.2.6 +PORTREVISION= 0 CATEGORIES= net MASTER_SITES= http://www.libsdl.org/projects/SDL_net/release/ DISTNAME= SDL_net-${PORTVERSION} diff --git a/net/sdl_net/distinfo b/net/sdl_net/distinfo index e5e356138432..2459e6a3ad5c 100644 --- a/net/sdl_net/distinfo +++ b/net/sdl_net/distinfo @@ -1,3 +1,3 @@ -MD5 (SDL_net-1.2.5.tar.gz) = e45b1048d2747480dcc65ece4130a920 -SHA256 (SDL_net-1.2.5.tar.gz) = 397dee6b7ac13dea70dd3dd2ae6044f45a632a1ba156da178c96df66fb8ccdcb -SIZE (SDL_net-1.2.5.tar.gz) = 169238 +MD5 (SDL_net-1.2.6.tar.gz) = 7be5b9ef36129ee187ace96906cd264c +SHA256 (SDL_net-1.2.6.tar.gz) = 1a4b1a9e63e3cb6a9d482c7fecb0da0edb5b285d06e221cdabdbd421e747554b +SIZE (SDL_net-1.2.6.tar.gz) = 372116 diff --git a/net/sdl_net/files/patch-Makefile.in b/net/sdl_net/files/patch-Makefile.in index f85d916aebec..93796b1512a6 100644 --- a/net/sdl_net/files/patch-Makefile.in +++ b/net/sdl_net/files/patch-Makefile.in @@ -1,12 +1,10 @@ ---- Makefile.in.orig Thu Mar 6 22:49:11 2003 -+++ Makefile.in Sun Jan 22 13:34:45 2006 -@@ -91,3 +91,3 @@ - --libSDL_netincludedir = $(includedir)/SDL -+libSDL_netincludedir = $(includedir)/SDL11 - libSDL_netinclude_HEADERS = SDL_net.h -@@ -102,3 +102,3 @@ +--- Makefile.in.orig Thu Aug 31 14:52:06 2006 ++++ Makefile.in Thu Aug 31 14:52:12 2006 +@@ -263,7 +263,6 @@ libSDL_net_la_LIBADD = @INETLIB@ --libSDL_net_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libSDL_net_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + libSDL_net_la_LDFLAGS = \ + -no-undefined \ +- -release $(LT_RELEASE) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + @HAVE_GUI_LIB_FALSE@EXAMPLES = diff --git a/net/sdl_net/pkg-plist b/net/sdl_net/pkg-plist index 6e9ccda94a3a..d9dd4f0fd220 100644 --- a/net/sdl_net/pkg-plist +++ b/net/sdl_net/pkg-plist @@ -1,5 +1,6 @@ -include/SDL11/SDL_net.h +include/SDL/SDL_net.h lib/libSDL_net.a lib/libSDL_net.la lib/libSDL_net.so lib/libSDL_net.so.0 +@dirrmtry include/SDL diff --git a/ports-mgmt/instant-tinderbox/Makefile b/ports-mgmt/instant-tinderbox/Makefile index 0bfd25b343bf..f1928acd0c57 100644 --- a/ports-mgmt/instant-tinderbox/Makefile +++ b/ports-mgmt/instant-tinderbox/Makefile @@ -7,7 +7,7 @@ PORTNAME= instant-tinderbox PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc DISTFILES= diff --git a/shells/bush/Makefile b/shells/bush/Makefile index 46b60fab619b..da6b0a286d8e 100644 --- a/shells/bush/Makefile +++ b/shells/bush/Makefile @@ -7,6 +7,7 @@ PORTNAME= bush PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= http://www.pegasoft.ca/downloads/ \ http://66.11.182.223/downloads/ diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index 31682c7431e4..c410e680c8b7 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -7,7 +7,7 @@ PORTNAME= openvrml PORTVERSION= 0.15.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile index 1bd70339b6ac..17dfd288ee30 100644 --- a/www/swfdec-plugin/Makefile +++ b/www/swfdec-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= swfdec-plugin PORTVERSION= 0.3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.schleef.org/swfdec/download/ DISTNAME= swfdec-${PORTVERSION} diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile index 219aa9213d0b..aab8700e6678 100644 --- a/x11-fm/tdfsb/Makefile +++ b/x11-fm/tdfsb/Makefile @@ -7,7 +7,7 @@ PORTNAME= tdfsb PORTVERSION= 0.0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm MASTER_SITES= http://www.determinate.net/webdata/data/ diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile index c491878642da..bc4a467e67a9 100644 --- a/x11-toolkits/gai/Makefile +++ b/x11-toolkits/gai/Makefile @@ -8,7 +8,7 @@ PORTNAME= gai PORTVERSION= 0.5.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile index e3c1887ddfe8..a4d3cd2d2cee 100644 --- a/x11-toolkits/mesgui/Makefile +++ b/x11-toolkits/mesgui/Makefile @@ -7,7 +7,7 @@ PORTNAME= mesgui PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile index ed8b061c05e8..35076b06a591 100644 --- a/x11-toolkits/paragui-devel/Makefile +++ b/x11-toolkits/paragui-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= paragui PORTVERSION= 1.1.8 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile index 33d390726eba..b025a266378c 100644 --- a/x11-toolkits/paragui/Makefile +++ b/x11-toolkits/paragui/Makefile @@ -8,7 +8,7 @@ PORTNAME= paragui PORTVERSION= 1.0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SAVANNAH} \ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile index 86331879db15..6a186da2ceea 100644 --- a/x11-toolkits/sdl_gui/Makefile +++ b/x11-toolkits/sdl_gui/Makefile @@ -8,7 +8,7 @@ PORTNAME= sdl_gui PORTVERSION= 0.10.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= http://www.newimage.com/~rhk/SDL_gui/ \ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ diff --git a/x11-toolkits/sdl_gui/files/patch-include::Makefile.in b/x11-toolkits/sdl_gui/files/patch-include::Makefile.in deleted file mode 100644 index d6750394c3e5..000000000000 --- a/x11-toolkits/sdl_gui/files/patch-include::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- include/Makefile.in.orig Sun Sep 15 23:11:18 2002 -+++ include/Makefile.in Sun Sep 15 23:11:32 2002 -@@ -82,7 +82,7 @@ - SDL_LIBS = @SDL_LIBS@ - VERSION = @VERSION@ - --libSDL_guiincludedir = $(includedir)/SDL -+libSDL_guiincludedir = $(includedir)/SDL11 - - # Which header files to install - libSDL_guiinclude_HEADERS = SDL_gui.h diff --git a/x11-toolkits/sdl_gui/pkg-plist b/x11-toolkits/sdl_gui/pkg-plist index eea3128764a7..a622b8060a85 100644 --- a/x11-toolkits/sdl_gui/pkg-plist +++ b/x11-toolkits/sdl_gui/pkg-plist @@ -1,5 +1,6 @@ -include/SDL11/SDL_gui.h +include/SDL/SDL_gui.h lib/libSDL_gui.a lib/libSDL_gui.la lib/libSDL_gui.so lib/libSDL_gui.so.0 +@dirrmtry include/SDL diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile index 29c1ed841f43..e473ea1c913b 100644 --- a/x11/electricsheep/Makefile +++ b/x11/electricsheep/Makefile @@ -7,6 +7,7 @@ PORTNAME= electricsheep PORTVERSION= 2.6.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= http://electricsheep.org/ @@ -59,10 +60,6 @@ post-patch: ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ - 's|<SDL/SDL.h>|<SDL11/SDL.h>|' \ - ${WRKSRC}/mpeg2dec/libvo/video_out_sdl.c - - @${REINPLACE_CMD} -e \ 's|/usr/local/share|${DATADIR}|' \ ${WRKSRC}/electricsheep.c |