From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 1 17:00:35 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 9C6D716A403 for ; Mon, 1 May 2006 17:00:35 +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 ED81343D48 for ; Mon, 1 May 2006 17:00:33 +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 k41H0XXY054191 for ; Mon, 1 May 2006 17:00:33 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k41H0XGJ054190; Mon, 1 May 2006 17:00:33 GMT (envelope-from gnats) Resent-Date: Mon, 1 May 2006 17:00:33 GMT Resent-Message-Id: <200605011700.k41H0XGJ054190@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, Gabor Kovesdan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E6D916A401 for ; Mon, 1 May 2006 16:58:19 +0000 (UTC) (envelope-from root@server.t-hosting.hu) Received: from server.t-hosting.hu (server.t-hosting.hu [217.20.133.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CCC843D48 for ; Mon, 1 May 2006 16:58:18 +0000 (GMT) (envelope-from root@server.t-hosting.hu) Received: from localhost (localhost [127.0.0.1]) by server.t-hosting.hu (Postfix) with ESMTP id 4008E999481; Mon, 1 May 2006 18:58:16 +0200 (CEST) Received: from server.t-hosting.hu ([127.0.0.1]) by localhost (server.t-hosting.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id WPayaeyhJ35T; Mon, 1 May 2006 18:58:12 +0200 (CEST) Received: by server.t-hosting.hu (Postfix, from userid 0) id 2D7B2999471; Mon, 1 May 2006 18:58:12 +0200 (CEST) Message-Id: <20060501165812.2D7B2999471@server.t-hosting.hu> Date: Mon, 1 May 2006 18:58:12 +0200 (CEST) From: Gabor Kovesdan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Gabor Kovesdan Subject: ports/96608: [port update] devel/dmake X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Gabor Kovesdan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 17:00:35 -0000 >Number: 96608 >Category: ports >Synopsis: [port update] devel/dmake >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 01 17:00:33 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Gabor Kovesdan >Release: FreeBSD 5.3-RELEASE-p17 amd64 >Organization: n/a >Environment: >Description: - Update to 4.4 - Make portlint happy >How-To-Repeat: >Fix: --- dmake.diff begins here --- diff -Nur /usr/ports/devel/dmake/Makefile ./Makefile --- /usr/ports/devel/dmake/Makefile Mon Apr 3 21:41:32 2006 +++ ./Makefile Mon May 1 18:54:21 2006 @@ -6,11 +6,10 @@ # PORTNAME= dmake -PORTVERSION= 4.3 -PORTREVISION= 1 +PORTVERSION= 4.4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} -DISTFILES= ${PORTNAME}_${PORTVERSION}.orig.tar.gz +DISTNAME= ${PORTNAME}_${PORTVERSION}.orig MAINTAINER= ports@FreeBSD.org COMMENT= Another hyper make utility diff -Nur /usr/ports/devel/dmake/distinfo ./distinfo --- /usr/ports/devel/dmake/distinfo Fri Dec 2 14:43:35 2005 +++ ./distinfo Thu Apr 20 22:23:35 2006 @@ -1,3 +1,3 @@ -MD5 (dmake_4.3.orig.tar.gz) = c1dacc7684aff96a1cc198dcce5cc139 -SHA256 (dmake_4.3.orig.tar.gz) = a985f3722ecda826ec4f280b1f96e3a5795bee7ecb3ec42fa7c0ef0ee64ddf02 -SIZE (dmake_4.3.orig.tar.gz) = 614637 +MD5 (dmake_4.4.orig.tar.gz) = 0d082461caedcca10c3c56f1a587403d +SHA256 (dmake_4.4.orig.tar.gz) = 873ec5908712df836415afea08ca847786b9788e1c12b82a14176f4e9de2d30b +SIZE (dmake_4.4.orig.tar.gz) = 649098 diff -Nur /usr/ports/devel/dmake/files/patch-configure ./files/patch-configure --- /usr/ports/devel/dmake/files/patch-configure Fri Mar 24 21:27:39 2006 +++ ./files/patch-configure Thu Apr 20 22:33:18 2006 @@ -1,6 +1,6 @@ ---- configure.orig Tue Oct 12 21:47:46 2004 -+++ configure Fri Mar 24 22:06:28 2006 -@@ -6206,12 +6206,13 @@ +--- configure.old Thu Apr 20 22:28:24 2006 ++++ configure Thu Apr 20 22:32:50 2006 +@@ -6420,12 +6420,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -15,21 +15,3 @@ && 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 diff -Nur /usr/ports/devel/dmake/files/patch-getinp.c ./files/patch-getinp.c --- /usr/ports/devel/dmake/files/patch-getinp.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-getinp.c Thu Apr 20 22:41:23 2006 @@ -0,0 +1,11 @@ +--- getinp.c.orig Thu Apr 20 22:38:09 2006 ++++ getinp.c Thu Apr 20 22:39:39 2006 +@@ -497,7 +497,7 @@ + static short action[MAX_COND_DEPTH]; + static char ifcntl[MAX_COND_DEPTH]; + char *lhs, *expr, *expr_end; +- char *lop; ++ const char *lop; + int result; + + DB_ENTER( "_handle_conditional" ); diff -Nur /usr/ports/devel/dmake/files/patch-make.c ./files/patch-make.c --- /usr/ports/devel/dmake/files/patch-make.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-make.c Mon May 1 18:45:27 2006 @@ -0,0 +1,14 @@ +--- make.c.orig Mon May 1 18:43:36 2006 ++++ make.c Mon May 1 18:45:08 2006 +@@ -341,8 +341,9 @@ + } + + 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); ++ + } + } + } diff -Nur /usr/ports/devel/dmake/files/patch-stat.c ./files/patch-stat.c --- /usr/ports/devel/dmake/files/patch-stat.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-stat.c Mon May 1 18:34:09 2006 @@ -0,0 +1,13 @@ +--- stat.c.orig Mon May 1 18:23:40 2006 ++++ stat.c Mon May 1 18:25:04 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 ); diff -Nur /usr/ports/devel/dmake/files/patch-sysinf.c ./files/patch-sysinf.c --- /usr/ports/devel/dmake/files/patch-sysinf.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-sysinf.c Mon May 1 18:34:34 2006 @@ -0,0 +1,30 @@ +--- sysintf.c.orig Thu Feb 2 05:39:56 2006 ++++ sysintf.c Mon May 1 18:33:02 2006 +@@ -596,13 +596,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) + { +@@ -839,8 +838,9 @@ + } + + 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 ); ++ + + if( Measure & M_TARGET ) + Do_profile_output( "e", M_TARGET, tcp ); diff -Nur /usr/ports/devel/dmake/files/patch-unix-arlib.c ./files/patch-unix-arlib.c --- /usr/ports/devel/dmake/files/patch-unix-arlib.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-unix-arlib.c Mon May 1 18:37:39 2006 @@ -0,0 +1,11 @@ +--- unix/arlib.c.orig Mon May 1 18:35:44 2006 ++++ unix/arlib.c Mon May 1 18:37:16 2006 +@@ -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 diff -Nur /usr/ports/devel/dmake/files/patch-unix-runargv.c ./files/patch-unix-runargv.c --- /usr/ports/devel/dmake/files/patch-unix-runargv.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-unix-runargv.c Mon May 1 18:39:36 2006 @@ -0,0 +1,12 @@ +--- unix/runargv.c.orig Mon May 1 18:38:28 2006 ++++ unix/runargv.c Mon May 1 18:38:58 2006 +@@ -66,6 +66,9 @@ + with runargv(). + */ + ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif + #include + + #include "extern.h" diff -Nur /usr/ports/devel/dmake/files/patch-warnings ./files/patch-warnings --- /usr/ports/devel/dmake/files/patch-warnings Mon Apr 3 21:41:32 2006 +++ ./files/patch-warnings Thu Jan 1 01:00:00 1970 @@ -1,128 +0,0 @@ -Fix warnings to allow ``-Wall -Werror'' with gcc-3.4.2 on FreeBSD/i386. -Most of these seemed fairly benign -- assumptions about time_t are the -most common. - - -mi - ---- state.c Fri Sep 22 11:33:25 2000 -+++ state.c Sun Jan 2 18:13:26 2005 -@@ -123,6 +123,6 @@ - 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 ); - } - } ---- getinp.c Wed Apr 21 10:10:17 2004 -+++ getinp.c Sun Jan 2 18:16:37 2005 -- remove unused variables -@@ -481,6 +481,6 @@ - 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" ); -@@ -562,5 +562,7 @@ - - /* 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++; - ---- unix/arlib.c Wed Sep 8 12:08:45 2004 -+++ unix/arlib.c Sun Jan 2 18:20:44 2005 -@@ -399,5 +399,5 @@ - 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 - } -@@ -422,5 +422,5 @@ - - #if ASCARCH -- fprintf(f, "%lu", now); -+ fprintf(f, "%llu", (unsigned long long)now); - #else - fwrite((char *)now, sizeof(now), 1, f); ---- unix/runargv.c Wed Sep 8 12:09:39 2004 -+++ unix/runargv.c Sun Jan 2 18:25:02 2005 -@@ -26,4 +26,7 @@ - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif - #include - #ifdef HAVE_WAIT_H ---- make.c Wed Sep 8 12:06:46 2004 -+++ make.c Sun Jan 2 18:26:55 2005 -@@ -336,6 +336,6 @@ - - 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); - } - } -@@ -590,6 +590,6 @@ - - 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 ) { ---- stat.c Fri Sep 22 11:33:25 2000 -+++ stat.c Sun Jan 2 18:27:46 2005 -@@ -140,6 +140,6 @@ - - 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 ); - } - ---- sysintf.c Thu Oct 7 18:18:47 2004 -- change the loop to make it more -+++ sysintf.c Sun Jan 2 18:30:33 2005 -- obvious, that fd *will* be set -@@ -500,11 +500,10 @@ - tmpdir = "/tmp"; - -- while( --tries ) -- { -+ do { - if( (fd = Create_temp(tmpdir, path, suff)) != -1) - break; - - free(*path); -- } -+ } while( --tries ); - - if( fd != -1) -@@ -739,6 +738,6 @@ - - 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 ); ---- function.c Wed Sep 8 12:06:20 2004 -+++ function.c Sun Jan 2 18:33:09 2005 -- unused variable -@@ -287,5 +287,5 @@ - - if( file && *file ) { -- char *newtmp; -+ /* char *newtmp; */ - - /* This call to Get_temp sets TMPFILE for subsequent expansion of file. --- dmake.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: