diff options
| -rw-r--r-- | sysutils/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/rej/Makefile | 53 | ||||
| -rw-r--r-- | sysutils/rej/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/rej/pkg-descr | 21 |
4 files changed, 77 insertions, 0 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 13194601f355..87429b54062b 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -430,6 +430,7 @@ SUBDIR += rdiff-backup-devel SUBDIR += readlink SUBDIR += reed + SUBDIR += rej SUBDIR += rename SUBDIR += reoback SUBDIR += rfstool diff --git a/sysutils/rej/Makefile b/sysutils/rej/Makefile new file mode 100644 index 000000000000..52b1fe7ee433 --- /dev/null +++ b/sysutils/rej/Makefile @@ -0,0 +1,53 @@ +# New ports collection makefile for: rej +# Date created: 16 Sep 2005 +# Whom: Emanuel Haupt <ehaupt@critical.ch> +# +# $FreeBSD$ +# + +PORTNAME= rej +PORTVERSION= 0.15 +CATEGORIES= sysutils perl5 +MASTER_SITES= http://critical.ch/distfiles/ \ + http://ftp.suse.com/pub/people/mason/rej/ + +MAINTAINER= ehaupt@critical.ch +COMMENT= Merges patch-rejects and runs a merge program to verify the changes + +USE_PERL5= yes +NO_BUILD= yes +USE_REINPLACE= yes + +PORTDOCS= CHANGELOG README vimrc +PLIST_FILES= bin/rej bin/qp + +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500806 +IGNORE= needs Perl 5.8.6 or above (lang/perl5.8) +.endif + +post-patch: +.for f in ${PORTNAME} qp + @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \ + ${WRKSRC}/${f} +.endfor + @${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \ + ${WRKSRC}/runtests.sh + +do-install: +.for f in ${PORTNAME} qp + ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin +.endfor + +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +.endfor +.endif + +run-test: patch + @cd ${WRKSRC}; ${SH} runtests.sh + +.include <bsd.port.post.mk> diff --git a/sysutils/rej/distinfo b/sysutils/rej/distinfo new file mode 100644 index 000000000000..cf4edbb80d21 --- /dev/null +++ b/sysutils/rej/distinfo @@ -0,0 +1,2 @@ +MD5 (rej-0.15.tar.gz) = 49d6ef35808a90617b375aeb231c2b84 +SIZE (rej-0.15.tar.gz) = 422508 diff --git a/sysutils/rej/pkg-descr b/sysutils/rej/pkg-descr new file mode 100644 index 000000000000..54ada8ee1247 --- /dev/null +++ b/sysutils/rej/pkg-descr @@ -0,0 +1,21 @@ +rej tries to merge simple patch-rejects and then run a merge program so the +changes can be verified. It is not meant to resolve complex problems that +would not be immediately obvious to the programmer, the goal instead is to +quickly fix the easy problems. + +rej understands both unified and context diffs. + +There are four basic rejects fixable via rej. + + 1. missing context at the top or bottom of the hunk + 2. different context in the middle of the hunk + 3. slightly different lines removed by the hunk than exist in the file + 4. Large hunks that might apply if they were broken up into smaller ones + +rej also allows you to tag hunks in a reject with special processing +hints. + +WWW: http://ftp.suse.com/pub/people/mason/rej/ + +- ehaupt +ehaupt@critical.ch |