Insert another symbolic link so it configures on amd64. Fix getline()

conflict. Fix makefiles that weren't stopping on error.

Now builds.

10 files changed, 158 insertions, 2 deletions

diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index 7f0fc0616b2..39d9e68823d 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/03/18 19:18:59 darcy Exp $
+# $NetBSD: Makefile,v 1.13 2012/06/16 08:55:54 dholland Exp $
 #
 
 DISTNAME=		sformat-3.5
@@ -37,5 +37,6 @@ post-extract:
 	${CP} ${WRKSRC}/RULES/os-freebsd.id ${WRKSRC}/RULES/os-dragonfly.id
 	${CP} ${WRKSRC}/RULES/os-freebsd.def ${WRKSRC}/RULES/os-dragonfly.def
 	ln -s i386-netbsd-cc.rul ${WRKSRC}/RULES/amd64-netbsd-cc.rul
+	ln -s i386-netbsd-cc.rul ${WRKSRC}/RULES/amd64-netbsd-gcc.rul
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sformat/distinfo b/sysutils/sformat/distinfo
index 24d7a9db623..65a48637729 100644
--- a/sysutils/sformat/distinfo
+++ b/sysutils/sformat/distinfo
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.3 2007/06/27 13:40:49 joerg Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 08:55:54 dholland Exp $
 
 SHA1 (sformat-3.5.tar.gz) = 1ebde6c9d58f376ad2d82f6f8e3bb2e89da00920
 RMD160 (sformat-3.5.tar.gz) = 5dd3e15d1fca7dd961694996bd094e3f2abce28f
 Size (sformat-3.5.tar.gz) = 526375 bytes
+SHA1 (patch-RULES_rules1_dir) = 25b5f88d65b4d8265417bc97cee63f6346e3b008
 SHA1 (patch-aa) = e398bc734a7bc48668a0b61d3535c0d87b1a4ccf
+SHA1 (patch-include_schily_h) = 68bd5500c199edbbd48dba4d197ad70dc319bc84
+SHA1 (patch-lib_stdio_fgetline_c) = 0d9aacf5cebc70522b085d71ef90f9665d8c5d6a
+SHA1 (patch-libscg_scsitransp_c) = 889ec76b497782ffd42ef13214f0e1ab3187ceaf
+SHA1 (patch-sformat_defect_c) = 20ba1dfd1f671e216fd04e8dfbf02e6ca605ebf3
+SHA1 (patch-sformat_diskfmt_c) = bd86beb7d9590c32c75c158c9fb13cff8d60a3e3
+SHA1 (patch-sformat_io_c) = a0a27221e7151feac100c7fc3eb567f4555a6e1b
+SHA1 (patch-sformat_makelabel_c) = 84bbf9666fdabbcd65476a2e0389169723252327
diff --git a/sysutils/sformat/patches/patch-RULES_rules1_dir b/sysutils/sformat/patches/patch-RULES_rules1_dir
new file mode 100644
index 00000000000..048ed3d0ed8
--- /dev/null
+++ b/sysutils/sformat/patches/patch-RULES_rules1_dir
@@ -0,0 +1,15 @@
+$NetBSD: patch-RULES_rules1_dir,v 1.1 2012/06/16 08:55:55 dholland Exp $
+
+Makefiles should stop on error.
+
+--- RULES/rules1.dir~	2000-12-01 16:13:17.000000000 +0000
++++ RULES/rules1.dir
+@@ -32,7 +32,7 @@ $(ALLTARGETS):
+ 		(								\
+ 		echo "	==> MAKING \"$@\" ON SUBDIRECTORY \"$(CURDIR)/$$DIR\"";\
+ 		if [ -d ./$$DIR -a -r ./$$DIR/Makefile ] ; then			\
+-			cd ./$$DIR;$(MAKE) $(MAKEMACS) XARCH=$(XARCH) DIRNAME=$(CURDIR)/$$DIR $@;		\
++			cd ./$$DIR;$(MAKE) $(MAKEMACS) XARCH=$(XARCH) DIRNAME=$(CURDIR)/$$DIR $@ || exit 1;	\
+ 		else								\
+ 			echo "NOTICE: Partial source ($(CURDIR)/$$DIR) missing";\
+ 		fi								\
diff --git a/sysutils/sformat/patches/patch-include_schily_h b/sysutils/sformat/patches/patch-include_schily_h
new file mode 100644
index 00000000000..058fe0e2d44
--- /dev/null
+++ b/sysutils/sformat/patches/patch-include_schily_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_schily_h,v 1.1 2012/06/16 08:55:55 dholland Exp $
+
+Fix symbol name conflict with POSIX getline().
+
+--- include/schily.h	Sat Jun 16 04:48:53 2012 -0400
++++ include/schily.h	Sat Jun 16 04:50:37 2012 -0400
+@@ -153,7 +153,7 @@
+ extern	char	*findbytes __PR((const void *, int, char));
+ extern	int	findline __PR((const char *, char, const char *,
+ 							int, char **, int));
+-extern	int	getline __PR((char *, int));
++extern	int	get_line __PR((char *, int));
+ extern	int	getstr __PR((char *, int));
+ extern	int	breakline __PR((char *, char, char **, int));
+ extern	int	getallargs __PR((int *, char * const**, const char *, ...));
diff --git a/sysutils/sformat/patches/patch-lib_stdio_fgetline_c b/sysutils/sformat/patches/patch-lib_stdio_fgetline_c
new file mode 100644
index 00000000000..a9f2be40192
--- /dev/null
+++ b/sysutils/sformat/patches/patch-lib_stdio_fgetline_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_stdio_fgetline_c,v 1.1 2012/06/16 08:55:55 dholland Exp $
+
+Fix symbol name conflict with POSIX getline().
+
+--- lib/stdio/fgetline.c~	2000-12-03 11:19:29.000000000 +0000
++++ lib/stdio/fgetline.c
+@@ -64,7 +64,7 @@ fgetline(f, buf, len)
+ }
+ 
+ EXPORT int
+-getline(buf, len)
++get_line(buf, len)
+ 	char	*buf;
+ 	int	len;
+ {
diff --git a/sysutils/sformat/patches/patch-libscg_scsitransp_c b/sysutils/sformat/patches/patch-libscg_scsitransp_c
new file mode 100644
index 00000000000..7c66c98a358
--- /dev/null
+++ b/sysutils/sformat/patches/patch-libscg_scsitransp_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libscg_scsitransp_c,v 1.1 2012/06/16 08:55:55 dholland Exp $
+
+Fix symbol name conflict with POSIX getline().
+
+--- libscg/scsitransp.c	Sat Jun 16 04:48:53 2012 -0400
++++ libscg/scsitransp.c	Sat Jun 16 04:50:37 2012 -0400
+@@ -302,7 +302,7 @@
+ 
+ 	js_printf("%s", msg);
+ 	flush();
+-	if (getline(okbuf, sizeof(okbuf)) == EOF)
++	if (get_line(okbuf, sizeof(okbuf)) == EOF)
+ 		exit(EX_BAD);
+ 	if(streql(okbuf, "y") || streql(okbuf, "yes") ||
+ 	   streql(okbuf, "Y") || streql(okbuf, "YES"))
diff --git a/sysutils/sformat/patches/patch-sformat_defect_c b/sysutils/sformat/patches/patch-sformat_defect_c
new file mode 100644
index 00000000000..2d1f8a77843
--- /dev/null
+++ b/sysutils/sformat/patches/patch-sformat_defect_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-sformat_defect_c,v 1.1 2012/06/16 08:55:55 dholland Exp $
+
+Fix symbol name conflict with POSIX getline().
+
+--- sformat/defect.c	Sat Jun 16 04:48:53 2012 -0400
++++ sformat/defect.c	Sat Jun 16 04:50:37 2012 -0400
+@@ -238,7 +238,7 @@
+ 	for (;;) {
+ 		printf("def> ");
+ 		flush();
+-		if ((n = getline(line, 80)) == 0)
++		if ((n = get_line(line, 80)) == 0)
+ /*			return (FALSE);*/
+ 			continue;
+ 		if (n == EOF)
diff --git a/sysutils/sformat/patches/patch-sformat_diskfmt_c b/sysutils/sformat/patches/patch-sformat_diskfmt_c
new file mode 100644
index 00000000000..2cbf8f60dc1
--- /dev/null
+++ b/sysutils/sformat/patches/patch-sformat_diskfmt_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-sformat_diskfmt_c,v 1.1 2012/06/16 08:55:55 dholland Exp $
+
+Fix symbol name conflict with POSIX getline().
+
+--- sformat/diskfmt.c	Sat Jun 16 04:48:53 2012 -0400
++++ sformat/diskfmt.c	Sat Jun 16 04:50:37 2012 -0400
+@@ -1014,7 +1014,7 @@
+ 	}
+ 
+ 	printf("Enter filename for database prototype [proto.dat]: ");flush();
+-	(void)getline(name, sizeof(name));
++	(void)get_line(name, sizeof(name));
+ 	if (name[0] == '\0')
+ 		strcpy(name, "proto.dat");
+ 	if (streql(name, "-"))
diff --git a/sysutils/sformat/patches/patch-sformat_io_c b/sysutils/sformat/patches/patch-sformat_io_c
new file mode 100644
index 00000000000..1b3801df491
--- /dev/null
+++ b/sysutils/sformat/patches/patch-sformat_io_c
@@ -0,0 +1,33 @@
+$NetBSD: patch-sformat_io_c,v 1.1 2012/06/16 08:55:55 dholland Exp $
+
+Fix symbol name conflict with POSIX getline().
+
+--- sformat/io.c	Sat Jun 16 04:48:53 2012 -0400
++++ sformat/io.c	Sat Jun 16 04:50:37 2012 -0400
+@@ -245,7 +245,7 @@
+ 		(*prt)(s, *lp, mini, maxi, dp);
+ 		flush();
+ 		line[0] = '\0';
+-		if (getline(line, 80) == EOF)
++		if (get_line(line, 80) == EOF)
+ 			exit(EX_BAD);
+ 
+ 		linep = skipwhite(line);
+@@ -332,7 +332,7 @@
+ 	printf("%r", form, args);
+ 	va_end(args);
+ 	flush();
+-	if (getline(okbuf, sizeof(okbuf)) == EOF)
++	if (get_line(okbuf, sizeof(okbuf)) == EOF)
+ 		exit(EX_BAD);
+ 	if (okbuf[0] == '?') {
+ 		printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
+@@ -412,7 +412,7 @@
+ 		printf("%s [%s]:", s, csp->s_name);
+ 		flush();
+ 		line[0] = '\0';
+-		if (getline(line, 80) == EOF)
++		if (get_line(line, 80) == EOF)
+ 			exit(EX_BAD);
+ 
+ 		linep = skipwhite(line);
diff --git a/sysutils/sformat/patches/patch-sformat_makelabel_c b/sysutils/sformat/patches/patch-sformat_makelabel_c
new file mode 100644
index 00000000000..a7862ad7c3c
--- /dev/null
+++ b/sysutils/sformat/patches/patch-sformat_makelabel_c
@@ -0,0 +1,24 @@
+$NetBSD: patch-sformat_makelabel_c,v 1.1 2012/06/16 08:55:55 dholland Exp $
+
+Fix symbol name conflict with POSIX getline().
+
+--- sformat/makelabel.c	Sat Jun 16 04:48:53 2012 -0400
++++ sformat/makelabel.c	Sat Jun 16 04:50:37 2012 -0400
+@@ -284,7 +284,7 @@
+ 	if (yes("Label: <%s> change ? ", labelbuf)) {
+ 		printf("Enter disk label: "); flush();
+ 		tty_insert(labelbuf);
+-		(void)getline(lbuf, sizeof(lbuf));
++		(void)get_line(lbuf, sizeof(lbuf));
+ 		strcpy(labelbuf, lbuf);
+ 		
+ 	}
+@@ -296,7 +296,7 @@
+ 	if (yes("Volume Name: <%s> change ? ", lbuf)) {
+ 		printf("Enter volume name: "); flush();
+ 		tty_insert(lbuf);
+-		(void)getline(lbuf, LEN_DKL_VVOL+1);
++		(void)get_line(lbuf, LEN_DKL_VVOL+1);
+ 		strncpy(lp->dkl_vtoc.v_volume, lbuf, LEN_DKL_VVOL);
+ 	}
+ #endif