svn commit: r349246 - in head/net/trafshow: . files

[Alexey Degtyarev]

Author: alexey
Date: Wed Mar 26 12:27:50 2014
New Revision: 349246
URL: http://svnweb.freebsd.org/changeset/ports/349246
QAT: https://qat.redports.org/buildarchive/r349246/

Log:
  - Support STAGE
  - Make extra patch for >= 8.x into a normal patch as it's used on all supported
    FreeBSD versions
  
  PR:		ports/187320
  Submitted by:	Dmitry Marakasov <amdmi3 at amdmi3.ru>
  Approved by:	wg (mentor)

Added:
  head/net/trafshow/files/patch-800074+   (contents, props changed)
Deleted:
  head/net/trafshow/files/extra-patch-800074+
Modified:
  head/net/trafshow/Makefile
  head/net/trafshow/pkg-plist

Modified: head/net/trafshow/Makefile
==============================================================================
--- head/net/trafshow/Makefile	Wed Mar 26 12:21:48 2014	(r349245)
+++ head/net/trafshow/Makefile	Wed Mar 26 12:27:50 2014	(r349246)
@@ -19,31 +19,17 @@ GNU_CONFIGURE=	yes
 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>

Added: head/net/trafshow/files/patch-800074+
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/trafshow/files/patch-800074+	Wed Mar 26 12:27:50 2014	(r349246)
@@ -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>

Modified: head/net/trafshow/pkg-plist
==============================================================================
--- head/net/trafshow/pkg-plist	Wed Mar 26 12:21:48 2014	(r349245)
+++ head/net/trafshow/pkg-plist	Wed Mar 26 12:27:50 2014	(r349246)
@@ -2,3 +2,4 @@ bin/trafshow
 @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