Resolve conflicts, and remove files committed in error.

5 files changed, 50 insertions, 0 deletions

diff --git a/misc/par/DESCR b/misc/par/DESCR
new file mode 100644
index 00000000000..0e1066a80d9
--- /dev/null
+++ b/misc/par/DESCR
@@ -0,0 +1,13 @@
+"Parchive" implements a RAID-like system for multi-part archives. Such
+archives are commonly posted to Usenet binary newsgroups. Typically, a
+poster will construct 2 to 5 parity files for a multi-part archive
+consisting of somewhere in the neighborhood of 15 to 50 equal sized parts.
+These parity files contain a Reed-Solomon encoding of the original files.
+He'll then post all of them along with the original parts, so if any number
+of those original parts are lost or corrupted in transit (up to the number
+of parity files), a receiver may reconstruct them from only that number
+of parity files.
+
+Though quickly growing in popularity for it's intended application, the
+format of the parity files is sufficiently general to be useful for other
+applicatons as well. The format itself is in the public domain.
diff --git a/misc/par/Makefile b/misc/par/Makefile
new file mode 100644
index 00000000000..ee36da99ce4
--- /dev/null
+++ b/misc/par/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.3 2002/01/04 20:05:53 fredb Exp $
+#
+
+DISTNAME=	par-v1.1
+CATEGORIES=	misc archivers
+MASTER_SITES=	http://telia.dl.sourceforge.net/parchive/
+
+MAINTAINER=	fredb@netbsd.org
+HOMEPAGE=	http://sourceforge.net/project/parchive/
+COMMENT=	create or use "Parity Volume Set" (PAR and Pnn) files
+
+WRKSRC=		${WRKDIR}/par-cmdline
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/par ${PREFIX}/bin
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/par/PLIST b/misc/par/PLIST
new file mode 100644
index 00000000000..c8dbaf1ac9d
--- /dev/null
+++ b/misc/par/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.3 2002/01/04 20:05:53 fredb Exp $
+bin/par
diff --git a/misc/par/distinfo b/misc/par/distinfo
new file mode 100644
index 00000000000..922b6aab072
--- /dev/null
+++ b/misc/par/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.3 2002/01/04 20:05:54 fredb Exp $
+
+SHA1 (par-v1.1.tar.gz) = acba4cdfb8a89b1542cd9ba6494d0d3461e609a1
+Size (par-v1.1.tar.gz) = 40959 bytes
+SHA1 (patch-aa) = 597886e49329078291a455efdd520df6d9919088
diff --git a/misc/par/patches/patch-aa b/misc/par/patches/patch-aa
new file mode 100644
index 00000000000..cc0829a723b
--- /dev/null
+++ b/misc/par/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2002/01/04 20:05:55 fredb Exp $
+
+--- Makefile.orig	Sat Nov 17 10:39:52 2001
++++ Makefile
+@@ -2,7 +2,7 @@
+ CFLAGS=-g -W -Wall -Wno-unused -O2
+ 
+ par: backend.o checkpar.o makepar.o rwpar.o rs.o md5.o fileops.o main.o readoldpar.o interface.o ui_text.o
+-	$(CC) -o $@ $^
++	$(CC) -o ${.TARGET} ${.ALLSRC}
+ 
+ clean:
+ 	rm -f core par par.exe *.o