Tuesday, February 27, 2018

fs2open - switch to release

This diff switches fs2open to the release tarball. Simplifies things a ton
because now it doesn't need to fetch the git submodules separately. Includes
REVISION bump and new HOMEPAGE line.

Builds and runs as before on a quick test run.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/fs2open/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 16 Feb 2018 11:39:51 -0000 1.1.1.1
+++ Makefile 27 Feb 2018 18:12:23 -0000
@@ -1,29 +1,18 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/02/16 11:39:51 kirby Exp $
+# $OpenBSD: Makefile.template,v 1.76 2017/02/25 16:04:20 danj Exp $

COMMENT = open source game engine based on FreeSpace 2

V = 3.8.0
DISTNAME = fs2_open_${V:S/./_/g}-source-Unix
PKGNAME = fs2open-${V}
+REVISION = 0

-GH_ACCOUNT = scp-fs2open
-GH_PROJECT = fs2open.github.com
-GH_TAGNAME = release_${V:S/./_/g}
-
-# Upstream pulls in cmake modules from the asarium's fork
-RPAVLIK_MODS = ad436ee7be33ca291a59866a173b777b0e2d81ce
-COTIRE = cotire-1.7.10
-
-# asarium/cmake-modules is a mirror of rpavlik/cmake-modules
-MASTER_SITES0 = https://github.com/rpavlik/cmake-modules/archive/
-MASTER_SITES1
= https://github.com/sakra/cotire/archive/
-
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
- fs2open-rpavlik-${V}{${RPAVLIK_MODS}}.tar.gz:0 \
- ${COTIRE}.tar.gz:1
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}

CATEGORIES = games

+HOMEPAGE = https://github.com/scp-fs2open/fs2open.github.com
+
MAINTAINER = Thomas Frohwein <frohwein@ymail.com>

# Volition custom license (non-commercial, not really a license)
@@ -36,6 +25,8 @@ WANTLIB += SDL2 ${MODLUA_WANTLIB} openal
WANTLIB += avcodec avformat avutil jpeg swresample swscale
WANTLIB += jansson png

+MASTER_SITES = https://github.com/scp-fs2open/fs2open.github.com/releases/download/release_${V:S/./_/g}/
+
MODULES = devel/cmake \
lang/lua
LIB_DEPENDS = audio/openal \
@@ -49,14 +40,7 @@ CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=

NO_TEST = Yes

-WRKDIST = ${WRKDIR}/fs2open.github.com-release_${V:S/./_/g}
-
-post-extract:
- rmdir ${WRKSRC}/cmake/external/rpavlik-cmake-modules \
- ${WRKSRC}/cmake/external/cotire
- ln -s ${WRKDIR}/cmake-modules-${RPAVLIK_MODS} \
- ${WRKSRC}/cmake/external/rpavlik-cmake-modules
- ln -s ${WRKDIR}/cotire-${COTIRE} ${WRKSRC}/cmake/external/cotire
+WRKDIST = ${WRKDIR}/fs2open.github.com

post-install:
${SUBST_CMD} -c -m 755 ${FILESDIR}/fs2open ${PREFIX}/bin/fs2open
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/fs2open/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 16 Feb 2018 11:39:51 -0000 1.1.1.1
+++ distinfo 27 Feb 2018 18:12:23 -0000
@@ -1,6 +1,2 @@
-SHA256 (cotire-1.7.10.tar.gz) = Wb7YnHseWprOOarEm4yKKSjgdY72+cIFp3XuHu28ci8=
-SHA256 (fs2_open_3_8_0-source-Unix.tar.gz) = yTLYbaov497fUzqJBO0MyZFr/ozPjhz/zCCRGojTZFc=
-SHA256 (fs2open-rpavlik-3.8.0.tar.gz) = DMWj6YoyZBK+EOwtK+QOQSEJFSl4S8AJHCfpTyWi9wY=
-SIZE (cotire-1.7.10.tar.gz) = 64232
-SIZE (fs2_open_3_8_0-source-Unix.tar.gz) = 8711455
-SIZE (fs2open-rpavlik-3.8.0.tar.gz) = 270502
+SHA256 (fs2_open_3_8_0-source-Unix.tar.gz) = 0m/4tma9rh6fQquvL0mNs2EJPyKJ2nhVXx9vu6dWIic=
+SIZE (fs2_open_3_8_0-source-Unix.tar.gz) = 9040907

No comments:

Post a Comment