Mon May 21 09:48:29 2012 UTC ()
Pullup ticket #3792 - requested by joerg
pkgtools/pbulk: bug fix update

Revisions pulled up:
- pkgtools/pbulk/Makefile                                       1.63
- pkgtools/pbulk/files/pbulk/scripts/compute-packages.awk       1.4

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sun May 20 20:12:02 UTC 2012

   Modified Files:
   	pkgsrc/pkgtools/pbulk: Makefile
   	pkgsrc/pkgtools/pbulk/files/pbulk/scripts: compute-packages.awk

   Log Message:
   pbulk-0.49: Fix a bug in the computation of the restricted subset.


(tron)
diff -r1.62 -r1.62.14.1 pkgsrc/pkgtools/pbulk/Makefile
diff -r1.3 -r1.3.30.1 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/compute-packages.awk

cvs diff -r1.62 -r1.62.14.1 pkgsrc/pkgtools/pbulk/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pbulk/Makefile 2010/07/23 21:19:40 1.62
+++ pkgsrc/pkgtools/pbulk/Makefile 2012/05/21 09:48:29 1.62.14.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.62 2010/07/23 21:19:40 joerg Exp $ 1# $NetBSD: Makefile,v 1.62.14.1 2012/05/21 09:48:29 tron Exp $
2 2
3DISTNAME= pbulk-0.48 3DISTNAME= pbulk-0.49
4COMMENT= Modular bulk build framework 4COMMENT= Modular bulk build framework
5 5
6PKG_DESTDIR_SUPPORT= user-destdir 6PKG_DESTDIR_SUPPORT= user-destdir
7 7
8.include "../../pkgtools/pbulk/Makefile.common" 8.include "../../pkgtools/pbulk/Makefile.common"
9 9
10USE_TOOLS+= awk:run bzip2:run digest:run gzip:run make:run \ 10USE_TOOLS+= awk:run bzip2:run digest:run gzip:run make:run \
11 mail:run sed:run tar:run 11 mail:run sed:run tar:run
12DEPENDS+= rsync-[0-9]*:../../net/rsync 12DEPENDS+= rsync-[0-9]*:../../net/rsync
13DEPENDS+= pbulk-base>=0.38:../../pkgtools/pbulk-base 13DEPENDS+= pbulk-base>=0.38:../../pkgtools/pbulk-base
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16

cvs diff -r1.3 -r1.3.30.1 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/compute-packages.awk (expand / switch to unified diff)

--- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/compute-packages.awk 2008/09/14 18:59:02 1.3
+++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/compute-packages.awk 2012/05/21 09:48:29 1.3.30.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1#!@AWK@ -f 1#!@AWK@ -f
2# $NetBSD: compute-packages.awk,v 1.3 2008/09/14 18:59:02 joerg Exp $ 2# $NetBSD: compute-packages.awk,v 1.3.30.1 2012/05/21 09:48:29 tron Exp $
3# 3#
4# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. 4# Copyright (c) 2007, 2012 Joerg Sonnenberger <joerg@NetBSD.org>.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code was developed as part of Google's Summer of Code 2007 program. 7# This code was developed as part of Google's Summer of Code 2007 program.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 12#
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
16# notice, this list of conditions and the following disclaimer in 16# notice, this list of conditions and the following disclaimer in
17# the documentation and/or other materials provided with the 17# the documentation and/or other materials provided with the
@@ -60,27 +60,27 @@ BEGIN { @@ -60,27 +60,27 @@ BEGIN {
60 60
61 if ($0 ~ "^NO_BIN_ON_FTP=.") 61 if ($0 ~ "^NO_BIN_ON_FTP=.")
62 initial_restricted[cur] = 1 62 initial_restricted[cur] = 1
63 63
64 if ($0 ~ "^DEPENDS=") 64 if ($0 ~ "^DEPENDS=")
65 depends[cur] = substr($0, 9) 65 depends[cur] = substr($0, 9)
66 } 66 }
67 close(presolve_file) 67 close(presolve_file)
68 68
69 for (pkg in depends) { 69 for (pkg in depends) {
70 split(depends[pkg], depend_list, "[ \t]+") 70 split(depends[pkg], depend_list, "[ \t]+")
71 for (dep in depend_list) { 71 for (dep in depend_list) {
72 cur_dep = depend_list[dep] 72 cur_dep = depend_list[dep]
73 reverse_depends[cur_dep] = pkg " " cur_dep 73 reverse_depends[cur_dep] = pkg " " reverse_depends[cur_dep]
74 } 74 }
75 } 75 }
76 76
77 for (pkg in initial_restricted) 77 for (pkg in initial_restricted)
78 mark_restricted(pkg) 78 mark_restricted(pkg)
79 79
80 while ((getline pkg < success_file) > 0) { 80 while ((getline pkg < success_file) > 0) {
81 # skip restricted packages 81 # skip restricted packages
82 if (pkg in restricted) 82 if (pkg in restricted)
83 continue; 83 continue;
84 # build category/file list 84 # build category/file list
85 split(categories[pkg], cats, "[ \t]+") 85 split(categories[pkg], cats, "[ \t]+")
86 cats[0] = "All" 86 cats[0] = "All"