svn commit: r565138 - head/net/trafshow3

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Feb 13 13:11:05 2021
New Revision: 565138
URL: https://svnweb.freebsd.org/changeset/ports/565138

Log:
  - Add suffix to all installed files to avoid conflict with actual version of trafshow
  
  PR:		217489
  Submitted by:	sd at mostnet.ru

Modified:
  head/net/trafshow3/Makefile
  head/net/trafshow3/pkg-plist

Modified: head/net/trafshow3/Makefile
==============================================================================
--- head/net/trafshow3/Makefile	Sat Feb 13 13:09:23 2021	(r565137)
+++ head/net/trafshow3/Makefile	Sat Feb 13 13:11:05 2021	(r565138)
@@ -3,7 +3,7 @@
 
 PORTNAME=	trafshow
 PORTVERSION=	3.1
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/sem
@@ -12,8 +12,6 @@ PKGNAMESUFFIX=	3
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Full screen visualization of network traffic (an ancient version)
 
-CONFLICTS=	trafshow-[45].*
-
 .if defined(WITH_TRAFSHOW_SLANG) || \
     (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG))
 LIB_DEPENDS=	libslang.so:devel/libslang2
@@ -29,8 +27,8 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/.trafshow ${STAGEDIR}${PREFIX}/etc/trafshow.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${STAGEDIR}${PREFIX}/bin/trafshow3
+	${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${STAGEDIR}${PREFIX}/man/man1/trafshow3.1
+	${INSTALL_DATA} ${WRKSRC}/.trafshow ${STAGEDIR}${PREFIX}/etc/trafshow3.sample
 
 .include <bsd.port.mk>

Modified: head/net/trafshow3/pkg-plist
==============================================================================
--- head/net/trafshow3/pkg-plist	Sat Feb 13 13:09:23 2021	(r565137)
+++ head/net/trafshow3/pkg-plist	Sat Feb 13 13:11:05 2021	(r565138)
@@ -1,3 +1,3 @@
-bin/trafshow
-man/man1/trafshow.1.gz
- at sample etc/trafshow.sample
+bin/trafshow3
+man/man1/trafshow3.1.gz
+ at sample etc/trafshow3.sample