Hi ports@ Here is an updated diff for games/yquake2 5.34.
Changes in the port: - taking MAINTAINER, agreed with bmercer@ who provided the initial port - added a q2ded rc script in a similar fashion as the games/ioquake3 port does (note I did not reserve any id's so far - how do we do that?) - the existing /usr/local/share/yquake2/q2ded binary from previous port did not work as it was searching for games.so from a relative path. I found a way to make both quake2 and q2ded work with an upstream supported MAKE variable to provide the system wide quake data directory. Thanks to this change we can drop the wrapper script and use the binaries directly. - adding a new _q2 user/group plus /var/q2 for the dedicated server binary - updated the port to version 5.34 Tested on amd64 snapshot from June 18th. Additional notes: - make port-lib-depends-check complains on: Extra: openal.2 pthread.22 ktrace tells me that the check is wrong. Openal and pthreads are both used. - upstream said in their changelog that they are changing their platform policy 'Switch from an arch whitelist to an "all archs are supported" approach.'. I saw in our tree a change by landry@ specifically limiting the supported platform to the upstream supported versions (http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/games/yquake2/Makefile?rev=1.2&content-type=text/x-cvsweb-markup). I am not removing this restriction until I get some feedback from people able to test other platforms than currently listed in ONLY_FOR_ARCHS. Upstream changelog: Quake II 5.33 to 5.34: - Add support for stereo 3D (by Valery Guskov) - Make gibt solid so they move with conveyor belts. - Disable gl_ext_multitexturing by default. - Switch from an arch whitelist to an "all archs are supported" approach. - Add a new README. Quake II 5.32 to 5.33: - Add OGG volume slider in settings menu - Fixed some bugs in volume settings - Replaced HUD scale option in video menu with generic UI scale - General UI upscaling improvements - Better support for keyboards with AZERTY layout Any feedback? OK's? Index: Makefile =================================================================== RCS file: /cvs/ports/games/yquake2/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 16 Mar 2016 16:46:32 -0000 1.3 +++ Makefile 26 Jun 2016 18:30:12 -0000 @@ -4,12 +4,13 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64 COMMENT= Yamagi Quake II N= yquake2 -V= 5.32 +V= 5.34 PKGNAME= ${N}-${V} DISTNAME= quake2-${V} CATEGORIES= games HOMEPAGE= http://www.yamagi.org/quake2/ +MAINTAINER= Adam Wolk <[email protected]> MASTER_SITES= http://deponie.yamagi.org/quake2/ EXTRACT_SUFX= .tar.xz @@ -25,11 +26,12 @@ LIB_DEPENDS= audio/libvorbis \ MAKE_ENV+= VERBOSE=1 USE_GMAKE= Yes +MAKE_FLAGS = config WITH_SYSTEMWIDE=yes WITH_SYSTEMDIR=${PREFIX}/share/${N} + do-install: - ${INSTALL_SCRIPT} ${FILESDIR}/yquake2 ${PREFIX}/bin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/${N} ${INSTALL_PROGRAM} ${WRKBUILD}/release/{quake2,q2ded} \ - ${PREFIX}/share/${N}/ + ${PREFIX}/bin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/${N}/baseq2 ${INSTALL_PROGRAM} ${WRKBUILD}/release/baseq2/game.so \ ${PREFIX}/share/${N}/baseq2/ Index: distinfo =================================================================== RCS file: /cvs/ports/games/yquake2/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 17 Jan 2016 15:18:31 -0000 1.1.1.1 +++ distinfo 26 Jun 2016 18:30:12 -0000 @@ -1,2 +1,2 @@ -SHA256 (quake2-5.32.tar.xz) = v8eAMlSp0iiIVU1a8lL//iEts9qwYxY3u5BFhhuOUIw= -SIZE (quake2-5.32.tar.xz) = 1692720 +SHA256 (quake2-5.34.tar.xz) = gOEZPGM9vuh7n8uGQwafm9pEOqZVUcjzUYcBNsM9ONQ= +SIZE (quake2-5.34.tar.xz) = 1702984 Index: files/yquake2 =================================================================== RCS file: files/yquake2 diff -N files/yquake2 --- files/yquake2 17 Jan 2016 15:18:31 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -#!/bin/sh -cd /usr/local/share/yquake2 -exec /usr/local/share/yquake2/quake2 "$@" Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/yquake2/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 17 Jan 2016 15:18:31 -0000 1.1.1.1 +++ pkg/PLIST 26 Jun 2016 18:30:12 -0000 @@ -1,8 +1,17 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/17 15:18:31 bmercer Exp $ -bin/yquake2 +@newgroup _q2:777 +@newuser _q2:777:_q2:daemon:Yamagi Quake II Server:/var/q2:/sbin/nologin +@bin bin/q2ded +@bin bin/quake2 share/doc/pkg-readmes/${FULLPKGNAME} share/yquake2/ share/yquake2/baseq2/ share/yquake2/baseq2/game.so -@bin share/yquake2/q2ded -@bin share/yquake2/quake2 +@mode 750 +@owner _q2 +@group _q2 +@sample /var/q2/ +@owner +@group +@mode +@rcscript ${RCDIR}/q2ded Index: pkg/q2ded.rc =================================================================== RCS file: pkg/q2ded.rc diff -N pkg/q2ded.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/q2ded.rc 26 Jun 2016 18:30:12 -0000 @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $OpenBSD: $ + +daemon="${TRUEPREFIX}/bin/q2ded" +daemon_user="_q2" + +. /etc/rc.d/rc.subr + +pexp="${daemon}.*" + +rc_bg=YES +rc_reload=NO + +rc_cmd $1
