From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 15 11:00:33 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 7049616A420 for ; Wed, 15 Feb 2006 11:00:33 +0000 (GMT) (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 7FB3C43D75 for ; Wed, 15 Feb 2006 11:00:21 +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 k1FB0LnF019345 for ; Wed, 15 Feb 2006 11:00:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1FB0KQO019344; Wed, 15 Feb 2006 11:00:20 GMT (envelope-from gnats) Resent-Date: Wed, 15 Feb 2006 11:00:20 GMT Resent-Message-Id: <200602151100.k1FB0KQO019344@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, Malcolm Kay Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1DF516A420 for ; Wed, 15 Feb 2006 10:50:19 +0000 (GMT) (envelope-from malcolm.kay@internode.on.net) Received: from mail.internode.on.net (ppp222-1.lns2.adl4.internode.on.net [203.122.222.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00D3743D66 for ; Wed, 15 Feb 2006 10:50:14 +0000 (GMT) (envelope-from malcolm.kay@internode.on.net) Received: from alpha.home (localhost.home [127.0.0.1]) by alpha.home (8.13.3/8.13.3) with ESMTP id k1DCnBxN083671 for ; Mon, 13 Feb 2006 23:19:11 +1030 (CST) (envelope-from malcolm@alpha.home) Received: (from malcolm@localhost) by alpha.home (8.13.3/8.13.3/Submit) id k1DCnBoH083655; Mon, 13 Feb 2006 23:19:11 +1030 (CST) (envelope-from malcolm) Message-Id: <200602131249.k1DCnBoH083655@alpha.home> Date: Mon, 13 Feb 2006 23:19:11 +1030 (CST) From: Malcolm Kay To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/93383: dmake port -- wrong 'startup' files path X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Malcolm Kay List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 11:00:33 -0000 >Number: 93383 >Category: ports >Synopsis: dmake port -- wrong 'startup' files path >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Feb 15 11:00:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Malcolm Kay >Release: FreeBSD 5.4-RELEASE i386 >Organization: at home >Environment: System: FreeBSD alpha.home 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Wed Oct 5 17:15:31 CST 2005 malcolm@alpha.home:/usr/src/sys/i386/compile/CAM i386 >Description: The dmake port devel/dmake (dmake-4.3) installs the startup files in different path to that expected by the installed binary: /usr/local/share/dmake/startup vs /usr/local/share/startup >How-To-Repeat: "make isnstall" and try to run. Or try "dmake -V" >Fix: Replace the patch file (patch-warnings) in the port with the following patch file (patch-all), which includes the original patches, and rebuild: ---------------patch-all-------------------------------------------------- --- acinclude.m4.orig Fri Oct 8 07:27:35 2004 +++ acinclude.m4 Sun Feb 12 15:10:09 2006 @@ -4,7 +4,7 @@ AC_DEFUN([AC_SET_DMAKEROOT], [ if test "${prefix}" != NONE; then - DMAKEROOT=${prefix}/share/startup/startup.mk + DMAKEROOT=${prefix}/share/dmake/startup/startup.mk export DMAKEROOT else DMAKEROOT=startup.mk --- configure.in.orig Wed Oct 13 04:37:26 2004 +++ configure.in Sun Feb 12 14:37:06 2006 @@ -184,7 +184,7 @@ if test x$prefix != x; then if test x$OS_TYPE = xunix; then - echo '"DMAKEROOT := '$prefix'/share/startup",' >> $outfile + echo '"DMAKEROOT := '$prefix'/share/dmake/startup",' >> $outfile fi echo '"OS := '${OS_VERSION}'",' >> $outfile fi --- configure.orig Wed Oct 13 04:17:46 2004 +++ configure Sun Feb 12 15:04:00 2006 @@ -6206,12 +6206,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#include int main () { struct stat s, t; exit (!(stat ("conftest.data", &s) == 0 - && utime ("conftest.data", (long *)0) == 0 + && utime ("conftest.data", (void *)0) == 0 && stat ("conftest.data", &t) == 0 && t.st_mtime >= s.st_mtime && t.st_mtime - s.st_mtime < 120)); @@ -6669,7 +6670,7 @@ if test "${prefix}" != NONE; then - DMAKEROOT=${prefix}/share/startup/startup.mk + DMAKEROOT=${prefix}/share/dmake/startup/startup.mk export DMAKEROOT else DMAKEROOT=startup.mk @@ -8108,7 +8109,7 @@ if test x$prefix != x; then if test x$OS_TYPE = xunix; then - echo '"DMAKEROOT := '$prefix'/share/startup",' >> $outfile + echo '"DMAKEROOT := '$prefix'/share/dmake/startup",' >> $outfile fi echo '"OS := '${OS_VERSION}'",' >> $outfile fi --- function.c.orig Thu Sep 9 01:36:20 2004 +++ function.c Sun Feb 12 14:37:06 2006 @@ -286,7 +286,7 @@ name = Current_target ? Current_target->CE_NAME:"makefile text"; if( file && *file ) { - char *newtmp; + /* char *newtmp; */ /* This call to Get_temp sets TMPFILE for subsequent expansion of file. * The contents file variable passed may include TMPFILE to be expanded. */ --- getinp.c.orig Wed Apr 21 23:40:17 2004 +++ getinp.c Sun Feb 12 14:37:06 2006 @@ -480,8 +480,8 @@ static short action[MAX_COND_DEPTH]; static char ifcntl[MAX_COND_DEPTH]; char *lhs, *expr, *expr_end; - char *lop, *partstr; - int result, n, m; + const char *lop; + int result; DB_ENTER( "_handle_conditional" ); @@ -561,7 +561,9 @@ } /* uncomment to turn on expression debug statements */ -/*#define PARSE_DEBUG /* */ +#if 0 +# define PARSE_DEBUG /* */ +#endif #define PARSE_SKIP_WHITE(A) while( *A && ((*A==' ') || (*A=='\t')) ) A++; #define OP_NONE 0 --- make.c.orig Thu Sep 9 01:36:46 2004 +++ make.c Sun Feb 12 14:37:06 2006 @@ -335,8 +335,8 @@ } if( Verbose & V_MAKE ) - printf("%s: Time stamp of [%s] is %ld\n",Pname,tcp->CE_NAME, - tcp->ce_time); + printf("%s: Time stamp of [%s] is %llu\n",Pname,tcp->CE_NAME, + (unsigned long long)tcp->ce_time); } } } @@ -589,8 +589,8 @@ } if( Verbose & V_MAKE ) - printf( "%s: Updating [%s], (%ld > %ld)\n", Pname, - cp->CE_NAME, otime, cp->ce_time ); + printf( "%s: Updating [%s], (%llu > %llu)\n", Pname, + cp->CE_NAME, (unsigned long long)otime, (unsigned long long)cp->ce_time ); if( Touch ) { name = cp->ce_fname; --- stat.c.orig Sat Sep 23 01:03:25 2000 +++ stat.c Sun Feb 12 14:37:06 2006 @@ -139,8 +139,8 @@ } if( Verbose & V_MAKE ) - printf( "%s: Checking library '%s' for member [%s], time %ld\n", - Pname, cp->ce_lib, name, cp->ce_time ); + printf( "%s: Checking library '%s' for member [%s], time %llu\n", + Pname, cp->ce_lib, name, (unsigned long long)cp->ce_time ); } FREE( tmp ); --- state.c.orig Sat Sep 23 01:03:25 2000 +++ state.c Sun Feb 12 14:37:06 2006 @@ -122,8 +122,8 @@ if( Search_table(Defs, sp->st_name, &hv, &hk) ) { fprintf( fp, "%s\n", sp->st_name ); fprintf( fp, "%d\n", sp->st_count ); - fprintf( fp, "%lu\n", sp->st_dkey ); - fprintf( fp, "%lu\n", sp->st_key ); + fprintf( fp, "%lu\n", (unsigned long)sp->st_dkey ); + fprintf( fp, "%lu\n", (unsigned long)sp->st_key ); } } --- sysintf.c.orig Fri Oct 8 07:48:47 2004 +++ sysintf.c Sun Feb 12 14:37:06 2006 @@ -499,13 +499,12 @@ if( tmpdir == NIL(char) ) tmpdir = "/tmp"; - while( --tries ) - { + do { if( (fd = Create_temp(tmpdir, path, suff)) != -1) break; free(*path); - } + } while( --tries ); if( fd != -1) { @@ -738,8 +737,8 @@ } if( Verbose & V_MAKE ) - printf( "%s: <<<< Set [%s] time stamp to %lu\n", - Pname, tcp->CE_NAME, tcp->ce_time ); + printf( "%s: <<<< Set [%s] time stamp to %llu\n", + Pname, tcp->CE_NAME, (unsigned long long)tcp->ce_time ); Unlink_temp_files( tcp ); tcp->ce_flag |= F_MADE; --- unix/arlib.c.orig Thu Sep 9 01:38:45 2004 +++ unix/arlib.c Sun Feb 12 14:37:06 2006 @@ -398,7 +398,7 @@ if( _ar.ar_size == 0L ) break; fseek( f, (long) _ar.ar_size, 0 ); #else - fseek( f, arhdroffset + sizeof(arhdr) + (_ar.ar_size+1 & ~1L), 0 ); + fseek( f, arhdroffset + sizeof(arhdr) + ((_ar.ar_size+1) & ~1L), 0 ); #endif } @@ -421,7 +421,7 @@ fseek(f, arhdroffset + (unsigned long)(((struct ar_hdr *)0)->ar_date), 0); #if ASCARCH - fprintf(f, "%lu", now); + fprintf(f, "%llu", (unsigned long long)now); #else fwrite((char *)now, sizeof(now), 1, f); #endif --- unix/runargv.c.orig Thu Sep 9 01:39:39 2004 +++ unix/runargv.c Sun Feb 12 14:37:06 2006 @@ -25,6 +25,9 @@ -- Use cvs log to obtain detailed change logs. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #ifdef HAVE_WAIT_H # include -------------EOF----------------------------------- >Release-Note: >Audit-Trail: >Unformatted: