FreeBSD Bugzilla – Attachment 140654 Details for
Bug 187320
[PATCH] net/trafshow: support staging
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
trafshow-5.2.3.patch
trafshow-5.2.3.patch (text/plain), 3.43 KB, created by
Dmitry Marakasov
on 2014-03-06 17:20:00 UTC
(
hide
)
Description:
trafshow-5.2.3.patch
Filename:
MIME Type:
Creator:
Dmitry Marakasov
Created:
2014-03-06 17:20:00 UTC
Size:
3.43 KB
patch
obsolete
>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 <bsd.port.options.mk> >+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 <bsd.port.mk> >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 <string.h> >- #include <unistd.h> >- #include <errno.h> >-+#include <net/bpf.h> >- #include <pcap.h> >- #include <pthread.h> >- #include <time.h> >---- 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 <string.h> >- #include <unistd.h> >- #include <time.h> >-+#include <net/bpf.h> >- #include <pcap.h> >- #include <pthread.h> >- #include <errno.h> >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 <string.h> >+ #include <unistd.h> >+ #include <errno.h> >++#include <net/bpf.h> >+ #include <pcap.h> >+ #include <pthread.h> >+ #include <time.h> >+--- 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 <string.h> >+ #include <unistd.h> >+ #include <time.h> >++#include <net/bpf.h> >+ #include <pcap.h> >+ #include <pthread.h> >+ #include <errno.h> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 187320
: 140654