5 files changed, 37 insertions, 0 deletions
diff --git a/devel/Makefile b/devel/Makefile
index e8d5beb4576a..6793331bcbf0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -950,6 +950,7 @@
     SUBDIR += p5-Algorithm-LUHN
     SUBDIR += p5-Algorithm-MDiff
     SUBDIR += p5-Algorithm-MarkovChain
+    SUBDIR += p5-Algorithm-Merge
     SUBDIR += p5-Algorithm-MinMax
     SUBDIR += p5-Algorithm-NaiveBayes
     SUBDIR += p5-Algorithm-Networksort
diff --git a/devel/p5-Algorithm-Merge/Makefile b/devel/p5-Algorithm-Merge/Makefile
new file mode 100644
index 000000000000..603bdb684829
--- /dev/null
+++ b/devel/p5-Algorithm-Merge/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	devel/p5-Algorithm-Merge
+# Date created:				29 Mar 2009
+# Whom:					Lars Balker Rasmussen <lbr@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Algorithm-Merge
+PORTVERSION=	0.08
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	lbr@FreeBSD.org
+COMMENT=	Three-way merge and diff
+
+RUN_DEPENDS=	p5-Algorithm-Diff>=1.15:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS=	${RUN_DEPENDS}
+
+PERL_CONFIGURE=	yes
+
+MAN3=	Algorithm::Merge.3
+
+.include <bsd.port.mk>
diff --git a/devel/p5-Algorithm-Merge/distinfo b/devel/p5-Algorithm-Merge/distinfo
new file mode 100644
index 000000000000..c816a3e516d8
--- /dev/null
+++ b/devel/p5-Algorithm-Merge/distinfo
@@ -0,0 +1,3 @@
+MD5 (Algorithm-Merge-0.08.tar.gz) = eadf67581b25d00ca30d7ec6488c9db0
+SHA256 (Algorithm-Merge-0.08.tar.gz) = 9c0688258a1dc4b83988053b9f9a98e7728cdb9b69a5008dcbd251d0f80816cf
+SIZE (Algorithm-Merge-0.08.tar.gz) = 9915
diff --git a/devel/p5-Algorithm-Merge/pkg-descr b/devel/p5-Algorithm-Merge/pkg-descr
new file mode 100644
index 000000000000..aa76c6268c17
--- /dev/null
+++ b/devel/p5-Algorithm-Merge/pkg-descr
@@ -0,0 +1,4 @@
+This module complements Algorithm::Diff by providing three-way merge
+and diff functions.
+
+WWW: http://search.cpan.org/dist/Algorithm-Merge/
diff --git a/devel/p5-Algorithm-Merge/pkg-plist b/devel/p5-Algorithm-Merge/pkg-plist
new file mode 100644
index 000000000000..23f80e31593a
--- /dev/null
+++ b/devel/p5-Algorithm-Merge/pkg-plist
@@ -0,0 +1,5 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Merge/.packlist
+%%SITE_PERL%%/Algorithm/Merge.pm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Merge
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm