Fri Apr 23 11:31:57 2010 UTC ()
Add references to the upstream bug numbers that host these patches.


(jmmv)
diff -r1.4 -r1.5 pkgsrc/print/libpaper/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/print/libpaper/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/print/libpaper/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/print/libpaper/patches/patch-ac
cvs diff -r1.4 -r1.5 pkgsrc/print/libpaper/distinfo (expand / switch to unified diff)

--- pkgsrc/print/libpaper/distinfo 2009/02/16 18:05:44 1.4
+++ pkgsrc/print/libpaper/distinfo 2010/04/23 11:31:57 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2009/02/16 18:05:44 drochner Exp $ 1$NetBSD: distinfo,v 1.5 2010/04/23 11:31:57 jmmv Exp $
2 2
3SHA1 (libpaper_1.1.23.tar.gz) = e1c03fc0fa708cafe12d00a120685ef566100468 3SHA1 (libpaper_1.1.23.tar.gz) = e1c03fc0fa708cafe12d00a120685ef566100468
4RMD160 (libpaper_1.1.23.tar.gz) = bf407f5e75348abde5b7d3d3c8e2ea695de46cd7 4RMD160 (libpaper_1.1.23.tar.gz) = bf407f5e75348abde5b7d3d3c8e2ea695de46cd7
5Size (libpaper_1.1.23.tar.gz) = 351153 bytes 5Size (libpaper_1.1.23.tar.gz) = 351153 bytes
6SHA1 (patch-aa) = 389af838d6d1d532227b63fb1cf93bbb889d4abd 6SHA1 (patch-aa) = 1ea13f89be2dc0526537d2fc4143ecd255ea5032
7SHA1 (patch-ab) = 2d62d160c7f64b1ab4d12bf38632fcf433f4dd4c 7SHA1 (patch-ab) = d34307f99914a2eda7b87ce3e917f0eadd106e2d
8SHA1 (patch-ac) = 23bb17e9799b53307210c29c034513ac3257392f 8SHA1 (patch-ac) = 643541a5bbd3b422261c16f48fe86d018f315a82
cvs diff -r1.1.1.1 -r1.2 pkgsrc/print/libpaper/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/libpaper/patches/Attic/patch-aa 2007/09/04 20:10:12 1.1.1.1
+++ pkgsrc/print/libpaper/patches/Attic/patch-aa 2010/04/23 11:31:57 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.1.1.1 2007/09/04 20:10:12 drochner Exp $ 1$NetBSD: patch-aa,v 1.2 2010/04/23 11:31:57 jmmv Exp $
 2
 3http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578886
2 4
3--- src/paperconfig.in.orig 2007-09-04 20:59:02.000000000 +0200 5--- src/paperconfig.in.orig 2007-09-04 20:59:02.000000000 +0200
4+++ src/paperconfig.in 6+++ src/paperconfig.in
5@@ -1,4 +1,4 @@ 7@@ -1,4 +1,4 @@
6-#! /bin/bash 8-#! /bin/bash
7+#! /bin/sh 9+#! /bin/sh
8  10
9 # paperconfig: configuration of system paper name 11 # paperconfig: configuration of system paper name
10 # 12 #
11@@ -44,7 +44,7 @@ export @RUNPARTSDIRVAR@ 13@@ -44,7 +44,7 @@ export @RUNPARTSDIRVAR@
12  14
13 force=0 15 force=0
14  16
cvs diff -r1.1 -r1.2 pkgsrc/print/libpaper/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/libpaper/patches/Attic/patch-ab 2007/09/14 11:21:43 1.1
+++ pkgsrc/print/libpaper/patches/Attic/patch-ab 2010/04/23 11:31:57 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.1 2007/09/14 11:21:43 joerg Exp $ 1$NetBSD: patch-ab,v 1.2 2010/04/23 11:31:57 jmmv Exp $
 2
 3http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578884
2 4
3--- lib/paper.c.orig 2007-09-14 11:04:32.000000000 +0000 5--- lib/paper.c.orig 2007-09-14 11:04:32.000000000 +0000
4+++ lib/paper.c 6+++ lib/paper.c
5@@ -14,13 +14,12 @@ 7@@ -14,13 +14,12 @@
6 #include <sys/stat.h> 8 #include <sys/stat.h>
7  9
8 #include <stdio.h> 10 #include <stdio.h>
9-#include <malloc.h> 11-#include <malloc.h>
10+#include <stdlib.h> 12+#include <stdlib.h>
11 #include <string.h> 13 #include <string.h>
12 #include <ctype.h> 14 #include <ctype.h>
13  15
14 #include <unistd.h> 16 #include <unistd.h>
cvs diff -r1.1 -r1.2 pkgsrc/print/libpaper/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/print/libpaper/patches/Attic/patch-ac 2009/02/16 18:05:44 1.1
+++ pkgsrc/print/libpaper/patches/Attic/patch-ac 2010/04/23 11:31:57 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ac,v 1.1 2009/02/16 18:05:44 drochner Exp $ 1$NetBSD: patch-ac,v 1.2 2010/04/23 11:31:57 jmmv Exp $
 2
 3http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578885
2 4
3--- lib/paper.h.orig 1996-09-24 09:16:07.000000000 +0200 5--- lib/paper.h.orig 1996-09-24 09:16:07.000000000 +0200
4+++ lib/paper.h 6+++ lib/paper.h
5@@ -22,7 +22,7 @@ 7@@ -22,7 +22,7 @@
6 * 8 *
7 */ 9 */
8  10
9-#if __STDC__ - 0 == 0 11-#if __STDC__ - 0 == 0
10+#if !defined(__STDC__) 12+#if !defined(__STDC__)
11  13
12 #define __PAPER_CONST 14 #define __PAPER_CONST
13 #define __PAPER_PROTO(p) () 15 #define __PAPER_PROTO(p) ()