summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2009-12-10 20:26:33 +0000
committerabs <abs@pkgsrc.org>2009-12-10 20:26:33 +0000
commit66d7a18018a058437548310be58e34c1a0571e21 (patch)
tree2ae46e2b23570a18b72a922cef53fa74221b0d5a /pkgtools
parent6e6ff9e3d0d3306df746dd04a9c8c5de12f1fe29 (diff)
downloadpkgsrc-66d7a18018a058437548310be58e34c1a0571e21.tar.gz
Updated pkgtools/pkgdiff to 0.122
Set TZ=UTC before calling diff to ensure everyone uses the same timezone to avoid spurious diffs in metadata, such as: < clock/clock.c.orig 1993-06-29 01:11:39.000000000 -0400 --- > clock/clock.c.orig 1993-06-29 03:11:39.000000000 -0200
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkgdiff/Makefile4
-rwxr-xr-xpkgtools/pkgdiff/files/pkgdiff5
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 5461eeb3907..55141cef48e 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2009/09/20 11:57:16 tnn Exp $
+# $NetBSD: Makefile,v 1.69 2009/12/10 20:26:33 abs Exp $
#
-DISTNAME= pkgdiff-0.121
+DISTNAME= pkgdiff-0.122
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkgdiff/files/pkgdiff b/pkgtools/pkgdiff/files/pkgdiff
index f2f62b4abf8..f8b55f15192 100755
--- a/pkgtools/pkgdiff/files/pkgdiff
+++ b/pkgtools/pkgdiff/files/pkgdiff
@@ -1,6 +1,6 @@
#!@SH@
#
-# $NetBSD: pkgdiff,v 1.16 2005/08/02 12:16:19 seb Exp $
+# $NetBSD: pkgdiff,v 1.17 2009/12/10 20:26:33 abs Exp $
#
# Usage: pkgdiff newfile
# pkgdiff oldfile newfile
@@ -13,6 +13,9 @@
# All Rights Reserved. Absolutely no warranty.
#
+# Ensure we always use the same timezone to avoid spurious metadata diffs
+export TZ=UTC
+
if [ $# -le 1 ]
then
if [ -f "$1.orig" ]; then