3 files changed, 69 insertions, 0 deletions

diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile
new file mode 100644
index 000000000000..697f0e7bd615
--- /dev/null
+++ b/devel/git-merge-changelog/Makefile
@@ -0,0 +1,50 @@
+# New ports collection makefile for:	git-merge-changelog
+# Date created:		19 April 2010
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	git-merge-changelog
+PORTVERSION=	${GNULIB_PORTVERSION}
+PORTREVISION=	${GNULIB_PORTREVISION}
+PORTEPOCH=	${GNULIB_PORTEPOCH}
+CATEGORIES=	devel
+MASTER_SITES=	# none
+DISTFILES=	# none
+
+MAINTAINER=	knu@FreeBSD.org
+COMMENT=	Git "merge" driver for GNU style ChangeLog files
+
+BUILD_DEPENDS=	${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR}
+
+USE_AUTOTOOLS=	automake:110 autoconf:262
+GNU_CONFIGURE=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.pre.mk>
+
+GNULIB_DIR=	${LOCALBASE}/share/gnulib
+GNULIB_PORT=	devel/gnulib
+GNULIB_PORTDIR=	${PORTSDIR}/${GNULIB_PORT}
+GNULIB_PORTVERSION!=	cd ${GNULIB_PORTDIR} && ${MAKE} -V PORTVERSION
+GNULIB_PORTREVISION!=	cd ${GNULIB_PORTDIR} && ${MAKE} -V PORTREVISION
+GNULIB_PORTEPOCH!=	cd ${GNULIB_PORTDIR} && ${MAKE} -V PORTEPOCH
+GNULIB_WRKSRC!=	cd ${GNULIB_PORTDIR} && ${MAKE} -V WRKSRC
+
+do-extract:
+	${MKDIR} ${WRKDIR}
+	cd ${GNULIB_DIR}; ./gnulib-tool --create-testdir --dir="${WRKSRC}" ${PORTNAME}
+
+# Disable unwanted hooks added by USE_AUTOTOOLS.
+patch-autotools:
+	@${DO_NADA}
+run-autotools:
+	@${DO_NADA}
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
diff --git a/devel/git-merge-changelog/pkg-descr b/devel/git-merge-changelog/pkg-descr
new file mode 100644
index 000000000000..90f7b15ef930
--- /dev/null
+++ b/devel/git-merge-changelog/pkg-descr
@@ -0,0 +1,3 @@
+This is a Git "merge" driver for GNU style ChangeLog files.
+
+Author:	Bruno Haible <bruno@clisp.org>
diff --git a/devel/git-merge-changelog/pkg-message b/devel/git-merge-changelog/pkg-message
new file mode 100644
index 000000000000..24f30a6e287e
--- /dev/null
+++ b/devel/git-merge-changelog/pkg-message
@@ -0,0 +1,16 @@
+************************************************************************
+Usage of git-merge-changelog:
+
+- Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
+  lines:
+
+	[merge "merge-changelog"]
+		name = GNU-style ChangeLog merge driver
+		driver = git-merge-changelog %O %A %B
+
+- In every directory that contains a ChangeLog file, add a file
+  '.gitattributes' with this line:
+
+	ChangeLog	merge=merge-changelog
+
+************************************************************************