On Sat, Nov 20, 2021 at 10:15:26PM +0100, Stefan Hagen wrote:
> Hi Tom,
>
> Tom Murphy wrote:
> > Here is a diff to update games/uqm from 0.7.0 to 0.8.0. The game
> > now compiles under SDL2.
> >
> > OK?
>
> I don't know how to play this game, but I clicked around and it seems to
> run fine. Tested on amd64.
>
> $ portcheck
> both data/3domusic and some of its parents has distinfo
> ...
>
> games/uqm/distinfo should be removed.
>
> OK sdk@ without parent distinfo.
>
> Best Regards,
> Stefan
Hi Stefan,
Thanks! I've updated the diff so that removes the parent distinfo.
Tom
Index: distinfo
===================================================================
RCS file: distinfo
diff -N distinfo
--- distinfo 20 Jan 2015 12:28:31 -0000 1.16
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-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=
-SHA256 (uqm/uqm-remix-disc4.uqm) = pMgZdxKltyqBx+96KjPqfTrJCrBjySndaOcyilWahtA=
-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
-SIZE (uqm/uqm-remix-disc4.uqm) = 86545760
Index: data/3domusic/Makefile
===================================================================
RCS file: /cvs/ports/games/uqm/data/3domusic/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- data/3domusic/Makefile 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/3domusic/Makefile 21 Nov 2021 21:37:15 -0000
@@ -2,14 +2,12 @@
COMMENT = ur-quan masters: 3DO music content
-V = 0.7.0
+V = 0.8.0
UQM_ADDON = Yes
# packages-specs(7): first digit following hyphen can only be version
PKGNAME = uqm-threedomusic-$V
DISTFILES = uqm-$V-3domusic.uqm
-
-REVISION = 6
.include <bsd.port.mk>
Index: data/3domusic/distinfo
===================================================================
RCS file: /cvs/ports/games/uqm/data/3domusic/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- data/3domusic/distinfo 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/3domusic/distinfo 21 Nov 2021 21:37:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (uqm/uqm-0.7.0-3domusic.uqm) =
xXCF5k2tS934pnmpqirfY/IVbV9sur5jr4BRkDPby4I=
-SIZE (uqm/uqm-0.7.0-3domusic.uqm) = 18980671
+SHA256 (uqm/uqm-0.8.0-3domusic.uqm) =
RM087H6VabQRettNd/FSKJCXJWYmc5GuCWMUhdIx2Lk=
+SIZE (uqm/uqm-0.8.0-3domusic.uqm) = 18980671
Index: data/3domusic/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/uqm/data/3domusic/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- data/3domusic/pkg/PLIST 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/3domusic/pkg/PLIST 21 Nov 2021 21:37:15 -0000
@@ -3,4 +3,4 @@
share/uqm/
share/uqm/content/
share/uqm/content/addons/
-share/uqm/content/addons/uqm-0.7.0-3domusic.uqm
+share/uqm/content/addons/uqm-0.8.0-3domusic.uqm
Index: data/content/Makefile
===================================================================
RCS file: /cvs/ports/games/uqm/data/content/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- data/content/Makefile 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/content/Makefile 21 Nov 2021 21:37:15 -0000
@@ -2,13 +2,11 @@
COMMENT = ur-quan masters: game content
-V = 0.7.0
+V = 0.8.0
UQM_PACKAGE = Yes
PKGNAME = uqm-content-$V
DISTFILES = uqm-$V-content.uqm
-
-REVISION = 6
.include <bsd.port.mk>
Index: data/content/distinfo
===================================================================
RCS file: /cvs/ports/games/uqm/data/content/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- data/content/distinfo 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/content/distinfo 21 Nov 2021 21:37:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (uqm/uqm-0.7.0-content.uqm) =
uPbbi6KfBij7HVwjODCJaxn0Qa7jdEvaZx6iZLRNo78=
-SIZE (uqm/uqm-0.7.0-content.uqm) = 11538533
+SHA256 (uqm/uqm-0.8.0-content.uqm) =
d9dawl5vt1WjPEujs4p7e8Qfy8AolokbDMmskhS3Lu8=
+SIZE (uqm/uqm-0.8.0-content.uqm) = 11547353
Index: data/content/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/uqm/data/content/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- data/content/pkg/PLIST 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/content/pkg/PLIST 21 Nov 2021 21:37:15 -0000
@@ -3,4 +3,4 @@
share/uqm/
share/uqm/content/
share/uqm/content/packages/
-share/uqm/content/packages/uqm-0.7.0-content.uqm
+share/uqm/content/packages/uqm-0.8.0-content.uqm
Index: data/remix/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/uqm/data/remix/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- data/remix/pkg/PLIST 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/remix/pkg/PLIST 21 Nov 2021 21:37:15 -0000
@@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2020/08/30 10:05:35 bentley Exp $
-@pkgpath games/uqm,-remix1
-@pkgpath games/uqm,-remix2
-@pkgpath games/uqm,-remix3
-@pkgpath games/uqm,-remix4
@conflict uqm-remix1-*
@conflict uqm-remix2-*
@conflict uqm-remix3-*
@conflict uqm-remix4-*
+@pkgpath games/uqm,-remix1
+@pkgpath games/uqm,-remix2
+@pkgpath games/uqm,-remix3
+@pkgpath games/uqm,-remix4
share/uqm/
share/uqm/content/
share/uqm/content/addons/
Index: data/voice/Makefile
===================================================================
RCS file: /cvs/ports/games/uqm/data/voice/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- data/voice/Makefile 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/voice/Makefile 21 Nov 2021 21:37:15 -0000
@@ -2,13 +2,11 @@
COMMENT = ur-quan masters: speech content
-V = 0.7.0
+V = 0.8.0
UQM_ADDON = Yes
PKGNAME = uqm-voice-$V
DISTFILES = uqm-$V-voice.uqm
-
-REVISION = 6
.include <bsd.port.mk>
Index: data/voice/distinfo
===================================================================
RCS file: /cvs/ports/games/uqm/data/voice/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- data/voice/distinfo 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/voice/distinfo 21 Nov 2021 21:37:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (uqm/uqm-0.7.0-voice.uqm) = vMz4AbS6N1lP9iF7KSdE6lhu4tRH6SeASELMrotzyXk=
-SIZE (uqm/uqm-0.7.0-voice.uqm) = 115143439
+SHA256 (uqm/uqm-0.8.0-voice.uqm) = ntv1HXfYtTM5nF86+1STFKghDXqrccosUbTySDIzekU=
+SIZE (uqm/uqm-0.8.0-voice.uqm) = 115164704
Index: data/voice/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/uqm/data/voice/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- data/voice/pkg/PLIST 30 Aug 2020 10:05:35 -0000 1.1.1.1
+++ data/voice/pkg/PLIST 21 Nov 2021 21:37:15 -0000
@@ -3,4 +3,4 @@
share/uqm/
share/uqm/content/
share/uqm/content/addons/
-share/uqm/content/addons/uqm-0.7.0-voice.uqm
+share/uqm/content/addons/uqm-0.8.0-voice.uqm
Index: uqm/Makefile
===================================================================
RCS file: /cvs/ports/games/uqm/uqm/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- uqm/Makefile 30 Aug 2020 10:33:57 -0000 1.2
+++ uqm/Makefile 21 Nov 2021 21:37:15 -0000
@@ -2,12 +2,9 @@
COMMENT = ur-quan masters: game of space exploration and battles
-EPOCH = 0
-
-DISTNAME = uqm-$V-source
+DISTNAME = uqm-$V-src
PKGNAME = uqm-$V
-V = 0.7.0
-REVISION = 6
+V = 0.8.0
CATEGORIES = games x11
@@ -18,17 +15,19 @@ MAINTAINER = Anthony J. Bentley <anthon
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += c m pthread z SDL mikmod vorbisfile SDL_image
+WANTLIB += c m z mikmod vorbisfile ogg png SDL2
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE=sc2/}
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sc2/}
EXTRACT_SUFX = .tgz
DIST_SUBDIR = uqm
LIB_DEPENDS = audio/libmikmod \
+ audio/libogg \
audio/libvorbis \
- devel/sdl-image
+ devel/sdl2 \
+ graphics/png
RUN_DEPENDS = games/uqm/data/content
Index: uqm/distinfo
===================================================================
RCS file: /cvs/ports/games/uqm/uqm/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- uqm/distinfo 30 Aug 2020 10:04:59 -0000 1.1.1.1
+++ uqm/distinfo 21 Nov 2021 21:37:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (uqm/uqm-0.7.0-source.tgz) =
o2lcX38L5+ycD4DsVpkHs4ICOh/ubmNVMr1Tt7U7siE=
-SIZE (uqm/uqm-0.7.0-source.tgz) = 1562003
+SHA256 (uqm/uqm-0.8.0-src.tgz) = JPL325z3+vU7lfniWA5vWWIFqY7QwzXP6DTGR4WtT1o=
+SIZE (uqm/uqm-0.8.0-src.tgz) = 1611401
Index: uqm/files/build.vars
===================================================================
RCS file: /cvs/ports/games/uqm/uqm/files/build.vars,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 build.vars
--- uqm/files/build.vars 30 Aug 2020 10:04:59 -0000 1.1.1.1
+++ uqm/files/build.vars 21 Nov 2021 21:37:15 -0000
@@ -29,8 +29,8 @@ ECHON='echo -n'
SED='sed'
REZ=''
WINDRES=''
-uqm_CFLAGS='@CFLAGS@ -I"." -I@LOCALBASE@/include `sdl-config --cflags`
-DGFXMODULE_SDL -DTHREADLIB_SDL -DSOUNDMODULE_SDL -DNETPLAY=NETPLAY_FULL
-DHAVE_JOYSTICK -DHAVE_ZIP=1 -DUSE_PLATFORM_ACCEL -pthread'
-uqm_LDFLAGS='`sdl-config --libs` -lSDL_image -lmikmod -lvorbisfile -lz -lm'
+uqm_CFLAGS='@CFLAGS@ -I"." -I@LOCALBASE@/include `sdl2-config --cflags`
-DGFXMODULE_SDL -DSDL_DIR=SDL2 -DTHREADLIB_SDL -DSOUNDMODULE_SDL
-DNETPLAY=NETPLAY_FULL -DHAVE_JOYSTICK -DHAVE_ZIP=1 -DUSE_PLATFORM_ACCEL
-pthread'
+uqm_LDFLAGS='`sdl2-config --libs` -lmikmod -logg -lpng -lvorbisfile -lz -lm'
uqm_INSTALL_BINDIR='@PREFIX@/bin/'
uqm_INSTALL_LIBDIR='@PREFIX@/lib/'
uqm_INSTALL_SHAREDIR='@PREFIX@/share/'
@@ -54,6 +54,7 @@ MACRO_WIN32=''
MACRO___MINGW32__=''
export BUILD_SYSTEM HOST_SYSTEM DEBUG
export MACRO_WIN32 MACRO___MINGW32__
-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_SOUNDMODULE uqm_OGGVORBIS uqm_USE_INTERNAL_MIKMOD
+export uqm_HAVE_GETOPT_LONG uqm_HAVE_REGEX uqm_USE_WINSOCK uqm_GFXMODULE
+export uqm_HAVE_OPENGL
export uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_THREADLIB uqm_NETPLAY
