[pkgsrc/trunk]: pkgsrc/games Changes 2.0.4:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/games Changes 2.0.4:
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:12:44 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/155bee7484bf
branches:  trunk
changeset: 498502:155bee7484bf
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Aug 24 10:36:02 2005 +0000

description:
Changes 2.0.4:
 - Fix some buffer underruns on the terrain array (this bug could have
   been the cause of arbitrary crashes on some platforms).
 - Don't automatically pop up the city dialog when in observer mode.
 - Treat an alt-left click the same as a middle click, to allow two-button
   mice to work on windows (GTK-2 client).
 - Fix a bug - when a city was transferred/conquered twice the client
   sometimes wouldn't get an update about the second exchange.
 - Fix the behavior of Granary and Pyramids in the Civ2 compatibility ruleset.
 - Fix Pyramids so they are no longer cumulative with Granary.
 - Fix a minor bug that prevented 2.0 savegames from working properly with
   1.14 Freeciv.

Changes 2.0.3:
 - Fix some bugs that show up on 64-bit machines.
 - Fix some bugs with future techs in some situations.
 - Fix some bugs that allowed naval units onto land.
 - Fix a bug that could crash the server when a player picked their nation.
 - Fix a bug with player info not being updated after an alliance is broken.
 - Fix a bug with happiness of a unit's home city when borders change.
 - Fix a bug with happiness of a unit's home city when the unit moves.
 - Fix some bugs with nation starting positions in scenarios.
 - Fix a bug when running the server without stdin input.
 - Don't allow teams to be changed when loading a game.
 - Don't allow observers to vote.
 - Fix a bug with the fallback when generator 3, startpos 3 fails.
 - Fix a crash in the help dialog (when looking at Engineers).
 - Don't popup the caravan dialogs when in observer mode.
 - Fix a crash in goto mode when the mouse is near the map overview window.
 - Fix a bug when a diplomat is killed while the diplomat dialog window is
   in the process of opening.
 - Fix a bug with the diplomat dialog window for spies when you don't have
   an embassy.

diffstat:

 games/freeciv-client/Makefile        |   24 +--
 games/freeciv-client/PLIST           |    3 +-
 games/freeciv-client/options.mk      |   38 ++++++
 games/freeciv-server/Makefile        |   15 +-
 games/freeciv-share/Makefile         |    3 +-
 games/freeciv-share/Makefile.common  |   17 ++-
 games/freeciv-share/PLIST            |  215 ++++++++++++++++++++++++++++++----
 games/freeciv-share/distinfo         |   10 +-
 games/freeciv-share/patches/patch-aa |  193 +++++++++++++++++++++++++++++++
 games/freeciv-share/patches/patch-ab |   15 ++
 games/freeciv-sounds/Makefile        |   17 +-
 games/freeciv-sounds/PLIST           |   33 ++--
 games/freeciv-sounds/distinfo        |    8 +-
 13 files changed, 498 insertions(+), 93 deletions(-)

diffs (truncated from 833 to 300 lines):

diff -r 7007cfdf9d33 -r 155bee7484bf games/freeciv-client/Makefile
--- a/games/freeciv-client/Makefile     Wed Aug 24 09:37:00 2005 +0000
+++ b/games/freeciv-client/Makefile     Wed Aug 24 10:36:02 2005 +0000
@@ -1,32 +1,22 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/24 10:45:32 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
 COMMENT=       Freeciv client with Xaw interface
 
 DEPENDS+=      freeciv-share>=${FC_VERS}:../../games/freeciv-share
-DEPENDS+=      freeciv-sounds>=2.0:../../games/freeciv-sounds
+DEPENDS+=      freeciv-sounds>=3.0:../../games/freeciv-sounds
 
 CONFLICTS=     freeciv-client-gtk<=1.11.4
 
-
-CONFIGURE_ARGS+=       --disable-server --disable-make-data
-CONFIGURE_ARGS+=       --enable-client=xaw
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
-CONFIGURE_ARGS+=       --with-xaw3d
-.endif
+CONFIGURE_ARGS+=       --disable-make-data
+CONFIGURE_ARGS+=       --disable-server
 
 .include "../freeciv-share/Makefile.common"
 
-do-install:
-       cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
-               ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
+.include "options.mk"
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 7007cfdf9d33 -r 155bee7484bf games/freeciv-client/PLIST
--- a/games/freeciv-client/PLIST        Wed Aug 24 09:37:00 2005 +0000
+++ b/games/freeciv-client/PLIST        Wed Aug 24 10:36:02 2005 +0000
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:52:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/08/24 10:45:32 adam Exp $
 bin/civclient
+share/applications/freeciv.desktop
diff -r 7007cfdf9d33 -r 155bee7484bf games/freeciv-client/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/freeciv-client/options.mk   Wed Aug 24 10:36:02 2005 +0000
@@ -0,0 +1,38 @@
+# $NetBSD: options.mk,v 1.1 2005/08/24 10:45:32 adam Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.freeciv-client
+PKG_SUPPORTED_OPTIONS= gtk gtk2 xaw xaw3d sdl x11
+PKG_SUGGESTED_OPTIONS= gtk2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk)
+CONFIGURE_ARGS+=       --enable-client=gtk
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+CONFIGURE_ARGS+=       --enable-client=gtk2
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mxaw)
+CONFIGURE_ARGS+=       --enable-client=xaw
+.include "../../mk/xaw.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mxaw3d)
+CONFIGURE_ARGS+=       --enable-client=xaw3d
+.include "../../x11/Xaw3d/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+=       --enable-ftwl=sdl
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=       --enable-ftwl=x11
+.include "../../mk/x11.buildlink3.mk"
+.endif
diff -r 7007cfdf9d33 -r 155bee7484bf games/freeciv-server/Makefile
--- a/games/freeciv-server/Makefile     Wed Aug 24 09:37:00 2005 +0000
+++ b/games/freeciv-server/Makefile     Wed Aug 24 10:36:02 2005 +0000
@@ -1,26 +1,21 @@
-# $NetBSD: Makefile,v 1.18 2004/11/03 14:20:09 adam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/24 10:43:32 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       Freeciv game server
 
 DEPENDS+=      freeciv-share>=${FC_VERS}:../../games/freeciv-share
 
-USE_GNU_READLINE=      # uses callback interface of GNU readline
+USE_GNU_READLINE=      yes
+CONFIGURE_ARGS+=       --disable-make-data
+CONFIGURE_ARGS+=       --enable-client=no
+CONFIGURE_ARGS+=       --with-readline
 LIBS+=                 -ltermcap
 
-CONFIGURE_ARGS+=       --enable-client=no --disable-make-data
-CONFIGURE_ARGS+=       --with-readline
-
 # Uses rl_filename_completion_function() which was introduced in readline-4.2
 BUILDLINK_DEPENDS.readline=    readline>=4.2
 
 .include "../freeciv-share/Makefile.common"
 
-do-install:
-       cd ${WRKSRC}/server; ${SETENV} ${MAKE_ENV} \
-               ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 7007cfdf9d33 -r 155bee7484bf games/freeciv-share/Makefile
--- a/games/freeciv-share/Makefile      Wed Aug 24 09:37:00 2005 +0000
+++ b/games/freeciv-share/Makefile      Wed Aug 24 10:36:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/05 12:06:38 adam Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/24 10:36:02 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-share-/}
 COMMENT=       Machine independent files for Freeciv
@@ -7,5 +7,6 @@
 
 CONFIGURE_ARGS+=       --disable-server
 CONFIGURE_ARGS+=       --enable-client=no
+CONFIGURE_ARGS+=       --enable-make-data
 
 .include "../../mk/bsd.pkg.mk"
diff -r 7007cfdf9d33 -r 155bee7484bf games/freeciv-share/Makefile.common
--- a/games/freeciv-share/Makefile.common       Wed Aug 24 09:37:00 2005 +0000
+++ b/games/freeciv-share/Makefile.common       Wed Aug 24 10:36:02 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.19 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/08/24 10:36:02 adam Exp $
 
 DISTNAME=      freeciv-${FC_VERS}
-FC_VERS=       1.14.2
+FC_VERS=       2.0.4
 CATEGORIES=    games
 MASTER_SITES=  ftp://ftp.freeciv.org/pub/freeciv/stable/ \
                http://www.freeciv.org/ftp/stable/ \
@@ -13,11 +13,22 @@
 HOMEPAGE=      http://www.freeciv.org/
 
 BUILD_USES_MSGFMT=     yes
-
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
 DISTINFO_FILE=         ${.CURDIR}/../../games/freeciv-share/distinfo
 PATCHDIR=              ${.CURDIR}/../../games/freeciv-share/patches
 
+PYTHON_PATCH_SCRIPTS=  ${WRKSRC}/common/generate_packets.py
+
+SUBST_CLASSES=         data
+SUBST_STAGE.data=      post-patch
+SUBST_FILES.data=      data/Makefile.in
+SUBST_SED.data+=       -e "s|@CLIENT_FALSE@|@MAKE_DATA_FALSE@|g"
+SUBST_SED.data+=       -e "s|@CLIENT_TRUE@|@MAKE_DATA_TRUE@|g"
+SUBST_SED.data+=       -e "s|@SERVER_FALSE@|@MAKE_DATA_FALSE@|g"
+SUBST_SED.data+=       -e "s|@SERVER_TRUE@|@MAKE_DATA_TRUE@|g"
+SUBST_MESSAGE.data=    "Fixing installation of data files."
+
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../lang/python/application.mk"
diff -r 7007cfdf9d33 -r 155bee7484bf games/freeciv-share/PLIST
--- a/games/freeciv-share/PLIST Wed Aug 24 09:37:00 2005 +0000
+++ b/games/freeciv-share/PLIST Wed Aug 24 10:36:02 2005 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/05 12:06:38 adam Exp $
-share/freeciv/Freeciv
+@comment $NetBSD: PLIST,v 1.4 2005/08/24 10:36:02 adam Exp $
+man/man6/civclient.6
+man/man6/civserver.6
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
 share/freeciv/civ1/game.ruleset
@@ -23,59 +24,197 @@
 share/freeciv/default/techs.ruleset
 share/freeciv/default/terrain.ruleset
 share/freeciv/default/units.ruleset
+share/freeciv/flags/afghanistan-shield.png
+share/freeciv/flags/afghanistan.png
+share/freeciv/flags/arab.png
+share/freeciv/flags/argentina.png
+share/freeciv/flags/armenia.png
+share/freeciv/flags/assyria-shield.png
+share/freeciv/flags/assyria.png
+share/freeciv/flags/australia.png
+share/freeciv/flags/austria.png
+share/freeciv/flags/azerbaijan.png
+share/freeciv/flags/barbarian.png
+share/freeciv/flags/bavarian.png
+share/freeciv/flags/belgium.png
+share/freeciv/flags/boer.png
+share/freeciv/flags/bosnia-shield.png
+share/freeciv/flags/bosnia.png
+share/freeciv/flags/brasil.png
+share/freeciv/flags/bulgaria.png
+share/freeciv/flags/canada.png
+share/freeciv/flags/catalan.png
+share/freeciv/flags/cheyenne.png
+share/freeciv/flags/chile.png
+share/freeciv/flags/china.png
+share/freeciv/flags/columbia-shield.png
+share/freeciv/flags/columbia.png
+share/freeciv/flags/cornwall.png
+share/freeciv/flags/croatia.png
+share/freeciv/flags/cuba.png
+share/freeciv/flags/czech.png
+share/freeciv/flags/denmark.png
+share/freeciv/flags/dunedain.png
+share/freeciv/flags/egypt.png
+share/freeciv/flags/elves-shield.png
+share/freeciv/flags/elves.png
+share/freeciv/flags/england.png
+share/freeciv/flags/estonia.png
+share/freeciv/flags/ethiopia-shield.png
+share/freeciv/flags/ethiopia.png
+share/freeciv/flags/europe.png
+share/freeciv/flags/finland.png
+share/freeciv/flags/france.png
+share/freeciv/flags/galicia-shield.png
+share/freeciv/flags/galicia.png
+share/freeciv/flags/germany.png
+share/freeciv/flags/greece.png
+share/freeciv/flags/greenland.png
+share/freeciv/flags/hobbits-shield.png
+share/freeciv/flags/hobbits.png
+share/freeciv/flags/hungary.png
+share/freeciv/flags/iceland.png
+share/freeciv/flags/india.png
+share/freeciv/flags/indonesia-shield.png
+share/freeciv/flags/indonesia.png
+share/freeciv/flags/iran.png
+share/freeciv/flags/iraq_old.png
+share/freeciv/flags/ireland.png
+share/freeciv/flags/israel.png
+share/freeciv/flags/italy.png
+share/freeciv/flags/japan.png
+share/freeciv/flags/kampuchea-shield.png
+share/freeciv/flags/kampuchea.png
+share/freeciv/flags/kenya.png
+share/freeciv/flags/korea.png
+share/freeciv/flags/krev.png
+share/freeciv/flags/latvia.png
+share/freeciv/flags/lithuania.png
+share/freeciv/flags/macedonia.png
+share/freeciv/flags/malaysia-shield.png
+share/freeciv/flags/malaysia.png
+share/freeciv/flags/mars-shield.png
+share/freeciv/flags/mars.png
+share/freeciv/flags/mexico.png
+share/freeciv/flags/mongolia.png
+share/freeciv/flags/mordor.png
+share/freeciv/flags/nato.png
+share/freeciv/flags/netherlands.png
+share/freeciv/flags/nigeria-shield.png
+share/freeciv/flags/nigeria.png
+share/freeciv/flags/norway.png
+share/freeciv/flags/observer.png
+share/freeciv/flags/pakistan.png
+share/freeciv/flags/peru.png
+share/freeciv/flags/philippines.png
+share/freeciv/flags/phoenicia-shield.png
+share/freeciv/flags/phoenicia.png
+share/freeciv/flags/poland.png
+share/freeciv/flags/portugal.png
+share/freeciv/flags/quebec-shield.png
+share/freeciv/flags/quebec.png
+share/freeciv/flags/rome.png
+share/freeciv/flags/russia.png
+share/freeciv/flags/rwanda.png
+share/freeciv/flags/scotland.png
+share/freeciv/flags/serbia.png
+share/freeciv/flags/silesia.png
+share/freeciv/flags/singapore.png
+share/freeciv/flags/slovenia.png
+share/freeciv/flags/south_africa.png
+share/freeciv/flags/soviet.png
+share/freeciv/flags/spain.png
+share/freeciv/flags/stpatrick.png
+share/freeciv/flags/sumeria-shield.png
+share/freeciv/flags/sumeria.png
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note bglibs update.
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/install Fixed a typo and added a comment about when...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note bglibs update.
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/install Fixed a typo and added a comment about when...
Indexes:
Home | Main Index | Thread Index | Old Index