From 662d1e1cf985bb31c0065ad7ecc692f61e4b305a Mon Sep 17 00:00:00 2001
From: Arthur David Olson <ado@elsie>
Date: Fri, 29 Oct 1993 22:08:20 -0400
Subject: [PATCH] handle Portugal right

SCCS-file: zic.c
SCCS-SID: 7.11
---
 zic.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/zic.c b/zic.c
index a16ea8b..aae2e7e 100644
--- a/zic.c
+++ b/zic.c
@@ -1481,9 +1481,11 @@ addtt(starttime, addtype(startoff, startbuf, startisdst, startttisstd));
 		** Now we may get to set starttime for the next zone line.
 		*/
 		if (useuntil) {
-			starttime = tadd(zp->z_untiltime,
-				-gmtoffs[types[timecnt - 1]]);
+			starttime = tadd(zp->z_untiltime, -gmtoff);
 			startttisstd = zp->z_untilrule.r_todisstd;
+			if (!startttisstd)
+				starttime = tadd(starttime, -stdoff);
+			gmtoff = (zp + 1)->z_gmtoff;
 		}
 	}
 	writezone(zpfirst->z_name);