[pkgsrc/pkgsrc-2005Q3]: pkgsrc/converters/chef Pullup ticket 870 - requested ...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/213ac6deaf25
branches:  pkgsrc-2005Q3
changeset: 499688:213ac6deaf25
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Nov 17 17:24:24 2005 +0000

description:
Pullup ticket 870 - requested by Min Sik Kim
distfile fixes for chef

Revisions pulled up:
- pkgsrc/converters/chef/Makefile       1.8, 1.9, 1.10
- pkgsrc/converters/chef/distinfo       1.3, 1.4

   Module Name:         pkgsrc
   Committed By:        tonio
   Date:                Mon Oct 17 20:59:27 UTC 2005

   Modified Files:
        pkgsrc/converters/chef: Makefile distinfo

   Log Message:
   Distfiles comes with a strange encoding.
   Updated checksum, it is just an encoding problem
   Add ${TR} magic to fix encoding
   This fixes PR 31639
---
   Module Name:         pkgsrc
   Committed By:        tonio
   Date:                Mon Oct 31 11:25:14 UTC 2005

   Modified Files:
        pkgsrc/converters/chef: Makefile distinfo

   Log Message:
   Add DIST_SUBDIR=${PKGNAME_NOREV} to change distfile path, as checksum
   was updated.
   Thanks Min Sik Kim for pointing the problem
---
   Module Name:         pkgsrc
   Committed By:        minskim
   Date:                Thu Nov 17 17:12:05 UTC 2005

   Modified Files:
        pkgsrc/converters/chef: Makefile

   Log Message:
   Correct a distfile path.  Noted by salo@.

diffstat:

 converters/chef/Makefile |  8 ++++++--
 converters/chef/distinfo |  8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r 76cf3123c6c2 -r 213ac6deaf25 converters/chef/Makefile
--- a/converters/chef/Makefile  Tue Nov 15 12:15:39 2005 +0000
+++ b/converters/chef/Makefile  Thu Nov 17 17:24:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:08 tv Exp $
+# $NetBSD: Makefile,v 1.7.4.1 2005/11/17 17:24:24 salo Exp $
 #
 
 DISTNAME=      chef.l
@@ -15,13 +15,17 @@
 
 NO_CONFIGURE=  yes
 WRKSRC=                ${WRKDIR}
+DIST_SUBDIR=   ${PKGNAME_NOREV}
 
 MAKE_ENV+=     BINDIR=${PREFIX}/bin BINOWN=${BINOWN} BINGRP=${BINGRP}
 
 INSTALLATION_DIRS=     bin
 
 do-extract:
-       ${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKDIR}/chef.l
+       # deal with the dos encoding of the file
+       ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKDIR}/chef.l.tmp
+       cd ${WRKSRC} && ${TR} '\015' '\n' < chef.l.tmp > chef.l
+       cd ${WRKSRC} && ${RM} chef.l.tmp
 
 do-build:
        cd ${WRKSRC} && ${LEX} chef.l
diff -r 76cf3123c6c2 -r 213ac6deaf25 converters/chef/distinfo
--- a/converters/chef/distinfo  Tue Nov 15 12:15:39 2005 +0000
+++ b/converters/chef/distinfo  Thu Nov 17 17:24:24 2005 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 16:12:33 agc Exp $
+$NetBSD: distinfo,v 1.2.6.1 2005/11/17 17:24:24 salo Exp $
 
-SHA1 (chef.l.txt) = 6bb58b4b42b08dbbbeb4649cf7f057e8aa74f1e1
-RMD160 (chef.l.txt) = 02855be02fcb40427d3f3e32dd60ea17ae974e16
-Size (chef.l.txt) = 2428 bytes
+SHA1 (chef-19920415/chef.l.txt) = 87d95cb4e0a7110a6aa11d02ba454a93c811e8c3
+RMD160 (chef-19920415/chef.l.txt) = 0a659d431391e54cfa1779481af953f41d0697d7
+Size (chef-19920415/chef.l.txt) = 2428 bytes