6 files changed, 47 insertions, 0 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 7bf167b89528..5a58b548c606 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -63,6 +63,7 @@
     SUBDIR += cweb
     SUBDIR += cxref
     SUBDIR += ddd
+    SUBDIR += diffconvert
     SUBDIR += dmake
     SUBDIR += dmalloc
     SUBDIR += doc++
diff --git a/devel/diffconvert/Makefile b/devel/diffconvert/Makefile
new file mode 100644
index 000000000000..ad33cd5015e6
--- /dev/null
+++ b/devel/diffconvert/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:   diffconvert
+# Date created:        30 December 2000
+# Whom:                George Reid <greid@ukug.uk.freebsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=       	diffconvert
+PORTVERSION=		1.2
+CATEGORIES=     	devel
+MASTER_SITES=   	ftp://ftp.ilog.fr/pub/Users/haible/gnu/
+
+MAINTAINER=		greid@ukug.uk.freebsd.org
+
+PROGRAMS=		cd2ud cdiffreverse ud2cd udiffreverse
+
+do-build:
+.for P in ${PROGRAMS}
+	${CXX} ${WRKSRC}/${P}.cc -o ${WRKSRC}/${P}
+.endfor
+
+do-install:
+.for P in ${PROGRAMS}
+	${INSTALL_PROGRAM} ${WRKSRC}/$P ${PREFIX}/bin
+.endfor
+
+.include <bsd.port.mk>
diff --git a/devel/diffconvert/distinfo b/devel/diffconvert/distinfo
new file mode 100644
index 000000000000..107519ca386d
--- /dev/null
+++ b/devel/diffconvert/distinfo
@@ -0,0 +1 @@
+MD5 (diffconvert-1.2.tar.gz) = c0534aaf6aa9c8ddf34d5d6935b6a40f
diff --git a/devel/diffconvert/pkg-comment b/devel/diffconvert/pkg-comment
new file mode 100644
index 000000000000..1018d0918082
--- /dev/null
+++ b/devel/diffconvert/pkg-comment
@@ -0,0 +1 @@
+A converter between context diff and unidiff formats
diff --git a/devel/diffconvert/pkg-descr b/devel/diffconvert/pkg-descr
new file mode 100644
index 000000000000..07a0e2ae2d72
--- /dev/null
+++ b/devel/diffconvert/pkg-descr
@@ -0,0 +1,13 @@
+This package contains four programs for converting diffs. Diff files are
+created by GNU diff and accepted as input by GNU patch. The two most common
+forms are "context diffs" and "unidiffs".
+
+  ud2cd          converts a unidiff (input) to a context diff (output).
+  cd2ud          converts a context diff (input) to a unidiff (output).
+  cdiffreverse   reverses a context diff.
+  cdiffreverse   reverses a unidiff.
+
+cd2ud is decicated to David S. Miller "context diffs make my head spin".
+
+- George Reid
+greid@ukug.uk.freebsd.org
diff --git a/devel/diffconvert/pkg-plist b/devel/diffconvert/pkg-plist
new file mode 100644
index 000000000000..1210186c2e04
--- /dev/null
+++ b/devel/diffconvert/pkg-plist
@@ -0,0 +1,4 @@
+bin/cd2ud
+bin/cdiffreverse
+bin/ud2cd
+bin/udiffreverse