From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 16 19:30:09 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C504616A41F for ; Fri, 16 Sep 2005 19:30:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BE4B43D46 for ; Fri, 16 Sep 2005 19:30:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j8GJU9ba061174 for ; Fri, 16 Sep 2005 19:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j8GJU84B061158; Fri, 16 Sep 2005 19:30:08 GMT (envelope-from gnats) Resent-Date: Fri, 16 Sep 2005 19:30:08 GMT Resent-Message-Id: <200509161930.j8GJU84B061158@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Emanuel Haupt Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B603B16A41F for ; Fri, 16 Sep 2005 19:25:18 +0000 (GMT) (envelope-from ehaupt@beaver.critical.ch) Received: from beaver.critical.ch (217-162-251-247.dclient.hispeed.ch [217.162.251.247]) by mx1.FreeBSD.org (Postfix) with ESMTP id 315CD43D46 for ; Fri, 16 Sep 2005 19:25:17 +0000 (GMT) (envelope-from ehaupt@beaver.critical.ch) Received: from beaver.critical.ch (localhost.critical.ch [127.0.0.1]) by beaver.critical.ch (8.13.3/8.13.3) with ESMTP id j8GJPFgR008209 for ; Fri, 16 Sep 2005 21:25:15 +0200 (CEST) (envelope-from ehaupt@beaver.critical.ch) Received: (from ehaupt@localhost) by beaver.critical.ch (8.13.3/8.13.3/Submit) id j8GJPFYx008208; Fri, 16 Sep 2005 21:25:15 +0200 (CEST) (envelope-from ehaupt) Message-Id: <200509161925.j8GJPFYx008208@beaver.critical.ch> Date: Fri, 16 Sep 2005 21:25:15 +0200 (CEST) From: Emanuel Haupt To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/86225: new port: sysutils/rej - Merges patch-rejects and runs a merge program to verify the changes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Emanuel Haupt List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Sep 2005 19:30:09 -0000 >Number: 86225 >Category: ports >Synopsis: new port: sysutils/rej - Merges patch-rejects and runs a merge program to verify the changes >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Sep 16 19:30:08 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Emanuel Haupt >Release: FreeBSD 5.4-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD beaver.critical.ch 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #0: Wed Jul 27 20:19:15 CEST 2005 root@beaver.critical.ch:/usr/obj/usr/src/RELENG_5_4/src/sys/BEAVER i386 >Description: new port: sysutils/rej - Merges patch-rejects and runs a merge program to verify the changes 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. >How-To-Repeat: >Fix: --- rej.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # rej # rej/Makefile # rej/pkg-descr # rej/distinfo # echo c - rej mkdir -p rej > /dev/null 2>&1 echo x - rej/Makefile sed 's/^X//' >rej/Makefile << 'END-of-rej/Makefile' X# New ports collection makefile for: rej X# Date created: 16 Sep 2005 X# Whom: Emanuel Haupt X# X# $FreeBSD$ X# X XPORTNAME= rej XPORTVERSION= 0.15 XCATEGORIES= sysutils perl5 XMASTER_SITES= http://critical.ch/distfiles/ XMASTER_SITES+= http://ftp.suse.com/pub/people/mason/rej/ X XMAINTAINER= ehaupt@critical.ch XCOMMENT= Merges patch-rejects and runs a merge program to verify the changes X XUSE_PERL5= yes XNO_BUILD= yes XUSE_REINPLACE= yes X XPORTDOCS= CHANGELOG README vimrc XPLIST_FILES= bin/rej bin/qp X X.include X X.if ${PERL_LEVEL} < 500806 XIGNORE= needs Perl 5.8.6 or above (lang/perl5.8) X.endif X Xpost-patch: X.for f in ${PORTNAME} qp X @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \ X ${WRKSRC}/${f} X.endfor X @${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \ X ${WRKSRC}/runtests.sh X Xdo-install: X.for f in ${PORTNAME} qp X ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin X.endfor X X.if !defined(NOPORTDOCS) X ${MKDIR} ${DOCSDIR} X.for f in ${PORTDOCS} X ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} X.endfor X.endif X Xrun-test: patch X @cd ${WRKSRC}; ${SH} runtests.sh X X.include END-of-rej/Makefile echo x - rej/pkg-descr sed 's/^X//' >rej/pkg-descr << 'END-of-rej/pkg-descr' Xrej tries to merge simple patch-rejects and then run a merge program so the Xchanges can be verified. It is not meant to resolve complex problems that Xwould not be immediately obvious to the programmer, the goal instead is to Xquickly fix the easy problems. X Xrej understands both unified and context diffs. X XThere are four basic rejects fixable via rej. X X 1. missing context at the top or bottom of the hunk X 2. different context in the middle of the hunk X 3. slightly different lines removed by the hunk than exist in the file X 4. Large hunks that might apply if they were broken up into smaller ones X Xrej also allows you to tag hunks in a reject with special processing Xhints. X XWWW: http://ftp.suse.com/pub/people/mason/rej/ X X- ehaupt Xehaupt@critical.ch END-of-rej/pkg-descr echo x - rej/distinfo sed 's/^X//' >rej/distinfo << 'END-of-rej/distinfo' XMD5 (rej-0.15.tar.gz) = 49d6ef35808a90617b375aeb231c2b84 XSIZE (rej-0.15.tar.gz) = 422508 END-of-rej/distinfo exit --- rej.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted: