svn commit: r549915 - in head/games/jfsw: . files
Ganael LAPLANCHE
martymac at FreeBSD.org
Thu Sep 24 10:37:56 UTC 2020
Author: martymac
Date: Thu Sep 24 10:37:54 2020
New Revision: 549915
URL: https://svnweb.freebsd.org/changeset/ports/549915
Log:
Update to 20200116
Added:
head/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c (contents, props changed)
head/games/jfsw/files/patch-jfbuild-kenbuild-game.c (contents, props changed)
head/games/jfsw/files/patch-jfbuild-src-sdlayer2.c (contents, props changed)
Deleted:
head/games/jfsw/files/patch-jfaudiolib-Makefile
head/games/jfsw/files/patch-jfaudiolib-Makefile.shared
head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c
head/games/jfsw/files/patch-jfbuild-Makefile
head/games/jfsw/files/patch-jfbuild-src-kplib.c
head/games/jfsw/files/patch-jfbuild-src-sdlayer.c
head/games/jfsw/files/patch-src-gamedefs.h
head/games/jfsw/files/patch-src-grpscan.h
head/games/jfsw/files/patch-src-jnstub.c
Modified:
head/games/jfsw/Makefile
head/games/jfsw/distinfo
head/games/jfsw/files/patch-Makefile
head/games/jfsw/files/patch-src-game.c
Modified: head/games/jfsw/Makefile
==============================================================================
--- head/games/jfsw/Makefile Thu Sep 24 09:54:30 2020 (r549914)
+++ head/games/jfsw/Makefile Thu Sep 24 10:37:54 2020 (r549915)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= jfsw
-PORTVERSION= 20131019
-PORTREVISION= 3
+PORTVERSION= 20200116
CATEGORIES= games
MAINTAINER= martymac at FreeBSD.org
@@ -15,30 +14,30 @@ 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
+LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \
+ libfluidsynth.so:audio/fluidsynth
USES= alias compiler:c++11-lang dos2unix gl gmake gnome \
- pkgconfig:build sdl
+ perl5 pkgconfig:build sdl
USE_GL= gl
USE_GNOME= gtk20
-USE_SDL= mixer sdl
+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= 5cff6a81708ff053b569ba4400fba073afe207fe \
- a73583184aca466cebde152db2ce1020591d7049:build \
- a39ccf5e95961952d27754a255940be1d76ce85e:audio \
- b1071da75cd465f59257240e5dbc60a014580190:mact
+GH_TAGNAME= 282b31a2335b2b5cac91d30044ff6b92053d1094 \
+ 31e2b842629f52227fd1291f5228a806704b0cbc:build \
+ 8e28fe3bc41bf809391461697cd0ecb7027cb7f6:audio \
+ dbbf346d78334c6907ad9014958305309d4df7a0: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}" \
- NOASM=1 \
- LINKED_GTK=1
+MAKE_ENV+= DATADIR="${DATADIR}"
SUB_FILES= pkg-message
@@ -49,9 +48,6 @@ OPTIONS_DEFINE= DOCS
post-patch:
@${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' \
${WRKSRC}/jfbuild/Makefile
- @${REINPLACE_CMD} 's|sdl-config|${SDL_CONFIG}|' \
- ${WRKSRC}/Makefile \
- ${WRKSRC}/jfbuild/Makefile.shared
@${REINPLACE_CMD} 's|/usr|${LOCALBASE}|' \
${WRKSRC}/jfaudiolib/src/driver_fluidsynth.c
Modified: head/games/jfsw/distinfo
==============================================================================
--- head/games/jfsw/distinfo Thu Sep 24 09:54:30 2020 (r549914)
+++ head/games/jfsw/distinfo Thu Sep 24 10:37:54 2020 (r549915)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1505332960
-SHA256 (jonof-jfsw-20131019-5cff6a81708ff053b569ba4400fba073afe207fe_GH0.tar.gz) = 605a84a06de4c5f1ea5e0603e39a55c9eaa4421f9d8138fe0fa49c2059a59b48
-SIZE (jonof-jfsw-20131019-5cff6a81708ff053b569ba4400fba073afe207fe_GH0.tar.gz) = 1393801
-SHA256 (jonof-jfbuild-a73583184aca466cebde152db2ce1020591d7049_GH0.tar.gz) = 1a9669d5fc8940c20d7169f524a6e3b99944ff0fd4c75479bbf98e4f2b1a94e2
-SIZE (jonof-jfbuild-a73583184aca466cebde152db2ce1020591d7049_GH0.tar.gz) = 1434766
-SHA256 (jonof-jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e_GH0.tar.gz) = 92d82f904df2f9cd546fafce9cea3462f6b092baa8a4f79426413fed3a426bcf
-SIZE (jonof-jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e_GH0.tar.gz) = 1041181
-SHA256 (jonof-jfmact-b1071da75cd465f59257240e5dbc60a014580190_GH0.tar.gz) = 61f98c885995d5d7c1f7bb7315eed118f95b53312ad7dfbd190006ba3446ee24
-SIZE (jonof-jfmact-b1071da75cd465f59257240e5dbc60a014580190_GH0.tar.gz) = 25410
+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
Modified: head/games/jfsw/files/patch-Makefile
==============================================================================
--- head/games/jfsw/files/patch-Makefile Thu Sep 24 09:54:30 2020 (r549914)
+++ head/games/jfsw/files/patch-Makefile Thu Sep 24 10:37:54 2020 (r549915)
@@ -1,8 +1,9 @@
-Rename PREFIX to DATADIR as its purpose is only to find data files (avoids
-conflicts with our PREFIX, which has another meaning).
-Do not enforce compilers.
+Rename PREFIX to DATADIR as its only purpose is to access data files
+(and avoid conflict with FreeBSD PREFIX, which has another meaning)
---- Makefile.orig 2020-09-03 06:19:21 UTC
+Tune GAMELIBS for FreeBSD platform
+
+--- Makefile.orig 2020-09-22 22:08:35 UTC
+++ Makefile
@@ -14,7 +14,7 @@
RELEASE ?= 1
@@ -11,32 +12,21 @@ Do not enforce compilers.
-PREFIX ?= /usr/local/share/games/jfsw
+DATADIR ?= /usr/local/share/games/jfsw
- # DirectX SDK location
- DXROOT ?= $(USERPROFILE)/sdks/directx/dx81
-@@ -61,8 +61,8 @@ endif
-
- include $(AUDIOLIBROOT)/Makefile.shared
-
--CC=gcc
--CXX=g++
-+CC?=gcc
-+CXX?=g++
- OURCFLAGS=$(debug) -W -Wall -Wimplicit -Wno-unused \
- -fno-pic -fno-strict-aliasing -DNO_GCC_BUILTINS \
- -I$(INC) -I$(EINC) -I$(MACTROOT) -I$(AUDIOLIBROOT)/include
-@@ -165,6 +165,10 @@ ifeq ($(PLATFORM),LINUX)
+ # 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)
++ GAMELIBS+= $(JFAUDIOLIB_LDFLAGS) -pthread
+endif
ifeq ($(PLATFORM),WINDOWS)
OURCFLAGS+= -I$(DXROOT)/include
NASMFLAGS+= -f win32 --prefix _
-@@ -192,7 +196,7 @@ endif
- OURCFLAGS+= $(BUILDCFLAGS)
+@@ -207,7 +211,7 @@ OURCFLAGS+= $(BUILDCFLAGS)
+ LIBS+= $(BUILDLIBS)
ifneq ($(PLATFORM),WINDOWS)
- OURCFLAGS+= -DPREFIX=\"$(PREFIX)\"
Added: head/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c Thu Sep 24 10:37:54 2020 (r549915)
@@ -0,0 +1,17 @@
+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);
+ }
Added: head/games/jfsw/files/patch-jfbuild-kenbuild-game.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfbuild-kenbuild-game.c Thu Sep 24 10:37:54 2020 (r549915)
@@ -0,0 +1,17 @@
+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);
+ }
Added: head/games/jfsw/files/patch-jfbuild-src-sdlayer2.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfbuild-src-sdlayer2.c Thu Sep 24 10:37:54 2020 (r549915)
@@ -0,0 +1,13 @@
+Fix include for FreeBSD
+
+--- jfbuild/src/sdlayer2.c.orig 2020-09-22 22:08:35 UTC
++++ jfbuild/src/sdlayer2.c
+@@ -22,7 +22,7 @@
+ # define _GNU_SOURCE 1
+ #endif
+
+-#if defined __APPLE__
++#if defined __APPLE__ || __FreeBSD__
+ # include <SDL2/SDL.h>
+ #else
+ # include "SDL.h"
Modified: head/games/jfsw/files/patch-src-game.c
==============================================================================
--- head/games/jfsw/files/patch-src-game.c Thu Sep 24 09:54:30 2020 (r549914)
+++ head/games/jfsw/files/patch-src-game.c Thu Sep 24 10:37:54 2020 (r549915)
@@ -1,8 +1,9 @@
-Rename PREFIX to DATADIR as its purpose is only to find data files.
+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-03 06:19:21 UTC
+--- src/game.c.orig 2020-09-22 22:08:35 UTC
+++ src/game.c
-@@ -3470,9 +3470,9 @@ int app_main(int argc, char const * const argv[])
+@@ -3405,9 +3405,9 @@ int app_main(int argc, char const * const argv[])
}
#endif
More information about the svn-ports-head
mailing list