Fix conflict with POSIX getline, and fix LP64 issues found by gcc.

PKGREVISION -> 2.

18 files changed, 240 insertions, 3 deletions

diff --git a/print/jcabc2ps/Makefile b/print/jcabc2ps/Makefile
index 4bcf9bc361b..4ea9047f283 100644
--- a/print/jcabc2ps/Makefile
+++ b/print/jcabc2ps/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/12/27 12:48:38 obache Exp $
+# $NetBSD: Makefile,v 1.5 2011/10/03 06:45:30 dholland Exp $
 #
 
 DISTNAME=	jcabc2ps-src
 PKGNAME=	jcabc2ps-20060106
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://ecf-guest.mit.edu/~jc/music/abc/src/
 
@@ -17,6 +17,12 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+SUBST_CLASSES+=		getline
+SUBST_STAGE.getline=	pre-configure
+SUBST_MESSAGE.getline=	Fixing conflict with POSIX getline.
+SUBST_FILES.getline=	jcabc2ps.c format.c music.c util.c util.h save/music.c
+SUBST_SED.getline=	-e 's/getline/mygetline/'
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jcabc2ps ${DESTDIR}${PREFIX}/bin/.
 	${INSTALL_MAN} ${WRKSRC}/doc/jcabc2ps.d ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/jcabc2ps.0
diff --git a/print/jcabc2ps/distinfo b/print/jcabc2ps/distinfo
index 5acfa2f5591..28a70041c45 100644
--- a/print/jcabc2ps/distinfo
+++ b/print/jcabc2ps/distinfo
@@ -1,7 +1,23 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/02 22:18:58 ben Exp $
+$NetBSD: distinfo,v 1.2 2011/10/03 06:45:30 dholland Exp $
 
 SHA1 (jcabc2ps-src.tar.gz) = 6dbd9d00453c97ccf04cf707e6c4db88361c3bea
 RMD160 (jcabc2ps-src.tar.gz) = e454dc1d787c9b5a833316f5edb5dff463e6daa4
 Size (jcabc2ps-src.tar.gz) = 550842 bytes
 SHA1 (patch-aa) = fe4235fbf9ef6e364fda51849f9b1dddf4af6d76
 SHA1 (patch-ab) = 8fd77d205e902eabc0338de6b88169735c812f42
+SHA1 (patch-buffer_c) = 51e82c3b96854d8c253f02af8c23736f5927eb13
+SHA1 (patch-format_c) = 00072a7081d0531dddda508412a193553204fcb1
+SHA1 (patch-jcabc2ps_c) = f59fa7d393e6bdee64cbb2336c7d8e39a3560513
+SHA1 (patch-macro_c) = 4f6fc99c7780017ec4dd49ca60db7a4892f89508
+SHA1 (patch-memBlock_c) = 714a5b2ab8c88185b2419f1fef9eb599a17ad209
+SHA1 (patch-memBlock_h) = 1ad1ab3ccc79881571c4222657cdf7fdaefd6150
+SHA1 (patch-minStrM_c) = d1f53802383cd1d265189dddd8142a374228ff91
+SHA1 (patch-minStr_c) = a83d1aa0ed266323d62dd0ece7f6d207127001d4
+SHA1 (patch-misc_c) = 1e801d82c3e309be464bc95b771d1797273dc07d
+SHA1 (patch-music_c) = a4f74c6c73ec3183fee32aa59d474cbd927454e4
+SHA1 (patch-parse_c) = afdb7166bb7dade13057f67da6920677996a1e7b
+SHA1 (patch-playback_c) = f51e8c7edede77944c379127349c809e7c327ef3
+SHA1 (patch-pssubs_c) = ec4fba07e85cb21f59d553c70518202ef1a1990d
+SHA1 (patch-setStr_c) = 5446511f40c6dc5c9018ad39b637a4742600a548
+SHA1 (patch-text_c) = 66fcb0f5857c350e2ff4e75d87ef2b186efbf6de
+SHA1 (patch-util_c) = 13a1e5ca3b827d68788d1fe09fff072d1f909ac7
diff --git a/print/jcabc2ps/patches/patch-buffer_c b/print/jcabc2ps/patches/patch-buffer_c
new file mode 100644
index 00000000000..6c95a400cbd
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-buffer_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-buffer_c,v 1.1 2011/10/03 06:45:30 dholland Exp $
+
+Use standard headers.
+
+--- buffer.c~	2006-01-06 22:48:10.000000000 +0000
++++ buffer.c
+@@ -4,6 +4,9 @@
+  *  See file jcabc2ps.c for details.
+  */
+ 
++#include <string.h>
++#include <stdlib.h>
++
+ #include "jcabc2ps.h"
+ #include "buffer.h"
+ #include "pssubs.h"
diff --git a/print/jcabc2ps/patches/patch-format_c b/print/jcabc2ps/patches/patch-format_c
new file mode 100644
index 00000000000..adc444fc324
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-format_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-format_c,v 1.1 2011/10/03 06:45:30 dholland Exp $
+
+Use standard headers.
+
+--- format.c~	2011-10-03 06:32:50.000000000 +0000
++++ format.c
+@@ -5,6 +5,7 @@
+  */
+ 
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "jcabc2ps.h"
+ #include "misc.h"
diff --git a/print/jcabc2ps/patches/patch-jcabc2ps_c b/print/jcabc2ps/patches/patch-jcabc2ps_c
new file mode 100644
index 00000000000..b8906c2fd6e
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-jcabc2ps_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-jcabc2ps_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Use standard headers.
+
+--- jcabc2ps.c~	2011-10-03 06:30:36.000000000 +0000
++++ jcabc2ps.c
+@@ -32,6 +32,7 @@
+ /* Main program jcabc2ps.c */
+ 
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "jcabc2ps.h"
+ #include "subs.h"
diff --git a/print/jcabc2ps/patches/patch-macro_c b/print/jcabc2ps/patches/patch-macro_c
new file mode 100644
index 00000000000..c53f9b72618
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-macro_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-macro_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Declare functions before calling them.
+
+--- macro.c~	2004-05-18 20:56:52.000000000 +0000
++++ macro.c
+@@ -7,6 +7,7 @@
+ 
+ #include "jcabc2ps.h"
+ #include "macro.h"
++#include "misc.h"
+ 
+ Macro *macrolist = 0;
+ 
diff --git a/print/jcabc2ps/patches/patch-memBlock_c b/print/jcabc2ps/patches/patch-memBlock_c
new file mode 100644
index 00000000000..06dcb4ead8b
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-memBlock_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-memBlock_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Use standard headers.
+Declare functions before calling them.
+
+--- memBlock.c~	2003-04-19 15:31:57.000000000 +0000
++++ memBlock.c
+@@ -1,4 +1,8 @@
++#include <string.h>
++#include <stdlib.h>
++
+ #include "jcabc2ps.h"
++#include "memBlock.h"
+ 
+ int mempad = 0;		// Pad chars to add to mallocs
+ 
diff --git a/print/jcabc2ps/patches/patch-memBlock_h b/print/jcabc2ps/patches/patch-memBlock_h
new file mode 100644
index 00000000000..2134ca5faf9
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-memBlock_h
@@ -0,0 +1,12 @@
+$NetBSD: patch-memBlock_h,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Declare functions before calling them.
+
+--- memBlock.h.orig	2011-10-03 06:37:09.000000000 +0000
++++ memBlock.h
+@@ -0,0 +1,5 @@
++void* memBlock(
++	void*  ptr,		// Block to reallocate, if any
++	size_t oldsize,	// Size of old block
++	size_t newsize,	// Min size of new block
++	char*  dsc);		// Description, for messages
diff --git a/print/jcabc2ps/patches/patch-minStrM_c b/print/jcabc2ps/patches/patch-minStrM_c
new file mode 100644
index 00000000000..34c5ee55ddb
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-minStrM_c
@@ -0,0 +1,11 @@
+$NetBSD: patch-minStrM_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Declare functions before calling them.
+
+--- minStrM.c~	2003-04-19 15:21:53.000000000 +0000
++++ minStrM.c
+@@ -1,3 +1,4 @@
++#include "memBlock.h"
+ 
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Make sure that a Str has at least n bytes allocated.  The return value is sp
diff --git a/print/jcabc2ps/patches/patch-minStr_c b/print/jcabc2ps/patches/patch-minStr_c
new file mode 100644
index 00000000000..4638ad8da17
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-minStr_c
@@ -0,0 +1,12 @@
+$NetBSD: patch-minStr_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Declare functions before calling them.
+
+--- minStr.c~	2004-05-18 20:56:52.000000000 +0000
++++ minStr.c
+@@ -1,4 +1,5 @@
+ #include "jcabc2ps.h"
++#include "memBlock.h"
+ 
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Make sure that a Str has at least n bytes allocated.
diff --git a/print/jcabc2ps/patches/patch-misc_c b/print/jcabc2ps/patches/patch-misc_c
new file mode 100644
index 00000000000..8f8805bfb69
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-misc_c
@@ -0,0 +1,13 @@
+$NetBSD: patch-misc_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Use standard headers.
+
+--- misc.c~	2004-05-18 20:56:52.000000000 +0000
++++ misc.c
+@@ -1,3 +1,6 @@
++#include <string.h>
++#include <stdlib.h>
++
+ #include "jcabc2ps.h"
+ #include "misc.h"
+ 
diff --git a/print/jcabc2ps/patches/patch-music_c b/print/jcabc2ps/patches/patch-music_c
new file mode 100644
index 00000000000..d7912c7b08d
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-music_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-music_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Use standard headers.
+
+--- music.c~	2011-10-03 06:44:38.000000000 +0000
++++ music.c
+@@ -5,6 +5,7 @@
+  */
+ 
+ #include <string.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ 
+ #include "jcabc2ps.h"
diff --git a/print/jcabc2ps/patches/patch-parse_c b/print/jcabc2ps/patches/patch-parse_c
new file mode 100644
index 00000000000..d7538a52dd8
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-parse_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-parse_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Declare functions before calling them.
+
+--- parse.c~	2006-01-06 22:46:33.000000000 +0000
++++ parse.c
+@@ -13,6 +13,7 @@
+ #include "format.h"
+ #include "subs.h"
+ #include "text.h"
++#include "misc.h"
+ 
+ #include "parse.h"
+ 
diff --git a/print/jcabc2ps/patches/patch-playback_c b/print/jcabc2ps/patches/patch-playback_c
new file mode 100644
index 00000000000..386f8ed0cc9
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-playback_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-playback_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Use standard headers.
+
+--- playback.c~	2004-05-18 20:56:52.000000000 +0000
++++ playback.c
+@@ -9,6 +9,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <string.h>
+ 
+ #include "jcabc2ps.h"
+ #include "util.h"
diff --git a/print/jcabc2ps/patches/patch-pssubs_c b/print/jcabc2ps/patches/patch-pssubs_c
new file mode 100644
index 00000000000..300fcedb129
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-pssubs_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-pssubs_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Use standard headers.
+
+--- pssubs.c~	2003-07-25 13:34:41.000000000 +0000
++++ pssubs.c
+@@ -4,6 +4,7 @@
+  *  See file jcabc2ps.c for details.
+  */
+ 
++#include <string.h>
+ #include <time.h>
+ 
+ #include "jcabc2ps.h"
diff --git a/print/jcabc2ps/patches/patch-setStr_c b/print/jcabc2ps/patches/patch-setStr_c
new file mode 100644
index 00000000000..e78c65430a9
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-setStr_c
@@ -0,0 +1,11 @@
+$NetBSD: patch-setStr_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Declare functions before calling them.
+
+--- setStr.c~	2003-04-19 15:21:53.000000000 +0000
++++ setStr.c
+@@ -1,3 +1,4 @@
++#include "memBlock.h"
+ 
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * This is a limited substitute for the more general MakStr*() functions in the *
diff --git a/print/jcabc2ps/patches/patch-text_c b/print/jcabc2ps/patches/patch-text_c
new file mode 100644
index 00000000000..c421e7e7a9f
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-text_c
@@ -0,0 +1,12 @@
+$NetBSD: patch-text_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Use standard headers.
+
+--- text.c~	2003-07-03 17:13:23.000000000 +0000
++++ text.c
+@@ -1,3 +1,5 @@
++#include <string.h>
++
+ #include "jcabc2ps.h"
+ #include "text.h"
+ #include "misc.h"
diff --git a/print/jcabc2ps/patches/patch-util_c b/print/jcabc2ps/patches/patch-util_c
new file mode 100644
index 00000000000..bc2b21e2bcb
--- /dev/null
+++ b/print/jcabc2ps/patches/patch-util_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-util_c,v 1.1 2011/10/03 06:45:31 dholland Exp $
+
+Use standard headers.
+
+--- util.c~	2011-10-03 06:32:50.000000000 +0000
++++ util.c
+@@ -8,6 +8,7 @@
+ #include <sys/stat.h>
+ #include <ctype.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "jcabc2ps.h"
+ #include "util.h"