Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Sep 2005 22:00:37 GMT
From:      Emanuel Haupt <ehaupt@critical.ch>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/86225: new port: sysutils/rej - Merges patch-rejects and runs a merge program to verify the changes
Message-ID:  <200509162200.j8GM0bM3078809@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/86225; it has been noted by GNATS.

From: Emanuel Haupt <ehaupt@critical.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/86225: new port: sysutils/rej - Merges patch-rejects and
 runs a merge program to verify the changes
Date: Fri, 16 Sep 2005 23:52:07 +0200

 this port should use USE_PERL5_RUN instead of USE_PERL5
 
 new shar:
 
 --- 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 <ehaupt@critical.ch>
 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_RUN=	yes
 XNO_BUILD=	yes
 XUSE_REINPLACE=	yes
 X
 XPORTDOCS=	CHANGELOG README vimrc
 XPLIST_FILES=	bin/rej bin/qp
 X
 X.include <bsd.port.pre.mk>
 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 <bsd.port.post.mk>
 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 ---



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509162200.j8GM0bM3078809>