diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 64805cbb144..20bf2deb8ab 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.15 2004/08/12 04:43:19 sturm Exp $ +# $OpenBSD: Makefile,v 1.16 2004/09/20 20:12:11 sturm Exp $ COMMENT= "Gtk-based GUI client for the Gnutella Network" -DISTNAME= gtk-gnutella-0.93.3 +DISTNAME= gtk-gnutella-0.94 CATEGORIES= net HOMEPAGE= http://gtk-gnutella.sourceforge.net/ @@ -32,7 +32,7 @@ CONFIGURE_ARGS= -d -e \ -D privlib="${PREFIX}/share/gtk-gnutella" \ -D cc="${CC}" \ -D ccflags="${CFLAGS} -I${LOCALBASE}/include" \ - -D ldflags="-liconv" \ + -D ldflags="-L${LOCALBASE}/lib -liconv" \ -D official="true" \ -U optimize diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo index 58aa05f33e5..8d3d21869c2 100644 --- a/net/gtk-gnutella/distinfo +++ b/net/gtk-gnutella/distinfo @@ -1,3 +1,3 @@ -MD5 (gtk-gnutella-0.93.3.tar.bz2) = 34e357c768e6bbecd267d04b95e9c380 -RMD160 (gtk-gnutella-0.93.3.tar.bz2) = 6072a1e1197890d97378ec70bb521a5e29cde10f -SHA1 (gtk-gnutella-0.93.3.tar.bz2) = 35972d17f2b7d826670d37cecd05db77590494fa +MD5 (gtk-gnutella-0.94.tar.bz2) = 8319ff7b8a5a5a7be995894c2ad3280f +RMD160 (gtk-gnutella-0.94.tar.bz2) = 6d73e269d429daec1bf96bf675c356c20c225632 +SHA1 (gtk-gnutella-0.94.tar.bz2) = ce77bbc4a302839f96caadadc5eac417ee0ecb30 diff --git a/net/gtk-gnutella/patches/patch-Configure b/net/gtk-gnutella/patches/patch-Configure index e65fa394f8d..8f60ff71ea5 100644 --- a/net/gtk-gnutella/patches/patch-Configure +++ b/net/gtk-gnutella/patches/patch-Configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-Configure,v 1.2 2004/05/15 14:35:01 sturm Exp $ ---- Configure.orig 2004-01-25 21:22:03.000000000 +0100 -+++ Configure 2004-05-15 16:22:46.000000000 +0200 -@@ -278,7 +278,7 @@ d_isascii='' +$OpenBSD: patch-Configure,v 1.3 2004/09/20 20:12:11 sturm Exp $ +--- Configure.orig Sat Jul 10 12:21:09 2004 ++++ Configure Mon Sep 20 21:05:34 2004 +@@ -307,7 +307,7 @@ d_keepsig='' d_memcpy='' d_nls='' d_open3='' @@ -10,16 +10,16 @@ $OpenBSD: patch-Configure,v 1.2 2004/05/15 14:35:01 sturm Exp $ d_random='' d_sendfile='' d_srandom='' -@@ -849,7 +849,7 @@ for file in $*; do +@@ -1024,7 +1024,7 @@ for file in $*; do dir=`expr X$file : 'X\(.*\)/'` file=`expr X$file : 'X.*/\(.*\)'` - (set x $dir; shift; eval $mkdir_p) -- sh <$SRC/$dir/$file + ./mkdirp $dir +- sh <"$SRC/$dir/$file" + cd $dir && sh $SRC/$dir/$file ;; *) - sh <$SRC/$file -@@ -5384,15 +5384,6 @@ If you'd like to make any changes to the + sh <"$SRC/$file" +@@ -6424,15 +6424,6 @@ If you'd like to make any changes to the to configure things, do it as a shell escape now (e.g. !vi config.sh). EOM diff --git a/net/gtk-gnutella/patches/patch-config_h_SH b/net/gtk-gnutella/patches/patch-config_h_SH deleted file mode 100644 index 6aca3867fc9..00000000000 --- a/net/gtk-gnutella/patches/patch-config_h_SH +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-config_h_SH,v 1.1 2004/04/09 10:20:47 sturm Exp $ ---- config_h.SH.orig 2004-04-08 23:33:51.000000000 +0200 -+++ config_h.SH 2004-04-08 23:34:15.000000000 +0200 -@@ -39,14 +39,6 @@ sed <config.h -e 's!^#unde - #ifndef _config_h_ - #define _config_h_ - --/* BSD: -- * This symbol, if defined, indicates that the program is running under -- * a BSD system. -- */ --#ifndef BSD --#$d_bsd BSD /**/ --#endif -- - /* CAT2: - * This macro catenates 2 tokens together. - */ diff --git a/net/gtk-gnutella/patches/patch-src_fileinfo_c b/net/gtk-gnutella/patches/patch-src_fileinfo_c index aaca19fd374..65e29e97c85 100644 --- a/net/gtk-gnutella/patches/patch-src_fileinfo_c +++ b/net/gtk-gnutella/patches/patch-src_fileinfo_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_fileinfo_c,v 1.3 2004/04/09 10:20:47 sturm Exp $ ---- src/fileinfo.c.orig 2004-01-25 21:22:06.000000000 +0100 -+++ src/fileinfo.c 2004-04-08 19:39:09.000000000 +0200 +$OpenBSD: patch-src_fileinfo_c,v 1.4 2004/09/20 20:12:11 sturm Exp $ +--- src/fileinfo.c.orig Sat Jul 10 12:21:11 2004 ++++ src/fileinfo.c Mon Sep 20 21:05:35 2004 @@ -56,7 +56,8 @@ #include #include @@ -9,5 +9,5 @@ $OpenBSD: patch-src_fileinfo_c,v 1.3 2004/04/09 10:20:47 sturm Exp $ +#include +#include #include - #include /* For iscntrl() */ + #include "override.h" /* Must be the last header included */ diff --git a/net/gtk-gnutella/patches/patch-src_getdate_y b/net/gtk-gnutella/patches/patch-src_getdate_y index 33953c9ded6..d42797ec2c2 100644 --- a/net/gtk-gnutella/patches/patch-src_getdate_y +++ b/net/gtk-gnutella/patches/patch-src_getdate_y @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_getdate_y,v 1.2 2004/04/09 10:20:47 sturm Exp $ ---- src/getdate.y.orig 2004-01-25 21:22:06.000000000 +0100 -+++ src/getdate.y 2004-04-08 19:39:09.000000000 +0200 +$OpenBSD: patch-src_getdate_y,v 1.3 2004/09/20 20:12:11 sturm Exp $ +--- src/getdate.y.orig Sat Jul 10 12:21:11 2004 ++++ src/getdate.y Mon Sep 20 21:05:36 2004 @@ -81,6 +81,14 @@ host does not conform to Posix. */ #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) @@ -16,18 +16,18 @@ $OpenBSD: patch-src_getdate_y,v 1.2 2004/04/09 10:20:47 sturm Exp $ #include "getdate.h" /* Some old versions of bison generate parsers that use bcopy. -@@ -159,14 +167,6 @@ typedef struct _TABLE { - - - /* +@@ -156,14 +164,6 @@ typedef struct _TABLE { + int type; + int value; + } TABLE; +- +- +-/* -** Meridian: am, pm, or 24-hour style. -*/ -typedef enum _MERIDIAN { - MERam, MERpm, MER24 -} MERIDIAN; -- -- --/* - ** Global variables. We could get rid of most of these by using a good - ** union as the yacc stack. (This routine was originally written before - ** yacc had the %union construct.) Maybe someday; right now we only use + + + /* diff --git a/net/gtk-gnutella/pkg/PLIST b/net/gtk-gnutella/pkg/PLIST index 1b7082b3549..c00eb660bcc 100644 --- a/net/gtk-gnutella/pkg/PLIST +++ b/net/gtk-gnutella/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2004/09/15 18:17:40 espie Exp $ +@comment $OpenBSD: PLIST,v 1.10 2004/09/20 20:12:11 sturm Exp $ bin/gtk-gnutella @man man/man1/gtk-gnutella.1 share/gtk-gnutella/ @@ -10,6 +10,8 @@ share/gtk-gnutella/pixmaps/arrow_up.xpm share/gtk-gnutella/pixmaps/booklib.xpm share/gtk-gnutella/pixmaps/booksha.xpm share/gtk-gnutella/pixmaps/bookshav.xpm +share/gtk-gnutella/pixmaps/clanbomber_red.xpm +share/gtk-gnutella/pixmaps/clanbomber_yellow.xpm share/gtk-gnutella/pixmaps/download.xpm share/gtk-gnutella/pixmaps/exit.xpm share/gtk-gnutella/pixmaps/filter.xpm @@ -28,6 +30,9 @@ share/gtk-gnutella/pixmaps/thaw.xpm share/gtk-gnutella/pixmaps/ultra.xpm share/gtk-gnutella/pixmaps/upload.xpm share/locale/ +share/locale/de/ +share/locale/de/LC_MESSAGES/ +share/locale/de/LC_MESSAGES/gtk-gnutella.mo share/locale/es/ share/locale/es/LC_MESSAGES/ share/locale/es/LC_MESSAGES/gtk-gnutella.mo