cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dopewars to 1.6.1.

Browse Source 
Notable changes:

- Add new required dependency on net/curl
- Switch from Gtk+2 to Gtk+3
- Drop now unneeded patches
This commit is contained in:
fcambus 2021-01-14 09:32:20 +00:00
parent 071c95c489
commit 5fb7d7b660
13 changed files with 25 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
games/dopewars/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.66 2020/01/09 08:22:38 fcambus Exp $
# $OpenBSD: Makefile,v 1.67 2021/01/14 09:32:20 fcambus Exp $
COMMENT= game where you deal drugs on the streets of NY
DISTNAME= dopewars-1.5.12
REVISION= 15
DISTNAME= dopewars-1.6.1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dopewars/}
@ -12,9 +11,10 @@ HOMEPAGE= https://dopewars.sourceforge.io/
# GPL
PERMIT_PACKAGE= Yes
WANTLIB += c glib-2.0 iconv intl curses
WANTLIB += c curl curses glib-2.0 iconv intl
LIB_DEPENDS+= devel/glib2
LIB_DEPENDS+= devel/glib2 \
net/curl
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/games
@ -35,11 +35,9 @@ FLAVOR?=
CONFIGURE_ARGS+= --disable-gui-client
.else
RUN_DEPENDS+= devel/xdg-utils
LIB_DEPENDS+= x11/gtk+2
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 gobject-2.0 gtk-x11-2.0
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 z
LIB_DEPENDS+= x11/gtk+3
WANTLIB += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += gobject-2.0 gtk-3 harfbuzz pango-1.0 pangocairo-1.0
.endif
post-patch:

4
games/dopewars/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dopewars-1.5.12.tar.gz) = IwWdzeqWxgcrFI7iHXYjfvNTXlvpCzstgjnRUP7uDBk=
SIZE (dopewars-1.5.12.tar.gz) = 1419725
SHA256 (dopewars-1.6.1.tar.gz) = gxJ5A6Ydgc2iUaAi+d8VDRHie90EDoWMCcV5J8wO3qY=
SIZE (dopewars-1.6.1.tar.gz) = 1459612

11
games/dopewars/patches/patch-Makefile_in
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.5 2007/07/05 17:28:18 jasper Exp $
--- Makefile.in.orig Wed Dec 20 20:53:11 2006
+++ Makefile.in Wed Dec 20 20:53:22 2006
@@ -652,7 +652,7 @@ info: info-recursive
$OpenBSD: patch-Makefile_in,v 1.6 2021/01/14 09:32:20 fcambus Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -823,7 +823,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local
+install-data-am:
install-exec-am:
install-dvi: install-dvi-recursive

12
games/dopewars/patches/patch-doc-help-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc-help-Makefile_in,v 1.1 2007/07/05 17:28:18 jasper Exp $
--- doc/help/Makefile.in.orig Fri Dec 30 22:29:33 2005
+++ doc/help/Makefile.in Sun Nov 26 00:07:05 2006
@@ -214,7 +214,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/help
+DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}/help
DOCS = cops.html general.html locations.html sounds.html \
drugs.html guns.html server.html

12
games/dopewars/patches/patch-doc_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_Makefile_in,v 1.4 2007/07/05 17:28:18 jasper Exp $
--- doc/Makefile.in.orig Fri Dec 30 22:29:33 2005
+++ doc/Makefile.in Sun Nov 26 00:07:05 2006
@@ -228,7 +228,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/
+DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}/
DOCS = aiplayer.html configfile.html index.html i18n.html \
server.html clientplay.html credits.html example-cfg \
installation.html servercommands.html commandline.html \

12
games/dopewars/patches/patch-src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.5 2007/07/05 17:28:18 jasper Exp $
--- src/Makefile.in.orig Fri Dec 30 22:29:34 2005
+++ src/Makefile.in Thu Jul 5 17:39:19 2007
@@ -265,7 +265,7 @@ dopewars_SOURCES = admin.c admin.h AIPlayer.c AIPlayer
serverside.c serverside.h sound.c sound.h \
tstring.c tstring.h winmain.c winmain.h
-INCLUDES = -I../intl -I${srcdir} -I.. @GLIB_CFLAGS@ @GTK_CFLAGS@
+INCLUDES = -I${srcdir} -I.. @GLIB_CFLAGS@ @GTK_CFLAGS@
PIXDIR = ${DESTDIR}${datadir}/pixmaps
DOPEDIR = ${DESTDIR}${bindir}
DOPEBIN = ${DOPEDIR}/dopewars

11
games/dopewars/patches/patch-src_curses_client_Makefile_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_curses_client_Makefile_in,v 1.2 2007/07/05 17:28:18 jasper Exp $
--- src/curses_client/Makefile.in.orig Fri Dec 30 22:29:34 2005
+++ src/curses_client/Makefile.in Sun Nov 26 00:07:05 2006
@@ -239,6 +239,7 @@ target_vendor = @target_vendor@
noinst_LIBRARIES = libcursesclient.a
libcursesclient_a_SOURCES = curses_client.c curses_client.h
INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GLIB_CFLAGS@
+INCLUDES = -I${srcdir} -I${srcdir}/.. -I../.. @GLIB_CFLAGS@
all: all-am
.SUFFIXES:

12
games/dopewars/patches/patch-src_cursesport_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_cursesport_Makefile_in,v 1.2 2007/07/05 17:28:18 jasper Exp $
--- src/cursesport/Makefile.in.orig Fri Dec 30 22:29:34 2005
+++ src/cursesport/Makefile.in Sun Nov 26 00:07:05 2006
@@ -238,7 +238,7 @@ target_os = @target_os@
target_vendor = @target_vendor@
noinst_LIBRARIES = libcursesport.a
libcursesport_a_SOURCES = cursesport.c cursesport.h
-INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../..
+INCLUDES = -I${srcdir} -I${srcdir}/.. -I../..
all: all-am
.SUFFIXES:

22
games/dopewars/patches/patch-src_dopewars_c
View File

@ -1,21 +1,13 @@
$OpenBSD: patch-src_dopewars_c,v 1.4 2012/12/23 14:23:13 sthen Exp $
--- src/dopewars.c.orig Fri Dec 30 21:26:13 2005
+++ src/dopewars.c Sun Dec 23 14:14:41 2012
@@ -2356,7 +2356,7 @@ gchar *GetDocRoot(void)
path = g_strdup_printf("file://%s\\", bindir);
g_free(bindir);
#else
- path = g_strdup_printf("file://%s/doc/%s-%s/", DPDATADIR, PACKAGE, VERSION);
+ path = g_strdup_printf("file://%s/doc/%s/", DPDATADIR, PACKAGE);
#endif
return path;
}
@@ -2443,7 +2443,7 @@ static void SetupParameters(GSList *extraconfigs, gboo
$OpenBSD: patch-src_dopewars_c,v 1.5 2021/01/14 09:32:21 fcambus Exp $
Index: src/dopewars.c
--- src/dopewars.c.orig
+++ src/dopewars.c
@@ -2425,7 +2425,7 @@ static void SetupParameters(GSList *extraconfigs, gboo
AssignName(&ServerName, "localhost");
AssignName(&ServerMOTD, "");
AssignName(&BindAddress, "");
- AssignName(&WebBrowser, "/usr/bin/mozilla");
+ AssignName(&WebBrowser, "/usr/local/bin/xdg-open");
- AssignName(&OurWebBrowser, "/usr/bin/firefox");
+ AssignName(&OurWebBrowser, "/usr/local/bin/xdg-open");
AssignName(&Sounds.FightHit, SNDPATH"colt.wav");
AssignName(&Sounds.EnemyBitchKilled, SNDPATH"shotdown.wav");

11
games/dopewars/patches/patch-src_gtkport_Makefile_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_gtkport_Makefile_in,v 1.2 2007/07/05 17:28:18 jasper Exp $
--- src/gtkport/Makefile.in.orig Fri Dec 30 22:29:34 2005
+++ src/gtkport/Makefile.in Thu Jul 5 17:39:19 2007
@@ -242,6 +242,7 @@ libgtkport_a_SOURCES = gtkport.c gtkport.h clist.c cli
unicodewrap.c unicodewrap.h
INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GTK_CFLAGS@ @GLIB_CFLAGS@
+INCLUDES = -I${srcdir} -I${srcdir}/.. -I../.. @GTK_CFLAGS@ @GLIB_CFLAGS@
all: all-am
.SUFFIXES:

12
games/dopewars/patches/patch-src_gui_client_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_gui_client_Makefile_in,v 1.2 2007/07/05 17:28:18 jasper Exp $
--- src/gui_client/Makefile.in.orig Fri Dec 30 22:29:34 2005
+++ src/gui_client/Makefile.in Thu Jul 5 17:39:19 2007
@@ -242,7 +242,7 @@ libguiclient_a_SOURCES = gtk_client.c gtk_client.h \
optdialog.c optdialog.h \
newgamedia.c newgamedia.h dopewars-pill.xpm
-INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GTK_CFLAGS@ @GLIB_CFLAGS@
+INCLUDES = -I${srcdir} -I${srcdir}/.. -I../.. @GTK_CFLAGS@ @GLIB_CFLAGS@
all: all-am
.SUFFIXES:

22
games/dopewars/patches/patch-src_serverside_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-src_serverside_c,v 1.3 2015/03/15 10:05:04 jasper Exp $
Security fix for CVE-2009-3591,
dopewars: DoS via REQUESTJET message with an invalid location
http://sourceforge.net/p/dopewars/code/1033/
--- src/serverside.c.orig Sun Mar 1 12:31:08 2015
+++ src/serverside.c Sun Mar 1 12:31:44 2015
@@ -504,6 +504,12 @@ void HandleServerMessage(gchar *buf, Player *Play)
break;
case C_REQUESTJET:
i = atoi(Data);
+ /* Make sure value is within range */
+ if (i < 0 || i >= NumLocation) {
+ dopelog(3, LF_SERVER, _("%s: DENIED jet to invalid location %s"),
+ GetPlayerName(Play), Data);
+ break;
+ }
if (Play->EventNum == E_FIGHT || Play->EventNum == E_FIGHTASK) {
if (CanRunHere(Play)) {
break;

3
games/dopewars/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2013/08/20 22:05:52 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.20 2021/01/14 09:32:21 fcambus Exp $
@mode g+s
@group games
@bin bin/dopewars
@ -55,6 +55,7 @@ share/examples/dopewars/dopewars.sco
@mode
@group
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/
share/locale/es_ES/LC_MESSAGES/