Thu Aug 23 18:15:45 2012 UTC ()
net/pload: Fix partial patch

I'm not sure what happened here.  pload was building fine on DragonFly
with the proposed patches, but right now patch-ae only looks half updated.
Update the rest of patch-ae to finish the work of my prior commit.

Only affects DragonFly, which it's never built on.


(marino)
diff -r1.9 -r1.10 pkgsrc/net/pload/distinfo
diff -r1.2 -r1.3 pkgsrc/net/pload/patches/patch-ae
cvs diff -r1.9 -r1.10 pkgsrc/net/pload/distinfo (expand / switch to unified diff)

--- pkgsrc/net/pload/distinfo 2012/08/11 17:20:23 1.9
+++ pkgsrc/net/pload/distinfo 2012/08/23 18:15:44 1.10
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.9 2012/08/11 17:20:23 marino Exp $ 1$NetBSD: distinfo,v 1.10 2012/08/23 18:15:44 marino Exp $
2 2
3SHA1 (pload-0.9.5.tar.gz) = 52e8ca31ad534cbc131d0bd19ef5ae45b5b37777 3SHA1 (pload-0.9.5.tar.gz) = 52e8ca31ad534cbc131d0bd19ef5ae45b5b37777
4RMD160 (pload-0.9.5.tar.gz) = 48ff961d760430a3a45533f7023b1fefa252ede8 4RMD160 (pload-0.9.5.tar.gz) = 48ff961d760430a3a45533f7023b1fefa252ede8
5Size (pload-0.9.5.tar.gz) = 22423 bytes 5Size (pload-0.9.5.tar.gz) = 22423 bytes
6SHA1 (patch-aa) = fb3a59555edfcd59b4930990dacc3dcab42cc462 6SHA1 (patch-aa) = fb3a59555edfcd59b4930990dacc3dcab42cc462
7SHA1 (patch-ab) = 4bf2639b64d20717716c66be85c4fb5cd3b114d5 7SHA1 (patch-ab) = 4bf2639b64d20717716c66be85c4fb5cd3b114d5
8SHA1 (patch-ac) = 401f9e56ed6543968b47d7c61eff40f5019b3959 8SHA1 (patch-ac) = 401f9e56ed6543968b47d7c61eff40f5019b3959
9SHA1 (patch-ad) = 2613c9344a8545af91ff7476b2fc5ea1e473aabe 9SHA1 (patch-ad) = 2613c9344a8545af91ff7476b2fc5ea1e473aabe
10SHA1 (patch-ae) = ef7707633af2c331fcc4d61479346089d443e4e3 10SHA1 (patch-ae) = 70e04a20a244a3ecfe766893a9dff0216a0d4d41
cvs diff -r1.2 -r1.3 pkgsrc/net/pload/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/pload/patches/patch-ae 2012/08/11 17:20:23 1.2
+++ pkgsrc/net/pload/patches/patch-ae 2012/08/23 18:15:44 1.3
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-ae,v 1.2 2012/08/11 17:20:23 marino Exp $ 1$NetBSD: patch-ae,v 1.3 2012/08/23 18:15:44 marino Exp $
2 2
3--- pload.c.orig 2000-02-01 07:11:24.000000000 +0000 3--- pload.c.orig 2000-02-01 07:11:24.000000000 +0000
4+++ pload.c 4+++ pload.c
5@@ -40,7 +40,11 @@ static void HandleExit(void); 5@@ -40,7 +40,11 @@ static void HandleExit(void);
6 static void CheckForWMExit(Widget, XtPointer, XEvent*, Boolean*); 6 static void CheckForWMExit(Widget, XtPointer, XEvent*, Boolean*);
7 static void CheckForIconState(Widget, XtPointer, XEvent*, Boolean*); 7 static void CheckForIconState(Widget, XtPointer, XEvent*, Boolean*);
8 static void update(XtPointer, XtIntervalId*); 8 static void update(XtPointer, XtIntervalId*);
9+#if defined(__NetBSD__) || defined(__DragonFly__) 9+#if defined(__NetBSD__) || defined(__DragonFly__)
10+static void make_label(char*,u_quad_t,double,double); 10+static void make_label(char*,u_quad_t,double,double);
11+#else 11+#else
12 static void make_label(char*,unsigned long,double,double); 12 static void make_label(char*,unsigned long,double,double);
13+#endif 13+#endif
14 static void do_rate(char*,double); 14 static void do_rate(char*,double);
15 static void do_total(char*, double); 15 static void do_total(char*, double);
16  16
17@@ -621,7 +625,11 @@ void do_rate(char *b, double rate) 17@@ -621,7 +625,11 @@ void do_rate(char *b, double rate)
18 } 18 }
19  19
20 /* stores label in global 'buff' */ 20 /* stores label in global 'buff' */
21+#ifdef __NetBSD__ 21+#if defined (__NetBSD__) || defined(__DragonFly__)
22+void make_label(char *fmt, u_quad_t total, double rate, double max) 22+void make_label(char *fmt, u_quad_t total, double rate, double max)
23+#else 23+#else
24 void make_label(char *fmt, unsigned long total, double rate, double max) 24 void make_label(char *fmt, unsigned long total, double rate, double max)
25+#endif 25+#endif
26 { 26 {
27 char *p; 27 char *p;
28 int i; 28 int i;