Bug 185694 - net-mgmt/bpft: Fix build on -current
Summary: net-mgmt/bpft: Fix build on -current
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-12 18:40 UTC by tkato432
Modified: 2014-01-15 08:30 UTC (History)
0 users

See Also:


Attachments
file.diff (1.91 KB, patch)
2014-01-12 18:40 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2014-01-12 18:40:01 UTC
- Fix build on -current
Comment 1 dfilter service freebsd_committer 2014-01-15 08:25:24 UTC
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%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 2 Vanilla I. Shu freebsd_committer 2014-01-15 08:25:32 UTC
State Changed
From-To: open->closed

Committed, thanks.