Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 02 Jun 2013 12:20:10 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        jpaetzel@freebsd.org
Subject:   ports/179198: [PATCH] net/tcpstat: Trim comment, docs, add license
Message-ID:  <20130602102019.66753AB5@hub.freebsd.org>
Resent-Message-ID: <201306021030.r52AU0nh002863@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179198
>Category:       ports
>Synopsis:       [PATCH] net/tcpstat: Trim comment, docs, add license
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 02 10:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:

- Shorten header
- Trim comment
- Add license
- Comply with OptionsNG
- Trim docs
- Remove pkg-plist

Removed file(s):
- pkg-plist

Generated and tested manually, tested with port test and with RedPorts, with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130531225000-30657/

>Fix:

--- tcpstat-1.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/tcpstat/Makefile ./Makefile
--- /usr/ports/net/tcpstat/Makefile	2013-01-14 17:56:33.000000000 +0100
+++ ./Makefile	2013-06-02 12:12:32.000000000 +0200
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   tcpstat
-# Date created:        29 January 2001
-# Whom:                George Reid <greid@ukug.uk.freebsd.org>
-#
+# Created by: George Reid <greid@ukug.uk.freebsd.org>
 # $FreeBSD: head/net/tcpstat/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
 
 PORTNAME=	tcpstat
 PORTVERSION=	1.5
@@ -11,17 +7,33 @@
 MASTER_SITES=	http://www.frenchfries.net/paul/tcpstat/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program to report various network statistics
+COMMENT=	Program to report various network statistics
+
+LICENSE=	BSD
 
 GNU_CONFIGURE=	yes
 
+PLIST_FILES=	bin/tcpstat bin/tcpprof
+
 MAN1=		tcpstat.1 tcpprof.1
-DOCS=		AUTHORS ChangeLog LICENSE README doc/Tips_and_Tricks.txt
 
-.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	AUTHORS ChangeLog README
+
+DOCSRCDIR2=	${WRKSRC}/doc
+DOCSDIR2=	${DOCSDIR}/doc
+DOC_FILES2=	Tips_and_Tricks.txt
+
+.include <bsd.port.options.mk>
+
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/net/tcpstat/pkg-plist ./pkg-plist
--- /usr/ports/net/tcpstat/pkg-plist	2013-01-14 17:56:33.000000000 +0100
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-@comment $FreeBSD: head/net/tcpstat/pkg-plist 300897 2012-07-14 14:29:18Z beat $
-bin/tcpstat
-bin/tcpprof
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/Tips_and_Tricks.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- tcpstat-1.5.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130602102019.66753AB5>