pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games crossfire*: Update to 1.73.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/34e90c150324
branches: trunk
changeset: 416732:34e90c150324
user: nia <nia%pkgsrc.org@localhost>
date: Tue Oct 29 17:59:17 2019 +0000
description:
crossfire*: Update to 1.73.0
Note that the GTK1 and X11 clients are now deprecated and no longer
receiving releases. crossfire-client is now the GTK2 version.
diffstat:
games/Makefile | 4 +-
games/crossfire-client-gtk/DESCR | 11 -
games/crossfire-client-gtk/Makefile | 12 -
games/crossfire-client-gtk/PLIST | 3 -
games/crossfire-client-gtk2/DESCR | 11 -
games/crossfire-client-gtk2/Makefile | 14 -
games/crossfire-client-gtk2/PLIST | 2 -
games/crossfire-client/DESCR | 18 +-
games/crossfire-client/Makefile | 35 +-
games/crossfire-client/Makefile.common | 35 -
games/crossfire-client/PLIST | 61 +-
games/crossfire-client/distinfo | 15 +-
games/crossfire-client/patches/patch-common-metaserver.c | 12 -
games/crossfire-client/patches/patch-gtk-v2-src-metaserver.c | 14 -
games/crossfire-client/patches/patch-gtk-v2_src_png.c | 15 -
games/crossfire-client/patches/patch-gtk_png.c | 15 -
games/crossfire-client/patches/patch-x11_png.c | 24 -
games/crossfire-server/DESCR | 18 +-
games/crossfire-server/Makefile | 46 +-
games/crossfire-server/PLIST | 17988 +++++++++-
games/crossfire-server/distinfo | 35 +-
games/crossfire-server/options.mk | 18 -
games/crossfire-server/patches/patch-aa | 13 -
games/crossfire-server/patches/patch-ab | 61 -
games/crossfire-server/patches/patch-ae | 12 -
games/crossfire-server/patches/patch-crossedit_png.c | 15 -
games/crossfire-server/patches/patch-lib_Makefile.in | 15 +
games/crossfire-server/patches/patch-server-c_misc.c | 15 -
games/crossfire-server/patches/patch-server-c_wiz.c | 31 -
games/crossfire-server/patches/patch-server-plugins.c | 21 -
games/crossfire-server/patches/patch-socket-metaserver.c | 12 -
31 files changed, 18048 insertions(+), 553 deletions(-)
diffs (truncated from 18816 to 300 lines):
diff -r c05638b47f7b -r 34e90c150324 games/Makefile
--- a/games/Makefile Tue Oct 29 17:47:34 2019 +0000
+++ b/games/Makefile Tue Oct 29 17:59:17 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.464 2019/10/28 09:47:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.465 2019/10/29 17:59:17 nia Exp $
#
COMMENT= Games
@@ -80,8 +80,6 @@
SUBDIR+= crimsonfields
SUBDIR+= criticalmass
SUBDIR+= crossfire-client
-SUBDIR+= crossfire-client-gtk
-SUBDIR+= crossfire-client-gtk2
SUBDIR+= crossfire-server
SUBDIR+= d2x
SUBDIR+= dd2
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client-gtk/DESCR
--- a/games/crossfire-client-gtk/DESCR Tue Oct 29 17:47:34 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-Crossfire is a multi-player graphical arcade and adventure game made for the
-X Windows systems environment. It has certain flavours from other games,
-especially gauntlet and the rogue-like games (Nethack, Moria, Angband, and
-Ragnarok.) Any number of players can move around in their own window, finding
-and using items and battling monsters. They can choose to cooperate or compete
-in the same world.
-
-In the years of development that have followed, Crossfire has grown to
-encompass over 150 monsters, ~3000 maps to explore, an elaborate magic system,
-over 15 character types, a system of skills, and many, many artifacts and
-treasures.
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client-gtk/Makefile
--- a/games/crossfire-client-gtk/Makefile Tue Oct 29 17:47:34 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2019/08/22 12:23:07 ryoon Exp $
-
-.include "../../games/crossfire-client/Makefile.common"
-
-PKGNAME= crossfire-client-gtk-${CROSSFIRE_VERSION}
-PKGREVISION= 23
-COMMENT= Multi-player graphical arcade and adventure game; GTK client
-
-INSTALL_DIRS= gtk
-
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client-gtk/PLIST
--- a/games/crossfire-client-gtk/PLIST Tue Oct 29 17:47:34 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/11 05:58:00 adam Exp $
-bin/gcfclient
-man/man6/gcfclient.6
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client-gtk2/DESCR
--- a/games/crossfire-client-gtk2/DESCR Tue Oct 29 17:47:34 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-Crossfire is a multi-player graphical arcade and adventure game made for the
-X Windows systems environment. It has certain flavours from other games,
-especially gauntlet and the rogue-like games (Nethack, Moria, Angband, and
-Ragnarok.) Any number of players can move around in their own window, finding
-and using items and battling monsters. They can choose to cooperate or compete
-in the same world.
-
-In the years of development that have followed, Crossfire has grown to
-encompass over 150 monsters, ~3000 maps to explore, an elaborate magic system,
-over 15 character types, a system of skills, and many, many artifacts and
-treasures.
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client-gtk2/Makefile
--- a/games/crossfire-client-gtk2/Makefile Tue Oct 29 17:47:34 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2019/08/22 12:23:08 ryoon Exp $
-
-.include "../../games/crossfire-client/Makefile.common"
-
-PKGNAME= crossfire-client-gtk2-${CROSSFIRE_VERSION}
-PKGREVISION= 47
-COMMENT= Multi-player graphical arcade and adventure game; GTK2 client
-
-INSTALL_DIRS= gtk-v2
-
-USE_TOOLS+= pkg-config
-
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client-gtk2/PLIST
--- a/games/crossfire-client-gtk2/PLIST Tue Oct 29 17:47:34 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/11 05:58:41 adam Exp $
-bin/gcfclient2
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client/DESCR
--- a/games/crossfire-client/DESCR Tue Oct 29 17:47:34 2019 +0000
+++ b/games/crossfire-client/DESCR Tue Oct 29 17:59:17 2019 +0000
@@ -1,11 +1,11 @@
-Crossfire is a multi-player graphical arcade and adventure game made for the
-X Windows systems environment. It has certain flavours from other games,
-especially gauntlet and the rogue-like games (Nethack, Moria, Angband, and
-Ragnarok.) Any number of players can move around in their own window, finding
-and using items and battling monsters. They can choose to cooperate or compete
-in the same world.
+Crossfire is a multi-player graphical arcade and adventure game.
+
+It has certain flavours from other games, especially gauntlet and the
+rogue-like games (Nethack, Moria, Angband, and Ragnarok.) Any number of
+players can move around in their own window, finding and using items and
+battling monsters. They can choose to cooperate or compete in the same world.
In the years of development that have followed, Crossfire has grown to
-encompass over 150 monsters, ~3000 maps to explore, an elaborate magic system,
-over 15 character types, a system of skills, and many, many artifacts and
-treasures.
+encompass over 150 monsters, ~3000 maps to explore, an elaborate magic
+system, over 15 character types, a system of skills, and many, many artifacts
+and treasures.
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client/Makefile
--- a/games/crossfire-client/Makefile Tue Oct 29 17:47:34 2019 +0000
+++ b/games/crossfire-client/Makefile Tue Oct 29 17:59:17 2019 +0000
@@ -1,9 +1,34 @@
-# $NetBSD: Makefile,v 1.35 2019/08/22 12:23:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2019/10/29 17:59:17 nia Exp $
+
+DISTNAME= crossfire-client-1.73.0
+CATEGORIES= games
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=crossfire/}
+EXTRACT_SUFX= .tar.bz2
-.include "../../games/crossfire-client/Makefile.common"
-PKGREVISION= 31
+MAINTAINER= adam%NetBSD.org@localhost
+HOMEPAGE= http://crossfire.real-time.com/
+COMMENT= Multi-player graphical arcade and adventure game (client)
+LICENSE= gnu-gpl-v2
+
+CONFLICTS+= crossfire-client-gtk2-[0-9]*
+SUPERSEDES+= crossfire-client-gtk2-[0-9]*
+SUPERSEDES+= crossfire-client-gtk-[0-9]*
-COMMENT= Multi-player graphical arcade and adventure game; X11 client
+USE_CMAKE= yes
+USE_TOOLS+= pkg-config perl:run
+USE_LANGUAGES= c99
+
+REPLACE_PERL+= common/items.pl
-.include "../../x11/libX11/buildlink3.mk"
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client/Makefile.common
--- a/games/crossfire-client/Makefile.common Tue Oct 29 17:47:34 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile.common,v 1.8 2019/08/30 17:01:33 nia Exp $
-# used by games/crossfire-client/Makefile
-# used by games/crossfire-client-gtk/Makefile
-# used by games/crossfire-client-gtk2/Makefile
-
-DISTNAME= crossfire-client-${CROSSFIRE_VERSION}
-PKGREVISION= 1
-CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=crossfire/}
-
-MAINTAINER= adam%NetBSD.org@localhost
-HOMEPAGE= http://crossfire.real-time.com/
-
-CROSSFIRE_VERSION= 1.11.0
-
-DISTINFO_FILE= ${.CURDIR}/../../games/crossfire-client/distinfo
-PATCHDIR= ${.CURDIR}/../../games/crossfire-client/patches
-
-USE_TOOLS+= gmake perl:run
-GNU_CONFIGURE= yes
-
-REPLACE_PERL+= common/items.pl utils/deftoheader.pl
-
-SUBST_CLASSES+= dsp
-SUBST_STAGE.dsp= pre-configure
-SUBST_MESSAGE.dsp= Adjusting path to sound device.
-SUBST_FILES.dsp= sound-src/cfsndserv.c
-SUBST_SED.dsp= -e "s|/dev/dsp|${DEVOSSAUDIO}|"
-
-.include "../../graphics/SDL_image/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/freeglut/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client/PLIST
--- a/games/crossfire-client/PLIST Tue Oct 29 17:47:34 2019 +0000
+++ b/games/crossfire-client/PLIST Tue Oct 29 17:59:17 2019 +0000
@@ -1,4 +1,59 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/11 05:57:14 adam Exp $
-bin/cfclient
+@comment $NetBSD: PLIST,v 1.2 2019/10/29 17:59:17 nia Exp $
bin/cfsndserv
-man/man6/cfclient.6
+bin/crossfire-client-gtk2
+share/applications/crossfire-client.desktop
+share/crossfire-client/sounds/COPYING
+share/crossfire-client/sounds/Creaky-1.wav
+share/crossfire-client/sounds/Evil_Laugh.wav
+share/crossfire-client/sounds/Explosion.wav
+share/crossfire-client/sounds/FloorTom.wav
+share/crossfire-client/sounds/Gun-5.wav
+share/crossfire-client/sounds/MetalCrash.wav
+share/crossfire-client/sounds/Missed.wav
+share/crossfire-client/sounds/Missle1.wav
+share/crossfire-client/sounds/Puke.wav
+share/crossfire-client/sounds/Tear.wav
+share/crossfire-client/sounds/Teeswing.wav
+share/crossfire-client/sounds/TowerClock.wav
+share/crossfire-client/sounds/Whoosh.wav
+share/crossfire-client/sounds/blip.wav
+share/crossfire-client/sounds/boink2.wav
+share/crossfire-client/sounds/bugle_charge.wav
+share/crossfire-client/sounds/chord.wav
+share/crossfire-client/sounds/claws.ogg
+share/crossfire-client/sounds/click1.wav
+share/crossfire-client/sounds/click2.wav
+share/crossfire-client/sounds/drip.wav
+share/crossfire-client/sounds/fire-spell.wav
+share/crossfire-client/sounds/first_try.wav
+share/crossfire-client/sounds/fist.ogg
+share/crossfire-client/sounds/gong.wav
+share/crossfire-client/sounds/knife.ogg
+share/crossfire-client/sounds/lightning1.wav
+share/crossfire-client/sounds/magic.wav
+share/crossfire-client/sounds/ouch1.wav
+share/crossfire-client/sounds/painb.wav
+share/crossfire-client/sounds/phit2.wav
+share/crossfire-client/sounds/sci_fi_gun.wav
+share/crossfire-client/sounds/sounds.conf
+share/crossfire-client/sounds/squish.wav
+share/crossfire-client/sounds/su-fanf.wav
+share/crossfire-client/sounds/swish.wav
+share/crossfire-client/sounds/sword-1.ogg
+share/crossfire-client/themes/Black
+share/crossfire-client/themes/Standard
+share/crossfire-client/ui/caelestis.ui
+share/crossfire-client/ui/chthonic.ui
+share/crossfire-client/ui/dialogs.ui
+share/crossfire-client/ui/eureka.ui
+share/crossfire-client/ui/gtk-v1.ui
+share/crossfire-client/ui/gtk-v2.ui
+share/crossfire-client/ui/lobotomy.ui
+share/crossfire-client/ui/meflin.ui
+share/crossfire-client/ui/oroboros.ui
+share/crossfire-client/ui/sixforty.ui
+share/crossfire-client/ui/un-deux.ui
+share/crossfire-client/ui/v1-redux.ui
+share/icons/hicolor/16x16/apps/crossfire-client.png
+share/icons/hicolor/32x32/apps/crossfire-client.png
+share/icons/hicolor/48x48/apps/crossfire-client.png
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client/distinfo
--- a/games/crossfire-client/distinfo Tue Oct 29 17:47:34 2019 +0000
+++ b/games/crossfire-client/distinfo Tue Oct 29 17:59:17 2019 +0000
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.6 2019/04/27 11:21:26 wiz Exp $
+$NetBSD: distinfo,v 1.7 2019/10/29 17:59:17 nia Exp $
-SHA1 (crossfire-client-1.11.0.tar.gz) = 934618207de854841c3e4673f896e9784ee70073
-RMD160 (crossfire-client-1.11.0.tar.gz) = 9fffcd301c0f32a583b5f6e5a9db77c7900d1cd7
-SHA512 (crossfire-client-1.11.0.tar.gz) = 2a61a057077fea8472a5af7fa60be8832181b7825ba1e9a5b468a25ac76fb21f0fd8d16b3a82583481d810fd95846e1f7122be3b489a16c9e08582a817a1aaba
-Size (crossfire-client-1.11.0.tar.gz) = 759887 bytes
-SHA1 (patch-common-metaserver.c) = 28707f7782fb97f2bf67f130b0beaba85dc3eec4
-SHA1 (patch-gtk-v2-src-metaserver.c) = ba8f9b1bd5ac876769c0911f166f1d2df38f55eb
-SHA1 (patch-gtk-v2_src_png.c) = 07fd35221a197124203daa066e687fe282190f3d
-SHA1 (patch-gtk_png.c) = 56bbe0d69725b9401754368b72776efa53df18d2
-SHA1 (patch-x11_png.c) = c04898bcd7d14f311f3d2a10431c9dfb651ef982
+SHA1 (crossfire-client-1.73.0.tar.bz2) = 5ccb1347b6f33af06f1cfb724d122f0d0b821869
+RMD160 (crossfire-client-1.73.0.tar.bz2) = ad1f343c384a83ea9f6136961db7763bd3030e62
+SHA512 (crossfire-client-1.73.0.tar.bz2) = 92b5e13de9b3f15eadaf51dd7edaa47b38ad808870675435fa6684723827b7d899b98dee9c88b0632784f0b4488927ee168b1b87471d49bc34a01419609f96bb
+Size (crossfire-client-1.73.0.tar.bz2) = 842671 bytes
diff -r c05638b47f7b -r 34e90c150324 games/crossfire-client/patches/patch-common-metaserver.c
--- a/games/crossfire-client/patches/patch-common-metaserver.c Tue Oct 29 17:47:34 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-common-metaserver.c,v 1.1 2011/08/20 15:31:33 joerg Exp $
-
---- common/metaserver.c.orig 2011-08-20 13:33:08.000000000 +0000
-+++ common/metaserver.c
-@@ -47,7 +47,6 @@ const char *rcsid_common_metaserver_c =
-
- #ifdef HAVE_CURL_CURL_H
- #include <curl/curl.h>
--#include <curl/types.h>
Home |
Main Index |
Thread Index |
Old Index