Date: Mon, 13 Jan 2014 03:20:23 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185694: net-mgmt/bpft: Fix build on -current Message-ID: <20140113032023.da3b6f7181f64da5bbca9c6b@yahoo.com> Resent-Message-ID: <201401121840.s0CIe1HH049289@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185694
>Category: ports
>Synopsis: net-mgmt/bpft: Fix build on -current
>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 Jan 12 18:40:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net-mgmt/bpft/Makefile net-mgmt/bpft/Makefile
--- /usr/ports/net-mgmt/bpft/Makefile 2013-11-06 21:49:08.000000000 +0900
+++ net-mgmt/bpft/Makefile 2014-01-13 00:00:00.000000000 +0900
@@ -21,11 +21,6 @@
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 @@
'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>
diff -urN /usr/ports/net-mgmt/bpft/pkg-plist net-mgmt/bpft/pkg-plist
--- /usr/ports/net-mgmt/bpft/pkg-plist 2013-11-06 21:49:08.000000000 +0900
+++ net-mgmt/bpft/pkg-plist 2014-01-13 00:00:00.000000000 +0900
@@ -6,10 +6,14 @@
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%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140113032023.da3b6f7181f64da5bbca9c6b>