From owner-freebsd-bugs Tue Dec 15 04:17:14 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id EAA21662 for freebsd-bugs-outgoing; Tue, 15 Dec 1998 04:17:14 -0800 (PST) (envelope-from owner-freebsd-bugs@FreeBSD.ORG) Received: from rmstar.campus.luth.se (rmstar.campus.luth.se [130.240.197.32]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA21650 for ; Tue, 15 Dec 1998 04:17:09 -0800 (PST) (envelope-from murduth@rmstar.campus.luth.se) Received: from rmstar.campus.luth.se (murduth@localhost [127.0.0.1]) by rmstar.campus.luth.se (8.9.1/8.9.1) with ESMTP id NAA09581 for ; Tue, 15 Dec 1998 13:17:01 +0100 (CET) (envelope-from murduth@rmstar.campus.luth.se) Message-Id: <199812151217.NAA09581@rmstar.campus.luth.se> X-Mailer: exmh version 2.0.2 2/24/98 To: freebsd-bugs@FreeBSD.ORG Subject: ports/9061 change-request Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_-9182098430" Date: Tue, 15 Dec 1998 13:17:00 +0100 From: Joakim Henriksson Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org This is a multipart MIME message. --==_Exmh_-9182098430 Content-Type: text/plain; charset=us-ascii Could someone either close ports/9061 (about jikes) and mail me, so that i can submit a pr with a better patch, or put the following patch in the pr instead. Since after rewieving the old patch i realized it was very wrong indeed. --==_Exmh_-9182098430 Content-Type: application/x-patch ; name="jikes.patch" Content-Description: jikes-double.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="JIKES.PAT" KioqIGppa2Vzb3MvamlrZXMvc3JjL2RvdWJsZS5jcHAub3JpZwlUdWUgRGVjIDE1IDEyOjI1 OjAwIDE5OTgKLS0tIGppa2Vzb3MvamlrZXMvc3JjL2RvdWJsZS5jcHAJVHVlIERlYyAxNSAx MzowMDo1NCAxOTk4CioqKioqKioqKioqKioqKgoqKiogMTI1LDEzNiAqKioqCiAgCiAgSUVF RWRvdWJsZSBJRUVFZG91YmxlOjpvcGVyYXRvci8gKElFRUVkb3VibGUgb3ApCiAgewohICAg ICByZXR1cm4gSUVFRWRvdWJsZShEb3VibGVWYWx1ZSgpIC8gb3AuRG91YmxlVmFsdWUoKSk7 CiAgfQogIAogIElFRUVkb3VibGUmIElFRUVkb3VibGU6Om9wZXJhdG9yLz0gKElFRUVkb3Vi bGUgb3ApCiAgewohICAgICAqdGhpcyA9ICp0aGlzIC8gb3A7CiAgICAgIHJldHVybiAqdGhp czsKICB9CiAgCi0tLSAxMjUsMTU2IC0tLS0KICAKICBJRUVFZG91YmxlIElFRUVkb3VibGU6 Om9wZXJhdG9yLyAoSUVFRWRvdWJsZSBvcCkKICB7CiEgICAgIGlmIChvcC5Eb3VibGVWYWx1 ZSgpID09IDAuMCkKISAgICAgewohICAgICAgICAgaWYgKERvdWJsZVZhbHVlKCkgPCAwLjAp CiEgICAgICAgICAgICAgcmV0dXJuIE5FR0FUSVZFX0lORklOSVRZKCk7CiEgCWVsc2UgaWYg KERvdWJsZVZhbHVlKCkgPT0gMC4wKQohICAgICAgICAgICAgIHJldHVybiBOYU4oKTsKISAJ ZWxzZQohICAgICAgICAgICAgIHJldHVybiBQT1NJVElWRV9JTkZJTklUWSgpOwohICAgICB9 CiEgICAgIGVsc2UKISAgICAgICAgIHJldHVybiBJRUVFZG91YmxlKERvdWJsZVZhbHVlKCkg LyBvcC5Eb3VibGVWYWx1ZSgpKTsKICB9CiAgCiAgSUVFRWRvdWJsZSYgSUVFRWRvdWJsZTo6 b3BlcmF0b3IvPSAoSUVFRWRvdWJsZSBvcCkKICB7CiEgICAgIGlmIChvcC5Eb3VibGVWYWx1 ZSgpID09IDAuMCkKISAgICAgewohICAgICAgICAgaWYgKCp0aGlzIDwgMC4wKQohICAgICAg ICAgICAgICp0aGlzID0gTkVHQVRJVkVfSU5GSU5JVFkoKTsKISAJZWxzZSBpZiAoKnRoaXMg PT0gMC4wKQohICAgICAgICAgICAgICp0aGlzID0gTmFOKCk7CiEgCWVsc2UKISAgICAgICAg ICAgICAqdGhpcyA9IFBPU0lUSVZFX0lORklOSVRZKCk7CiEgICAgIH0KISAgICAgZWxzZQoh ICAgICAgICAgKnRoaXMgPSAqdGhpcyAvIG9wOwogICAgICByZXR1cm4gKnRoaXM7CiAgfQog IAoqKioqKioqKioqKioqKioKKioqIDI0MCwyNTEgKioqKgogIAogIHZvaWQgSUVFRWRvdWJs ZTo6Rm1vZHVsdXMoSUVFRWRvdWJsZSBhLCBJRUVFZG91YmxlIGIsIElFRUVkb3VibGUmIHJl c3VsdCkKICB7CiEgICAgICByZXN1bHQuRG91YmxlVmFsdWUoKSA9IGZtb2QoYS5Eb3VibGVW YWx1ZSgpLCBiLkRvdWJsZVZhbHVlKCkpOwogIH0KICAKICB2b2lkIElFRUVkb3VibGU6OkRp dmlkZShJRUVFZG91YmxlIGRpdmlkZW5kLCBJRUVFZG91YmxlIGRpdmlzb3IsIElFRUVkb3Vi bGUgJnF1b3RpZW50KQogIHsKISAgICAgcXVvdGllbnQgPSBkaXZpZGVuZC5Eb3VibGVWYWx1 ZSgpIC8gZGl2aXNvci5Eb3VibGVWYWx1ZSgpOwogICAgICByZXR1cm47CiAgfQogIAotLS0g MjYwLDI4NCAtLS0tCiAgCiAgdm9pZCBJRUVFZG91YmxlOjpGbW9kdWx1cyhJRUVFZG91Ymxl IGEsIElFRUVkb3VibGUgYiwgSUVFRWRvdWJsZSYgcmVzdWx0KQogIHsKISAgICAgIGlmIChi LkRvdWJsZVZhbHVlKCkgPT0gMCkKISAgICAgICAgICByZXN1bHQuRG91YmxlVmFsdWUoKSA9 IE5hTigpLkRvdWJsZVZhbHVlKCk7CiEgICAgICBlbHNlCiEgICAgICAgICAgcmVzdWx0LkRv dWJsZVZhbHVlKCkgPSBmbW9kKGEuRG91YmxlVmFsdWUoKSwgYi5Eb3VibGVWYWx1ZSgpKTsK ICB9CiAgCiAgdm9pZCBJRUVFZG91YmxlOjpEaXZpZGUoSUVFRWRvdWJsZSBkaXZpZGVuZCwg SUVFRWRvdWJsZSBkaXZpc29yLCBJRUVFZG91YmxlICZxdW90aWVudCkKICB7CiEgICAgIGlm IChkaXZpc29yLkRvdWJsZVZhbHVlKCkgPT0gMCkKISAgICAgewohICAgICAgICAgaWYgKGRp dmlkZW5kLkRvdWJsZVZhbHVlKCkgPCAwLjApCiEgCSAgICBxdW90aWVudCA9IE5FR0FUSVZF X0lORklOSVRZKCk7CiEgCWVsc2UgaWYgKGRpdmlkZW5kLkRvdWJsZVZhbHVlKCkgPT0gMC4w KQohIAkgICAgcXVvdGllbnQgPSBOYU4oKTsKISAJZWxzZQohIAkgICAgcXVvdGllbnQgPSBQ T1NJVElWRV9JTkZJTklUWSgpOwohICAgICB9CiEgICAgIGVsc2UKISAgICAgICAgIHF1b3Rp ZW50ID0gZGl2aWRlbmQuRG91YmxlVmFsdWUoKSAvIGRpdmlzb3IuRG91YmxlVmFsdWUoKTsK ICAgICAgcmV0dXJuOwogIH0KICAKKioqKioqKioqKioqKioqCioqKiAyNjEsMjY3ICoqKioK ICAKICB2b2lkIElFRUVmbG9hdDo6Rm1vZHVsdXMoSUVFRWZsb2F0IGEsIElFRUVmbG9hdCBi LCBJRUVFZmxvYXQmIHJlc3VsdCkKICB7CiEgICAgIHJlc3VsdC5GbG9hdFZhbHVlKCkgPSAo ZmxvYXQpIGZtb2QoKGRvdWJsZSkgYS5GbG9hdFZhbHVlKCksIChkb3VibGUpIGIuRmxvYXRW YWx1ZSgpKTsKICB9CiAgCiAgdm9pZCBJRUVFZmxvYXQ6OlN0cmluZyhjaGFyICogc3RyKQot LS0gMjk0LDMwNiAtLS0tCiAgCiAgdm9pZCBJRUVFZmxvYXQ6OkZtb2R1bHVzKElFRUVmbG9h dCBhLCBJRUVFZmxvYXQgYiwgSUVFRWZsb2F0JiByZXN1bHQpCiAgewohICAgICBpZiAoYi5G bG9hdFZhbHVlKCkgPT0gMC4wKQohICAgICB7CiEgICAgICAgICBJRUVFZG91YmxlIGQ7CiEg ICAgICAgICByZXN1bHQuRmxvYXRWYWx1ZSgpID0gKGZsb2F0KSBkLk5hTigpLkRvdWJsZVZh bHVlKCk7CiEgICAgIH0KISAgICAgZWxzZQohICAgICAgICAgcmVzdWx0LkZsb2F0VmFsdWUo KSA9IChmbG9hdCkgZm1vZCgoZG91YmxlKSBhLkZsb2F0VmFsdWUoKSwgKGRvdWJsZSkgYi5G bG9hdFZhbHVlKCkpOwogIH0KICAKICB2b2lkIElFRUVmbG9hdDo6U3RyaW5nKGNoYXIgKiBz dHIpCg== --==_Exmh_-9182098430 Content-Type: text/plain; charset=us-ascii regards/ Joakim --==_Exmh_-9182098430-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message