From owner-svn-ports-head@FreeBSD.ORG  Wed Jan 15 08:25:18 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 14871660;
 Wed, 15 Jan 2014 08:25:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (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 DB0371774;
 Wed, 15 Jan 2014 08:25:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0F8PHSx033027;
 Wed, 15 Jan 2014 08:25:17 GMT (envelope-from vanilla@svn.freebsd.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0F8PH7Y033025;
 Wed, 15 Jan 2014 08:25:17 GMT (envelope-from vanilla@svn.freebsd.org)
Message-Id: <201401150825.s0F8PH7Y033025@svn.freebsd.org>
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Wed, 15 Jan 2014 08:25:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339763 - head/net-mgmt/bpft
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 08:25:18 -0000

Author: vanilla
Date: Wed Jan 15 08:25:17 2014
New Revision: 339763
URL: http://svnweb.freebsd.org/changeset/ports/339763
QAT: https://qat.redports.org/buildarchive/r339763/

Log:
  1: Fix building on 10 and -current.
  2: support stagedir
  
  PR:		ports/185694
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/net-mgmt/bpft/Makefile
  head/net-mgmt/bpft/pkg-plist

Modified: head/net-mgmt/bpft/Makefile
==============================================================================
--- head/net-mgmt/bpft/Makefile	Wed Jan 15 08:05:53 2014	(r339762)
+++ head/net-mgmt/bpft/Makefile	Wed Jan 15 08:25:17 2014	(r339763)
@@ -21,11 +21,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKE_JOBS_UNSAFE=	yes
 
-MANCOMPRESSED=	yes
-MAN1=		traflog.1 trafstat.1
-MAN8=		trafstatd.8 trafd.8
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -33,20 +28,23 @@ post-patch:
 		's|/usr/local|${PREFIX}|g' ${WRKSRC}/include/pathnames.h
 	@${REINPLACE_CMD} -e \
 		'/^PATH_TOSAVE/s|=.*|= ${PREFIX}/var/bpft| ; \
-		 /^INSTALL_DIRECTORY/s|=.*|= ${MKDIR}|' ${WRKSRC}/Makefile
+		 /^INSTALL_DIRECTORY/s|=.*|= ${MKDIR}| ; \
+		 s|please!|&"| ; \
+		 s| $${PATH_| $${DESTDIR}$${PATH_|g ; \
+		 s| $${PREFIX_| $${DESTDIR}$${PREFIX_|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|bpf_dump.[co]||' ${WRKSRC}/lib/Makefile
 	@${REINPLACE_CMD} -e \
 		's|<net/slip.h>|"../linux-include/net/slip.h"|' \
 		${WRKSRC}/lib/interfaces.c
 
 post-install:
 .for i in bin/traflog bin/trafstat sbin/trafd sbin/trafstatd
-	@${STRIP_CMD} ${PREFIX}/${i}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${i}
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README WhatsNew
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/bpft/pkg-plist
==============================================================================
--- head/net-mgmt/bpft/pkg-plist	Wed Jan 15 08:05:53 2014	(r339762)
+++ head/net-mgmt/bpft/pkg-plist	Wed Jan 15 08:25:17 2014	(r339763)
@@ -6,10 +6,14 @@ bin/trafstat
 bin/trafstop
 etc/rc.d/trafd.sh
 etc/traflog.format
+man/man1/traflog.1.gz
+man/man1/trafstat.1.gz
+man/man8/trafd.8.gz
+man/man8/trafstatd.8.gz
 sbin/trafd
 sbin/trafstatd
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WhatsNew
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry var/bpft
 @dirrmtry var
+%%PORTDOCS%%@dirrm %%DOCSDIR%%