From owner-freebsd-ports  Wed Jan  5 23:20:10 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id B4C7514DB3
	for <freebsd-ports@FreeBSD.org>; Wed,  5 Jan 2000 23:20:06 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id XAA61096;
	Wed, 5 Jan 2000 23:20:06 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from stalker.stu.cn.ua (cinet-gw.stu.cn.ua [212.86.102.3])
	by hub.freebsd.org (Postfix) with ESMTP id 6F3CC15526
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Jan 2000 23:11:29 -0800 (PST)
	(envelope-from acid@stalker.stu.cn.ua)
Received: (from acid@localhost)
	by stalker.stu.cn.ua (8.9.3/8.9.3) id JAA30356;
	Thu, 6 Jan 2000 09:11:26 +0200 (EET)
Message-Id: <200001060711.JAA30356@stalker.stu.cn.ua>
Date: Thu, 6 Jan 2000 09:11:26 +0200 (EET)
From: acid@stu.cn.ua
Reply-To: acid@stu.cn.ua
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/15931: bpft-2.0 port update
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         15931
>Category:       ports
>Synopsis:       bpft-2.0 port update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan  5 23:20:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Michael Vasilenko
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
Chernigiv State Technological University
>Environment:


>Description:

"trafshow" in bpft-2.0 conflicts with "trafshow" in trafshow-2.0,
so maybe it's better to rename "trafshow" in bpft-2.0 to "trafshow2" ?

Yesterday i've submitted PR of updating port from trafshow-2.0 to trafshow-3.1

>How-To-Repeat:

		pkg_add bpft-2.0.tgz
		pkg_add trafshow-2.0.tgz

>Fix:
	

diff -urN bpft.orig/Makefile bpft/Makefile
--- bpft.orig/Makefile	Mon Aug 30 17:22:14 1999
+++ bpft/Makefile	Wed Jan  5 15:43:39 2000
@@ -13,7 +13,7 @@
 
 MAINTAINER=	oddbjorn@tricknology.org
 
-MAN1=		trafshow.1
+MAN1=		trafshow2.1
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -urN bpft.orig/patches/patch-aa bpft/patches/patch-aa
--- bpft.orig/patches/patch-aa	Sat Apr  3 04:51:01 1999
+++ bpft/patches/patch-aa	Wed Jan  5 15:41:47 2000
@@ -1,5 +1,5 @@
-*** Makefile.orig	Wed Oct 30 12:38:00 1996
---- Makefile	Fri Mar 19 23:42:26 1999
+*** Makefile.orig	Wed Oct 30 13:38:00 1996
+--- Makefile	Wed Jan  5 15:41:25 2000
 ***************
 *** 11,16 ****
 --- 11,17 ----
@@ -48,7 +48,7 @@
 ! 	install -s -o root -g $(GROUP) -m $(MODE) trafstatd/trafstatd $(PATH_BINDIR)
 ! 	install -s -o root -g $(GROUP) -m $(MODE) traflog/traflog $(PATH_BINDIR)
   	install -c -o root -g $(GROUP) -m $(MODE) traflog/traflog.format $(PATH_TRAFLOG_FMT)
-  	install -s -o root -g $(GROUP) -m $(MODE) trafshow/trafshow $(PATH_BINDIR)
+! 	install -s -o root -g $(GROUP) -m $(MODE) trafshow/trafshow $(PATH_BINDIR)
 ! 	install -c -m 644 trafshow/trafshow.1 $(PATH_MANDIR)
   	@echo Done.
   
@@ -73,8 +73,8 @@
 ! 	install -s -o root -g $(GROUP) -m $(MODE) trafstatd/trafstatd $(PATH_SBINDIR)
 ! 	install -s -o root -g $(GROUP) -m $(MODE) traflog/traflog   $(PATH_BINDIR)
   	install -c -o root -g $(GROUP) -m $(MODE) traflog/traflog.format $(PATH_TRAFLOG_FMT)
-  	install -s -o root -g $(GROUP) -m $(MODE) trafshow/trafshow $(PATH_BINDIR)
-! 	install -c -m 644 trafshow/trafshow.1                       $(PATH_MANDIR)
+! 	install -s -o root -g $(GROUP) -m $(MODE) trafshow/trafshow $(PATH_BINDIR)/trafshow2
+! 	install -c -m 644 trafshow/trafshow.1                       $(PATH_MANDIR)/trafshow2.1
   	@echo Done.
   
   clean:

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message