From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 11 13:30:17 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7420416A4DD for ; Tue, 11 Jul 2006 13:30:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD0BF43D45 for ; Tue, 11 Jul 2006 13:30:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6BDUGnY072787 for ; Tue, 11 Jul 2006 13:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6BDUGOH072786; Tue, 11 Jul 2006 13:30:16 GMT (envelope-from gnats) Resent-Date: Tue, 11 Jul 2006 13:30:16 GMT Resent-Message-Id: <200607111330.k6BDUGOH072786@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kostik Belousov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 118D216A4E2 for ; Tue, 11 Jul 2006 13:20:54 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F5EF43D46 for ; Tue, 11 Jul 2006 13:20:53 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k6BDKrxD098684 for ; Tue, 11 Jul 2006 13:20:53 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k6BDKrvG098683; Tue, 11 Jul 2006 13:20:53 GMT (envelope-from nobody) Message-Id: <200607111320.k6BDKrvG098683@www.freebsd.org> Date: Tue, 11 Jul 2006 13:20:53 GMT From: Kostik Belousov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/100088: [patch] allow devel/tla to compile on 4.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jul 2006 13:30:17 -0000 >Number: 100088 >Category: ports >Synopsis: [patch] allow devel/tla to compile on 4.x >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jul 11 13:30:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Kostik Belousov >Release: 4-STABLE >Organization: >Environment: >Description: tla 1.3.4 contains some c99-isms that make it impossible to install port in 4-STABLE. Patch below fixes it. >How-To-Repeat: >Fix: diff -ru src/tla/libarch/changeset-report.c tla-1.3.4/src/tla/libarch/changeset-report.c --- src/tla/libarch/changeset-report.c Wed Jan 4 17:26:08 2006 +++ src/tla/libarch/changeset-report.c Tue Jul 11 13:03:48 2006 @@ -606,6 +606,10 @@ { int x; rel_field key; + t_uchar * orig_part_path; + t_uchar * orig_path; + t_uchar * mod_path; + assoc_table orig_paths = rel_to_assoc (report->orig_files_index, out_fd, 0); safe_printfmt ( out_fd, "* modified files\n\n"); @@ -615,9 +619,9 @@ t_uchar * id2 = str_save(0, rel_peek_str(report->patched_regular_files, x, 0)) /*report->patched_regular_files[x][1]*/; key = rel_make_field_str(id); - t_uchar * orig_part_path = assoc_get_str_taking(orig_paths, key) /*assoc_ref(orig_paths, id)*/; - t_uchar * orig_path = file_name_in_vicinity(0, orig_dir, orig_part_path); - t_uchar * mod_path = file_name_in_vicinity(0, mod_dir, id2 /*report->patched_regular_files[x][0]*/); + orig_part_path = assoc_get_str_taking(orig_paths, key) /*assoc_ref(orig_paths, id)*/; + orig_path = file_name_in_vicinity(0, orig_dir, orig_part_path); + mod_path = file_name_in_vicinity(0, mod_dir, id2 /*report->patched_regular_files[x][0]*/); arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (char **)opts); diff -ru src/tla/libarch/cmd-commit.c tla-1.3.4/src/tla/libarch/cmd-commit.c --- src/tla/libarch/cmd-commit.c Wed Jan 4 17:26:08 2006 +++ src/tla/libarch/cmd-commit.c Tue Jul 11 13:04:50 2006 @@ -518,6 +518,7 @@ t_uchar *file_name = 0; t_uchar *content_spec = 0; t_uchar *s = str_chr_index(revision_file_spec, ':'); + int fd ; if (!s) { @@ -528,7 +529,6 @@ file_name = str_save_n(0, revision_file_spec, s - revision_file_spec); content_spec = str_save(0, s + 1); - int fd ; fd = safe_open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666); if (!fd) { diff -ru src/tla/libarch/cmd-export.c tla-1.3.4/src/tla/libarch/cmd-export.c --- src/tla/libarch/cmd-export.c Wed Jan 4 17:26:08 2006 +++ src/tla/libarch/cmd-export.c Tue Jul 11 13:05:37 2006 @@ -301,6 +301,7 @@ t_uchar * output_dirname = 0; t_uchar * cwd = safe_current_working_directory (); t_uchar * absolute_output_dir = 0; + int output_dirname_exists; if (file_name_is_absolute(output_dir)) absolute_output_dir = str_save(0, output_dir); @@ -309,7 +310,7 @@ canonical_dir = file_name_from_directory(0, absolute_output_dir); output_dirname = file_name_directory (0, canonical_dir); - int output_dirname_exists = safe_access (output_dirname, F_OK) == 0; + output_dirname_exists = safe_access (output_dirname, F_OK) == 0; if (!output_dirname_exists) { >Release-Note: >Audit-Trail: >Unformatted: