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 -0000 1.2
> +++ Makefile 13 Oct 2016 07:58:29 -0000
> @@ -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 <bsd.port.mk>
> 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 -0000 1.2
> +++ pkg/PLIST 13 Oct 2016 07:58:29 -0000
> @@ -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/urbanterror/q3ut4/zUrT${URT_VER}_018.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_019.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_020.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_021.pk3
> +share/urbanterror/q3ut4/zUrT${URT_VER}_qvm.pk3
>
> >
> >>
> >> -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 -0000 1.1.1.1
> >> +++ urbanterror/Makefile 7 Oct 2016 01:00:46 -0000
> >> @@ -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 -0000 1.1.1.1
> >> +++ urbanterror/distinfo 7 Oct 2016 01:00:46 -0000
> >> @@ -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 -0000 1.1.1.1
> >> +++ urbanterror-data/Makefile 7 Oct 2016 01:00:46 -0000
> >> @@ -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 <ryan@slipgate
> >> 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 <bsd.port.mk>
> >> 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 -0000 1.1.1.1
> >> +++ urbanterror-data/distinfo 7 Oct 2016 01:00:46 -0000
> >> @@ -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/PLIST 26 Aug 2016 08:57:07 -0000 1.1.1.1
> >> +++ urbanterror-data/pkg/PLIST 7 Oct 2016 01:00:46 -0000
> >> @@ -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/urbanterror/
> >> share/examples/urbanterror/autoexec_example.cfg
> >> share/examples/urbanterror/mapcycle_example.txt
> >> share/examples/urbanterror/server_example.cfg
> >> share/urbanterror/
> >> share/urbanterror/q3ut4/
> >> -share/urbanterror/q3ut4/ut4_commune.pk3
> >> share/urbanterror/q3ut4/ut4_jumpents.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0001.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0002.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0003.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0004.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0005.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0006.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0007.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0008.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0009.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0010.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0011.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0012.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0013.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0014.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0015.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0016.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0017.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0018.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0019.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0020.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0021.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0022.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0023.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0024.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0025.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0026.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0027.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0028.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0029.pk3
> >> -share/urbanterror/q3ut4/zUrT42_0030.pk3
> >> -share/urbanterror/q3ut4/zUrT42_qvm.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
> >>
> >>
> >
> >
> >
>
>
