[pkgsrc/trunk]: pkgsrc/print/dvipsk Fix compiling with systems that provide t...

[roy <roy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34d3d465438c
branches:  trunk
changeset: 395878:34d3d465438c
user:      roy <roy%pkgsrc.org@localhost>
date:      Wed Jul 15 18:56:44 2009 +0000

description:
Fix compiling with systems that provide their own getline

diffstat:

 print/dvipsk/distinfo         |   3 ++-
 print/dvipsk/patches/patch-ab |  42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletions(-)

diffs (58 lines):

diff -r d2ec31e3a06a -r 34d3d465438c print/dvipsk/distinfo
--- a/print/dvipsk/distinfo     Wed Jul 15 12:27:31 2009 +0000
+++ b/print/dvipsk/distinfo     Wed Jul 15 18:56:44 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/02/17 19:10:49 minskim Exp $
+$NetBSD: distinfo,v 1.2 2009/07/15 18:56:44 roy Exp $
 
 SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
 RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
 Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
 SHA1 (patch-aa) = dc2c5ff745a3c73aebb9f16c2b5f525195f4026a
+SHA1 (patch-ab) = 809e12301d9fc261b3d6e24174c3628ef788fe80
diff -r d2ec31e3a06a -r 34d3d465438c print/dvipsk/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/dvipsk/patches/patch-ab     Wed Jul 15 18:56:44 2009 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-ab,v 1.1 2009/07/15 18:56:44 roy Exp $
+
+Rename getline to texlive_getline to avoid conflict with system getline.
+
+--- afm2tfm.c.orig     2009-07-15 19:52:45.000000000 +0100
++++ afm2tfm.c  2009-07-15 19:54:08.000000000 +0100
+@@ -260,7 +260,7 @@
+ }
+ 
+ int
+-getline P1H(void) {
++texlive_getline P1H(void) {
+    register char *p ;
+    register int c ;
+ 
+@@ -615,7 +615,7 @@
+    ai = newchar() ;
+    ai->adobenum = -1 ;
+    ai->adobename = "||" ; /* boundary character name */
+-   while (getline()) {
++   while (texlive_getline()) {
+       switch(interest(paramstring())) {
+ case FontName:
+          fontname = paramnewstring() ;
+@@ -1891,7 +1891,7 @@
+ 
+    while (1) {
+       while (param == 0 || *param == 0) {
+-         if (getline() == 0)
++         if (texlive_getline() == 0)
+             error("! premature end in encoding file") ;
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+@@ -1982,7 +1982,7 @@
+       p = gettoken() ;
+       if (strcmp(p, "]"))
+          error("! token 258 in encoding must be make-array (])") ;
+-      while (getline()) {
++      while (texlive_getline()) {
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+                if (ignoreligkern == 0)