From 00500547eb740ab99b9e4419948450592052442f Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
Date: Thu, 18 Jan 2007 13:23:33 +0000
Subject: Add imerge(1), a tool to help merge one file to another
 interactively.

This utility was (obviously) inspired by the mergemaster utility in
hope of using part of its functionality stand-alone.
---
 misc/Makefile         |  1 +
 misc/imerge/Makefile  | 27 +++++++++++++++++++++++++++
 misc/imerge/distinfo  |  3 +++
 misc/imerge/pkg-descr |  8 ++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 misc/imerge/Makefile
 create mode 100644 misc/imerge/distinfo
 create mode 100644 misc/imerge/pkg-descr

(limited to 'misc')

diff --git a/misc/Makefile b/misc/Makefile
index 7b3b708874b..d5c2ceea9a5 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -155,6 +155,7 @@
     SUBDIR += histring
     SUBDIR += hotkeys
     SUBDIR += hulgalugha
+    SUBDIR += imerge
     SUBDIR += inplace
     SUBDIR += instant-server
     SUBDIR += instant-tinderbox
diff --git a/misc/imerge/Makefile b/misc/imerge/Makefile
new file mode 100644
index 00000000000..c976e32285f
--- /dev/null
+++ b/misc/imerge/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	imerge(1)
+# Date created:		18 January 2007
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	imerge
+PORTVERSION=	0.2.0
+CATEGORIES=	misc
+MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	knu
+
+MAINTAINER=	knu@FreeBSD.org
+COMMENT=	A tool to help merge one file to another interactively
+
+USE_BZIP2=	yes
+
+MAKE_ARGS=	PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}"
+MAKEFILE=	BSDmakefile
+
+MAN1=		imerge.1
+MANCOMPRESSED=	maybe
+PLIST_FILES=	bin/imerge
+
+.include <bsd.port.mk>
diff --git a/misc/imerge/distinfo b/misc/imerge/distinfo
new file mode 100644
index 00000000000..9c9cdf9e484
--- /dev/null
+++ b/misc/imerge/distinfo
@@ -0,0 +1,3 @@
+MD5 (imerge-0.2.0.tar.bz2) = 0fb81d792d1ee05f4712b7a794bff0b7
+SHA256 (imerge-0.2.0.tar.bz2) = 5cf539943d25bdfb52e67e1d0b2318e23d7902375fba53d0ffbb0eff75058bb9
+SIZE (imerge-0.2.0.tar.bz2) = 2980
diff --git a/misc/imerge/pkg-descr b/misc/imerge/pkg-descr
new file mode 100644
index 00000000000..9ae356652ab
--- /dev/null
+++ b/misc/imerge/pkg-descr
@@ -0,0 +1,8 @@
+The imerge(1) command is a utility to help merge one file to another
+interactively.
+
+This utility was (obviously) inspired by the mergemaster utility in
+hope of using part of its functionality stand-alone.
+
+Author: Akinori MUSHA <knu@iDaemons.org>
+WWW:	http://akinori.org/#imerge
-- 
cgit