Re: UPDATE: games/urbanterror{,-data}
On 07/01/18 14:46, Ryan Freeman wrote:
Hey,
Trivial update to Urbanterror 4.3.4, unfortunately they did touch the
data files ever-so-slightly, so that got bumped too. Mostly engine
fixes: https://www.urbanterror.info/news/520-urban-terror-4-3-4-release/
Builds/packages a-okay on -current amd64, looking for OK + commit :-)
I wonder if we can remove that MODULES stuff for i386. Has i386 moved to
clang as its default compiler yet?
Otherwise it looks good; happy to commit after receiving an answer on
that question.
~Brian
Cheers,
-ryan
Index: urbanterror/Makefile
===
RCS file: /cvs/ports/games/urbanterror/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- urbanterror/Makefile23 Mar 2018 22:59:36 - 1.6
+++ urbanterror/Makefile1 Jul 2018 18:42:04 -
@@ -3,11 +3,11 @@
ONLY_FOR_ARCHS = amd64 i386
COMMENT = fast-paced hollywood-tactical shooter: "fun over realism"
-DISTNAME = urbanterror-4.3.3
+DISTNAME = urbanterror-4.3.4
GH_ACCOUNT = Barbatos
GH_PROJECT = ioq3-for-UrbanTerror-4
-GH_TAGNAME = release-4.3.3
+GH_TAGNAME = release-4.3.4
CATEGORIES = games x11
Index: urbanterror/distinfo
===
RCS file: /cvs/ports/games/urbanterror/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- urbanterror/distinfo23 Mar 2018 22:59:36 - 1.5
+++ urbanterror/distinfo1 Jul 2018 18:42:04 -
@@ -1,2 +1,2 @@
-SHA256 (urbanterror-4.3.3.tar.gz) =
uQvKfqksCyfUzjvArkTlPEu1jaJsgHXSOUYxeSPEa2A=
-SIZE (urbanterror-4.3.3.tar.gz) = 3325609
+SHA256 (urbanterror-4.3.4.tar.gz) =
zp0JqK0Un4odNqhaWG4d2Oybjcs+Xp6C7CozAXZVv0M=
+SIZE (urbanterror-4.3.4.tar.gz) = 3325100
Index: urbanterror-data/Makefile
===
RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- urbanterror-data/Makefile 23 Mar 2018 22:59:36 - 1.6
+++ urbanterror-data/Makefile 1 Jul 2018 18:42:04 -
@@ -3,11 +3,11 @@
ONLY_FOR_ARCHS = amd64 i386
COMMENT = Urban Terror game data
-PKGNAME = urbanterror-data-4.3.3
+PKGNAME = urbanterror-data-4.3.4
CATEGORIES = games
URT_VER = 43
-URT_REV = 3
+URT_REV = 4
DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
Index: urbanterror-data/distinfo
===
RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- urbanterror-data/distinfo 23 Mar 2018 22:59:36 - 1.4
+++ urbanterror-data/distinfo 1 Jul 2018 18:42:04 -
@@ -1,2 +1,2 @@
-SHA256 (UrbanTerror433_full.zip) = w1gnGSckr8qqB9e9t08X4G5LhlNGZy7aKwBxez0CMGc=
-SIZE (UrbanTerror433_full.zip) = 1472028382
+SHA256 (UrbanTerror434_full.zip) = cWZpzGxSVmO3kYUuUf+clNlvOCvjknnatghN3ay1pOc=
+SIZE (UrbanTerror434_full.zip) = 1472003870
Re: update: games/urbanterror and games/urbanterror-data
On 2018/03/21 08:25, Ryan Freeman wrote:
> On Wed, Mar 14, 2018 at 12:51:40PM -0700, Ryan Freeman wrote:
> > On Sat, Mar 03, 2018 at 07:59:46PM -0800, Ryan Freeman wrote:
> > > On Sat, Mar 03, 2018 at 09:22:26AM +, Stuart Henderson wrote:
> > > > This is not an uploaded release tarball, it's auto-generated so
> > > > please keep GH_*.
> > > >
> > > > Like Makefile.template says, look at the file url -
> > > >
> > > > /archive/ -> GH_*
> > > > /releases/ -> MASTER_SITES etc
> > > >
> > > > --
> > > > Sent from a phone, apologies for poor formatting.
> > >
> > > Here is a patch that undoes that change, thanks for catching that.
> > >
> >
> > ping
>
> One more try...we've hit urgent fixes only mode i see, and while
> this isn't exactly urgent, online games will not work without this
> update. Anyone? :-)
Since without this update we're shipping at least 3GB of useless data
files as part of the release, I tend to think this should go in. Comments
from anyone else?
> -ryan
>
> >
> > >
> > > Index: urbanterror/Makefile
> > > ===
> > > RCS file: /cvs/ports/games/urbanterror/Makefile,v
> > > retrieving revision 1.5
> > > diff -u -p -r1.5 Makefile
> > > --- urbanterror/Makefile 26 Feb 2018 08:54:59 - 1.5
> > > +++ urbanterror/Makefile 4 Mar 2018 03:55:32 -
> > > @@ -3,11 +3,11 @@
> > > ONLY_FOR_ARCHS = amd64 i386
> > >
> > > COMMENT =fast-paced hollywood-tactical shooter: "fun over
> > > realism"
> > > -DISTNAME = urbanterror-4.3.2pl1
> > > +DISTNAME = urbanterror-4.3.3
> > >
> > > GH_ACCOUNT = Barbatos
> > > GH_PROJECT = ioq3-for-UrbanTerror-4
> > > -GH_TAGNAME = release-4.3.2-hotfix
> > > +GH_TAGNAME = release-4.3.3
> > >
> > > CATEGORIES = games x11
> > >
> > > Index: urbanterror/distinfo
> > > ===
> > > RCS file: /cvs/ports/games/urbanterror/distinfo,v
> > > retrieving revision 1.4
> > > diff -u -p -r1.4 distinfo
> > > --- urbanterror/distinfo 26 Feb 2018 08:54:59 - 1.4
> > > +++ urbanterror/distinfo 4 Mar 2018 03:55:32 -
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (urbanterror-4.3.2pl1.tar.gz) =
> > > kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
> > > -SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
> > > +SHA256 (urbanterror-4.3.3.tar.gz) =
> > > uQvKfqksCyfUzjvArkTlPEu1jaJsgHXSOUYxeSPEa2A=
> > > +SIZE (urbanterror-4.3.3.tar.gz) = 3325609
> > > Index: urbanterror-data/Makefile
> > > ===
> > > RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
> > > retrieving revision 1.5
> > > diff -u -p -r1.5 Makefile
> > > --- urbanterror-data/Makefile 9 Feb 2017 11:19:47 - 1.5
> > > +++ urbanterror-data/Makefile 4 Mar 2018 03:55:32 -
> > > @@ -3,11 +3,11 @@
> > > ONLY_FOR_ARCHS = amd64 i386
> > >
> > > COMMENT =Urban Terror game data
> > > -PKGNAME =urbanterror-data-4.3.2
> > > +PKGNAME =urbanterror-data-4.3.3
> > > CATEGORIES = games
> > >
> > > URT_VER =43
> > > -URT_REV =2
> > > +URT_REV =3
> > >
> > > DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
> > >
> > > Index: urbanterror-data/distinfo
> > > ===
> > > RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
> > > retrieving revision 1.3
> > > diff -u -p -r1.3 distinfo
> > > --- urbanterror-data/distinfo 7 Feb 2017 06:12:27 - 1.3
> > > +++ urbanterror-data/distinfo 4 Mar 2018 03:55:32 -
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (UrbanTerror432_full.zip) =
> > > dN7hVm+mzQ6ybYZhSaG2rX6PGKZTaT8CeQwF73zjUqQ=
> > > -SIZE (UrbanTerror432_full.zip) = 1469432087
> > > +SHA256 (UrbanTerror433_full.zip) =
> > > w1gnGSckr8qqB9e9t08X4G5LhlNGZy7aKwBxez0CMGc=
> > > +SIZE (UrbanTerror433_full.zip) = 1472028382
> > >
> >
>
Re: update: games/urbanterror and games/urbanterror-data
On Wed, Mar 14, 2018 at 12:51:40PM -0700, Ryan Freeman wrote:
> On Sat, Mar 03, 2018 at 07:59:46PM -0800, Ryan Freeman wrote:
> > On Sat, Mar 03, 2018 at 09:22:26AM +, Stuart Henderson wrote:
> > > This is not an uploaded release tarball, it's auto-generated so
> > > please keep GH_*.
> > >
> > > Like Makefile.template says, look at the file url -
> > >
> > > /archive/ -> GH_*
> > > /releases/ -> MASTER_SITES etc
> > >
> > > --
> > > Sent from a phone, apologies for poor formatting.
> >
> > Here is a patch that undoes that change, thanks for catching that.
> >
>
> ping
One more try...we've hit urgent fixes only mode i see, and while
this isn't exactly urgent, online games will not work without this
update. Anyone? :-)
-ryan
>
> >
> > Index: urbanterror/Makefile
> > ===
> > RCS file: /cvs/ports/games/urbanterror/Makefile,v
> > retrieving revision 1.5
> > diff -u -p -r1.5 Makefile
> > --- urbanterror/Makefile26 Feb 2018 08:54:59 - 1.5
> > +++ urbanterror/Makefile4 Mar 2018 03:55:32 -
> > @@ -3,11 +3,11 @@
> > ONLY_FOR_ARCHS = amd64 i386
> >
> > COMMENT = fast-paced hollywood-tactical shooter: "fun over realism"
> > -DISTNAME = urbanterror-4.3.2pl1
> > +DISTNAME = urbanterror-4.3.3
> >
> > GH_ACCOUNT = Barbatos
> > GH_PROJECT = ioq3-for-UrbanTerror-4
> > -GH_TAGNAME = release-4.3.2-hotfix
> > +GH_TAGNAME = release-4.3.3
> >
> > CATEGORIES = games x11
> >
> > Index: urbanterror/distinfo
> > ===
> > RCS file: /cvs/ports/games/urbanterror/distinfo,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 distinfo
> > --- urbanterror/distinfo26 Feb 2018 08:54:59 - 1.4
> > +++ urbanterror/distinfo4 Mar 2018 03:55:32 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (urbanterror-4.3.2pl1.tar.gz) =
> > kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
> > -SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
> > +SHA256 (urbanterror-4.3.3.tar.gz) =
> > uQvKfqksCyfUzjvArkTlPEu1jaJsgHXSOUYxeSPEa2A=
> > +SIZE (urbanterror-4.3.3.tar.gz) = 3325609
> > Index: urbanterror-data/Makefile
> > ===
> > RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
> > retrieving revision 1.5
> > diff -u -p -r1.5 Makefile
> > --- urbanterror-data/Makefile 9 Feb 2017 11:19:47 - 1.5
> > +++ urbanterror-data/Makefile 4 Mar 2018 03:55:32 -
> > @@ -3,11 +3,11 @@
> > ONLY_FOR_ARCHS = amd64 i386
> >
> > COMMENT = Urban Terror game data
> > -PKGNAME = urbanterror-data-4.3.2
> > +PKGNAME = urbanterror-data-4.3.3
> > CATEGORIES = games
> >
> > URT_VER = 43
> > -URT_REV = 2
> > +URT_REV = 3
> >
> > DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
> >
> > Index: urbanterror-data/distinfo
> > ===
> > RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 distinfo
> > --- urbanterror-data/distinfo 7 Feb 2017 06:12:27 - 1.3
> > +++ urbanterror-data/distinfo 4 Mar 2018 03:55:32 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (UrbanTerror432_full.zip) =
> > dN7hVm+mzQ6ybYZhSaG2rX6PGKZTaT8CeQwF73zjUqQ=
> > -SIZE (UrbanTerror432_full.zip) = 1469432087
> > +SHA256 (UrbanTerror433_full.zip) =
> > w1gnGSckr8qqB9e9t08X4G5LhlNGZy7aKwBxez0CMGc=
> > +SIZE (UrbanTerror433_full.zip) = 1472028382
> >
>
Re: update: games/urbanterror and games/urbanterror-data
On Sat, Mar 03, 2018 at 07:59:46PM -0800, Ryan Freeman wrote:
> On Sat, Mar 03, 2018 at 09:22:26AM +, Stuart Henderson wrote:
> > This is not an uploaded release tarball, it's auto-generated so
> > please keep GH_*.
> >
> > Like Makefile.template says, look at the file url -
> >
> > /archive/ -> GH_*
> > /releases/ -> MASTER_SITES etc
> >
> > --
> > Sent from a phone, apologies for poor formatting.
>
> Here is a patch that undoes that change, thanks for catching that.
>
ping
>
> Index: urbanterror/Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- urbanterror/Makefile 26 Feb 2018 08:54:59 - 1.5
> +++ urbanterror/Makefile 4 Mar 2018 03:55:32 -
> @@ -3,11 +3,11 @@
> ONLY_FOR_ARCHS = amd64 i386
>
> COMMENT =fast-paced hollywood-tactical shooter: "fun over realism"
> -DISTNAME = urbanterror-4.3.2pl1
> +DISTNAME = urbanterror-4.3.3
>
> GH_ACCOUNT = Barbatos
> GH_PROJECT = ioq3-for-UrbanTerror-4
> -GH_TAGNAME = release-4.3.2-hotfix
> +GH_TAGNAME = release-4.3.3
>
> CATEGORIES = games x11
>
> Index: urbanterror/distinfo
> ===
> RCS file: /cvs/ports/games/urbanterror/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- urbanterror/distinfo 26 Feb 2018 08:54:59 - 1.4
> +++ urbanterror/distinfo 4 Mar 2018 03:55:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (urbanterror-4.3.2pl1.tar.gz) =
> kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
> -SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
> +SHA256 (urbanterror-4.3.3.tar.gz) =
> uQvKfqksCyfUzjvArkTlPEu1jaJsgHXSOUYxeSPEa2A=
> +SIZE (urbanterror-4.3.3.tar.gz) = 3325609
> Index: urbanterror-data/Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- urbanterror-data/Makefile 9 Feb 2017 11:19:47 - 1.5
> +++ urbanterror-data/Makefile 4 Mar 2018 03:55:32 -
> @@ -3,11 +3,11 @@
> ONLY_FOR_ARCHS = amd64 i386
>
> COMMENT =Urban Terror game data
> -PKGNAME =urbanterror-data-4.3.2
> +PKGNAME =urbanterror-data-4.3.3
> CATEGORIES = games
>
> URT_VER =43
> -URT_REV =2
> +URT_REV =3
>
> DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
>
> Index: urbanterror-data/distinfo
> ===
> RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- urbanterror-data/distinfo 7 Feb 2017 06:12:27 - 1.3
> +++ urbanterror-data/distinfo 4 Mar 2018 03:55:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (UrbanTerror432_full.zip) =
> dN7hVm+mzQ6ybYZhSaG2rX6PGKZTaT8CeQwF73zjUqQ=
> -SIZE (UrbanTerror432_full.zip) = 1469432087
> +SHA256 (UrbanTerror433_full.zip) =
> w1gnGSckr8qqB9e9t08X4G5LhlNGZy7aKwBxez0CMGc=
> +SIZE (UrbanTerror433_full.zip) = 1472028382
>
Re: update: games/urbanterror and games/urbanterror-data
On Sat, Mar 03, 2018 at 09:22:26AM +, Stuart Henderson wrote:
> This is not an uploaded release tarball, it's auto-generated so
> please keep GH_*.
>
> Like Makefile.template says, look at the file url -
>
> /archive/ -> GH_*
> /releases/ -> MASTER_SITES etc
>
> --
> Sent from a phone, apologies for poor formatting.
Here is a patch that undoes that change, thanks for catching that.
Index: urbanterror/Makefile
===
RCS file: /cvs/ports/games/urbanterror/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- urbanterror/Makefile26 Feb 2018 08:54:59 - 1.5
+++ urbanterror/Makefile4 Mar 2018 03:55:32 -
@@ -3,11 +3,11 @@
ONLY_FOR_ARCHS = amd64 i386
COMMENT = fast-paced hollywood-tactical shooter: "fun over realism"
-DISTNAME = urbanterror-4.3.2pl1
+DISTNAME = urbanterror-4.3.3
GH_ACCOUNT = Barbatos
GH_PROJECT = ioq3-for-UrbanTerror-4
-GH_TAGNAME = release-4.3.2-hotfix
+GH_TAGNAME = release-4.3.3
CATEGORIES = games x11
Index: urbanterror/distinfo
===
RCS file: /cvs/ports/games/urbanterror/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- urbanterror/distinfo26 Feb 2018 08:54:59 - 1.4
+++ urbanterror/distinfo4 Mar 2018 03:55:32 -
@@ -1,2 +1,2 @@
-SHA256 (urbanterror-4.3.2pl1.tar.gz) =
kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
-SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
+SHA256 (urbanterror-4.3.3.tar.gz) =
uQvKfqksCyfUzjvArkTlPEu1jaJsgHXSOUYxeSPEa2A=
+SIZE (urbanterror-4.3.3.tar.gz) = 3325609
Index: urbanterror-data/Makefile
===
RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- urbanterror-data/Makefile 9 Feb 2017 11:19:47 - 1.5
+++ urbanterror-data/Makefile 4 Mar 2018 03:55:32 -
@@ -3,11 +3,11 @@
ONLY_FOR_ARCHS = amd64 i386
COMMENT = Urban Terror game data
-PKGNAME = urbanterror-data-4.3.2
+PKGNAME = urbanterror-data-4.3.3
CATEGORIES = games
URT_VER = 43
-URT_REV = 2
+URT_REV = 3
DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
Index: urbanterror-data/distinfo
===
RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- urbanterror-data/distinfo 7 Feb 2017 06:12:27 - 1.3
+++ urbanterror-data/distinfo 4 Mar 2018 03:55:32 -
@@ -1,2 +1,2 @@
-SHA256 (UrbanTerror432_full.zip) = dN7hVm+mzQ6ybYZhSaG2rX6PGKZTaT8CeQwF73zjUqQ=
-SIZE (UrbanTerror432_full.zip) = 1469432087
+SHA256 (UrbanTerror433_full.zip) = w1gnGSckr8qqB9e9t08X4G5LhlNGZy7aKwBxez0CMGc=
+SIZE (UrbanTerror433_full.zip) = 1472028382
Re: update: games/urbanterror and games/urbanterror-data
This is not an uploaded release tarball, it's auto-generated so please keep
GH_*.
Like Makefile.template says, look at the file url -
/archive/ -> GH_*
/releases/ -> MASTER_SITES etc
--
Sent from a phone, apologies for poor formatting.
On 3 March 2018 07:07:47 Ryan Freeman wrote:
Hot on the heels of the 4.3.2 hotfix is a full-fledged 4.3.3 release.
Titled 'Still Dying', it has lots of bug fixes and game behavior
tweaks this time around, as well as security fixes:
http://www.urbanterror.info/news/516-urban-terror-4-3-3-release/
Diff inline for both urbanterror and urbanterror-data
I've switched this from the GH_ vars to using a release tarball
in the engine port.
Builds and packages good here on amd64, OKs and anyone available
to commit? I am hoping we can sneak this one if we are getting
close to lock, as most servers seem to have already made the switch
and the current version in ports won't be able to join network
games.
Cheers,
-ryan
Index: urbanterror/Makefile
===
RCS file: /cvs/ports/games/urbanterror/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- urbanterror/Makefile26 Feb 2018 08:54:59 - 1.5
+++ urbanterror/Makefile3 Mar 2018 06:47:10 -
@@ -2,12 +2,10 @@
ONLY_FOR_ARCHS = amd64 i386
+V =4.3.3
COMMENT = fast-paced hollywood-tactical shooter: "fun over realism"
-DISTNAME = urbanterror-4.3.2pl1
-
-GH_ACCOUNT = Barbatos
-GH_PROJECT = ioq3-for-UrbanTerror-4
-GH_TAGNAME = release-4.3.2-hotfix
+DISTNAME = release-${V}
+PKGNAME = urbanterror-${V}
CATEGORIES = games x11
@@ -20,9 +18,12 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += X11 Xxf86vm c m pthread SDL
+MASTER_SITES = https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/
+
LIB_DEPENDS = devel/sdl
RUN_DEPENDS = games/urbanterror-data \
net/curl
+
# using clang's integrated assembler for %xmm (code/qcommon/snapvector_sse.c)
MODULES = lang/clang
MODCLANG_ARCHS = i386
@@ -32,6 +33,8 @@ ALL_TARGET =release
MAKE_ENV = V=1 \
DEFAULT_BASEDIR=${TRUEPREFIX}/share/urbanterror
+
+WRKDIST = ${WRKDIR}/ioq3-for-UrbanTerror-4-release-${V}
do-install:
${INSTALL_PROGRAM} \
Index: urbanterror/distinfo
===
RCS file: /cvs/ports/games/urbanterror/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- urbanterror/distinfo26 Feb 2018 08:54:59 - 1.4
+++ urbanterror/distinfo3 Mar 2018 06:47:10 -
@@ -1,2 +1,2 @@
-SHA256 (urbanterror-4.3.2pl1.tar.gz) =
kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI=
-SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
+SHA256 (release-4.3.3.tar.gz) = uQvKfqksCyfUzjvArkTlPEu1jaJsgHXSOUYxeSPEa2A=
+SIZE (release-4.3.3.tar.gz) = 3325609
Index: urbanterror-data/Makefile
===
RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- urbanterror-data/Makefile 9 Feb 2017 11:19:47 - 1.5
+++ urbanterror-data/Makefile 3 Mar 2018 06:47:10 -
@@ -3,11 +3,11 @@
ONLY_FOR_ARCHS = amd64 i386
COMMENT = Urban Terror game data
-PKGNAME = urbanterror-data-4.3.2
+PKGNAME = urbanterror-data-4.3.3
CATEGORIES = games
URT_VER = 43
-URT_REV = 2
+URT_REV = 3
DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
Index: urbanterror-data/distinfo
===
RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- urbanterror-data/distinfo 7 Feb 2017 06:12:27 - 1.3
+++ urbanterror-data/distinfo 3 Mar 2018 06:47:10 -
@@ -1,2 +1,2 @@
-SHA256 (UrbanTerror432_full.zip) =
dN7hVm+mzQ6ybYZhSaG2rX6PGKZTaT8CeQwF73zjUqQ=
-SIZE (UrbanTerror432_full.zip) = 1469432087
+SHA256 (UrbanTerror433_full.zip) =
w1gnGSckr8qqB9e9t08X4G5LhlNGZy7aKwBxez0CMGc=
+SIZE (UrbanTerror433_full.zip) = 1472028382
Re: UPDATE: games/urbanterror
On Tue, Feb 13, 2018 at 03:18:02PM -0800, Ryan Freeman wrote: > On Wed, Feb 07, 2018 at 08:12:07AM -0800, Ryan Freeman wrote: > > On Wed, Feb 07, 2018 at 07:22:04AM +, Mikolaj Kucharski wrote: > > > On Tue, Feb 06, 2018 at 08:58:29AM -0800, Ryan Freeman wrote: > > > > -DISTNAME = urbanterror-4.3.2 > > > > +DISTNAME = urbanterror-4.3.2p1 > > > > > > I think `p` marker is reserved for REVISION, so why not useing > > > revision directly? > > > > Woops, thanks. That 'p' should be 'pl' for patch level. Unless > > I am wrong, the REVISION marker is more for updating a package > > that itself hasn't changed, but a dependency of it has? Or > > some other small tweak to the port that doesn't actually change > > the src of the program in question. > > > > As this is a hotfix update from upstream, I meant to use 'pl' for > > patchlevel. > > > > Thank you, > > -ryan > > ping Anyone to merge this? I should reiterate, this does address a security bug found in ioq3 (awhile ago, so ioquake3 port is already fine, iourbanterror was just based off much older version) http://www.urbanterror.info/news/514-urban-terror-security-update/ Cheers, -ryan > > > > > > > ? urt.diff > > Index: Makefile > > === > > RCS file: /cvs/ports/games/urbanterror/Makefile,v > > retrieving revision 1.4 > > diff -u -p -r1.4 Makefile > > --- Makefile8 Feb 2017 12:55:18 - 1.4 > > +++ Makefile7 Feb 2018 16:11:26 - > > @@ -1,14 +1,13 @@ > > # $OpenBSD: Makefile,v 1.4 2017/02/08 12:55:18 sthen Exp $ > > > > -USE_WXNEEDED = Yes > > ONLY_FOR_ARCHS = amd64 i386 > > > > COMMENT = fast-paced hollywood-tactical shooter: "fun over realism" > > -DISTNAME = urbanterror-4.3.2 > > +DISTNAME = urbanterror-4.3.2pl1 > > > > GH_ACCOUNT = Barbatos > > GH_PROJECT = ioq3-for-UrbanTerror-4 > > -GH_TAGNAME = release-4.3.2 > > +GH_TAGNAME = release-4.3.2-hotfix > > > > CATEGORIES = games x11 > > > > Index: distinfo > > === > > RCS file: /cvs/ports/games/urbanterror/distinfo,v > > retrieving revision 1.3 > > diff -u -p -r1.3 distinfo > > --- distinfo7 Feb 2017 06:12:27 - 1.3 > > +++ distinfo7 Feb 2018 16:11:26 - > > @@ -1,2 +1,2 @@ > > -SHA256 (urbanterror-4.3.2.tar.gz) = > > gRrLDcuQNQnFbNwFaz0qZuQ1myO6Smj1bw6hRSEJzvs= > > -SIZE (urbanterror-4.3.2.tar.gz) = 11775787 > > +SHA256 (urbanterror-4.3.2pl1.tar.gz) = > > kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI= > > +SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324 > > >
Re: UPDATE: games/urbanterror
On Wed, Feb 07, 2018 at 08:12:07AM -0800, Ryan Freeman wrote: > On Wed, Feb 07, 2018 at 07:22:04AM +, Mikolaj Kucharski wrote: > > On Tue, Feb 06, 2018 at 08:58:29AM -0800, Ryan Freeman wrote: > > > -DISTNAME = urbanterror-4.3.2 > > > +DISTNAME = urbanterror-4.3.2p1 > > > > I think `p` marker is reserved for REVISION, so why not useing > > revision directly? > > Woops, thanks. That 'p' should be 'pl' for patch level. Unless > I am wrong, the REVISION marker is more for updating a package > that itself hasn't changed, but a dependency of it has? Or > some other small tweak to the port that doesn't actually change > the src of the program in question. > > As this is a hotfix update from upstream, I meant to use 'pl' for > patchlevel. > > Thank you, > -ryan ping > > > ? urt.diff > Index: Makefile > === > RCS file: /cvs/ports/games/urbanterror/Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 Makefile > --- Makefile 8 Feb 2017 12:55:18 - 1.4 > +++ Makefile 7 Feb 2018 16:11:26 - > @@ -1,14 +1,13 @@ > # $OpenBSD: Makefile,v 1.4 2017/02/08 12:55:18 sthen Exp $ > > -USE_WXNEEDED = Yes > ONLY_FOR_ARCHS = amd64 i386 > > COMMENT =fast-paced hollywood-tactical shooter: "fun over realism" > -DISTNAME = urbanterror-4.3.2 > +DISTNAME = urbanterror-4.3.2pl1 > > GH_ACCOUNT = Barbatos > GH_PROJECT = ioq3-for-UrbanTerror-4 > -GH_TAGNAME = release-4.3.2 > +GH_TAGNAME = release-4.3.2-hotfix > > CATEGORIES = games x11 > > Index: distinfo > === > RCS file: /cvs/ports/games/urbanterror/distinfo,v > retrieving revision 1.3 > diff -u -p -r1.3 distinfo > --- distinfo 7 Feb 2017 06:12:27 - 1.3 > +++ distinfo 7 Feb 2018 16:11:26 - > @@ -1,2 +1,2 @@ > -SHA256 (urbanterror-4.3.2.tar.gz) = > gRrLDcuQNQnFbNwFaz0qZuQ1myO6Smj1bw6hRSEJzvs= > -SIZE (urbanterror-4.3.2.tar.gz) = 11775787 > +SHA256 (urbanterror-4.3.2pl1.tar.gz) = > kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI= > +SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324 >
Re: UPDATE: games/urbanterror
On Wed, Feb 07, 2018 at 07:22:04AM +, Mikolaj Kucharski wrote: > On Tue, Feb 06, 2018 at 08:58:29AM -0800, Ryan Freeman wrote: > > -DISTNAME = urbanterror-4.3.2 > > +DISTNAME = urbanterror-4.3.2p1 > > I think `p` marker is reserved for REVISION, so why not useing > revision directly? Woops, thanks. That 'p' should be 'pl' for patch level. Unless I am wrong, the REVISION marker is more for updating a package that itself hasn't changed, but a dependency of it has? Or some other small tweak to the port that doesn't actually change the src of the program in question. As this is a hotfix update from upstream, I meant to use 'pl' for patchlevel. Thank you, -ryan ? urt.diff Index: Makefile === RCS file: /cvs/ports/games/urbanterror/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile8 Feb 2017 12:55:18 - 1.4 +++ Makefile7 Feb 2018 16:11:26 - @@ -1,14 +1,13 @@ # $OpenBSD: Makefile,v 1.4 2017/02/08 12:55:18 sthen Exp $ -USE_WXNEEDED = Yes ONLY_FOR_ARCHS = amd64 i386 COMMENT = fast-paced hollywood-tactical shooter: "fun over realism" -DISTNAME = urbanterror-4.3.2 +DISTNAME = urbanterror-4.3.2pl1 GH_ACCOUNT = Barbatos GH_PROJECT = ioq3-for-UrbanTerror-4 -GH_TAGNAME = release-4.3.2 +GH_TAGNAME = release-4.3.2-hotfix CATEGORIES = games x11 Index: distinfo === RCS file: /cvs/ports/games/urbanterror/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo7 Feb 2017 06:12:27 - 1.3 +++ distinfo7 Feb 2018 16:11:26 - @@ -1,2 +1,2 @@ -SHA256 (urbanterror-4.3.2.tar.gz) = gRrLDcuQNQnFbNwFaz0qZuQ1myO6Smj1bw6hRSEJzvs= -SIZE (urbanterror-4.3.2.tar.gz) = 11775787 +SHA256 (urbanterror-4.3.2pl1.tar.gz) = kyvOLKLR+uSd9mLoUQmf1kmNV8VuDE+dXMOg+NtAhNI= +SIZE (urbanterror-4.3.2pl1.tar.gz) = 3326324
Re: UPDATE: games/urbanterror
On Tue, Feb 06, 2018 at 08:58:29AM -0800, Ryan Freeman wrote: > -DISTNAME = urbanterror-4.3.2 > +DISTNAME = urbanterror-4.3.2p1 I think `p` marker is reserved for REVISION, so why not useing revision directly? -- best regards q#
Re: UPDATE: games/urbanterror{,-data}
On Sun, Feb 05, 2017 at 10:34:29AM -0800, Ryan Freeman wrote:
> Hey,
>
> Here is an update to the freshly-released UrbanTerror 4.3.2!
> Not much change in the way of the port itself, regen'd patches
> and I added a RUN_DEPENDS on net/curl, as it uses it via DLOPEN
> to fetch maps the user does not have when connecting to servers.
>
> Changes for this version can be found here:
> http://www.urbanterror.info/news/508-urban-terror-4-3-2-release/
>
> (They mention OpenBSD improvements, but when I looked into it,
> I think they actually meant for FreeBSD)
I forgot to mention, that without this update the game prints a
warning that it is out-of-date. Once all the servers are upgraded,
the existing package won't be very useful for playing online games.
For that reason I really hope I didn't send this in after ports
cutoff for 6.1!
>
> OK?
> -ryan
>
>
> Index: urbanterror/Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- urbanterror/Makefile 12 Oct 2016 02:01:32 - 1.2
> +++ urbanterror/Makefile 5 Feb 2017 18:29:18 -
> @@ -4,11 +4,11 @@ USE_WXNEEDED = Yes
> ONLY_FOR_ARCHS = amd64 i386
>
> COMMENT =fast-paced hollywood-tactical shooter: "fun over realism"
> -DISTNAME = urbanterror-4.3.1
> +DISTNAME = urbanterror-4.3.2
>
> GH_ACCOUNT = Barbatos
> GH_PROJECT = ioq3-for-UrbanTerror-4
> -GH_TAGNAME = release-4.3.1
> +GH_TAGNAME = release-4.3.2
>
> CATEGORIES = games x11
>
> @@ -22,7 +22,8 @@ PERMIT_PACKAGE_CDROM = Yes
> WANTLIB += X11 Xxf86vm c m pthread SDL
>
> LIB_DEPENDS =devel/sdl
> -RUN_DEPENDS =games/urbanterror-data
> +RUN_DEPENDS =games/urbanterror-data \
> + net/curl
>
> USE_GMAKE = Yes
> ALL_TARGET =release
> Index: urbanterror/distinfo
> ===
> RCS file: /cvs/ports/games/urbanterror/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- urbanterror/distinfo 12 Oct 2016 02:01:32 - 1.2
> +++ urbanterror/distinfo 5 Feb 2017 18:29:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (urbanterror-4.3.1.tar.gz) =
> MGjKz5k3vOux0U6mHFBoLYH8Cxc4kNawJjaqle9zV14=
> -SIZE (urbanterror-4.3.1.tar.gz) = 12023440
> +SHA256 (urbanterror-4.3.2.tar.gz) =
> gRrLDcuQNQnFbNwFaz0qZuQ1myO6Smj1bw6hRSEJzvs=
> +SIZE (urbanterror-4.3.2.tar.gz) = 11775787
> Index: urbanterror/patches/patch-Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror/patches/patch-Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Makefile
> --- urbanterror/patches/patch-Makefile13 Oct 2016 02:38:28 -
> 1.2
> +++ urbanterror/patches/patch-Makefile5 Feb 2017 18:29:18 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile,v 1.2 2016/10/13 02:38:28 bentley Exp $
> Makefile.origWed Oct 5 12:47:05 2016
> -+++ Makefile Wed Oct 12 13:04:57 2016
> -@@ -150,8 +150,8 @@ endif
> +--- Makefile.origSat Feb 4 11:15:58 2017
> Makefile Sat Feb 4 18:44:05 2017
> +@@ -153,8 +153,8 @@ endif
>
>
> #
>
> @@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile,v 1.2 2016/10/1
> CDIR=$(MOUNT_DIR)/client
> SDIR=$(MOUNT_DIR)/server
> RDIR=$(MOUNT_DIR)/renderer
> -@@ -834,11 +834,11 @@ endif #SunOS
> +@@ -854,11 +854,11 @@ endif #SunOS
> TARGETS =
>
> ifneq ($(BUILD_SERVER),0)
> @@ -26,7 +26,7 @@ $OpenBSD: patch-Makefile,v 1.2 2016/10/1
> ifneq ($(BUILD_CLIENT_SMP),0)
> TARGETS += $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT)
> endif
> -@@ -1268,7 +1268,7 @@ else
> +@@ -1296,7 +1296,7 @@ else
> $(B)/clientsmp/sdl_glimp.o
> endif
>
> @@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile,v 1.2 2016/10/1
> $(echo_cmd) "LD $@"
> $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
> $(LDFLAGS) $(LIBSDLMAIN)
> -@@ -1401,7 +1401,7 @@ ifeq ($(HAVE_VM_COMPILED),true)
> +@@ -1437,7 +1437,7 @@ ifeq ($(HAVE_VM_COMPILED),true)
> endif
> endif
>
> Index: urbanterror-data/Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- urbanterror-data/Makefile 14 Oct 2016 06:27:12 - 1.3
> +++ urbanterror-data/Makefile 5 Feb 2017 18:29:18 -
> @@ -1,11 +1,11 @@
> # $OpenBSD: Makefile,v 1.3 2016/10/14 06:27:12 kirby Exp $
>
> COMMENT =Urban Terror game data
> -PKGNAME =urbanterror-data-4.3.1
> +PKGNAME =urbanterror-data-4.3.2
> CATEGORIES = games
>
> URT_VER =43
> -URT_REV =1
> +URT_REV =2
>
> DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
>
> Index: urbanterror-data/distinfo
> ===
> R
Re: UPDATE: games/urbanterror and games/urbanterror-data
On Thu, Oct 13, 2016 at 11:02:50AM +0300, Kirill Bychkov wrote:
> On Wed, October 12, 2016 08:03, Kirill Bychkov wrote:
> > On Fri, October 7, 2016 04:01, Ryan Freeman wrote:
> >> Hey,
> >>
> >> Here is an update to the newly released UrbanTerror 4.3.1 (4.3.1 being
> >> a hotfix release to the also newly released 4.3.0)
> >>
> >> Since the engine and data is very dependant on each other, I have
> >> the diff of both urbanterror and urbanterror-data in one, to be
> >> applied from $PORTSDIR/games/
> >>
> >> Played for a few hours yesterday on amd64-current with no issues
> >>
> >> OK?
> >
> > Hi!
> > Please regen patches and split INSTALL_* lines in data port. Other than this
> > ok kirby@
>
> Some improvements to urbanterror-data:
> - split long lines
> - add URI_VER to SUBST_VARS to reduce PLIST diff on next update
Hey, I didn't noticed this until after it was merged, but FWIW I am
OK with Kirill's fixes.
-ryan
>
> OK?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile
> --- Makefile 12 Oct 2016 02:01:33 - 1.2
> +++ Makefile 13 Oct 2016 07:58:29 -
> @@ -28,16 +28,23 @@
>
> WRKDIST =${WRKDIR}/UrbanTerror${URT_VER}
>
> +SUBST_VARS +=URT_VER
> +
> do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/urbanterror/
> ${INSTALL_DATA_DIR} ${PREFIX}/share/urbanterror/q3ut4/
> ${INSTALL_DATA} ${WRKDIST}/q3ut4/*.pk3
> ${PREFIX}/share/urbanterror/q3ut4/
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/urbanterror/
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/urbanterror/
> - ${INSTALL_DATA} ${WRKDIST}/q3ut4/autoexec_example.cfg
> ${PREFIX}/share/examples/urbanterror/
> - ${INSTALL_DATA} ${WRKDIST}/q3ut4/mapcycle_example.txt
> ${PREFIX}/share/examples/urbanterror/
> - ${INSTALL_DATA} ${WRKDIST}/q3ut4/server_example.cfg
> ${PREFIX}/share/examples/urbanterror/
> - ${INSTALL_DATA} ${WRKDIST}/q3ut4/QIIIA_Game_Source_License.doc
> ${PREFIX}/share/doc/urbanterror/
> - ${INSTALL_DATA} ${WRKDIST}/q3ut4/readme${URT_VER}.txt
> ${PREFIX}/share/doc/urbanterror/
> + ${INSTALL_DATA} ${WRKDIST}/q3ut4/autoexec_example.cfg \
> + ${PREFIX}/share/examples/urbanterror/
> + ${INSTALL_DATA} ${WRKDIST}/q3ut4/mapcycle_example.txt \
> + ${PREFIX}/share/examples/urbanterror/
> + ${INSTALL_DATA} ${WRKDIST}/q3ut4/server_example.cfg \
> + ${PREFIX}/share/examples/urbanterror/
> + ${INSTALL_DATA} ${WRKDIST}/q3ut4/QIIIA_Game_Source_License.doc \
> + ${PREFIX}/share/doc/urbanterror/
> + ${INSTALL_DATA} ${WRKDIST}/q3ut4/readme${URT_VER}.txt \
> + ${PREFIX}/share/doc/urbanterror/
>
> .include
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/games/urbanterror-data/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -r1.2 PLIST
> --- pkg/PLIST 12 Oct 2016 02:01:33 - 1.2
> +++ pkg/PLIST 13 Oct 2016 07:58:29 -
> @@ -1,7 +1,7 @@
> @comment $OpenBSD: PLIST,v 1.2 2016/10/12 02:01:33 bentley Exp $
> share/doc/urbanterror/
> share/doc/urbanterror/QIIIA_Game_Source_License.doc
> -share/doc/urbanterror/readme43.txt
> +share/doc/urbanterror/readme${URT_VER}.txt
> share/examples/urbanterror/
> share/examples/urbanterror/autoexec_example.cfg
> share/examples/urbanterror/mapcycle_example.txt
> @@ -9,25 +9,25 @@
> share/urbanterror/
> share/urbanterror/q3ut4/
> share/urbanterror/q3ut4/ut4_jumpents.pk3
> -share/urbanterror/q3ut4/zUrT43_001.pk3
> -share/urbanterror/q3ut4/zUrT43_002.pk3
> -share/urbanterror/q3ut4/zUrT43_003.pk3
> -share/urbanterror/q3ut4/zUrT43_004.pk3
> -share/urbanterror/q3ut4/zUrT43_005.pk3
> -share/urbanterror/q3ut4/zUrT43_006.pk3
> -share/urbanterror/q3ut4/zUrT43_007.pk3
> -share/urbanterror/q3ut4/zUrT43_008.pk3
> -share/urbanterror/q3ut4/zUrT43_009.pk3
> -share/urbanterror/q3ut4/zUrT43_010.pk3
> -share/urbanterror/q3ut4/zUrT43_011.pk3
> -share/urbanterror/q3ut4/zUrT43_012.pk3
> -share/urbanterror/q3ut4/zUrT43_013.pk3
> -share/urbanterror/q3ut4/zUrT43_014.pk3
> -share/urbanterror/q3ut4/zUrT43_015.pk3
> -share/urbanterror/q3ut4/zUrT43_016.pk3
> -share/urbanterror/q3ut4/zUrT43_017.pk3
> -share/urbanterror/q3ut4/zUrT43_018.pk3
> -share/urbanterror/q3ut4/zUrT43_019.pk3
> -share/urbanterror/q3ut4/zUrT43_020.pk3
> -share/urbanterror/q3ut4/zUrT43_021.pk3
> -share/urbanterror/q3ut4/zUrT43_qvm.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_001.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_002.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_003.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_004.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_005.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_006.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_007.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_008.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_009.pk3
> +share/urbanterror/q3ut4/zUrT${
Re: UPDATE: games/urbanterror and games/urbanterror-data
On Wed, October 12, 2016 08:03, Kirill Bychkov wrote:
> On Fri, October 7, 2016 04:01, Ryan Freeman wrote:
>> Hey,
>>
>> Here is an update to the newly released UrbanTerror 4.3.1 (4.3.1 being
>> a hotfix release to the also newly released 4.3.0)
>>
>> Since the engine and data is very dependant on each other, I have
>> the diff of both urbanterror and urbanterror-data in one, to be
>> applied from $PORTSDIR/games/
>>
>> Played for a few hours yesterday on amd64-current with no issues
>>
>> OK?
>
> Hi!
> Please regen patches and split INSTALL_* lines in data port. Other than this
> ok kirby@
Some improvements to urbanterror-data:
- split long lines
- add URI_VER to SUBST_VARS to reduce PLIST diff on next update
OK?
Index: Makefile
===
RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile12 Oct 2016 02:01:33 - 1.2
+++ Makefile13 Oct 2016 07:58:29 -
@@ -28,16 +28,23 @@
WRKDIST = ${WRKDIR}/UrbanTerror${URT_VER}
+SUBST_VARS += URT_VER
+
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/urbanterror/
${INSTALL_DATA_DIR} ${PREFIX}/share/urbanterror/q3ut4/
${INSTALL_DATA} ${WRKDIST}/q3ut4/*.pk3
${PREFIX}/share/urbanterror/q3ut4/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/urbanterror/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/urbanterror/
- ${INSTALL_DATA} ${WRKDIST}/q3ut4/autoexec_example.cfg
${PREFIX}/share/examples/urbanterror/
- ${INSTALL_DATA} ${WRKDIST}/q3ut4/mapcycle_example.txt
${PREFIX}/share/examples/urbanterror/
- ${INSTALL_DATA} ${WRKDIST}/q3ut4/server_example.cfg
${PREFIX}/share/examples/urbanterror/
- ${INSTALL_DATA} ${WRKDIST}/q3ut4/QIIIA_Game_Source_License.doc
${PREFIX}/share/doc/urbanterror/
- ${INSTALL_DATA} ${WRKDIST}/q3ut4/readme${URT_VER}.txt
${PREFIX}/share/doc/urbanterror/
+ ${INSTALL_DATA} ${WRKDIST}/q3ut4/autoexec_example.cfg \
+ ${PREFIX}/share/examples/urbanterror/
+ ${INSTALL_DATA} ${WRKDIST}/q3ut4/mapcycle_example.txt \
+ ${PREFIX}/share/examples/urbanterror/
+ ${INSTALL_DATA} ${WRKDIST}/q3ut4/server_example.cfg \
+ ${PREFIX}/share/examples/urbanterror/
+ ${INSTALL_DATA} ${WRKDIST}/q3ut4/QIIIA_Game_Source_License.doc \
+ ${PREFIX}/share/doc/urbanterror/
+ ${INSTALL_DATA} ${WRKDIST}/q3ut4/readme${URT_VER}.txt \
+ ${PREFIX}/share/doc/urbanterror/
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/urbanterror-data/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 12 Oct 2016 02:01:33 - 1.2
+++ pkg/PLIST 13 Oct 2016 07:58:29 -
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2016/10/12 02:01:33 bentley Exp $
share/doc/urbanterror/
share/doc/urbanterror/QIIIA_Game_Source_License.doc
-share/doc/urbanterror/readme43.txt
+share/doc/urbanterror/readme${URT_VER}.txt
share/examples/urbanterror/
share/examples/urbanterror/autoexec_example.cfg
share/examples/urbanterror/mapcycle_example.txt
@@ -9,25 +9,25 @@
share/urbanterror/
share/urbanterror/q3ut4/
share/urbanterror/q3ut4/ut4_jumpents.pk3
-share/urbanterror/q3ut4/zUrT43_001.pk3
-share/urbanterror/q3ut4/zUrT43_002.pk3
-share/urbanterror/q3ut4/zUrT43_003.pk3
-share/urbanterror/q3ut4/zUrT43_004.pk3
-share/urbanterror/q3ut4/zUrT43_005.pk3
-share/urbanterror/q3ut4/zUrT43_006.pk3
-share/urbanterror/q3ut4/zUrT43_007.pk3
-share/urbanterror/q3ut4/zUrT43_008.pk3
-share/urbanterror/q3ut4/zUrT43_009.pk3
-share/urbanterror/q3ut4/zUrT43_010.pk3
-share/urbanterror/q3ut4/zUrT43_011.pk3
-share/urbanterror/q3ut4/zUrT43_012.pk3
-share/urbanterror/q3ut4/zUrT43_013.pk3
-share/urbanterror/q3ut4/zUrT43_014.pk3
-share/urbanterror/q3ut4/zUrT43_015.pk3
-share/urbanterror/q3ut4/zUrT43_016.pk3
-share/urbanterror/q3ut4/zUrT43_017.pk3
-share/urbanterror/q3ut4/zUrT43_018.pk3
-share/urbanterror/q3ut4/zUrT43_019.pk3
-share/urbanterror/q3ut4/zUrT43_020.pk3
-share/urbanterror/q3ut4/zUrT43_021.pk3
-share/urbanterror/q3ut4/zUrT43_qvm.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_001.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_002.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_003.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_004.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_005.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_006.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_007.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_008.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_009.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_010.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_011.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_012.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_013.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_014.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_015.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_016.pk3
+share/urbanterror/q3ut4/zUrT${URT_VER}_017.pk3
+share
Re: UPDATE: games/urbanterror and games/urbanterror-data
On Fri, October 7, 2016 04:01, Ryan Freeman wrote:
> Hey,
>
> Here is an update to the newly released UrbanTerror 4.3.1 (4.3.1 being
> a hotfix release to the also newly released 4.3.0)
>
> Since the engine and data is very dependant on each other, I have
> the diff of both urbanterror and urbanterror-data in one, to be
> applied from $PORTSDIR/games/
>
> Played for a few hours yesterday on amd64-current with no issues
>
> OK?
Hi!
Please regen patches and split INSTALL_* lines in data port. Other than this
ok kirby@
>
> -ryan
>
>
> Index: urbanterror/Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- urbanterror/Makefile 26 Aug 2016 08:55:57 - 1.1.1.1
> +++ urbanterror/Makefile 7 Oct 2016 01:00:46 -
> @@ -4,11 +4,11 @@ USE_WXNEEDED = Yes
> ONLY_FOR_ARCHS = amd64 i386
>
> COMMENT =fast-paced hollywood-tactical shooter: "fun over realism"
> -DISTNAME = urbanterror-4.2.023pl1
> +DISTNAME = urbanterror-4.3.1
>
> GH_ACCOUNT = Barbatos
> GH_PROJECT = ioq3-for-UrbanTerror-4
> -GH_COMMIT = fdcc11fc48bc3b154523a201e91460904a3261d1
> +GH_TAGNAME = release-4.3.1
>
> CATEGORIES = games x11
>
> Index: urbanterror/distinfo
> ===
> RCS file: /cvs/ports/games/urbanterror/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- urbanterror/distinfo 26 Aug 2016 08:55:57 - 1.1.1.1
> +++ urbanterror/distinfo 7 Oct 2016 01:00:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (urbanterror-4.2.023pl1.tar.gz) =
> tZPueTR1mjWaanmlhxtmuWEh9Hizw1oJGxSaqM9GtnQ=
> -SIZE (urbanterror-4.2.023pl1.tar.gz) = 10022625
> +SHA256 (urbanterror-4.3.1.tar.gz) =
> MGjKz5k3vOux0U6mHFBoLYH8Cxc4kNawJjaqle9zV14=
> +SIZE (urbanterror-4.3.1.tar.gz) = 12023440
> Index: urbanterror-data/Makefile
> ===
> RCS file: /cvs/ports/games/urbanterror-data/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- urbanterror-data/Makefile 26 Aug 2016 08:57:07 - 1.1.1.1
> +++ urbanterror-data/Makefile 7 Oct 2016 01:00:46 -
> @@ -1,13 +1,13 @@
> # $OpenBSD: Makefile,v 1.1.1.1 2016/08/26 08:57:07 bentley Exp $
>
> COMMENT =Urban Terror game data
> -PKGNAME =urbanterror-data-4.2.023
> +PKGNAME =urbanterror-data-4.3.1
> CATEGORIES = games
>
> -URT_VER =42
> -URT_REV =023
> +URT_VER =43
> +URT_REV =1
>
> -DISTNAME = UrbanTerror${URT_VER}_full${URT_REV}
> +DISTNAME = UrbanTerror${URT_VER}${URT_REV}_full
>
> HOMEPAGE = http://urbanterror.info/
>
> @@ -18,9 +18,7 @@ MAINTAINER =Ryan Freeman PERMIT_PACKAGE_CDROM = May not be redistributed on physical media
> PERMIT_PACKAGE_FTP =Yes
>
> -MASTER_SITES= http://cdn.urbanterror.info/urt/42/zips/ \
> - http://www.f1m.fr/uploads/urt/ \
> - http://mirror.urtstats.net/urbanterror/
> +MASTER_SITES =
> http://cdn.urbanterror.info/urt/${URT_VER}/releases/zips/
>
> EXTRACT_SUFX = .zip
>
> @@ -40,6 +38,6 @@ do-install:
> ${INSTALL_DATA} ${WRKDIST}/q3ut4/mapcycle_example.txt
> ${PREFIX}/share/examples/urbanterror/
> ${INSTALL_DATA} ${WRKDIST}/q3ut4/server_example.cfg
> ${PREFIX}/share/examples/urbanterror/
> ${INSTALL_DATA} ${WRKDIST}/q3ut4/QIIIA_Game_Source_License.doc
> ${PREFIX}/share/doc/urbanterror/
> - ${INSTALL_DATA} ${WRKDIST}/q3ut4/readme42.txt
> ${PREFIX}/share/doc/urbanterror/
> + ${INSTALL_DATA} ${WRKDIST}/q3ut4/readme${URT_VER}.txt
> ${PREFIX}/share/doc/urbanterror/
>
> .include
> Index: urbanterror-data/distinfo
> ===
> RCS file: /cvs/ports/games/urbanterror-data/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- urbanterror-data/distinfo 26 Aug 2016 08:57:07 - 1.1.1.1
> +++ urbanterror-data/distinfo 7 Oct 2016 01:00:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (UrbanTerror42_full023.zip) =
> 4ofioXQyuBVR9cFuQx11JITOm+EFCOdWVC9lN1eikJA=
> -SIZE (UrbanTerror42_full023.zip) = 1924172827
> +SHA256 (UrbanTerror431_full.zip) =
> nBlVatRi5Fv9l+bIzB+gQgZxnBP3SA5v7064/MTy1rU=
> +SIZE (UrbanTerror431_full.zip) = 1462419175
> Index: urbanterror-data/pkg/PLIST
> ===
> RCS file: /cvs/ports/games/urbanterror-data/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- urbanterror-data/pkg/PLIST26 Aug 2016 08:57:07 - 1.1.1.1
> +++ urbanterror-data/pkg/PLIST7 Oct 2016 01:00:46 -
> @@ -1,43 +1,33 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2016/08/26 08:57:07 bentley Exp $
> share/doc/urbanterror/
> share/doc/urbanterror/QIIIA_Game_Source_License.doc
> -share/doc/urbanterror/readme42.txt
> +share/doc/urbanterror/readme43.txt
> share/examples/u
