Index: head/games/jfsw/Makefile =================================================================== --- head/games/jfsw/Makefile (revision 552762) +++ head/games/jfsw/Makefile (revision 552763) @@ -1,61 +1,63 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= jfsw -PORTVERSION= 20200116 +PORTVERSION= 20201010 CATEGORIES= games MAINTAINER= martymac@FreeBSD.org COMMENT= Jonathon Fowler's Shadow Warrior Port LICENSE= GPLv2 BuildLic LICENSE_COMB= multi LICENSE_NAME_BuildLic= Build source code license LICENSE_FILE_BuildLic= ${WRKSRC}/jfbuild/buildlic.txt LICENSE_PERMS_BuildLic= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libfluidsynth.so:audio/fluidsynth USES= alias compiler:c++11-lang dos2unix gl gmake gnome \ perl5 pkgconfig:build sdl USE_GL= gl USE_GNOME= gtk20 USE_SDL= mixer2 sdl2 USE_PERL5= build DOS2UNIX_REGEX= .*(\.(c|h)|Makefile)(\.deps)? USE_GITHUB= yes GH_ACCOUNT= jonof GH_PROJECT= jfbuild:build jfaudiolib:audio jfmact:mact -GH_TAGNAME= 282b31a2335b2b5cac91d30044ff6b92053d1094 \ - 31e2b842629f52227fd1291f5228a806704b0cbc:build \ - 8e28fe3bc41bf809391461697cd0ecb7027cb7f6:audio \ - dbbf346d78334c6907ad9014958305309d4df7a0:mact +# See GH listing to get current (tested) submodule hashes: +# https://github.com/jonof/jfsw +GH_TAGNAME= ea58641 \ + 11d083e:build \ + 3ff144d:audio \ + dbbf346:mact GH_SUBDIR= jfbuild:build jfaudiolib:audio jfmact:mact NO_CDROM= Must be distributed only through the Internet and free of charge MAKE_ENV+= DATADIR="${DATADIR}" SUB_FILES= pkg-message -PORTDOCS= readme.txt releasenotes.html +PORTDOCS= README.md releasenotes.html OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/jfbuild/Makefile @${REINPLACE_CMD} 's|/usr|${LOCALBASE}|' \ ${WRKSRC}/jfaudiolib/src/driver_fluidsynth.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sw ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/build ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-build ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DATADIR} .include Index: head/games/jfsw/distinfo =================================================================== --- head/games/jfsw/distinfo (revision 552762) +++ head/games/jfsw/distinfo (revision 552763) @@ -1,9 +1,9 @@ -TIMESTAMP = 1600721184 -SHA256 (jonof-jfsw-20200116-282b31a2335b2b5cac91d30044ff6b92053d1094_GH0.tar.gz) = 77d3fb88e479b91c13dfcf6a3f9e5ba5366f1aee0da0092aff161fe7f6b5aad5 -SIZE (jonof-jfsw-20200116-282b31a2335b2b5cac91d30044ff6b92053d1094_GH0.tar.gz) = 988265 -SHA256 (jonof-jfbuild-31e2b842629f52227fd1291f5228a806704b0cbc_GH0.tar.gz) = 5f953fcb3744a6cea61186cf8bfc99ac1c3794fbc8de4f083ad6e7d593ae1225 -SIZE (jonof-jfbuild-31e2b842629f52227fd1291f5228a806704b0cbc_GH0.tar.gz) = 1535215 -SHA256 (jonof-jfaudiolib-8e28fe3bc41bf809391461697cd0ecb7027cb7f6_GH0.tar.gz) = 836efc3d49d3e32d6d8f136fa380de03f42760130b8073fe1f27a2e96e9112a5 -SIZE (jonof-jfaudiolib-8e28fe3bc41bf809391461697cd0ecb7027cb7f6_GH0.tar.gz) = 210132 -SHA256 (jonof-jfmact-dbbf346d78334c6907ad9014958305309d4df7a0_GH0.tar.gz) = 08b8ca80a76103e2ac86ee258f058dd79a4c9f6ffe43e4a1772698ea0ea518a4 -SIZE (jonof-jfmact-dbbf346d78334c6907ad9014958305309d4df7a0_GH0.tar.gz) = 25342 +TIMESTAMP = 1603053347 +SHA256 (jonof-jfsw-20201010-ea58641_GH0.tar.gz) = 3b9f76a76b26cd8b3f29cf562ed3614c233078125865c6eb830806679075941e +SIZE (jonof-jfsw-20201010-ea58641_GH0.tar.gz) = 988016 +SHA256 (jonof-jfbuild-11d083e_GH0.tar.gz) = 8c96a138f03c1daea951547cddb798a882dec06c2705bd29e97fb428d7b44d44 +SIZE (jonof-jfbuild-11d083e_GH0.tar.gz) = 1536049 +SHA256 (jonof-jfaudiolib-3ff144d_GH0.tar.gz) = c1aa49ab4841b80ecb8b26170f10116694a82cd886f5c53f61b3843bbee8b5c6 +SIZE (jonof-jfaudiolib-3ff144d_GH0.tar.gz) = 1482329 +SHA256 (jonof-jfmact-dbbf346_GH0.tar.gz) = ba267c134de7525da6a6feffd1620b41d78c7deb00c699503bfe1e236b00e287 +SIZE (jonof-jfmact-dbbf346_GH0.tar.gz) = 25339 Index: head/games/jfsw/files/patch-src-game.c =================================================================== --- head/games/jfsw/files/patch-src-game.c (revision 552762) +++ head/games/jfsw/files/patch-src-game.c (nonexistent) @@ -1,17 +0,0 @@ -Rename PREFIX to DATADIR as its only purpose is to access data files -(and avoid conflict with FreeBSD PREFIX, which has another meaning) - ---- src/game.c.orig 2020-09-22 22:08:35 UTC -+++ src/game.c -@@ -3405,9 +3405,9 @@ int app_main(int argc, char const * const argv[]) - } - #endif - --#if defined(PREFIX) -+#if defined(DATADIR) - { -- const char *prefixdir = PREFIX; -+ const char *prefixdir = DATADIR; - if (prefixdir && prefixdir[0]) { - addsearchpath(prefixdir); - } Property changes on: head/games/jfsw/files/patch-src-game.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/jfsw/files/patch-jfbuild-kenbuild-game.c =================================================================== --- head/games/jfsw/files/patch-jfbuild-kenbuild-game.c (revision 552762) +++ head/games/jfsw/files/patch-jfbuild-kenbuild-game.c (nonexistent) @@ -1,17 +0,0 @@ -Rename PREFIX to DATADIR as its only purpose is to access data files -(and avoid conflict with FreeBSD PREFIX, which has another meaning) - ---- jfbuild/kenbuild/game.c.orig 2020-09-22 22:08:35 UTC -+++ jfbuild/kenbuild/game.c -@@ -405,9 +405,9 @@ int app_main(int argc, char const * const argv[]) - int startretval = STARTWIN_RUN; - struct startwin_settings settings; - --#if defined(PREFIX) -+#if defined(DATADIR) - { -- const char *prefixdir = PREFIX; -+ const char *prefixdir = DATADIR; - if (prefixdir && prefixdir[0]) { - addsearchpath(prefixdir); - } Property changes on: head/games/jfsw/files/patch-jfbuild-kenbuild-game.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/jfsw/files/patch-Makefile =================================================================== --- head/games/jfsw/files/patch-Makefile (revision 552762) +++ head/games/jfsw/files/patch-Makefile (nonexistent) @@ -1,36 +0,0 @@ -Rename PREFIX to DATADIR as its only purpose is to access data files -(and avoid conflict with FreeBSD PREFIX, which has another meaning) - -Tune GAMELIBS for FreeBSD platform - ---- Makefile.orig 2020-09-22 22:08:35 UTC -+++ Makefile -@@ -14,7 +14,7 @@ - RELEASE ?= 1 - - # Base path of app installation --PREFIX ?= /usr/local/share/games/jfsw -+DATADIR ?= /usr/local/share/games/jfsw - - # Engine source code path - EROOT ?= jfbuild -@@ -168,6 +168,10 @@ ifeq ($(PLATFORM),LINUX) - NASMFLAGS+= -f elf - GAMELIBS+= $(JFAUDIOLIB_LDFLAGS) - endif -+ifeq ($(PLATFORM),BSD) -+ NASMFLAGS+= -f elf -+ GAMELIBS+= $(JFAUDIOLIB_LDFLAGS) -pthread -+endif - ifeq ($(PLATFORM),WINDOWS) - OURCFLAGS+= -I$(DXROOT)/include - NASMFLAGS+= -f win32 --prefix _ -@@ -207,7 +211,7 @@ OURCFLAGS+= $(BUILDCFLAGS) - LIBS+= $(BUILDLIBS) - - ifneq ($(PLATFORM),WINDOWS) -- OURCFLAGS+= -DPREFIX=\"$(PREFIX)\" -+ OURCFLAGS+= -DDATADIR=\"$(DATADIR)\" - endif - - .PHONY: clean all engine $(ELIB)/$(ENGINELIB) $(ELIB)/$(EDITORLIB) $(AUDIOLIBROOT)/$(JFAUDIOLIB) Property changes on: head/games/jfsw/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c =================================================================== --- head/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c (revision 552762) +++ head/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c (nonexistent) @@ -1,17 +0,0 @@ -Rename PREFIX to DATADIR as its only purpose is to access data files -(and avoid conflict with FreeBSD PREFIX, which has another meaning) - ---- jfbuild/kenbuild/bstub.c.orig 2020-09-22 22:08:35 UTC -+++ jfbuild/kenbuild/bstub.c -@@ -73,9 +73,9 @@ int ExtInit(void) - getch(); - */ - --#if defined(PREFIX) -+#if defined(DATADIR) - { -- const char *prefixdir = PREFIX; -+ const char *prefixdir = DATADIR; - if (prefixdir && prefixdir[0]) { - addsearchpath(prefixdir); - } Property changes on: head/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property