Date: Wed, 7 Nov 2001 21:06:37 -0800 (PST) From: John Merryweather Cooper <john_m_cooper@yahoo.com> To: FreeBSD-gnats-submit@freebsd.org Cc: tobez@freebsd.org Subject: ports/31848: [MAINTAINER UPDATE] Bug Fix for makepatch-2.00a Message-ID: <20011108050637.129F515503@johncoop.MSHOME>
next in thread | raw e-mail | index | archive | help
>Number: 31848 >Category: ports >Synopsis: [MAINTAINER UPDATE] Bug Fix for makepatch-2.00a >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Nov 07 21:10:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: John Merryweather Cooper >Release: FreeBSD 4.4-STABLE i386 >Organization: >Environment: System: FreeBSD johncoop.MSHOME 4.4-STABLE FreeBSD 4.4-STABLE #43: Mon Nov 5 00:03:41 PST 2001 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: Fix a bug and tweak dependencies: * under certain circumstances, makepatch would fail because -T and -B operations on filehandles are not implemented (and not really needed) under FreeBSD. Fix by commenting out the test (which would just issue a warning about detecting a binary file). * while making the above fix, I noticed that makepatch depends on several modules whose latest versions are in ports. Add dependencies for these. P.S. Bento is whining to me about some bad sites in MASTER_PERL_SITES. Perhaps some pruning needed? >How-To-Repeat: I found the bug when trying to run makepatch on my upgrade from netrexx-1.160 to netrexx-2.02. >Fix: makepatch -nomanifest -diff "diff -u" makepatch makepatch.new follows: # This is a patch for makepatch to update it to makepatch.new # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # If you have a decent Bourne-type shell: # STEP 2: Run the shell with this file as input. # If you don't have such a shell, you may need to manually create # the files/directories as shown below. # STEP 3: Run the 'patch' program with this file as input. # # These are the commands needed to create/delete files/directories: # mkdir 'files' chmod 0755 'files' touch 'files/patch-makepatch.PL' chmod 0644 'files/patch-makepatch.PL' # # This command terminates the shell and need not be executed manually. exit # #### End of Preamble #### #### Patch data follows #### diff -u 'makepatch/Makefile' 'makepatch.new/Makefile' Index: ./Makefile --- ./Makefile Tue Oct 30 14:21:37 2001 +++ ./Makefile Mon Nov 5 19:16:41 2001 @@ -2,16 +2,21 @@ # Date created: 22 October 2001 # Whom: John Merryweather Cooper # -# $FreeBSD: ports/textproc/makepatch/Makefile,v 1.1 2001/10/30 22:21:37 tobez Exp $ +# $FreeBSD$ # PORTNAME= makepatch PORTVERSION= 2.00a +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/JV MAINTAINER= jmcoopr@webmail.bmi.net + +BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \ + ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO PERL_CONFIGURE= yes diff -u /dev/null 'makepatch.new/files/patch-makepatch.PL' Index: ./files/patch-makepatch.PL --- ./files/patch-makepatch.PL Wed Dec 31 16:00:00 1969 +++ ./files/patch-makepatch.PL Mon Nov 5 19:48:50 2001 @@ -0,0 +1,22 @@ +--- makepatch.PL Sun Dec 6 09:04:51 1998 ++++ makepatch.PL.new Mon Nov 5 19:47:17 2001 +@@ -670,11 +670,14 @@ + $skipped++; + return 0; + } +- if ( -B $fh ) { +- verbose ("WARNING: Binary file $new -- skipped\n"); +- $skipped++; +- return 0; +- } ++# Binary/Text test on filehandle makes no sense (and causes failure) ++# on FreeBSD ++# ++# if ( -B $fh ) { ++# verbose ("WARNING: Binary file $new -- skipped\n"); ++# $skipped++; ++# return 0; ++# } + my $pos = $fh->getpos; + while ( <$fh> ) { + $lines++; #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Mon Nov 5 19:56:26 2001 # Generated by : makepatch 2.00 # Recurse directories : Yes # p 'Makefile' 468 1005016601 0100644 # c 'files/patch-makepatch.PL' 0 1005018530 0100644 # C 'files' 0 1005018530 040755 #### End of ApplyPatch data #### #### End of Patch kit [created: Mon Nov 5 19:56:26 2001] #### #### Checksum: 99 3188 48526 #### >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011108050637.129F515503>