On Mon, 10 Oct 2005, Hubert Feyrer wrote:
> 	SHA1 (unzip-5.52nb2/unzip552.tar.gz) = 
> 1831bd59b9e607a69052f83b263384895e2d4a19

FWIW, the following command probably fixes this:

 	cd pkgsrc ; perl -i.BLA -pe 's,nb[0-9]*/,/,' */*/distinfo

At least the patch (below) looks sane to me. Please review, etc. and 
commit.

I wonder how this change was tested before committing...


  - Hubert


Index: archivers/unzip/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/unzip/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- archivers/unzip/distinfo	4 Aug 2005 14:20:35 -0000	1.14
+++ archivers/unzip/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,8 +1,8 @@
  $NetBSD: distinfo,v 1.14 2005/08/04 14:20:35 tron Exp $

-SHA1 (unzip-5.52nb2/unzip552.tar.gz) = 1831bd59b9e607a69052f83b263384895e2d4a19
-RMD160 (unzip-5.52nb2/unzip552.tar.gz) = b749b0923bc4cceaa6f937aef688e9713a84328c
-Size (unzip-5.52nb2/unzip552.tar.gz) = 1140291 bytes
+SHA1 (unzip-5.52/unzip552.tar.gz) = 1831bd59b9e607a69052f83b263384895e2d4a19
+RMD160 (unzip-5.52/unzip552.tar.gz) = b749b0923bc4cceaa6f937aef688e9713a84328c
+Size (unzip-5.52/unzip552.tar.gz) = 1140291 bytes
  SHA1 (patch-aa) = de66b7b5c45904167e8596ce5235d957c2df4d2a
  SHA1 (patch-ab) = dd426fdf4b774bd73f4ee46da470ffa3c2cf6513
  SHA1 (patch-ac) = ada9059d9b3384396bbf6437f55fa40f2f6c0c73
Index: audio/csound-manual/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/csound-manual/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- audio/csound-manual/distinfo	23 Feb 2005 20:39:43 -0000	1.9
+++ audio/csound-manual/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,5 +1,5 @@
  $NetBSD: distinfo,v 1.9 2005/02/23 20:39:43 agc Exp $

-SHA1 (csound-manual-4.23nb2/manual-html-4.23.tar.gz) = 114c4155ae5de4260827f7f0d9342c3b200a171f
-RMD160 (csound-manual-4.23nb2/manual-html-4.23.tar.gz) = 47008c7bd4437ddfd7739f1795a631bc94234d5b
-Size (csound-manual-4.23nb2/manual-html-4.23.tar.gz) = 1762467 bytes
+SHA1 (csound-manual-4.23/manual-html-4.23.tar.gz) = 114c4155ae5de4260827f7f0d9342c3b200a171f
+RMD160 (csound-manual-4.23/manual-html-4.23.tar.gz) = 47008c7bd4437ddfd7739f1795a631bc94234d5b
+Size (csound-manual-4.23/manual-html-4.23.tar.gz) = 1762467 bytes
Index: audio/festvox-aec/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/festvox-aec/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- audio/festvox-aec/distinfo	23 Feb 2005 20:39:44 -0000	1.4
+++ audio/festvox-aec/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,5 +1,5 @@
  $NetBSD: distinfo,v 1.4 2005/02/23 20:39:44 agc Exp $

-SHA1 (festvox-aec-2.0nb1/voice_aec_di-2.0.tar.gz) = bc53c8cc3b22adb72f9ce720f8cc95df7df106a6
-RMD160 (festvox-aec-2.0nb1/voice_aec_di-2.0.tar.gz) = c1fcfa12c24915b566cb18e5ceba7b6c8956992a
-Size (festvox-aec-2.0nb1/voice_aec_di-2.0.tar.gz) = 5778312 bytes
+SHA1 (festvox-aec-2.0/voice_aec_di-2.0.tar.gz) = bc53c8cc3b22adb72f9ce720f8cc95df7df106a6
+RMD160 (festvox-aec-2.0/voice_aec_di-2.0.tar.gz) = c1fcfa12c24915b566cb18e5ceba7b6c8956992a
+Size (festvox-aec-2.0/voice_aec_di-2.0.tar.gz) = 5778312 bytes
Index: databases/geneweb/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/geneweb/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- databases/geneweb/distinfo	29 May 2005 07:45:26 -0000	1.10
+++ databases/geneweb/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,5 +1,5 @@
  $NetBSD: distinfo,v 1.10 2005/05/29 07:45:26 wiz Exp $

-SHA1 (geneweb-4.10nb1/geneweb-4.10.tar.gz) = 0ab12497a3ffc3541228d9dc899c095b18e7fba1
-RMD160 (geneweb-4.10nb1/geneweb-4.10.tar.gz) = 5d5c9d08d76bbc08a288e7ae56aa335b9cfc0fb8
-Size (geneweb-4.10nb1/geneweb-4.10.tar.gz) = 998314 bytes
+SHA1 (geneweb-4.10/geneweb-4.10.tar.gz) = 0ab12497a3ffc3541228d9dc899c095b18e7fba1
+RMD160 (geneweb-4.10/geneweb-4.10.tar.gz) = 5d5c9d08d76bbc08a288e7ae56aa335b9cfc0fb8
+Size (geneweb-4.10/geneweb-4.10.tar.gz) = 998314 bytes
Index: devel/jam/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/jam/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- devel/jam/distinfo	23 Feb 2005 22:24:16 -0000	1.5
+++ devel/jam/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,5 +1,5 @@
  $NetBSD: distinfo,v 1.5 2005/02/23 22:24:16 agc Exp $

-SHA1 (jam-2.5nb1/jam-2.5.zip) = 794a3f4483315c6b9f010f03b592646d3815328c
-RMD160 (jam-2.5nb1/jam-2.5.zip) = 8e2779e6e41e34d2368e54813e3c92d4604b9e66
-Size (jam-2.5nb1/jam-2.5.zip) = 191864 bytes
+SHA1 (jam-2.5/jam-2.5.zip) = 794a3f4483315c6b9f010f03b592646d3815328c
+RMD160 (jam-2.5/jam-2.5.zip) = 8e2779e6e41e34d2368e54813e3c92d4604b9e66
+Size (jam-2.5/jam-2.5.zip) = 191864 bytes
Index: graphics/libgdgeda/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libgdgeda/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- graphics/libgdgeda/distinfo	24 Feb 2005 08:45:09 -0000	1.8
+++ graphics/libgdgeda/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,5 +1,5 @@
  $NetBSD: distinfo,v 1.8 2005/02/24 08:45:09 agc Exp $

-SHA1 (libgdgeda-2.0.15nb2/libgdgeda-2.0.15.tar.gz) = 472b361047ba7fb00b37fe4bcbb20316667677da
-RMD160 (libgdgeda-2.0.15nb2/libgdgeda-2.0.15.tar.gz) = 19279eea6ec59d3397f802579b3b21cd2b8d0d09
-Size (libgdgeda-2.0.15nb2/libgdgeda-2.0.15.tar.gz) = 522645 bytes
+SHA1 (libgdgeda-2.0.15/libgdgeda-2.0.15.tar.gz) = 472b361047ba7fb00b37fe4bcbb20316667677da
+RMD160 (libgdgeda-2.0.15/libgdgeda-2.0.15.tar.gz) = 19279eea6ec59d3397f802579b3b21cd2b8d0d09
+Size (libgdgeda-2.0.15/libgdgeda-2.0.15.tar.gz) = 522645 bytes
Index: security/msf/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/msf/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- security/msf/distinfo	3 Aug 2005 20:37:44 -0000	1.6
+++ security/msf/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,6 +1,6 @@
  $NetBSD: distinfo,v 1.6 2005/08/03 20:37:44 adrianp Exp $

-SHA1 (msf-2.4nb2/framework-2.4.tar.gz) = b09ec49e259d812805301dc9152175903e46beb3
-RMD160 (msf-2.4nb2/framework-2.4.tar.gz) = c2791c46d6c7b8ac9490acfb81f88f5be7105855
-Size (msf-2.4nb2/framework-2.4.tar.gz) = 2607730 bytes
+SHA1 (msf-2.4/framework-2.4.tar.gz) = b09ec49e259d812805301dc9152175903e46beb3
+RMD160 (msf-2.4/framework-2.4.tar.gz) = c2791c46d6c7b8ac9490acfb81f88f5be7105855
+Size (msf-2.4/framework-2.4.tar.gz) = 2607730 bytes
  SHA1 (patch-aa) = 318c8136c22d95195ecd40071d36ae22af0807bb
Index: security/nikto/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/nikto/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- security/nikto/distinfo	6 Sep 2005 21:11:57 -0000	1.6
+++ security/nikto/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,6 +1,6 @@
  $NetBSD: distinfo,v 1.6 2005/09/06 21:11:57 adrianp Exp $

-SHA1 (nikto-1.35nb2/nikto-1.35.tar.gz) = b77154ee5974149d6e7777aa912036fb53e7cdbe
-RMD160 (nikto-1.35nb2/nikto-1.35.tar.gz) = d15079d704cde511adf6ac0f944c19dea9f3edd1
-Size (nikto-1.35nb2/nikto-1.35.tar.gz) = 192642 bytes
+SHA1 (nikto-1.35/nikto-1.35.tar.gz) = b77154ee5974149d6e7777aa912036fb53e7cdbe
+RMD160 (nikto-1.35/nikto-1.35.tar.gz) = d15079d704cde511adf6ac0f944c19dea9f3edd1
+Size (nikto-1.35/nikto-1.35.tar.gz) = 192642 bytes
  SHA1 (patch-ab) = 5e6b5d3533dbe7076d555efd2f56da6bf8881bae
Index: sysutils/aperture/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/aperture/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- sysutils/aperture/distinfo	24 Feb 2005 13:40:50 -0000	1.10
+++ sysutils/aperture/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,8 +1,8 @@
  $NetBSD: distinfo,v 1.10 2005/02/24 13:40:50 agc Exp $

-SHA1 (aperture-2.0nb5/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b
-RMD160 (aperture-2.0nb5/apNetBSD.shar) = 74739d4d0a5d21d5098c3fab000ad4d622137895
-Size (aperture-2.0nb5/apNetBSD.shar) = 66731 bytes
+SHA1 (aperture-2.0/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b
+RMD160 (aperture-2.0/apNetBSD.shar) = 74739d4d0a5d21d5098c3fab000ad4d622137895
+Size (aperture-2.0/apNetBSD.shar) = 66731 bytes
  SHA1 (patch-aa) = 544d71b6524b7aaeb5deb985372599f1962af4fe
  SHA1 (patch-ab) = fc3f65e9b9bc94880dc18e2091d7daccd3d480ad
  SHA1 (patch-ac) = 676b2f426d6f9e725262342e0d7e9ac1c8418362
Index: textproc/tei/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/tei/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- textproc/tei/distinfo	9 Apr 2005 18:33:38 -0000	1.4
+++ textproc/tei/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,5 +1,5 @@
  $NetBSD: distinfo,v 1.4 2005/04/09 18:33:38 wiz Exp $

-SHA1 (tei-4nb3/dtd.zip) = 412f52ef6c3a352442f41870a73bd19846df2f2c
-RMD160 (tei-4nb3/dtd.zip) = 54f44b49b26405725dc95b65d53d8b644e595317
-Size (tei-4nb3/dtd.zip) = 73194 bytes
+SHA1 (tei-4/dtd.zip) = 412f52ef6c3a352442f41870a73bd19846df2f2c
+RMD160 (tei-4/dtd.zip) = 54f44b49b26405725dc95b65d53d8b644e595317
+Size (tei-4/dtd.zip) = 73194 bytes
Index: www/awstats/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/awstats/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- www/awstats/distinfo	26 Aug 2005 20:22:56 -0000	1.13
+++ www/awstats/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,7 +1,7 @@
  $NetBSD: distinfo,v 1.13 2005/08/26 20:22:56 adrianp Exp $

-SHA1 (awstats-6.4nb2/awstats-6.4.tgz) = e58671499006881516406e9fa704b0ef34b94971
-RMD160 (awstats-6.4nb2/awstats-6.4.tgz) = 318b34afcb7f7e8a4d26d46344e37bcbe3a8460a
-Size (awstats-6.4nb2/awstats-6.4.tgz) = 918435 bytes
+SHA1 (awstats-6.4/awstats-6.4.tgz) = e58671499006881516406e9fa704b0ef34b94971
+RMD160 (awstats-6.4/awstats-6.4.tgz) = 318b34afcb7f7e8a4d26d46344e37bcbe3a8460a
+Size (awstats-6.4/awstats-6.4.tgz) = 918435 bytes
  SHA1 (patch-aa) = a28254829dc3a025648ead708c932d432a69ed59
  SHA1 (patch-ab) = e39f2eae584597879428b02315e08067432f7d88
Index: www/thttpd/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/thttpd/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- www/thttpd/distinfo	19 Aug 2005 13:38:58 -0000	1.11
+++ www/thttpd/distinfo	10 Oct 2005 01:57:32 -0000
@@ -1,11 +1,11 @@
  $NetBSD: distinfo,v 1.11 2005/08/19 13:38:58 cube Exp $

-SHA1 (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52
-RMD160 (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e
-Size (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = 132275 bytes
-SHA1 (thttpd-2.25bnb3/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
-RMD160 (thttpd-2.25bnb3/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
-Size (thttpd-2.25bnb3/sitedrivenby.gif) = 8519 bytes
+SHA1 (thttpd-2.25b/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52
+RMD160 (thttpd-2.25b/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e
+Size (thttpd-2.25b/thttpd-2.25b.tar.gz) = 132275 bytes
+SHA1 (thttpd-2.25b/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
+RMD160 (thttpd-2.25b/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
+Size (thttpd-2.25b/sitedrivenby.gif) = 8519 bytes
  SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66
  SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df
  SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2