Bug 149500

Summary: Update port: textproc/diffstat
Product: Ports & Packages Reporter: Frederic Culot <frederic>
Component: Individual Port(s)Assignee: Cheng-Lung Sung <clsung>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
diffstat.diff none

Description Frederic Culot 2010-08-10 15:00:16 UTC 
Update to 1.53:
- post-patch target updated (to make use of 'xz' instead of 'lzcat', see PR148604)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-08-10 15:00:25 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->clsung

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 swell.k 2010-08-10 16:22:24 UTC 
Frederic Culot <frederic@culot.org> writes:

>  post-patch:	.SILENT
> -	${REINPLACE_CMD} 's/lzcat/xz/' ${WRKSRC}/configure
> +	${REINPLACE_CMD} 's/=lzcat/=xz/' ${WRKSRC}/configure
> +	${REINPLACE_CMD} 's/lzcat//' ${WRKSRC}/configure

Please, don't use REINPLACE_CMD several times against same file. It
makes harder to view changes

  $ cd $(make -V WRKSRC)
  $ diff -up configure.bak configure

Besides, I think new version already distinguishes between XZ and LZCAT.
It's better to patch the source.

  post-patch:	.SILENT
          ${REINPLACE_CMD} '/\.xz/ { N; s/dcLzma/dcXz/; }' ${WRKSRC}/diffstat.c

So, it'll look like

@@ -1934,7 +1934,7 @@ is_compressed(const char *name)
     } else if (len > 5 && !strcmp(name + len - 5, ".lzma")) {
 	which = dcLzma;
     } else if (len > 3 && !strcmp(name + len - 3, ".xz")) {
-	which = dcLzma;
+	which = dcXz;
     } else {
 	which = dcNone;
     }
Comment 3 Frederic Culot 2010-08-10 19:26:26 UTC 
Following an email exchange with swell.k at gmail.com, I send an updated patch
with the post-patch Makefile target applying on configure replaced by a patch
applying on the source and contained in files/patch-diffstat.c.

Many thanks to swell.k for his advise.

Frederic
Comment 4 Cheng-Lung Sung freebsd_committer freebsd_triage 2010-09-06 03:21:29 UTC 
State Changed
From-To: open->closed

Committed. Thank You.
Comment 5 dfilter service freebsd_committer freebsd_triage 2010-09-06 03:21:32 UTC 
clsung      2010-09-06 02:21:18 UTC

  FreeBSD ports repository

  Modified files:
    textproc/diffstat    Makefile distinfo 
  Added files:
    textproc/diffstat/files patch-diffstat.c 
  Log:
  - Update to 1.53
  
  PR:             ports/149500
  Submitted by:   Frederic Culot <frederic_AT_culot dot org>
  Reviewed by:    swell.k at gmail.com
  
  Revision  Changes    Path
  1.32      +1 -5      ports/textproc/diffstat/Makefile
  1.22      +3 -3      ports/textproc/diffstat/distinfo
  1.1       +11 -0     ports/textproc/diffstat/files/patch-diffstat.c (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"