Attachment 10233 Details for Bug 20570 – file.diff

[patch] file.diff

file.diff (text/plain), 7.83 KB, created by Erich Zigler on 2000-08-13 05:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erich Zigler

Created: 2000-08-13 05:20:01 UTC

Size: 7.83 KB

patch

obsolete

>diff -ruN /usr/ports/net/gabber.old/Makefile /usr/ports/net/gabber/Makefile
>--- /usr/ports/net/gabber.old/Makefile  Wed Jul 19 02:32:05 2000
>+++ /usr/ports/net/gabber/Makefile      Sat Aug 12 22:56:31 2000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=      gabber
>-PORTVERSION=   0.6.1
>+PORTVERSION=   0.7.0
> CATEGORIES=    net
> MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=    ${PORTNAME}
>diff -ruN /usr/ports/net/gabber.old/files/md5 /usr/ports/net/gabber/files/md5
>--- /usr/ports/net/gabber.old/files/md5 Fri Jun 30 09:34:13 2000
>+++ /usr/ports/net/gabber/files/md5     Sat Aug 12 22:56:31 2000
>@@ -1 +1 @@
>-MD5 (gabber-0.6.1.tar.gz) = 423c62683083c0e8d89d11448cd9e9a4
>+MD5 (gabber-0.7.0.tar.gz) = 0446b9692de1203515bf3c498c1eb899
>diff -ruN /usr/ports/net/gabber.old/patches/patch-aa /usr/ports/net/gabber/patches/patch-aa
>--- /usr/ports/net/gabber.old/patches/patch-aa  Fri Jun 30 09:34:14 2000
>+++ /usr/ports/net/gabber/patches/patch-aa      Sat Aug 12 22:56:32 2000
>@@ -9,3 +9,4 @@
>  #define INT64 long long
>  #else
>  #include <string.h>
>+
>diff -ruN /usr/ports/net/gabber.old/patches/patch-ab /usr/ports/net/gabber/patches/patch-ab
>--- /usr/ports/net/gabber.old/patches/patch-ab  Fri Jun 30 09:34:14 2000
>+++ /usr/ports/net/gabber/patches/patch-ab      Sat Aug 12 22:56:31 2000
>@@ -1,6 +1,7 @@
>---- jabberoo/Makefile.am.orig  Thu Jun 22 00:06:36 2000
>-+++ jabberoo/Makefile.am       Thu Jun 22 00:06:46 2000
>+--- jabberoo/Makefile.am.orig   Tue Aug  1 00:41:15 2000
>++++ jabberoo/Makefile.am        Tue Aug  1 00:41:25 2000
> @@ -1,2 +1,2 @@
>  EXTRA_DIST = include
>--SUBDIRS = src test 
>-+SUBDIRS = src
>+-SUBDIRS = expat src test 
>++SUBDIRS = expat src 
>+
>diff -ruN /usr/ports/net/gabber.old/patches/patch-ac /usr/ports/net/gabber/patches/patch-ac
>--- /usr/ports/net/gabber.old/patches/patch-ac  Fri Jun 30 09:34:14 2000
>+++ /usr/ports/net/gabber/patches/patch-ac      Sat Aug 12 22:56:32 2000
>@@ -1,6 +1,6 @@
>---- src/Makefile.in.orig       Fri Jun 30 09:25:00 2000
>-+++ src/Makefile.in    Fri Jun 30 09:25:25 2000
>-@@ -141,7 +141,7 @@
>+--- src/Makefile.in.orig        Tue Aug  1 00:42:55 2000
>++++ src/Makefile.in     Tue Aug  1 00:43:22 2000
>+@@ -148,7 +148,7 @@
>  
>  EXTRA_DIST = Gabber.hh GladeHelper.hh gabber.glade GabberGladeStrings.c GabberConfig.hh
>  
>@@ -9,3 +9,4 @@
>  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>  CONFIG_HEADER = ../config.h
>  CONFIG_CLEAN_FILES =  GabberConfig.hh
>+
>diff -ruN /usr/ports/net/gabber.old/patches/patch-ad /usr/ports/net/gabber/patches/patch-ad
>--- /usr/ports/net/gabber.old/patches/patch-ad  Fri Jun 30 09:34:14 2000
>+++ /usr/ports/net/gabber/patches/patch-ad      Sat Aug 12 22:56:31 2000
>@@ -1,6 +1,6 @@
>---- configure.orig     Fri Jun 30 09:43:51 2000
>-+++ configure  Fri Jun 30 09:43:05 2000
>-@@ -3604,7 +3604,7 @@
>+--- configure.orig     Tue Aug  1 00:44:24 2000
>++++ configure  Tue Aug  1 01:04:28 2000
>+@@ -4276,7 +4276,7 @@
>    cat conftest.$ac_ext >&5
>    rm -rf conftest*
>    CATOBJEXT=.mo
>@@ -9,3 +9,12 @@
>  fi
>  rm -f conftest*
>                INSTOBJEXT=.mo
>+@@ -4538,7 +4538,7 @@
>+                USE_INCLUDED_LIBINTL=yes
>+                CATOBJEXT=.cat
>+                INSTOBJEXT=.cat
>+-               DATADIRNAME=lib
>++               DATADIRNAME=share
>+                INTLDEPS='$(top_builddir)/intl/libintl.a'
>+                INTLLIBS=$INTLDEPS
>+                LIBS=`echo $LIBS | sed -e 's/-lintl//'`
>diff -ruN /usr/ports/net/gabber.old/patches/patch-af /usr/ports/net/gabber/patches/patch-af
>--- /usr/ports/net/gabber.old/patches/patch-af  Fri Jun 30 09:34:14 2000
>+++ /usr/ports/net/gabber/patches/patch-af      Sat Aug 12 22:56:32 2000
>@@ -1,7 +1,7 @@
>---- pixmaps/Makefile.in.orig   Fri Jun 30 17:19:39 2000
>-+++ pixmaps/Makefile.in        Fri Jun 30 17:20:16 2000
>-@@ -130,10 +130,10 @@
>- EXTRA_DIST = gabber.png                               away.xpm               			chat.xpm                                dnd.xpm                		        offline.xpm                             online.xpm             	                stalker.xpm                             xa.xpm				        gnome-gabber.xpm                        gnome-message.xpm  		        gnome-ooochat.xpm                       gnome-s10n.xpm          		glade-gabber-logo.png                   glade-message.xpm       		glade-ooochat.xpm                       glade-s10n.xpm          		glade-new-user.xpm                      glade-new-user-menu.xpm
>+--- pixmaps/Makefile.in.orig   Tue Aug  1 00:46:43 2000
>++++ pixmaps/Makefile.in        Tue Aug  1 00:47:11 2000
>+@@ -137,10 +137,10 @@
>+ EXTRA_DIST = gabber.png                               away.xpm                		chat.xpm                                dnd.xpm                 		offline.xpm                             online.xpm             	     		stalker.xpm                             xa.xpm                  		gnome-gabber.xpm                        gnome-message.xpm                       gnome-ooochat.xpm                       gnome-s10n.xpm          		glade-gabber-logo.png                   glade-message.xpm       		glade-ooochat.xpm                       glade-s10n.xpm          		glade-new-user.xpm                      glade-new-user-menu.xpm 		glade-edit-user.xpm                     glade-edit-user-menu.xpm		glade-delete-user.xpm                   glade-delete-user-menu.xpm              glade-users.xpm                         glade-sendasooo.xpm     		glade-noclose.xpm       
>  
> -logodir = $(datadir)/pixmaps
>diff -ruN /usr/ports/net/gabber.old/pkg/PLIST /usr/ports/net/gabber/pkg/PLIST
>--- /usr/ports/net/gabber.old/pkg/PLIST Fri Jun 30 09:34:14 2000
>+++ /usr/ports/net/gabber/pkg/PLIST     Sat Aug 12 22:56:32 2000
>@@ -1,5 +1,5 @@
> bin/gabber
>-share/locale/en_SE/LC_MESSAGES/gabber.mo
>+lib/locale/en_SE/LC_MESSAGES/gabber.mo
> share/gabber/gabber.glade
> share/gabber/glade-gabber-logo.png
> share/gabber/glade-message.xpm
>@@ -7,6 +7,13 @@
> share/gabber/glade-s10n.xpm
> share/gabber/glade-new-user.xpm
> share/gabber/glade-new-user-menu.xpm
>+share/gabber/glade-edit-user.xpm
>+share/gabber/glade-edit-user-menu.xpm
>+share/gabber/glade-delete-user.xpm
>+share/gabber/glade-delete-user-menu.xpm
>+share/gabber/glade-users.xpm
>+share/gabber/glade-sendasooo.xpm
>+share/gabber/glade-noclose.xpm
> share/gnome/pixmaps/gabber.png
> share/gnome/pixmaps/gabber/away.xpm
> share/gnome/pixmaps/gabber/chat.xpm
>@@ -52,11 +59,6 @@
> share/gnome/help/gabber/C/agents-register.png
> share/gnome/help/gabber/C/first.png
> share/gnome/help/gabber/C/login.png
>-share/gnome/help/gabber/C/main-menubar-gabber.png
>-share/gnome/help/gabber/C/main-menubar-help.png
>-share/gnome/help/gabber/C/main-menubar-roster.png
>-share/gnome/help/gabber/C/main-menubar-user.png
>-share/gnome/help/gabber/C/main-roster-menu.png
> share/gnome/help/gabber/C/main-status-roster.png
> share/gnome/help/gabber/C/main-status-user-dialog.png
> share/gnome/help/gabber/C/main-status-user-show.png
>@@ -64,22 +66,14 @@
> share/gnome/help/gabber/C/main.png
> share/gnome/help/gabber/C/mainshot.png
> share/gnome/help/gabber/C/msg-gc-join.png
>-share/gnome/help/gabber/C/msg-gc-main-menubar-chat.png
>-share/gnome/help/gabber/C/msg-gc-main-menubar-edit.png
>-share/gnome/help/gabber/C/msg-gc-main-menubar-help.png
> share/gnome/help/gabber/C/msg-gc-main.png
>-share/gnome/help/gabber/C/msg-normal-advanced.png
> share/gnome/help/gabber/C/msg-normal-reply.png
> share/gnome/help/gabber/C/msg-normal.png
> share/gnome/help/gabber/C/msg-ooo.png
>-share/gnome/help/gabber/C/pref-connection.png
>-share/gnome/help/gabber/C/pref-mainwindow.png
>-share/gnome/help/gabber/C/pref-msg.png
>-share/gnome/help/gabber/C/pref-roster-statuscolors.png
>-share/gnome/help/gabber/C/pref-roster.png
>-share/gnome/help/gabber/C/userinfo-basic.png
>+share/gnome/help/gabber/C/userinfo-general.png
> share/gnome/help/gabber/C/userinfo-jud.png
> share/gnome/help/gabber/C/users-adduser.png
>+share/gnome/help/gabber/C/users-edituser-client.png
> share/gnome/help/gabber/C/users-edituser-groups-add.png
> share/gnome/help/gabber/C/users-edituser-groups.png
> share/gnome/help/gabber/C/users-edituser-info.png

Actions: View | Diff

Attachments on bug 20570: 10233