On Tue, Apr 16, 2019 at 12:03:29AM -0600, Anthony J. Bentley wrote:
> > 'apertium-sv-da' => 'apertium-swe-dan',
>
> Put a 6.6 comment here.
Yup.
> > +@conflict Xonotic-*
>
> According to pkg_create(1) this is a pkgspec. From my reading of
> packages-specs(7), this needs to have the full stem, so Xonotic-data-*.
> Ditto for server.
Seems right, from packages-specs(7):
Note that the stem ends at the version part. So, for instance,
"kdelibs-1.1.2" and "kdelibs-2.1.1" conflict. But "openldap-2.0.7" and
"openldap-client-2.0.7" don't. Neither do "qt-1.45" and "qt2-3.0".
Updated diff with those fixed and after the gitea quirk.
OK?
Index: devel/quirks//Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.732
diff -u -p -r1.732 Makefile
--- devel/quirks//Makefile 17 Apr 2019 13:19:49 -0000 1.732
+++ devel/quirks//Makefile 18 Apr 2019 22:32:13 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.125
+PKGNAME = quirks-3.126
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks//files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.749
diff -u -p -r1.749 Quirks.pm
--- devel/quirks//files/Quirks.pm 17 Apr 2019 13:19:49 -0000 1.749
+++ devel/quirks//files/Quirks.pm 18 Apr 2019 22:32:01 -0000
@@ -326,6 +326,10 @@ my $stem_extensions = {
'py-zeroconf' => 'py3-zeroconf',
'digikam' => 'digikam-kde4',
'apertium-sv-da' => 'apertium-swe-dan',
+# 6.6
+ 'Xonotic' => 'xonotic',
+ 'Xonotic-data' => 'xonotic-data',
+ 'Xonotic-server' => 'xonotic-server',
};
my $obsolete_reason = {
Index: games/xonotic/Makefile
===================================================================
RCS file: /cvs/ports/games/xonotic/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- games/xonotic/Makefile 5 Dec 2018 15:53:53 -0000 1.1.1.1
+++ games/xonotic/Makefile 17 Mar 2019 22:44:46 -0000
@@ -8,12 +8,12 @@ COMMENT-server = fast-paced first person
MULTI_PACKAGES = -main -data -server
-N = Xonotic
V = 0.8.2
-DISTNAME = ${N:L}-${V}
-PKGNAME-main = ${N}-${V}
-PKGNAME-data = ${N}-data-${V}
-PKGNAME-server = ${N}-server-${V}
+REVISION = 0
+DISTNAME = xonotic-${V}
+PKGNAME-main = xonotic-${V}
+PKGNAME-data = xonotic-data-${V}
+PKGNAME-server = xonotic-server-${V}
EXTRACT_SUFX = .zip
CATEGORIES = games x11
@@ -54,14 +54,14 @@ NO_TEST = Yes
MAKE_FILE = makefile
PKG_ARCH-data = *
-WRKDIST = ${WRKDIR}/${N}
+WRKDIST = ${WRKDIR}/Xonotic
WRKSRC = ${WRKDIST}/source/darkplaces
ALL_TARGET = sdl-release sv-release
do-install:
.for p in dedicated sdl
- ${INSTALL_PROGRAM} ${WRKBUILD}/darkplaces-${p} ${PREFIX}/bin/${N}-${p}
+ ${INSTALL_PROGRAM} ${WRKBUILD}/darkplaces-${p}
${PREFIX}/bin/xonotic-${p}
.endfor
.for d in xonotic/data examples/xonotic xonotic/server/rcon2irc
${INSTALL_DATA_DIR} ${PREFIX}/share/${d}/
Index: games/xonotic/pkg/PLIST-data
===================================================================
RCS file: /cvs/ports/games/xonotic/pkg/PLIST-data,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-data
--- games/xonotic/pkg/PLIST-data 5 Dec 2018 15:53:53 -0000 1.1.1.1
+++ games/xonotic/pkg/PLIST-data 18 Apr 2019 22:36:27 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-data,v 1.1.1.1 2018/12/05 15:53:53 kn Exp $
+@conflict Xonotic-data-*
share/xonotic/
share/xonotic/data/
share/xonotic/data/font-unifont-20170401.pk3
Index: games/xonotic/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/games/xonotic/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- games/xonotic/pkg/PLIST-main 5 Dec 2018 15:53:53 -0000 1.1.1.1
+++ games/xonotic/pkg/PLIST-main 17 Mar 2019 23:16:07 -0000
@@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2018/12/05 15:53:53 kn Exp $
-@bin bin/Xonotic-sdl
+@conflict Xonotic-*
+@bin bin/xonotic-sdl
Index: games/xonotic/pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/games/xonotic/pkg/PLIST-server,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-server
--- games/xonotic/pkg/PLIST-server 5 Dec 2018 15:53:53 -0000 1.1.1.1
+++ games/xonotic/pkg/PLIST-server 18 Apr 2019 22:36:16 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-server,v 1.1.1.1 2018/12/05 15:53:53 kn Exp $
-@bin bin/Xonotic-dedicated
+@conflict Xonotic-server-*
+@bin bin/xonotic-dedicated
share/examples/xonotic/
share/examples/xonotic/help.cfg
share/examples/xonotic/server.cfg
