Hi,
The below diff updates games/uqm to 0.7.0. The addons structure changed
significantly since 0.6.2.
Tested extensively on i386/amd64.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/uqm/Makefile,v
retrieving revision 1.32
diff -N -u -p Makefile
--- Makefile 1 May 2012 15:49:12 -0000 1.32
+++ Makefile 11 May 2012 04:45:18 -0000
@@ -8,23 +8,22 @@ COMMENT-remix3= ur-quan masters: remix pack
number th
COMMENT-threedomusic= ur-quan masters: 3DO music content
COMMENT-voice= ur-quan masters: speech content
-VER= 0.6.0
+VER = 0.7.0
EPOCH= 0 # N.B. in RUN_DEPENDS
-DISTNAME= uqm-0.6.2
+DISTNAME = uqm-${VER}
CATEGORIES= games x11
PDIST= ${DISTNAME}-source.tgz
-CDIST= uqm-${VER}-content.uqm
-MDIST= uqm-${VER}-3domusic.uqm
-VDIST= uqm-${VER}-voice.uqm
-RM1DIST= uqm-remix-pack1.zip
-RM2DIST= uqm-remix-pack2.zip
-RM3DIST= uqm-remix-pack3.zip
+CDIST = ${DISTNAME}-content.uqm
+MDIST = ${DISTNAME}-3domusic.uqm
+VDIST = ${DISTNAME}-voice.uqm
+RM1DIST = uqm-remix-disc1.uqm
+RM2DIST = uqm-remix-disc2.uqm
+RM3DIST = uqm-remix-disc3.uqm
DISTFILES= ${PDIST} ${CDIST}
SUPDISTFILES= ${MDIST} ${VDIST} ${RM1DIST} ${RM2DIST} ${RM3DIST}
DIST_SUBDIR= uqm
CATEGORIES= games x11
-PKGNAME-main= uqm-0.6.2
-REVISION-main = 2
+PKGNAME-main= uqm-${VER}
PKGNAME-content= uqm-content-${VER}
PKGNAME-remix1= uqm-remix1-${VER}
PKGNAME-remix2= uqm-remix2-${VER}
@@ -60,8 +59,6 @@ WANTLIB-main= c m pthread z SDL mikmod>=2.4 vorbiside
NO_REGRESS= Yes
USE_GMAKE= Yes
-WRKSRC= ${WRKDIST}/sc2
-
PSEUDO_FLAVORS= no_remix1 no_remix2 no_remix3 no_threedomusic no_voice
FLAVOR?= no_remix1 no_remix2 no_remix3 no_threedomusic no_voice
@@ -105,7 +102,8 @@ do-build:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uqm
- ${INSTALL_DATA_DIR} ${PREFIX}/share/uqm/content/packages/addons/uqmremix
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/uqm/content/packages
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/uqm/content/addons
${INSTALL_DATA} ${WRKBUILD}/doc/users/manual.txt \
${PREFIX}/share/doc/uqm
${INSTALL_DATA} ${WRKBUILD}/content/version \
@@ -114,23 +112,23 @@ do-install:
${PREFIX}/share/uqm/content/packages
.if ${BUILD_PACKAGES:M-remix1}
${INSTALL_DATA} ${FULLDISTDIR}/${RM1DIST} \
- ${PREFIX}/share/uqm/content/packages/addons/uqmremix
+ ${PREFIX}/share/uqm/content/addons
.endif
.if ${BUILD_PACKAGES:M-remix2}
${INSTALL_DATA} ${FULLDISTDIR}/${RM2DIST} \
- ${PREFIX}/share/uqm/content/packages/addons/uqmremix
+ ${PREFIX}/share/uqm/content/addons
.endif
.if ${BUILD_PACKAGES:M-remix3}
${INSTALL_DATA} ${FULLDISTDIR}/${RM3DIST} \
- ${PREFIX}/share/uqm/content/packages/addons/uqmremix
+ ${PREFIX}/share/uqm/content/addons
.endif
.if ${BUILD_PACKAGES:M-threedomusic}
${INSTALL_DATA} ${FULLDISTDIR}/${MDIST} \
- ${PREFIX}/share/uqm/content/packages
+ ${PREFIX}/share/uqm/content/addons
.endif
.if ${BUILD_PACKAGES:M-voice}
${INSTALL_DATA} ${FULLDISTDIR}/${VDIST} \
- ${PREFIX}/share/uqm/content/packages
+ ${PREFIX}/share/uqm/content/addons
.endif
${INSTALL_PROGRAM} ${WRKBUILD}/uqm ${PREFIX}/bin
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/uqm/distinfo,v
retrieving revision 1.13
diff -N -u -p distinfo
--- distinfo 1 Jun 2007 02:06:01 -0000 1.13
+++ distinfo 11 May 2012 04:45:18 -0000
@@ -1,35 +1,35 @@
-MD5 (uqm/uqm-0.6.0-3domusic.uqm) = ogysyOZvX/H99eHTo7k/0g==
-MD5 (uqm/uqm-0.6.0-content.uqm) = fo8O2EkOJCMUMUIOorpqAw==
-MD5 (uqm/uqm-0.6.0-voice.uqm) = 0xV3uJa+k1zCI4r9Bymbiw==
-MD5 (uqm/uqm-0.6.2-source.tgz) = uk7llbYjSYc9UQuYJ+dkjQ==
-MD5 (uqm/uqm-remix-pack1.zip) = LfQCspUcAYdgSoHDmX+7nQ==
-MD5 (uqm/uqm-remix-pack2.zip) = 1an7crNpv1pdvKPbnx4eow==
-MD5 (uqm/uqm-remix-pack3.zip) = VnvC2ePKBn0hFwxaxVOEQQ==
-RMD160 (uqm/uqm-0.6.0-3domusic.uqm) = aAVrrCdTTm20nB40ki04xfNo27k=
-RMD160 (uqm/uqm-0.6.0-content.uqm) = 1W0Gw3fkQojVvUH41o1ZyHtYzNs=
-RMD160 (uqm/uqm-0.6.0-voice.uqm) = Om8kBNe/7rK8sVbIAQQCV5oMWKs=
-RMD160 (uqm/uqm-0.6.2-source.tgz) = Pzb9x1Bgf922jVIZXweeMYYAIKc=
-RMD160 (uqm/uqm-remix-pack1.zip) = HAzyM9Y3eRi2drzVkfQwS42oWqE=
-RMD160 (uqm/uqm-remix-pack2.zip) = RB7cceMAbkNinuJi/vjvhnZXODI=
-RMD160 (uqm/uqm-remix-pack3.zip) = eG6N/Xkkq/bviG5yI8HVewdA1SQ=
-SHA1 (uqm/uqm-0.6.0-3domusic.uqm) = nkd3yJ0X+LHJri6jQ8RJfw8YGlo=
-SHA1 (uqm/uqm-0.6.0-content.uqm) = 9LN00gKfDi0mwOr17Zf9FXtT5PU=
-SHA1 (uqm/uqm-0.6.0-voice.uqm) = V9gPoGjoEujFpBUlEADocP+H0hU=
-SHA1 (uqm/uqm-0.6.2-source.tgz) = eeOTuorSx4bU5jO6hVhZ3AObrNI=
-SHA1 (uqm/uqm-remix-pack1.zip) = fL3IeIfr665UOcaJ/FvS/6lGD8g=
-SHA1 (uqm/uqm-remix-pack2.zip) = 8evKRP8QX5aNb89l35NZJlI7HJc=
-SHA1 (uqm/uqm-remix-pack3.zip) = 9V0ZjFagljprsvnC/gTExHWyUIY=
-SHA256 (uqm/uqm-0.6.0-3domusic.uqm) =
w+claXINHherLQgwHZ3JDyxKsnKBHEiOGPh484uEysg=
-SHA256 (uqm/uqm-0.6.0-content.uqm) =
cnZ5pmNR1DXBo8U8o9LocHnx8FwJ+gdIA17Wj/8c1j0=
-SHA256 (uqm/uqm-0.6.0-voice.uqm) = 7oTJCHOplncd36IVRkBiDjdDZv/7UeGN/ftCNgULwno=
-SHA256 (uqm/uqm-0.6.2-source.tgz) =
2NXhW46uK0hZ7u6C7fyoEfre8gTIxuIRK4/mqko5bqE=
-SHA256 (uqm/uqm-remix-pack1.zip) = G5zMeZ5TH1BYCVKvkrNC+2aErpe3vcQ087fiLQwjBkQ=
-SHA256 (uqm/uqm-remix-pack2.zip) = Hf8XkqVYpS61y98k4MG4t+yFr/daAN20A+yYhgf1HdA=
-SHA256 (uqm/uqm-remix-pack3.zip) = TjR9UieXheukulNVvq5jBIzjtVDbMYHU1V32ogNhaC0=
-SIZE (uqm/uqm-0.6.0-3domusic.uqm) = 18980071
-SIZE (uqm/uqm-0.6.0-content.uqm) = 11580000
-SIZE (uqm/uqm-0.6.0-voice.uqm) = 114823409
-SIZE (uqm/uqm-0.6.2-source.tgz) = 1497342
-SIZE (uqm/uqm-remix-pack1.zip) = 50188123
-SIZE (uqm/uqm-remix-pack2.zip) = 60281175
-SIZE (uqm/uqm-remix-pack3.zip) = 39923803
+MD5 (uqm/uqm-0.7.0-3domusic.uqm) = hqXjdtm3aIit0dEIGPCrnw==
+MD5 (uqm/uqm-0.7.0-content.uqm) = LzbcsVJ027y14mby7YTVsg==
+MD5 (uqm/uqm-0.7.0-source.tgz) = +QGOoEk9faxqnhAGsAr33w==
+MD5 (uqm/uqm-0.7.0-voice.uqm) = t44GBjJYEPny6ex4YZHAGw==
+MD5 (uqm/uqm-remix-disc1.uqm) = CfJC2NchZtHVzL09mck+fQ==
+MD5 (uqm/uqm-remix-disc2.uqm) = +8i9y3CZOdVZ2MchatFcwg==
+MD5 (uqm/uqm-remix-disc3.uqm) = XMxtSsMBrpjhcqxoNdzerQ==
+RMD160 (uqm/uqm-0.7.0-3domusic.uqm) = 9koZaUjERlUwlqETfrb82ECQ0FQ=
+RMD160 (uqm/uqm-0.7.0-content.uqm) = ktDmveRx/TxrkUchHwkmPBqUgvc=
+RMD160 (uqm/uqm-0.7.0-source.tgz) = t2CtJWB15OIl5E5ac4oBOppeZIM=
+RMD160 (uqm/uqm-0.7.0-voice.uqm) = ruJaFUQPgQMBY4074ErMYw0DP8Y=
+RMD160 (uqm/uqm-remix-disc1.uqm) = CrxrnL7SNXrdK2OakyjMfg0mok8=
+RMD160 (uqm/uqm-remix-disc2.uqm) = s7vwhkeg0QEuJb/oy7c6NAVFx6A=
+RMD160 (uqm/uqm-remix-disc3.uqm) = NDIAEJSzI9Zsg/1n5tkh/4S1V+Y=
+SHA1 (uqm/uqm-0.7.0-3domusic.uqm) = kDMPM1hx3ScosiMvWyh3NLt54S4=
+SHA1 (uqm/uqm-0.7.0-content.uqm) = LeoHOQcIeQd5riWIbpMxtesL32g=
+SHA1 (uqm/uqm-0.7.0-source.tgz) = VeUldpBlDmPxMQJKuP393c9WJ7w=
+SHA1 (uqm/uqm-0.7.0-voice.uqm) = cAFF0CPRDJqqe7+MUarKdSVEU8U=
+SHA1 (uqm/uqm-remix-disc1.uqm) = 8R9hJo8PC5+QOMiivHo9JHIcMWg=
+SHA1 (uqm/uqm-remix-disc2.uqm) = Skn+L1CY+L+7Sx4uXsCz1A3dIfw=
+SHA1 (uqm/uqm-remix-disc3.uqm) = OvoyQq4xb28DSkrfp3qz2TMF2Hs=
+SHA256 (uqm/uqm-0.7.0-3domusic.uqm) =
xXCF5k2tS934pnmpqirfY/IVbV9sur5jr4BRkDPby4I=
+SHA256 (uqm/uqm-0.7.0-content.uqm) =
uPbbi6KfBij7HVwjODCJaxn0Qa7jdEvaZx6iZLRNo78=
+SHA256 (uqm/uqm-0.7.0-source.tgz) =
o2lcX38L5+ycD4DsVpkHs4ICOh/ubmNVMr1Tt7U7siE=
+SHA256 (uqm/uqm-0.7.0-voice.uqm) = vMz4AbS6N1lP9iF7KSdE6lhu4tRH6SeASELMrotzyXk=
+SHA256 (uqm/uqm-remix-disc1.uqm) = tpdpR0XZOTEejr/91e32kuAQwl15ZuFIEHSUCk0Eh+g=
+SHA256 (uqm/uqm-remix-disc2.uqm) = f7tHRBAuMSc+RFmwGhVtoFLsU3wSj+kXk2Q+NIvBut4=
+SHA256 (uqm/uqm-remix-disc3.uqm) = 5tifj2bPHfHLJ4/KHpImGxd27mcN/yYTLjPxTb0x6R0=
+SIZE (uqm/uqm-0.7.0-3domusic.uqm) = 18980671
+SIZE (uqm/uqm-0.7.0-content.uqm) = 11538533
+SIZE (uqm/uqm-0.7.0-source.tgz) = 1562003
+SIZE (uqm/uqm-0.7.0-voice.uqm) = 115143439
+SIZE (uqm/uqm-remix-disc1.uqm) = 50188876
+SIZE (uqm/uqm-remix-disc2.uqm) = 60282662
+SIZE (uqm/uqm-remix-disc3.uqm) = 39924875
Index: files/build.vars
===================================================================
RCS file: /cvs/ports/games/uqm/files/build.vars,v
retrieving revision 1.8
diff -N -u -p files/build.vars
--- files/build.vars 11 Jan 2008 14:05:35 -0000 1.8
+++ files/build.vars 11 May 2012 04:45:18 -0000
@@ -29,7 +29,7 @@ ECHON='echo -n'
SED='sed'
REZ=''
WINDRES=''
-uqm_CFLAGS='@CFLAGS@ -I"." -I@LOCALBASE@/include `sdl-config --cflags`
-DGFXMODULE_SDL -DSOUNDMODULE_SDL -DOVCODEC_TREMOR -DNETPLAY=NETPLAY_FULL
-DHAVE_JOYSTICK -DHAVE_ZIP=1 -DUSE_PLATFORM_ACCEL -pthread'
+uqm_CFLAGS='@CFLAGS@ -I"." -I@LOCALBASE@/include `sdl-config --cflags`
-DGFXMODULE_SDL -DTHREADLIB_SDL -DSOUNDMODULE_SDL -DOVCODEC_TREMOR
-DNETPLAY=NETPLAY_FULL -DHAVE_JOYSTICK -DHAVE_ZIP=1 -DUSE_PLATFORM_ACCEL
-pthread'
uqm_LDFLAGS='`sdl-config --libs` -lSDL_image -lmikmod -lvorbisidec -lz'
uqm_INSTALL_BINDIR='@PREFIX@/bin/'
uqm_INSTALL_LIBDIR='@PREFIX@/lib/'
@@ -38,11 +38,15 @@ uqm_INSTALL_SHAREDIR='@PREFIX@/share/'
# Exported variables are available from all the Makeinfo files
# Non-exported files only where build.vars is explicitely included.
uqm_SOUNDMODULE='mixsdl'
+uqm_OGGVORBIS='vorbisfile'
uqm_USE_INTERNAL_MIKMOD=''
+uqm_HAVE_GETOPT_LONG='#define HAVE_GETOPT_LONG'
uqm_HAVE_REGEX='1'
+uqm_GFXMODULE='sdl'
uqm_HAVE_OPENGL='0'
uqm_USE_ZIP_IO='1'
uqm_USE_PLATFORM_ACCEL='1'
+uqm_THREADLIB='SDL'
uqm_NETPLAY='FULL'
uqm_USE_WINSOCK=''
DEBUG='0'
@@ -50,5 +54,6 @@ MACRO_WIN32=''
MACRO___MINGW32__=''
export BUILD_SYSTEM HOST_SYSTEM DEBUG
export MACRO_WIN32 MACRO___MINGW32__
-export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX uqm_USE_WINSOCK
-export uqm_HAVE_OPENGL uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_NETPLAY
+export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_GETOPT_LONG
+export uqm_HAVE_REGEX uqm_USE_WINSOCK uqm_GFXMODULE uqm_HAVE_OPENGL
+export uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_THREADLIB uqm_NETPLAY
Index: files/config_unix.h
===================================================================
RCS file: /cvs/ports/games/uqm/files/config_unix.h,v
retrieving revision 1.2
diff -N -u -p files/config_unix.h
--- files/config_unix.h 23 Dec 2006 09:32:03 -0000 1.2
+++ files/config_unix.h 11 May 2012 04:45:18 -0000
@@ -37,6 +37,10 @@
/* Defined if your system has strupr of its own */
#undef HAVE_STRUPR
+/* Defined if your system has strcasecmp of its own */
+#define HAVE_STRCASECMP_UQM
+ // Not using "HAVE_STRCASECMP" as that conflicts with SDL.
+
/* Defined if your system has stricmp of its own */
#undef HAVE_STRICMP
@@ -51,5 +55,8 @@
/* Defined if your system has wint_t of its own */
#define HAVE_WINT_T
+
+/* Defined if your system has _Bool of its own */
+#define HAVE__BOOL
#endif /* _CONFIG_UNIX_H */
Index: patches/patch-sc2_src_sc2code_libs_sound_decoders_oggaud_c
===================================================================
RCS file:
/cvs/ports/games/uqm/patches/patch-sc2_src_sc2code_libs_sound_decoders_oggaud_c,v
retrieving revision 1.1
diff -N -u -p patches/patch-sc2_src_sc2code_libs_sound_decoders_oggaud_c
--- patches/patch-sc2_src_sc2code_libs_sound_decoders_oggaud_c 28 Apr 2012
09:04:14 -0000 1.1
+++ /dev/null 11 May 2012 04:31:01 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-sc2_src_sc2code_libs_sound_decoders_oggaud_c,v 1.1 2012/04/28
09:04:14 ajacoutot Exp $
---- sc2/src/sc2code/libs/sound/decoders/oggaud.c.orig Fri Apr 13 01:18:24 2012
-+++ sc2/src/sc2code/libs/sound/decoders/oggaud.c Fri Apr 13 01:28:54 2012
-@@ -270,10 +270,6 @@ ova_GetFrame (THIS_PTR)
- TFB_OggSoundDecoder* ova = (TFB_OggSoundDecoder*) This;
- // this is the closest to a frame there is in ogg vorbis stream
- // doesn't seem to be a func to retrive it
--#ifdef OVCODEC_TREMOR
-- return ova->vf.os->pageno;
--#else
- return ova->vf.os.pageno;
--#endif /* OVCODEC_TREMOR */
- }
-
? patches/patch-src_libs_sound_decoders_oggaud_c
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/DESCR-main,v
retrieving revision 1.1
diff -N -u -p pkg/DESCR-main
--- pkg/DESCR-main 24 Nov 2006 00:15:11 -0000 1.1
+++ pkg/DESCR-main 11 May 2012 04:45:18 -0000
@@ -4,4 +4,4 @@ popular game Star Control 2.
It is highly recommended to at least skim through the text version
of the introduction, a copy of which may be found here:
-http://www.classicgaming.com/starcontrol/sc2/sc2_hist.shtml
+http://web.archive.org/web/20090303080946/http://starcontrol.classicgaming.gamespy.com/sc2/sc2_hist.shtml
Index: pkg/DESCR-remix1
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/DESCR-remix1,v
retrieving revision 1.1
diff -N -u -p pkg/DESCR-remix1
--- pkg/DESCR-remix1 31 Oct 2003 04:09:21 -0000 1.1
+++ pkg/DESCR-remix1 11 May 2012 04:45:18 -0000
@@ -1,3 +1,3 @@
Optional remix package #1 for The Ur-Quan Masters.
-Run uqm with "--addon uqmremix" as an argument to use the remixed music.
+Go to "Sound Options" in the Setup menu to enable the remixed music.
Index: pkg/DESCR-remix2
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/DESCR-remix2,v
retrieving revision 1.1
diff -N -u -p pkg/DESCR-remix2
--- pkg/DESCR-remix2 12 Nov 2003 23:18:27 -0000 1.1
+++ pkg/DESCR-remix2 11 May 2012 04:45:18 -0000
@@ -1,3 +1,3 @@
Optional remix package #2 for The Ur-Quan Masters.
-Run uqm with "--addon uqmremix" as an argument to use the remixed music.
+Go to "Sound Options" in the Setup menu to enable the remixed music.
Index: pkg/DESCR-remix3
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/DESCR-remix3,v
retrieving revision 1.1
diff -N -u -p pkg/DESCR-remix3
--- pkg/DESCR-remix3 8 Aug 2004 00:27:24 -0000 1.1
+++ pkg/DESCR-remix3 11 May 2012 04:45:18 -0000
@@ -1,3 +1,3 @@
Optional remix package #3 for The Ur-Quan Masters.
-Run uqm with "--addon uqmremix" as an argument to use the remixed music.
+Go to "Sound Options" in the Setup menu to enable the remixed music.
Index: pkg/PLIST-content
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/PLIST-content,v
retrieving revision 1.4
diff -N -u -p pkg/PLIST-content
--- pkg/PLIST-content 23 Dec 2006 09:32:03 -0000 1.4
+++ pkg/PLIST-content 11 May 2012 04:45:18 -0000
@@ -2,5 +2,6 @@
share/uqm/
share/uqm/content/
share/uqm/content/packages/
-share/uqm/content/packages/uqm-0.6.0-content.uqm
+share/uqm/content/addons/
+share/uqm/content/packages/uqm-0.7.0-content.uqm
share/uqm/content/version
Index: pkg/PLIST-remix1
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/PLIST-remix1,v
retrieving revision 1.2
diff -N -u -p pkg/PLIST-remix1
--- pkg/PLIST-remix1 23 Dec 2006 09:32:03 -0000 1.2
+++ pkg/PLIST-remix1 11 May 2012 04:45:18 -0000
@@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-remix1,v 1.2 2006/12/23 09:32:03 jolan Exp $
-share/uqm/content/packages/addons/
-share/uqm/content/packages/addons/uqmremix/
-share/uqm/content/packages/addons/uqmremix/uqm-remix-pack1.zip
+share/uqm/content/addons/
+share/uqm/content/addons/uqm-remix-disc1.uqm
Index: pkg/PLIST-remix2
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/PLIST-remix2,v
retrieving revision 1.2
diff -N -u -p pkg/PLIST-remix2
--- pkg/PLIST-remix2 23 Dec 2006 09:32:03 -0000 1.2
+++ pkg/PLIST-remix2 11 May 2012 04:45:18 -0000
@@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-remix2,v 1.2 2006/12/23 09:32:03 jolan Exp $
-share/uqm/content/packages/addons/
-share/uqm/content/packages/addons/uqmremix/
-share/uqm/content/packages/addons/uqmremix/uqm-remix-pack2.zip
+share/uqm/content/addons/
+share/uqm/content/addons/uqm-remix-disc2.uqm
Index: pkg/PLIST-remix3
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/PLIST-remix3,v
retrieving revision 1.2
diff -N -u -p pkg/PLIST-remix3
--- pkg/PLIST-remix3 23 Dec 2006 09:32:03 -0000 1.2
+++ pkg/PLIST-remix3 11 May 2012 04:45:18 -0000
@@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-remix3,v 1.2 2006/12/23 09:32:03 jolan Exp $
-share/uqm/content/packages/addons/
-share/uqm/content/packages/addons/uqmremix/
-share/uqm/content/packages/addons/uqmremix/uqm-remix-pack3.zip
+share/uqm/content/addons/
+share/uqm/content/addons/uqm-remix-disc3.uqm
Index: pkg/PLIST-threedomusic
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/PLIST-threedomusic,v
retrieving revision 1.4
diff -N -u -p pkg/PLIST-threedomusic
--- pkg/PLIST-threedomusic 23 Dec 2006 09:32:03 -0000 1.4
+++ pkg/PLIST-threedomusic 11 May 2012 04:45:18 -0000
@@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-threedomusic,v 1.4 2006/12/23 09:32:03 jolan Exp $
-share/uqm/content/packages/uqm-0.6.0-3domusic.uqm
+share/uqm/content/addons/
+share/uqm/content/addons/uqm-0.7.0-3domusic.uqm
Index: pkg/PLIST-voice
===================================================================
RCS file: /cvs/ports/games/uqm/pkg/PLIST-voice,v
retrieving revision 1.5
diff -N -u -p pkg/PLIST-voice
--- pkg/PLIST-voice 23 Dec 2006 09:32:03 -0000 1.5
+++ pkg/PLIST-voice 11 May 2012 04:45:18 -0000
@@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-voice,v 1.5 2006/12/23 09:32:03 jolan Exp $
-share/uqm/content/packages/uqm-0.6.0-voice.uqm
+share/uqm/content/addons/
+share/uqm/content/addons/uqm-0.7.0-voice.uqm
--- /dev/null Thu May 10 22:45:39 2012
+++ patches/patch-src_libs_sound_decoders_oggaud_c Thu May 10 21:54:06 2012
@@ -0,0 +1,14 @@
+$OpenBSD: patch-sc2_src_sc2code_libs_sound_decoders_oggaud_c,v 1.1 2012/04/28
09:04:14 ajacoutot Exp $
+--- src/libs/sound/decoders/oggaud.c.orig Fri Apr 13 01:18:24 2012
++++ src/libs/sound/decoders/oggaud.c Fri Apr 13 01:28:54 2012
+@@ -270,10 +270,6 @@ ova_GetFrame (THIS_PTR)
+ TFB_OggSoundDecoder* ova = (TFB_OggSoundDecoder*) This;
+ // this is the closest to a frame there is in ogg vorbis stream
+ // doesn't seem to be a func to retrive it
+-#ifdef OVCODEC_TREMOR
+- return ova->vf.os->pageno;
+-#else
+ return ova->vf.os.pageno;
+-#endif /* OVCODEC_TREMOR */
+ }
+
