Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20351/games

Modified Files:
        teg.info ggz-gtk-client.info ggz-gtk-games.info 
Added Files:
        teg-themes.info teg.patch bundle-ggz.info ggz-server.info 
        ggz-server.patch 
Log Message:
ggz workage!

--- NEW FILE: ggz-server.info ---
Package: ggz-server
Version: 0.0.11
Revision: 11
Description: GGZ Gaming Zone server
License: LGPL
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>

BuildDepends: <<
        libggz-crypto (>= %v-12) | libggz (>= %v-12), gettext-dev, gettext-bin,
        libiconv-dev, popt, expat, libhowl-dev, db43-ssl | db43
<<

Depends: <<
        %N-shlibs (= %v-%r), db43-ssl-shlibs | db43-shlibs,
        gettext, libiconv, popt-shlibs, expat-shlibs, libhowl-shlibs
<<

CustomMirror: <<
        primary: http://ftp.ggzgamingzone.org/pub/
        eur-be: http://ftp.belnet.be/packages/ggzgamingzone/
        eur-dk: http://mirrors.sunsite.dk/ggzgamingzone/
        eur-de: http://ftp.de.ggzgamingzone.org/pub/
        eur-uk: http://uk.ggzgamingzone.org/pub/
        eur-fr: http://ftp.fr.ggzgamingzone.org/pub/
<<
Source: mirror:custom:ggz/%v/%n-%v.tar.gz
Source-MD5: f4ccb7d76adba5091e0aa0cc4f981abc

Patch: %n.patch

# For howl
SetLDFLAGS: -framework CoreFoundation
SetCPPFLAGS: -I%p/include/howl -fsigned-char -I%p/include/db4

ConfigureParams: --mandir=%p/share/man --enable-debug-gdb --with-database=db4
InstallScript: make install DESTDIR=%d

DocFiles: <<
        AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README README.GGZ
        TODO
<<

Homepage: http://www.ggzgamingzone.org/
DescDetail: <<
  This is the software for setting up and managing a GGZ server
  installation, including the server game modules.  Note that if you
  only want to play games on an existing server, you do not need to
  install this.
<<

SplitOff: <<
        Package: %N-shlibs
        Depends: libggz-crypto-shlibs (>= %v-12) | libggz-shlibs (>= %v-12)
        Files: lib/*.*.dylib
        Shlibs: <<
                %p/lib/libggzdmod.4.dylib               5.0.0   %n (>= 
0.0.11-11)
        <<
        DocFiles: <<
                AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README README.GGZ
                TODO
        <<
<<
SplitOff2: <<
        Package: %N-dev
        BuildDependsOnly: true
        Depends: %N-shlibs (= %v-%r)
        Files: lib/*[!.][!.][!.].[adl]* include share/man/man3
        DocFiles: <<
                AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README README.GGZ
                TODO
        <<
<<


Index: ggz-gtk-client.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/ggz-gtk-client.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ggz-gtk-client.info 25 May 2005 10:04:44 -0000      1.2
+++ ggz-gtk-client.info 21 Jun 2005 19:38:59 -0000      1.3
@@ -1,6 +1,6 @@
 Package: ggz-gtk-client
 Version: 0.0.11
-Revision: 11
+Revision: 12
 Description: GGZ Gaming Zone GTK+ Client
 License: LGPL
 Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
@@ -9,11 +9,14 @@
        libggz-crypto (>= %v-11) | libggz (>= %v-11),
        ggz-client-libs-dev (>= %v-11),
        gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
-       pkgconfig, gtk+2-dev, atk1, glib2-dev, pango1-xft2-dev,
+       pkgconfig, gtk+2-dev (>= 2.6.0-1), atk1, glib2-dev, pango1-xft2-dev,
        expat
 <<
 
-Depends: ggz-client-libs (>= %v-1), gtk+2-shlibs, expat-shlibs
+Depends: <<
+       ggz-client-libs (>= %v-1), gtk+2-shlibs (>= 2.6.0-1), expat-shlibs,
+       librsvg2-gtk
+<<
 
 CustomMirror: <<
        primary: http://ftp.ggzgamingzone.org/pub/

--- NEW FILE: teg.patch ---
(This appears to be a binary file; contents omitted.)

Index: ggz-gtk-games.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/ggz-gtk-games.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ggz-gtk-games.info  17 Jun 2005 16:12:20 -0000      1.3
+++ ggz-gtk-games.info  21 Jun 2005 19:38:59 -0000      1.4
@@ -1,6 +1,6 @@
 Package: ggz-gtk-games
 Version: 0.0.11
-Revision: 12
+Revision: 13
 Description: GGZ Gaming Zone GTK+ Game Modules
 License: LGPL
 Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
@@ -9,10 +9,10 @@
        libggz-crypto (>= %v-11) | libggz (>= %v-11),
        ggz-client-libs-dev (>= %v-11),
        gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
-       pkgconfig, gtk+2-dev, atk1, glib2-dev, pango1-xft2-dev
+       pkgconfig, gtk+2-dev (>= 2.6.0-1), atk1, glib2-dev, pango1-xft2-dev
 <<
 
-Depends: ggz-client-libs (>= %v-11), gtk+2-shlibs
+Depends: ggz-client-libs (>= %v-11), gtk+2-shlibs (>= 2.6.0-1), librsvg2-gtk
 
 CustomMirror: <<
        primary: http://ftp.ggzgamingzone.org/pub/

--- NEW FILE: ggz-server.patch ---
diff -Naur server-old/game_servers/ggzcards/ai.c 
server-new/game_servers/ggzcards/ai.c
--- server-old/game_servers/ggzcards/ai.c       2002-09-03 00:55:18.000000000 
-0400
+++ server-new/game_servers/ggzcards/ai.c       2005-06-19 12:29:06.000000000 
-0400
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#include <wait.h>
+#include <sys/wait.h>
 
 #include "ai.h"
 #include "common.h"
diff -Naur server-old/ggzd/client.c server-new/ggzd/client.c
--- server-old/ggzd/client.c    2004-11-17 17:02:24.000000000 -0500
+++ server-new/ggzd/client.c    2005-06-19 12:29:06.000000000 -0400
@@ -99,9 +99,8 @@
        struct sockaddr_in addr;
        GGZClient *client;
        int addrlen = sizeof(addr);
-       struct hostent hostbuf, *hp;
-       char tmphstbuf[1024];
-       int rc, herr;
+       struct hostent *hp;
+       int rc;
 
        /* Get our arguments out of the arg buffer */
        sock = *((int *)arg_ptr);
@@ -122,14 +121,24 @@
 
        rc = -1;
        if (opt.perform_lookups) {
-               rc = gethostbyaddr_r(&addr.sin_addr, sizeof(struct in_addr),
-                                    AF_INET, &hostbuf, tmphstbuf, 1024, &hp, 
&herr);
+               static pthread_mutex_t gethostbyaddr_mutex;
+               static int gethostbyaddr_mutex_inited = 0;
+               if (!gethostbyaddr_mutex_inited) {
+                       gethostbyaddr_mutex_inited = 1;
+                       pthread_mutex_init(&gethostbyaddr_mutex, NULL);
+               }
+               pthread_mutex_lock(&gethostbyaddr_mutex);
+               
+               hp = gethostbyaddr((char*)&addr.sin_addr, sizeof(struct 
in_addr),
+                                    AF_INET);
                /* Note if we get an error we don't bother expanding the */
                /* buffer or so forth. Is the hostname vs. IP that important? */
-               if(rc == 0) {
-                       strncpy(client->addr, hostbuf.h_name, 
sizeof(client->addr));
+               if(hp != NULL) {
+                       strncpy(client->addr, hp->h_name, sizeof(client->addr));
                        client->addr[sizeof(client->addr)-1] = '\0';
                }
+               
+               pthread_mutex_unlock(&gethostbyaddr_mutex);
        }
        if (rc < 0)
                inet_ntop(AF_INET, &addr.sin_addr, client->addr, 
sizeof(client->addr));
diff -Naur server-old/ggzd/control.c server-new/ggzd/control.c
--- server-old/ggzd/control.c   2005-05-16 17:11:37.000000000 -0400
+++ server-new/ggzd/control.c   2005-06-19 19:00:20.000000000 -0400
@@ -215,8 +215,6 @@
 int main(int argc, char *argv[])
 {
        int main_sock, new_sock, status, flags;
-       socklen_t addrlen;
-       struct sockaddr_in addr;
        fd_set active_fd_set, read_fd_set;
        struct timeval tv;
 
@@ -336,17 +334,12 @@
                        continue;
                }
 
-               addrlen = sizeof(addr);
-               if ( (new_sock = accept(main_sock, (struct sockaddr*)&addr, 
&addrlen)) < 0) {
-                       switch (errno) {
-                       case EWOULDBLOCK:
-                       case ECONNABORTED:
-                       case EINTR:
+               new_sock = ggz_accept(main_sock);
+               if (new_sock < 0) {
+                       if (new_sock == -1)
                                continue;
-                               break;
-                       default:
+                       else
                                err_sys_exit("Error accepting connection");
-                       }
                } else {
                        /* This is where to test for ignored IP addresses */
                        client_handler_launch(new_sock);

--- NEW FILE: teg-themes.info ---
Package: teg-themes
Version: 1.0
Revision: 1
Description: Extra themes for TEG
License: Restrictive/Distributable
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>

Depends: teg

Source: http://teg.sourceforge.net/data/share/theme/IRL-20050409.tar.bz2
Source-MD5: a0a28b0640370de57ae19348e409d784
SourceDirectory: IRL
Source2: http://teg.sourceforge.net/data/share/theme/realist-1.0.tar.gz
Source2-MD5: 3a253ae92526c48c167bbce966821baf
Source2Directory: realist
Source3: http://teg.sourceforge.net/data/share/theme/tworld.tar.bz2
Source3-MD5: 0311a98e55fe3f4fc323540e5b7a15a3
Source3Directory: tworld

CompileScript: echo "No compilation necessary"
InstallScript: <<
        #!/bin/sh -ev
        src=`dirname %b`
        dest=share/pixmaps/teg_pix/themes
        install -d -m 755 %i/$dest
        for i in IRL realist tworld; do
                mv $src/$i %i/$dest/
        done
<<

Homepage: http://teg.sourceforge.net/index.php?page=themes

--- NEW FILE: bundle-ggz.info ---
Package: bundle-ggz
Version: 0.0.11
Revision: 11
Description: Mininum necessary packages for GGZ
License: LGPL
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
Homepage: http://www.ggzgamingzone.org/
Type: bundle
Depends: <<
        ggz-gtk-client  (>= %v-1),
        ggz-gtk-games   (>= %v-1),
<<
SplitOff: <<
        Package: bundle-ggz-all
        Description: The complete GGZ distribution
        Depends: <<
                ggz-client-libs (>= %v-1),
                ggz-gtk-client  (>= %v-1),
                ggz-gtk-games   (>= %v-1),
                ggz-server              (>= %v-1),
        <<
        Type: bundle
<<


Index: teg.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/teg.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- teg.info    27 Apr 2005 03:25:40 -0000      1.1
+++ teg.info    21 Jun 2005 19:38:58 -0000      1.2
@@ -1,11 +1,12 @@
 Package: teg
 Version: 0.11.1
-Revision: 1
+Revision: 11
 Description: Strategy game similar to Risk
 License: GPL
 Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
 
 Depends: <<
+       expat-shlibs,
        atk1-shlibs,
        audiofile-shlibs,
        esound-bin,
@@ -13,12 +14,14 @@
        gconf2,
        gconf2-shlibs,
        glib2-shlibs,
+       gnome-keyring-shlibs,
        gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs,
        gtk+2-shlibs,
        libart2-shlibs,
        libbonobo2-shlibs,
        libbonoboui2-shlibs,
        libgnome2-shlibs,
+       libgnomeui2-shlibs,
        libgnomecanvas2-shlibs,
        libiconv,
        libjpeg-shlibs,
@@ -26,18 +29,23 @@
        orbit2-shlibs,
        pango1-xft2-shlibs,
        popt-shlibs,
-       readline-shlibs,
-       x11
+       readline5-shlibs,
+       x11,
+       libgettext3-shlibs,
+       
+       ggz-client-libs,
+       ggz-server-shlibs,
 <<
 
 BuildDepends: <<
+       expat,
        atk1,
        audiofile,
        esound,
        gconf2-dev,
-       gettext-bin, gettext-tools,
-       gettext-dev,
+       libgettext3-dev,
        glib2-dev,
+       gnome-keyring-dev,
        gnome-vfs2-ssl-dev | gnome-vfs2-dev,
        gtk+2-dev,
        intltool,
@@ -53,9 +61,15 @@
        orbit2-dev,
        pango1-xft2-dev,
        pkgconfig,
-       readline,
+       popt,
+       readline5,
        scrollkeeper,
-       x11-dev
+       x11-dev,
+       
+       libggz (>= 0.0.11-1) | libggz-crypto (>= 0.0.11-1),
+       ggz-client-libs-dev     (>= 0.0.11-1),
+       ggz-server-dev          (>= 0.0.11-1),
+       ggz-server                      (>= 0.0.11-1),
 <<
 
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
@@ -63,7 +77,9 @@
 
 GCC: 3.3
 SetCPPFLAGS: -DMACOSX
-ConfigureParams: --with-readline
+ConfigureParams: --with-readline --enable-ggz=yes --with-ggzdmod-dir=%p 
--with-ggzmod-dir=%p -with-ggzconfig=%p/bin --with-ggzd-confdir=%p/etc/ggzd
+
+Patch: %n.patch
 
 CompileScript: <<
        intltoolize -c -f
@@ -72,26 +88,38 @@
 <<
 
 InstallScript: <<
-       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
+       install -d -m 755 %i/etc/ggzd/games
+       install -d -m 755 %i/etc/ggzd/rooms
+       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d 
GGZ_CONFIG="%p/share/ggz/ggz-config-fake %p %n" ggzdconfdir=%i/etc/ggzd
 <<
 
 PostInstScript: <<
        GCONF_CONFIG_SOURCE=xml::%p/etc/gconf/gconf.xml.defaults 
%p/bin/gconftool-2 --makefile-install-rule %p/etc/gconf/schemas/teg.schemas > 
/dev/null
+       for mod in %p/share/ggz/modules/%n/*.dsc; do
+               %p/bin/ggz-config --install --modfile=$mod --force
+       done
 <<
 
 PreRmScript: <<
        GCONF_CONFIG_SOURCE=xml::%p/etc/gconf/gconf.xml.defaults 
%p/bin/gconftool-2 --makefile-uninstall-rule %p/etc/gconf/schemas/teg.schemas > 
/dev/null
+       if [ "x$1" != xfailed-upgrade ]; then 
+               for mod in %p/share/ggz/modules/%n/*.dsc; do
+                       %p/bin/ggz-config --remove --modfile=$mod
+               done
+       fi
 <<
 
 DocFiles: COPYING HACKING PEOPLE README* TODO
 Homepage: http://teg.sourceforge.net
 DescDetail: <<
-Tenes Empanadas Graciela is a clone of Plan Tactico y Estrategico de la Guerra,
-a turn based strategy game, based on Risk. It's a multiplayer game (it can be
-played across the internet), it has a server, a GNOME client, and a robot.
+       Tenes Empanadas Graciela is a clone of Plan Tactico y Estrategico
+       de la Guerra, a turn based strategy game, based on Risk. It's a
+       multiplayer game (it can be played across the internet), it has a
+       server, a GNOME client, and an AI.
+       
+       If you have GGZ installed, the Teg client and server functionality will
+       be available.
 <<
 DescPort: <<
-Documentation currently doesn't work, possibly because of a bug in yelp.
-http://qa.mandrakesoft.com/show_bug.cgi?id=6332
-Mandrake fix doesn't seem to help.
+       - Help feature doesn't seem to work at all! Damn gnome...
 <<



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to