git: 9ce981ef3cd7 - main - games/sdl-sopwith: move from games/sopwith, update 1.8.4 → 2.1.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Sep 2022 16:26:51 UTC
The branch main has been updated by amdmi3:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9ce981ef3cd7ab3ee3de968f86a702e126488d48
commit 9ce981ef3cd7ab3ee3de968f86a702e126488d48
Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-09-02 19:28:01 +0000
Commit: Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-09-05 16:26:34 +0000
games/sdl-sopwith: move from games/sopwith, update 1.8.4 → 2.1.0
---
MOVED | 1 +
games/Makefile | 2 +-
games/sdl-sopwith/Makefile | 21 +++++++++++++++++++++
games/sdl-sopwith/distinfo | 3 +++
games/sdl-sopwith/files/patch-configure.ac | 15 +++++++++++++++
games/{sopwith => sdl-sopwith}/pkg-descr | 1 +
games/sdl-sopwith/pkg-plist | 3 +++
games/sopwith/Makefile | 19 -------------------
games/sopwith/distinfo | 3 ---
games/sopwith/files/patch-src__Makefile.in | 11 -----------
games/sopwith/pkg-plist | 6 ------
11 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/MOVED b/MOVED
index 0effed5b5a08..f62ae77fc552 100644
--- a/MOVED
+++ b/MOVED
@@ -17550,3 +17550,4 @@ x11-drivers/xf86-video-trident||2022-09-04|Has expired: Broken with recent xorg,
x11-drivers/xf86-video-s3||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream
x11-drivers/xf86-video-glint||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream
www/mediawiki136||2022-09-04|Has expired: Upstream no longer maintained
+games/sopwith|games/sdl-sopwith|2022-09-04|Moved to match upstream name
diff --git a/games/Makefile b/games/Makefile
index 0e7861a15e31..b33ea50b4cfe 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -880,6 +880,7 @@
SUBDIR += scummvm-tools
SUBDIR += sdb
SUBDIR += sdl-ball
+ SUBDIR += sdl-sopwith
SUBDIR += sdl_jewels
SUBDIR += sdl_lopan
SUBDIR += sdl_scavenger
@@ -915,7 +916,6 @@
SUBDIR += solarconquest
SUBDIR += solarus
SUBDIR += solarus-quest-editor
- SUBDIR += sopwith
SUBDIR += spacejunk
SUBDIR += spacezero
SUBDIR += speak
diff --git a/games/sdl-sopwith/Makefile b/games/sdl-sopwith/Makefile
new file mode 100644
index 000000000000..7147d0d81d6c
--- /dev/null
+++ b/games/sdl-sopwith/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= sdl-sopwith
+DISTVERSIONPREFIX= ${PORTNAME}-
+DISTVERSION= 2.1.0
+CATEGORIES= games
+
+MAINTAINER= amdmi3@FreeBSD.org
+COMMENT= Classic WW1 biplane game
+
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING.md
+
+USES= autoreconf pkgconfig sdl
+USE_GITHUB= yes
+GH_ACCOUNT= fragglet
+GNU_CONFIGURE= yes
+USE_SDL= sdl2
+
+PORTDOCS= *
+OPTIONS_DEFINE= DOCS
+
+.include <bsd.port.mk>
diff --git a/games/sdl-sopwith/distinfo b/games/sdl-sopwith/distinfo
new file mode 100644
index 000000000000..f8cf3e4c5a66
--- /dev/null
+++ b/games/sdl-sopwith/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1662145718
+SHA256 (fragglet-sdl-sopwith-sdl-sopwith-2.1.0_GH0.tar.gz) = 6f199c9e94c7b9bea1c9514cf088ac8283661da31749c52a2dee3eefe6fc986b
+SIZE (fragglet-sdl-sopwith-sdl-sopwith-2.1.0_GH0.tar.gz) = 153957
diff --git a/games/sdl-sopwith/files/patch-configure.ac b/games/sdl-sopwith/files/patch-configure.ac
new file mode 100644
index 000000000000..9ada53c0cbfd
--- /dev/null
+++ b/games/sdl-sopwith/files/patch-configure.ac
@@ -0,0 +1,15 @@
+--- configure.ac.orig 2022-08-31 15:52:22 UTC
++++ configure.ac
+@@ -27,12 +27,6 @@ AC_PROG_RANLIB
+ AC_CHECK_TOOL(STRIP, strip, )
+ AC_CHECK_TOOL(CONVERT, convert, )
+
+-if test "$GCC" = "yes"
+-then
+- WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
+- CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
+-fi
+-
+ dnl network libraries
+
+ case "$target" in
diff --git a/games/sopwith/pkg-descr b/games/sdl-sopwith/pkg-descr
similarity index 89%
rename from games/sopwith/pkg-descr
rename to games/sdl-sopwith/pkg-descr
index 5a9b37eea3f8..43d793aad84c 100644
--- a/games/sopwith/pkg-descr
+++ b/games/sdl-sopwith/pkg-descr
@@ -6,3 +6,4 @@ initial code written toward a backport allowing it to be run under
DOS, like the original.
WWW: http://sdl-sopwith.sourceforge.net/
+WWW: https://github.com/fragglet/sdl-sopwith
diff --git a/games/sdl-sopwith/pkg-plist b/games/sdl-sopwith/pkg-plist
new file mode 100644
index 000000000000..7a27011f4ee9
--- /dev/null
+++ b/games/sdl-sopwith/pkg-plist
@@ -0,0 +1,3 @@
+bin/sopwith
+man/man5/sopwith.cfg.5.gz
+man/man6/sopwith.6.gz
diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile
deleted file mode 100644
index 3f2953dc7fb1..000000000000
--- a/games/sopwith/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-PORTNAME= sopwith
-PORTVERSION= 1.8.4
-CATEGORIES= games
-MASTER_SITES= SF/sdl-${PORTNAME}/sdl_${PORTNAME}/${PORTVERSION}
-
-MAINTAINER= amdmi3@FreeBSD.org
-COMMENT= Classic WW1 biplane game
-
-LICENSE= GPLv2+
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-USES= gmake gnome pkgconfig sdl
-USE_SDL= sdl
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-
-OPTIONS_DEFINE= DOCS
-
-.include <bsd.port.mk>
diff --git a/games/sopwith/distinfo b/games/sopwith/distinfo
deleted file mode 100644
index a98e15cb7391..000000000000
--- a/games/sopwith/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1473636971
-SHA256 (sopwith-1.8.4.tar.gz) = a5ecb795a7aeff6be3ebfb99f1c6218054b73048786809f8468a92c952c17bd0
-SIZE (sopwith-1.8.4.tar.gz) = 310438
diff --git a/games/sopwith/files/patch-src__Makefile.in b/games/sopwith/files/patch-src__Makefile.in
deleted file mode 100644
index dd099f9a1aa9..000000000000
--- a/games/sopwith/files/patch-src__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig 2014-11-17 21:43:31 UTC
-+++ src/Makefile.in
-@@ -82,7 +82,7 @@ EXTRA_SUBDIRS = sdl gtk psion
- bin_PROGRAMS = @SOPWITH_BINS@
- EXTRA_PROGRAMS = sopwith gtksopwith psopwith
-
--CFLAGS = @CFLAGS@ -I.. -I/usr/include/SDL ${SDL_CGLAFS}
-+CFLAGS = @CFLAGS@ -I.. ${SDL_CFLAGS}
-
- COMMON_SRC = video.h swcollsn.c swgames.h swmain.h swutil.h font.h swcollsn.h swground.c swmisc.c tcpcomm.c pcsound.h swconf.c swground.h swmisc.h swsound.c tcpcomm.h std.h swconf.h swgrpha.c swmove.c swsound.h timer.h sw.h swdisp.c swgrpha.h swmove.h swsymbol.c swasynio.c swdisp.h swinit.c swsymbol.h swasynio.h swend.c swinit.h swtitle.c swauto.c swend.h swobject.c swtitle.h swauto.h swgames.c swmain.c swobject.h swutil.c video.c
-
diff --git a/games/sopwith/pkg-plist b/games/sopwith/pkg-plist
deleted file mode 100644
index 219fe93b32bc..000000000000
--- a/games/sopwith/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/sopwith
-man/man6/sopwith.6.gz
-%%PORTDOCS%%%%DOCSDIR%%/keys.txt
-%%PORTDOCS%%%%DOCSDIR%%/dlcvsamj.txt
-%%PORTDOCS%%%%DOCSDIR%%/origdoc.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt