pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/dopewars dopewars: update to 1.6.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c1fcdf3669a9
branches: trunk
changeset: 445661:c1fcdf3669a9
user: fcambus <fcambus%pkgsrc.org@localhost>
date: Tue Jan 26 22:12:08 2021 +0000
description:
dopewars: update to 1.6.1.
ChangeLog:
# 1.6.1 - 2020-12-11
- Improved display in non-English text-mode clients; previously
columns were not aligned properly in some cases and occasionally
not all available drugs at a location were shown on screen (#54).
- Minimal British English translation added (#57). Configuration file
entries can now use either British English or American English spelling
(i.e. Armor/Armour).
- On Windows the "browse" button in the graphical client options dialog
now opens at the folder containing the selected sound file (#55).
# 1.6.0 - 2020-12-06
- Fixes to build with OpenWRT (thanks to Theodor-Iulian Ciobanu).
- Write server pidfile after fork (thanks to Theodor-Iulian Ciobanu).
- Updated German and French Canadian translations from Benjamin Karaca
and Francois Marier.
- Support for old GTK1 and GLIB1 libraries removed - we now need version 2
of these libraries to build dopewars. GTK+3 is also supported.
- Update metaserver to work with new SourceForge; older versions can no
longer successfully register with the metaserver.
- Switch to using libcurl to talk to the metaserver (this supports https,
unlike the old internal code). The metaserver configuration has changed
accordingly; `MetaServer.Name`, `MetaServer.Port` and `MetaServer.Path` are
replaced with `MetaServer.URL`, while `MetaServer.Auth`, `MetaServer.Proxy*`,
and `MetaServer.UseSocks` are removed (set the `https_proxy` environment
variable instead, as per
https://curl.haxx.se/libcurl/c/libcurl-tutorial.html#Environment)
- The default web browser on Linux has changed from 'mozilla' to
'firefox'; on Mac the system-configured default browser is used.
- On Windows the high score file, log file, and config file are now
stored in the user application data directory (e.g.
`C:\Users\foo\AppData\Local\dopewars`) rather than the same directory as
the dopewars binary.
- Add sound support with SDL2, and on Mac.
- Add 64-bit Windows binaries.
- Fix for a DOS against the server using the REQUESTJET message type
(thanks to Doug Prostko for reporting the problem).
diffstat:
games/dopewars/Makefile | 8 +-
games/dopewars/PLIST | 54 +++++----
games/dopewars/distinfo | 16 +-
games/dopewars/options.mk | 5 +-
games/dopewars/patches/patch-Makefile.in | 15 ++
games/dopewars/patches/patch-aa | 22 ----
games/dopewars/patches/patch-ac | 21 ---
games/dopewars/patches/patch-ae | 49 ---------
games/dopewars/patches/patch-af | 13 --
games/dopewars/patches/patch-src_curses__client_curses__client.c | 21 +++
10 files changed, 78 insertions(+), 146 deletions(-)
diffs (truncated from 301 to 300 lines):
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/Makefile
--- a/games/dopewars/Makefile Tue Jan 26 22:10:14 2021 +0000
+++ b/games/dopewars/Makefile Tue Jan 26 22:12:08 2021 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.77 2020/08/17 20:18:43 leot Exp $
+# $NetBSD: Makefile,v 1.78 2021/01/26 22:12:08 fcambus Exp $
-DISTNAME= dopewars-1.5.12
-PKGREVISION= 34
+DISTNAME= dopewars-1.6.1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dopewars/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://dopewars.sourceforge.io/
COMMENT= Make a fortune dealing drugs on the streets of New York
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= destdir
@@ -24,4 +24,6 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/PLIST
--- a/games/dopewars/PLIST Tue Jan 26 22:10:14 2021 +0000
+++ b/games/dopewars/PLIST Tue Jan 26 22:12:08 2021 +0000
@@ -1,31 +1,32 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 19:10:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2021/01/26 22:12:08 fcambus Exp $
bin/dopewars
man/man6/dopewars.6
-share/doc/${PKGNAME}/help/cops.html
-share/doc/${PKGNAME}/help/drugs.html
-share/doc/${PKGNAME}/help/general.html
-share/doc/${PKGNAME}/help/guns.html
-share/doc/${PKGNAME}/help/locations.html
-share/doc/${PKGNAME}/help/server.html
-share/doc/${PKGNAME}/help/sounds.html
-share/doc/${PKGNAME}/LICENCE
-share/doc/${PKGNAME}/aiplayer.html
-share/doc/${PKGNAME}/clientplay.html
-share/doc/${PKGNAME}/commandline.html
-share/doc/${PKGNAME}/configfile.html
-share/doc/${PKGNAME}/contribute.html
-share/doc/${PKGNAME}/credits.html
-share/doc/${PKGNAME}/developer.html
-share/doc/${PKGNAME}/example-cfg
-share/doc/${PKGNAME}/example-igneous
-share/doc/${PKGNAME}/i18n.html
-share/doc/${PKGNAME}/index.html
-share/doc/${PKGNAME}/installation.html
-share/doc/${PKGNAME}/metaserver.html
-share/doc/${PKGNAME}/protocol.html
-share/doc/${PKGNAME}/server.html
-share/doc/${PKGNAME}/servercommands.html
-share/doc/${PKGNAME}/windows.html
+share/applications/dopewars.desktop
+share/doc/dopewars/LICENCE
+share/doc/dopewars/aiplayer.html
+share/doc/dopewars/clientplay.html
+share/doc/dopewars/commandline.html
+share/doc/dopewars/configfile.html
+share/doc/dopewars/contribute.html
+share/doc/dopewars/credits.html
+share/doc/dopewars/developer.html
+share/doc/dopewars/example-cfg
+share/doc/dopewars/example-igneous
+share/doc/dopewars/help/cops.html
+share/doc/dopewars/help/drugs.html
+share/doc/dopewars/help/general.html
+share/doc/dopewars/help/guns.html
+share/doc/dopewars/help/locations.html
+share/doc/dopewars/help/server.html
+share/doc/dopewars/help/sounds.html
+share/doc/dopewars/i18n.html
+share/doc/dopewars/index.html
+share/doc/dopewars/installation.html
+share/doc/dopewars/metaserver.html
+share/doc/dopewars/protocol.html
+share/doc/dopewars/server.html
+share/doc/dopewars/servercommands.html
+share/doc/dopewars/windows.html
share/dopewars/bye.wav
share/dopewars/colt.wav
share/dopewars/die.wav
@@ -39,6 +40,7 @@
share/dopewars/shotdown.wav
share/dopewars/train.wav
share/locale/de/LC_MESSAGES/dopewars.mo
+share/locale/en_GB/LC_MESSAGES/dopewars.mo
share/locale/es/LC_MESSAGES/dopewars.mo
share/locale/es_ES/LC_MESSAGES/dopewars.mo
share/locale/fr/LC_MESSAGES/dopewars.mo
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/distinfo
--- a/games/dopewars/distinfo Tue Jan 26 22:10:14 2021 +0000
+++ b/games/dopewars/distinfo Tue Jan 26 22:12:08 2021 +0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 20:56:47 agc Exp $
+$NetBSD: distinfo,v 1.16 2021/01/26 22:12:08 fcambus Exp $
-SHA1 (dopewars-1.5.12.tar.gz) = ad46a38e225680e591b078eeec563d47b96684bc
-RMD160 (dopewars-1.5.12.tar.gz) = 66c86bceb67657a9fb2ef7944b1a069dafab8ae0
-SHA512 (dopewars-1.5.12.tar.gz) = cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a
-Size (dopewars-1.5.12.tar.gz) = 1419725 bytes
-SHA1 (patch-aa) = df0e51ad4da9ce3963682ba246de9c4f1496a6ec
-SHA1 (patch-ac) = 529cf6e5b9f28a7fa547f81841c5199a1f8f84ae
+SHA1 (dopewars-1.6.1.tar.gz) = 4598bfb838ece6d3e87d5c0014cc0f85204ce023
+RMD160 (dopewars-1.6.1.tar.gz) = 77c8f598dc240d93950dd13720b5536be925796c
+SHA512 (dopewars-1.6.1.tar.gz) = c4b33879be499a732e42a7a8829ff56a1807c5943eae4d39bc14ef16e06cf22b6c5792e7cefa8ad76846498be8bbf3f9c00f8f6664f14b5ce4d45604e42e8175
+Size (dopewars-1.6.1.tar.gz) = 1459612 bytes
+SHA1 (patch-Makefile.in) = e0ccd415a7154a08f0bddcf10949439fe4719c9e
SHA1 (patch-ad) = 471c30b8b8e75d687e7891037f2427cb8ee51c14
-SHA1 (patch-ae) = 2e4f715e02f4d9ff3827e22a98b87bf593742845
-SHA1 (patch-af) = a25c54a74aacf58b85af879df70fe4ba78c3a49c
+SHA1 (patch-src_curses__client_curses__client.c) = 95c871ec0faebe0de65e81504e9d71021c3478ec
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/options.mk
--- a/games/dopewars/options.mk Tue Jan 26 22:10:14 2021 +0000
+++ b/games/dopewars/options.mk Tue Jan 26 22:12:08 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2013/10/17 09:44:57 roy Exp $
+# $NetBSD: options.mk,v 1.3 2021/01/26 22:12:08 fcambus Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dopewars
PKG_SUPPORTED_OPTIONS= curses gtk
@@ -18,6 +18,5 @@
. include "../../x11/gtk2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-gui-client
-CONFIGURE_ARGS+= --disable-glib2
-. include "../../devel/glib/buildlink3.mk"
+. include "../../devel/glib2/buildlink3.mk"
.endif
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/dopewars/patches/patch-Makefile.in Tue Jan 26 22:12:08 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/01/26 22:12:08 fcambus Exp $
+
+Fix target for Pkgsrc.
+
+--- Makefile.in.orig 2021-01-26 20:49:46.188727756 +0000
++++ Makefile.in
+@@ -400,7 +400,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src doc po sounds
+-DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
++DESKTOPDIR = ${DESTDIR}${datadir}/applications
+ DESKTOP = dopewars.desktop
+ SCOREDIR = ${DESTDIR}${localstatedir}
+ SCORE = ${SCOREDIR}/dopewars.sco
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/patches/patch-aa
--- a/games/dopewars/patches/patch-aa Tue Jan 26 22:10:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2004/11/05 09:44:33 adam Exp $
-
---- Makefile.in.orig 2004-10-25 07:05:33.000000000 +0000
-+++ Makefile.in
-@@ -224,7 +224,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = intl src doc po sounds
-+SUBDIRS = src doc po sounds
- DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
- DESKTOP = dopewars.desktop
- SCOREDIR = ${DESTDIR}${localstatedir}
-@@ -673,8 +673,6 @@ install-data-local:
- @chgrp games ${SCORE} || chgrp wheel ${SCORE} || \
- echo "Unable to change group ownership of the high score file"
- chmod 0660 ${SCORE}
-- ${mkinstalldirs} ${DESKTOPDIR}
-- ${INSTALL} -m 0644 ${srcdir}/${DESKTOP} ${DESKTOPDIR}
-
- uninstall-local:
- /bin/rm -f ${SCORE} ${DESKTOPDIR}/${DESKTOP}
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/patches/patch-ac
--- a/games/dopewars/patches/patch-ac Tue Jan 26 22:10:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/07/12 10:07:35 wiz Exp $
-
---- src/curses_client/curses_client.c.orig Fri Jun 6 21:13:04 2003
-+++ src/curses_client/curses_client.c
-@@ -45,7 +45,6 @@
- #include "tstring.h"
-
- static int ResizedFlag;
--static SCREEN *cur_screen;
-
- #define PromptAttr (COLOR_PAIR(1))
- #define TextAttr (COLOR_PAIR(2))
-@@ -112,7 +111,7 @@ static gboolean QuitRequest, WantColour
- */
- static void start_curses(void)
- {
-- cur_screen = newterm(NULL, stdout, stdin);
-+ initscr();
- if (WantColour) {
- start_color();
- init_pair(1, COLOR_MAGENTA, COLOR_WHITE);
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/patches/patch-ae
--- a/games/dopewars/patches/patch-ae Tue Jan 26 22:10:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2004/11/05 09:44:33 adam Exp $
-
---- configure.orig 2004-10-25 07:05:30.000000000 +0000
-+++ configure
-@@ -9249,8 +9249,8 @@ echo "${ECHO_T}Configuring for Unix bina
-
- if test "$CURSES_CLIENT" != "no" ; then
-
--echo "$as_me:$LINENO: checking for newterm in -lncurses" >&5
--echo $ECHO_N "checking for newterm in -lncurses... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for start_color in -lncurses" >&5
-+echo $ECHO_N "checking for start_color in -lncurses... $ECHO_C" >&6
- if test "${ac_cv_lib_ncurses_newterm+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9269,11 +9269,11 @@ extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char newterm ();
-+char start_color ();
- int
- main ()
- {
--newterm ();
-+start_color ();
- ;
- return 0;
- }
-@@ -16157,7 +16157,10 @@ cat >>confdefs.h <<_ACEOF
- #define DPDATADIR "$DPDATADIR"
- _ACEOF
-
--
-+DPLOCALSTATEDIR="${localstatedir}"
-+cat >>confdefs.h <<_ACEOF
-+#define DPLOCALSTATEDIR "$DPLOCALSTATEDIR"
-+_ACEOF
-
- localedir=${datadir}/locale
-
-@@ -17053,6 +17056,7 @@ s,@PLUGINS_TRUE@,$PLUGINS_TRUE,;t t
- s,@PLUGINS_FALSE@,$PLUGINS_FALSE,;t t
- s,@DPSCOREDIR@,$DPSCOREDIR,;t t
- s,@DPDATADIR@,$DPDATADIR,;t t
-+s,@DPLOCALSTATEDIR@,$DPLOCALSTATEDIR,;t t
- s,@localedir@,$localedir,;t t
- s,@GUI_CLIENT_TRUE@,$GUI_CLIENT_TRUE,;t t
- s,@GUI_CLIENT_FALSE@,$GUI_CLIENT_FALSE,;t t
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/patches/patch-af
--- a/games/dopewars/patches/patch-af Tue Jan 26 22:10:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/11/05 09:44:33 adam Exp $
-
---- src/Makefile.in.orig 2004-10-25 07:05:36.000000000 +0000
-+++ src/Makefile.in
-@@ -324,7 +324,7 @@ clean-binPROGRAMS:
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
--dopewars$(EXEEXT): $(dopewars_OBJECTS) $(dopewars_DEPENDENCIES)
-+dopewars$(EXEEXT): $(dopewars_OBJECTS)
- @rm -f dopewars$(EXEEXT)
- $(LINK) $(dopewars_LDFLAGS) $(dopewars_OBJECTS) $(dopewars_LDADD) $(LIBS)
-
diff -r 453eb7639c26 -r c1fcdf3669a9 games/dopewars/patches/patch-src_curses__client_curses__client.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/dopewars/patches/patch-src_curses__client_curses__client.c Tue Jan 26 22:12:08 2021 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_curses__client_curses__client.c,v 1.1 2021/01/26 22:12:08 fcambus Exp $
+
+--- src/curses_client/curses_client.c.orig 2021-01-03 12:38:52.113243136 +0000
++++ src/curses_client/curses_client.c
+@@ -45,7 +45,6 @@
+ #include "tstring.h"
+
+ static int ResizedFlag;
+-static SCREEN *cur_screen;
+
+ #define PromptAttr (COLOR_PAIR(1))
+ #define TextAttr (COLOR_PAIR(2))
+@@ -113,7 +112,7 @@ static gboolean QuitRequest, WantColor =
+ */
+ static void start_curses(void)
+ {
+- cur_screen = newterm(NULL, stdout, stdin);
++ initscr();
+ if (WantColor) {
+ start_color();
Home |
Main Index |
Thread Index |
Old Index