From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 6 17:20:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC8547EB for ; Thu, 6 Mar 2014 17:20:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C807EF33 for ; Thu, 6 Mar 2014 17:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s26HK0uT056191 for ; Thu, 6 Mar 2014 17:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s26HK0Io056190; Thu, 6 Mar 2014 17:20:00 GMT (envelope-from gnats) Resent-Date: Thu, 6 Mar 2014 17:20:00 GMT Resent-Message-Id: <201403061720.s26HK0Io056190@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, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D16165F0 for ; Thu, 6 Mar 2014 17:15:44 +0000 (UTC) Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8BB78EF0 for ; Thu, 6 Mar 2014 17:15:44 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WLbtU-0000nI-TV; Thu, 06 Mar 2014 21:15:40 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 6FB1082E; Thu, 6 Mar 2014 21:15:40 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 45EE537D01; Thu, 6 Mar 2014 21:15:40 +0400 (MSK) Message-Id: <20140306171540.45EE537D01@hades.panopticon> Date: Thu, 6 Mar 2014 21:15:40 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187320: [PATCH] net/trafshow: support staging Cc: alexey@renatasystems.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 17:20:01 -0000 >Number: 187320 >Category: ports >Synopsis: [PATCH] net/trafshow: support staging >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: Thu Mar 06 17:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Support staging - Make extra patch for >= 8.x into a normal patch as it's used on all supported FreeBSD versions Port maintainer (alexey@renatasystems.org) is cc'd. Renamed files: files/extra-patch-800074+ -> files/patch-800074+ Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- trafshow-5.2.3.patch begins here --- diff -ruN /usr/ports/net/trafshow/Makefile ./Makefile --- /usr/ports/net/trafshow/Makefile 2013-12-05 15:10:49.000000000 +0400 +++ ./Makefile 2014-03-06 18:37:28.421022101 +0400 @@ -19,31 +19,17 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" ALL_TARGET= trafshow -MAN1= trafshow.1 - -OPTIONS_DEFINE= IPV6 - -NO_STAGE= yes -.include +OPTIONS_DEFINE= IPV6 +IPV6_CFLAGS= -DINET6 post-patch: @${REINPLACE_CMD} -e 's|-D_THREAD_SAFE||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \ ${WRKSRC}/colormask.c ${WRKSRC}/trafshow.1 ${WRKSRC}/trafshow.c -.if ${OSVERSION} >= 800074 - @${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-800074+ -.endif - -.if ${PORT_OPTIONS:MIPV6} -CFLAGS+= -DINET6 -.endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/.trafshow ${PREFIX}/etc/trafshow.dist - if [ ! -e ${PREFIX}/etc/trafshow ]; then \ - ${CP} -p ${PREFIX}/etc/trafshow.dist ${PREFIX}/etc/trafshow; \ - fi + ${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/.trafshow ${STAGEDIR}${PREFIX}/etc/trafshow.dist .include diff -ruN /usr/ports/net/trafshow/files/extra-patch-800074+ ./files/extra-patch-800074+ --- /usr/ports/net/trafshow/files/extra-patch-800074+ 2014-01-22 21:40:44.000000000 +0400 +++ ./files/extra-patch-800074+ 1970-01-01 03:00:00.000000000 +0300 @@ -1,23 +0,0 @@ -# -# http://lists.freebsd.org/pipermail/freebsd-ports/2009-March/053823.html -# ---- show_dump.c.orig 2009-03-29 23:18:16.000000000 +0400 -+++ show_dump.c 2009-03-29 23:18:24.000000000 +0400 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- trafshow.c.orig 2009-03-29 23:18:49.000000000 +0400 -+++ trafshow.c 2009-03-29 23:18:58.000000000 +0400 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff -ruN /usr/ports/net/trafshow/files/patch-800074+ ./files/patch-800074+ --- /usr/ports/net/trafshow/files/patch-800074+ 1970-01-01 03:00:00.000000000 +0300 +++ ./files/patch-800074+ 2014-01-23 04:44:07.851683737 +0400 @@ -0,0 +1,23 @@ +# +# http://lists.freebsd.org/pipermail/freebsd-ports/2009-March/053823.html +# +--- show_dump.c.orig 2009-03-29 23:18:16.000000000 +0400 ++++ show_dump.c 2009-03-29 23:18:24.000000000 +0400 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- trafshow.c.orig 2009-03-29 23:18:49.000000000 +0400 ++++ trafshow.c 2009-03-29 23:18:58.000000000 +0400 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff -ruN /usr/ports/net/trafshow/pkg-plist ./pkg-plist --- /usr/ports/net/trafshow/pkg-plist 2014-01-22 19:16:56.000000000 +0400 +++ ./pkg-plist 2014-03-06 18:35:28.151029617 +0400 @@ -2,3 +2,4 @@ @unexec if cmp -s %D/etc/trafshow %D/etc/trafshow.dist; then rm -f %D/etc/trafshow; fi etc/trafshow.dist @exec if [ ! -e %D/etc/trafshow ]; then cp -p %D/%F %B/trafshow; fi +man/man1/trafshow.1.gz --- trafshow-5.2.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: