Import of pkgsrc-2013Q2

sysutils/sformat/DESCR

@@ -0,0 +1,11 @@
+Sformat is the best SCSI disk tool, I came across in the last 20 years.
+It is able to repair and format nearly any disk, as long as its heads
+are still in working condition and a few percent of its blocks are
+writable. Once you have learned to use it, you will never think of using
+something else. Formating a disk with sformat does not only send a
+scsi-format command to the disk, but also make a detailed surface
+analysis after formating. The defect lists are updated, and you come out
+with a reliable disk, again. Thanks Joerg.
+
+On the other side, like with any other powerful tool, you have to invest
+some time in learning. Well invested time.

sysutils/sformat/Makefile

@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.16 2013/04/06 03:45:25 rodent Exp $
+#
+
+DISTNAME=	sformat-3.5
+PKGREVISION=	1
+CATEGORIES=	sysutils
+MASTER_SITES=	ftp://ftp.berlios.de/pub/sformat/
+
+MAINTAINER=	Andreas.Hallmann@tiscali.de
+HOMEPAGE=	http://freshmeat.net/projects/sformat
+COMMENT=	SCSI disk maintainance, formating, and ultimative repair tool
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+.include "../../mk/bsd.prefs.mk"
+
+USE_TOOLS+=		gmake
+TBL?=			tbl
+
+# avoid picking up a bad ${ARCH} during the build
+MAKE_ENV+=	ARCH=""
+MAKE_ENV+=	MAKEPROG="gmake"
+MAKE_ENV+=	COPTX=${CFLAGS:M*:Q}
+MAKE_ENV+=	LDOPTX=${LDFLAGS:M*:Q}
+MAKE_FLAGS+=	INS_BASE=${DESTDIR}${LOCALBASE:Q} # won't work in MAKE_ENV!
+
+# if we're using a gcc which is named gcc, we need to set CCOM=gcc
+# in MAKE_ENV so the make infrastructure picks the right options.
+.if !empty(CC:M*gcc*)
+MAKE_ENV+=	CCOM="gcc"
+.endif
+
+INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+
+post-extract:
+	${CP} ${WRKSRC}/RULES/os-freebsd.id ${WRKSRC}/RULES/os-dragonfly.id
+	${CP} ${WRKSRC}/RULES/os-freebsd.def ${WRKSRC}/RULES/os-dragonfly.def
+.for x in amd64 macppc
+	ln -s i386-netbsd-cc.rul ${WRKSRC}/RULES/${x}-netbsd-cc.rul
+	ln -s i386-netbsd-cc.rul ${WRKSRC}/RULES/${x}-netbsd-gcc.rul
+.endfor
+
+.include "../../mk/bsd.pkg.mk"

sysutils/sformat/PLIST

@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/02 10:08:03 hubertf Exp $
+bin/sformat
+etc/sformat.dat
+include/align.h
+include/avoffset.h
+lib/libdeflt.a
+lib/librscg.a
+lib/libscg.a
+lib/libschily.a
+man/man5/makefiles.5
+man/man5/makerules.5
+man/man8/sformat.8
+sbin/rscsi

sysutils/sformat/distinfo

@@ -0,0 +1,14 @@
+$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

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								\

sysutils/sformat/patches/patch-aa

@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/06/27 13:40:49 joerg Exp $
+
+--- lib/fconv.c.orig	2007-06-27 13:16:27.000000000 +0000
++++ lib/fconv.c
+@@ -68,7 +68,7 @@ extern	char	*fcvt __PR((double, int, int
+ #define	FOUND_ISXX
+ #endif 
+ 
+-#if	defined(HAVE_IEEEFP_H) && !defined(FOUND_ISXX)
++#if	defined(HAVE_IEEEFP_H) && !defined(FOUND_ISXX) && !defined(__DragonFly__)
+ /*
+  * SVR4
+  */

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 *, ...));

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;
+ {

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"))

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)

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, "-"))

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);

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