From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 27 15:50:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1C5A1065670 for ; Mon, 27 Jul 2009 15:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8D1DD8FC20 for ; Mon, 27 Jul 2009 15:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6RFo2IB040221 for ; Mon, 27 Jul 2009 15:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6RFo2SU040220; Mon, 27 Jul 2009 15:50:02 GMT (envelope-from gnats) Resent-Date: Mon, 27 Jul 2009 15:50:02 GMT Resent-Message-Id: <200907271550.n6RFo2SU040220@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, Andrey Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD4F6106564A for ; Mon, 27 Jul 2009 15:48:59 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id AB45D8FC15 for ; Mon, 27 Jul 2009 15:48:59 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n6RFmwTL011714 for ; Mon, 27 Jul 2009 15:48:58 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n6RFmws1011713; Mon, 27 Jul 2009 15:48:58 GMT (envelope-from nobody) Message-Id: <200907271548.n6RFmws1011713@www.freebsd.org> Date: Mon, 27 Jul 2009 15:48:58 GMT From: Andrey To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/137179: net/skyfish incorrect install with custom PREFIX 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: Mon, 27 Jul 2009 15:50:02 -0000 >Number: 137179 >Category: ports >Synopsis: net/skyfish incorrect install with custom PREFIX >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 27 15:50:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Andrey >Release: Freebsd 8.0-BETA2 >Organization: >Environment: FreeBSD nsand.home 8.0-BETA2 FreeBSD 8.0-BETA2 #0: Wed Jul 15 23:25:30 UTC 2009 >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: --- bin/Makefile.orig 2008-10-11 18:05:45.000000000 +0400 +++ bin/Makefile 2009-06-30 22:04:35.000000000 +0400 @@ -5,9 +5,8 @@ SRCS= db.c db.h file_sky.c file_sky.h parse_http.c parse_http.h skyfish.h skyfish.c my_types.h \ interface.h interface.c sky_node.c sky_node.h sky_conf.c sky_conf.h sky_shm.c sky_shm.h convert.h convert.c PROG= skyfish -PREFIX=/usr/local NO_MAN= -BINDIR= /usr/local/bin +BINDIR= ${PREFIX}/bin BINOWN= root BINGRP= wheel BINMODE= 4550 --- doc/Makefile.orig 2008-09-16 09:24:53.000000000 +0400 +++ doc/Makefile 2009-06-30 22:04:47.000000000 +0400 @@ -1,14 +1,12 @@ NO_MAN= -PREFIX=/usr/local/share/doc/skyfish - install: - mkdir -p ${PREFIX} - cp -f README ${PREFIX} - cp -f README.rus ${PREFIX} - cp -f COPYRIGHT ${PREFIX} - cp -f CREDITS ${PREFIX} - cp -f CHANGES ${PREFIX} + mkdir -p ${PREFIX}/share/doc/skyfish + cp -f README ${PREFIX}/share/doc/skyfish + cp -f README.rus ${PREFIX}/share/doc/skyfish + cp -f COPYRIGHT ${PREFIX}/share/doc/skyfish + cp -f CREDITS ${PREFIX}/share/doc/skyfish + cp -f CHANGES ${PREFIX}/share/doc/skyfish .include --- etc/Makefile.orig 2008-09-16 09:24:56.000000000 +0400 +++ etc/Makefile 2009-06-30 22:04:53.000000000 +0400 @@ -1,9 +1,7 @@ -PREFIX=/usr/local/etc - NO_MAN= install: - cp -f skyfish.conf.dist ${PREFIX} + cp -f skyfish.conf.dist ${PREFIX}/etc -.include \ No newline at end of file +.include --- bin/interface.c.orig 2008-10-14 16:38:48.000000000 +0400 +++ bin/interface.c 2009-06-30 22:19:27.000000000 +0400 @@ -862,7 +862,14 @@ bzero(&tmp2[0],320); traf=db[i].rspeed; - if (traf == 0 && db[i].deltatime > 10) sprintf(tmp2,"|-[%4lu]s",db[i].deltatime); + if (traf == 0 && db[i].deltatime > 10) { + if (db[i].deltatime >= 3600) + sprintf(tmp2,"|-[%4lu]h",db[i].deltatime/3600); + if (db[i].deltatime >= 60 && db[i].deltatime < 3600) + sprintf(tmp2,"|-[%4lu]m",db[i].deltatime/60); + else + sprintf(tmp2,"|-[%4lu]s",db[i].deltatime); + } else if (traf > GB) sprintf(tmp2,"|%4.0f G/s",traf/GBYTE); else if (traf > MB) sprintf(tmp2,"|%4.0f M/s",traf/MBYTE); else if (traf > KB) sprintf(tmp2,"|%4.0f K/s",traf/KBYTE); --- man/Makefile.orig 2008-09-16 09:24:57.000000000 +0400 +++ man/Makefile 2009-06-28 23:33:36.000000000 +0400 @@ -1,6 +1,6 @@ # MAN1= skyfish.1 -MANDIR = /usr/local/man/man +MANDIR = ${PREFIX}/man/man -.include \ No newline at end of file +.include --- bin/my_types.h.orig 2008-10-13 09:33:00.000000000 +0400 +++ bin/my_types.h 2009-06-28 23:52:19.000000000 +0400 @@ -46,7 +46,7 @@ #define CP1251 2 -static char VERSION[] = "0.90"; +static char VERSION[] = "0.91"; #define LENTMP 320 #define LENPATH 300 --- bin/skyfish.c.orig 2008-10-14 16:30:21.000000000 +0400 +++ bin/skyfish.c 2009-06-28 23:51:59.000000000 +0400 @@ -92,7 +92,7 @@ fclose(fd); } - while ((ch = getopt(argc, argv, "rdsi")) != -1) + while ((ch = getopt(argc, argv, "rdsiv")) != -1) switch (ch) { case 'd': /* daemon mode */ if (rpid > 0) {printf("Daemon already running\n");return 1;} @@ -119,8 +119,13 @@ runmode=CLIENT; if (rpid == 0) {printf("No running daemon\n");return 1;} break; + case 'v': + printf("Skyfish version %s\n",VERSION); + return 1; + break; default: printf("read man skyfish\n"); + return 1; break; } if (argc < 2 && rpid > 0) {printf("Daemon already running\n");return 1;} >Release-Note: >Audit-Trail: >Unformatted: