summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-07-25 15:12:53 +0000
committerjoerg <joerg@pkgsrc.org>2007-07-25 15:12:53 +0000
commit057de8d82c4dcfe4718c0fbe1aef0cce053b9dda (patch)
treeff2284b4b7a83f617b3e33b042c82b16b636dc21 /pkgtools
parentfa43e6186a0b4ae4014620861eabea41b918a42e (diff)
downloadpkgsrc-057de8d82c4dcfe4718c0fbe1aef0cce053b9dda.tar.gz
pkgsrc_base_dir is now without leading /, compensate. GC it in the HTML
report script. Bump to pbulk-0.9.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pbulk/Makefile4
-rwxr-xr-xpkgtools/pbulk/files/pbulk/scripts/create-report-html.awk6
-rwxr-xr-xpkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk6
3 files changed, 7 insertions, 9 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index 0e0cde6a5c8..e17de92cad4 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2007/07/25 11:07:28 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/07/25 15:12:53 joerg Exp $
-DISTNAME= pbulk-0.8
+DISTNAME= pbulk-0.9
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk b/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk
index db9639942e0..80d39a8949f 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk
+++ b/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk
@@ -1,5 +1,5 @@
#!@AWK@ -f
-# $NetBSD: create-report-html.awk,v 1.5 2007/07/25 11:07:28 joerg Exp $
+# $NetBSD: create-report-html.awk,v 1.6 2007/07/25 15:12:53 joerg Exp $
#
# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
# All rights reserved.
@@ -123,9 +123,7 @@ BEGIN {
else if ($0 ~ "^BUILD_START_ISO=")
pkgsrc_build_start_iso = substr($0, 17)
else if ($0 ~ "^BUILD_END_ISO=")
- pkgsrc_build_end_iso = substr($0, 14)
- else if ($0 ~ "^BASE_URL=")
- pkgsrc_base_url = substr($0, 10)
+ pkgsrc_build_end_iso = substr($0, 15)
}
close status_file
diff --git a/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk b/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk
index 9563da6c56d..c4a7592e9bd 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk
+++ b/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk
@@ -1,5 +1,5 @@
#!@AWK@ -f
-# $NetBSD: create-report-txt.awk,v 1.3 2007/07/20 19:39:34 joerg Exp $
+# $NetBSD: create-report-txt.awk,v 1.4 2007/07/25 15:12:53 joerg Exp $
#
# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
# All rights reserved.
@@ -69,7 +69,7 @@ BEGIN {
else if ($0 ~ "^BUILD_START_DIR=")
pkgsrc_build_start_dir = substr($0, 17)
else if ($0 ~ "^BUILD_END_ISO=")
- pkgsrc_build_end_iso = substr($0, 14)
+ pkgsrc_build_end_iso = substr($0, 15)
else if ($0 ~ "^BASE_URL=")
pkgsrc_base_url = substr($0, 10)
}
@@ -127,7 +127,7 @@ BEGIN {
print "Build start: " pkgsrc_build_start_iso > txt_report
print "Build end: " pkgsrc_build_end_iso > txt_report
print "" > txt_report
- report_base_url = pkgsrc_base_url pkgsrc_build_start_dir
+ report_base_url = pkgsrc_base_url "/" pkgsrc_build_start_dir
print "Full report: " report_base_url "/meta/report.html" > txt_report
print "Machine readable version: " report_base_url "/meta/report.bz2" > txt_report
print "" > txt_report