Updated freebsd patch to build fine with latest gamin version.

Package-Manager: portage-2.0.51.22

3 files changed, 46 insertions, 29 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index 307da1218ae3..68de74ad2aec 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gamin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.27 2005/08/02 20:52:53 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.28 2005/08/02 21:10:46 flameeyes Exp $
+
+  02 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/gamin-0.1.3-freebsd.patch:
+  Updated freebsd patch to build fine with latest gamin version.
 
 *gamin-0.1.3 (02 Aug 2005)
 
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 664e3795caa7..690a861fd249 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a7ac3ee584596faa7f10aeafecb24f07 gamin-0.1.3.ebuild 1823
-MD5 4dcf9ef178820168a4233e6f8fbbd6ee gamin-0.1.2.ebuild 1812
-MD5 f2489a73a5fe56c290b5039f1b5e3188 ChangeLog 5137
-MD5 03f3bc849895689c9635a6a7e8c11d0b gamin-0.1.1.ebuild 1345
+MD5 5ae7926b20fe565c93a5083a857102a8 ChangeLog 5294
 MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
+MD5 03f3bc849895689c9635a6a7e8c11d0b gamin-0.1.1.ebuild 1345
+MD5 4dcf9ef178820168a4233e6f8fbbd6ee gamin-0.1.2.ebuild 1812
+MD5 a7ac3ee584596faa7f10aeafecb24f07 gamin-0.1.3.ebuild 1823
 MD5 fd8dba98fd1b79aed73e3b6f17e0a779 files/digest-gamin-0.1.1 63
 MD5 50691da4c01bbd32e1397b8873180986 files/gamin-0.1.1-inotify-fix.patch 14533
-MD5 65e3ff0dfeabee2182ee256c943f5b37 files/digest-gamin-0.1.3 63
-MD5 8de0cd571ba4ad6189595d7267bb78b7 files/gamin-0.1.3-freebsd.patch 3527
-MD5 6e519de04a1b260384534977bb6ba1f6 files/gamin-0.1.2-freebsd.patch 4550
-MD5 281a6a262337245c21884f5afdd616b3 files/gamin-0.1.3-inotify-legacy-backend.patch 27609
 MD5 2ab0167c306465e140ebfe2d8151fced files/digest-gamin-0.1.2 63
+MD5 6e519de04a1b260384534977bb6ba1f6 files/gamin-0.1.2-freebsd.patch 4550
 MD5 67e42fe9ea88f0a3a0bc59377d43aab5 files/gamin-0.1.2-inotify-legacy-backend.patch 27593
+MD5 65e3ff0dfeabee2182ee256c943f5b37 files/digest-gamin-0.1.3 63
+MD5 510d70d44de83d7822311077a39621c8 files/gamin-0.1.3-freebsd.patch 3857
+MD5 281a6a262337245c21884f5afdd616b3 files/gamin-0.1.3-inotify-legacy-backend.patch 27609
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC791E1ZcsMnZjRyIRAjnyAJ91N26MpHPZk5AFmam40fnwIls/bACgwF7c
-L6oiDYqv51m2o7n7x+bPQdM=
-=YHWU
+iD8DBQFC7+GAj5H05b2HAEkRAg/bAJ9JJzbdt8Y/B508dGYT4htQivNZNACfUOeU
+esN+57aGgeM6ldZO5i6PUxk=
+=6/fI
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gamin/files/gamin-0.1.3-freebsd.patch b/app-admin/gamin/files/gamin-0.1.3-freebsd.patch
index d732c7f3e4b8..a0f122726827 100644
--- a/app-admin/gamin/files/gamin-0.1.3-freebsd.patch
+++ b/app-admin/gamin/files/gamin-0.1.3-freebsd.patch
@@ -1,6 +1,6 @@
-diff -ur -x '*~' gamin-0.1.2/libgamin/gam_api.c gamin-0.1.2-fbsd/libgamin/gam_api.c
---- gamin-0.1.2/libgamin/gam_api.c	2005-06-15 12:53:25.000000000 +0200
-+++ gamin-0.1.2-fbsd/libgamin/gam_api.c	2005-07-16 00:15:37.317345328 +0200
+diff -ur gamin-0.1.3/libgamin/gam_api.c gamin-0.1.3-fbsd/libgamin/gam_api.c
+--- gamin-0.1.3/libgamin/gam_api.c	2005-06-15 12:53:25.000000000 +0200
++++ gamin-0.1.3-fbsd/libgamin/gam_api.c	2005-08-02 23:09:22.416835112 +0200
 @@ -421,7 +421,7 @@
  {
      char data[2] = { 0, 0 };
@@ -28,10 +28,9 @@ diff -ur -x '*~' gamin-0.1.2/libgamin/gam_api.c gamin-0.1.2-fbsd/libgamin/gam_ap
      /* Set the socket to receive credentials on the next message */
      {
          int on = 1;
-Only in gamin-0.1.2-fbsd/libgamin: gam_api.c.orig
-diff -ur -x '*~' gamin-0.1.2/libgamin/gam_data.c gamin-0.1.2-fbsd/libgamin/gam_data.c
---- gamin-0.1.2/libgamin/gam_data.c	2005-05-18 16:45:04.000000000 +0200
-+++ gamin-0.1.2-fbsd/libgamin/gam_data.c	2005-07-16 12:06:58.586806112 +0200
+diff -ur gamin-0.1.3/libgamin/gam_data.c gamin-0.1.3-fbsd/libgamin/gam_data.c
+--- gamin-0.1.3/libgamin/gam_data.c	2005-05-18 16:45:04.000000000 +0200
++++ gamin-0.1.3-fbsd/libgamin/gam_data.c	2005-08-02 23:09:22.416835112 +0200
 @@ -17,6 +17,10 @@
  #ifdef HAVE_PTHREAD_H
  #include <pthread.h>
@@ -52,10 +51,10 @@ diff -ur -x '*~' gamin-0.1.2/libgamin/gam_data.c gamin-0.1.2-fbsd/libgamin/gam_d
  	pthread_mutex_init(&ret->lock, &attr);
  	pthread_mutexattr_destroy(&attr);
      }
-diff -ur -x '*~' gamin-0.1.2/server/gam_channel.c gamin-0.1.2-fbsd/server/gam_channel.c
---- gamin-0.1.2/server/gam_channel.c	2005-06-15 13:02:34.000000000 +0200
-+++ gamin-0.1.2-fbsd/server/gam_channel.c	2005-07-16 00:15:37.326343960 +0200
-@@ -29,7 +29,7 @@
+diff -ur gamin-0.1.3/server/gam_channel.c gamin-0.1.3-fbsd/server/gam_channel.c
+--- gamin-0.1.3/server/gam_channel.c	2005-08-01 23:04:50.000000000 +0200
++++ gamin-0.1.3-fbsd/server/gam_channel.c	2005-08-02 23:09:22.417834960 +0200
+@@ -30,7 +30,7 @@
  {
      char data[2] = { 0, 0 };
      int written;
@@ -64,7 +63,7 @@ diff -ur -x '*~' gamin-0.1.2/server/gam_channel.c gamin-0.1.2-fbsd/server/gam_ch
      struct {
  	    struct cmsghdr hdr;
  	    struct cmsgcred cred;
-@@ -53,7 +53,7 @@
+@@ -54,7 +54,7 @@
  #endif
  
  retry:
@@ -73,7 +72,7 @@ diff -ur -x '*~' gamin-0.1.2/server/gam_channel.c gamin-0.1.2-fbsd/server/gam_ch
      written = sendmsg(fd, &msg, 0);
  #else
      written = write(fd, &data[0], 1);
-@@ -100,7 +100,7 @@
+@@ -103,7 +103,7 @@
  
      s_uid = getuid();
  
@@ -82,9 +81,24 @@ diff -ur -x '*~' gamin-0.1.2/server/gam_channel.c gamin-0.1.2-fbsd/server/gam_ch
      /* Set the socket to receive credentials on the next message */
      {
          int on = 1;
-diff -ur -x '*~' gamin-0.1.2/tests/testing.c gamin-0.1.2-fbsd/tests/testing.c
---- gamin-0.1.2/tests/testing.c	2005-06-13 10:59:29.000000000 +0200
-+++ gamin-0.1.2-fbsd/tests/testing.c	2005-07-16 00:15:37.337342288 +0200
+Only in gamin-0.1.3-fbsd/server: gam_channel.c.orig
+diff -ur gamin-0.1.3/server/gam_pidname.c gamin-0.1.3-fbsd/server/gam_pidname.c
+--- gamin-0.1.3/server/gam_pidname.c	2005-08-01 17:27:19.000000000 +0200
++++ gamin-0.1.3-fbsd/server/gam_pidname.c	2005-08-02 23:05:34.795438824 +0200
+@@ -7,9 +7,9 @@
+ 
+ char *gam_get_pidname (int pid)
+ {
++    gchar *pidname = NULL;
+ #ifdef HAVE_LINUX
+     gchar *procname;
+-    gchar *pidname = NULL;
+     FILE *fp;
+ #endif
+ 
+diff -ur gamin-0.1.3/tests/testing.c gamin-0.1.3-fbsd/tests/testing.c
+--- gamin-0.1.3/tests/testing.c	2005-06-13 10:59:29.000000000 +0200
++++ gamin-0.1.3-fbsd/tests/testing.c	2005-08-02 23:09:22.417834960 +0200
 @@ -436,9 +436,9 @@
              return (-1);
          }
@@ -97,4 +111,3 @@ diff -ur -x '*~' gamin-0.1.2/tests/testing.c gamin-0.1.2-fbsd/tests/testing.c
              debugLoop(100);
  
  /*	    printf("+"); fflush(stdout); */
-Only in gamin-0.1.2-fbsd/tests: testing.c.orig