- Update to 1.0.2938

PR:		ports/125177
Submitted by:	Guram Dukashvili <white_raven@users.berlios.de> (maintainer)

4 files changed, 28 insertions, 64 deletions

diff --git a/net-mgmt/macroscope/Makefile b/net-mgmt/macroscope/Makefile
index 67f06536684b..1a24506f19e8 100644
--- a/net-mgmt/macroscope/Makefile
+++ b/net-mgmt/macroscope/Makefile
@@ -5,51 +5,48 @@
 # $FreeBSD$
 #
 
-PORTNAME=	macroscope
-PORTVERSION=	1.0.2278
-CATEGORIES=	net-mgmt
-MASTER_SITES=	ftp://ftp.berlios.de/pub/macroscope/ \
-		http://white-raven.pisem.net/
+PORTNAME=		macroscope
+PORTVERSION=		1.0.2938
+CATEGORIES=		net-mgmt
+MASTER_SITES=		ftp://ftp.berlios.de/pub/macroscope/ \
+			http://white-raven.pisem.net/
+DISTNAME=		${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	white_raven@users.berlios.de
-COMMENT=	User and IP traffic management with Web interface
+MAINTAINER=		white_raven@users.berlios.de
+COMMENT=		User and IP traffic management with Web interface
 
-LIB_DEPENDS=	lzo2:${PORTSDIR}/archivers/lzo2 \
-		odbc:${PORTSDIR}/databases/unixODBC \
-		pcap:${PORTSDIR}/net/libpcap
+LIB_DEPENDS=		lzo2:${PORTSDIR}/archivers/lzo2 \
+			odbc:${PORTSDIR}/databases/unixODBC \
+			pcap:${PORTSDIR}/net/libpcap
 
-USE_RC_SUBR=	macroscope
-USE_BZIP2=	yes
-USE_DOS2UNIX=	yes
-USE_CMAKE=	yes
+USE_RC_SUBR=		${PORTNAME}
+USE_BZIP2=		yes
+USE_DOS2UNIX=		yes
+USE_CMAKE=		yes
 
-OPTIONS=	MYSQL		"With MySQL support" on \
-		FIREBIRD	"With Firebird support" off
+OPTIONS=		MYSQL		"With MySQL support" on \
+			FIREBIRD	"With Firebird support" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(NOPORTDOCS)
-CMAKE_ARGS+=	-DCMAKE_NOT_INSTALL_DOC:BOOL=ON
+CMAKE_ARGS+=		-DCMAKE_NOT_INSTALL_DOC:BOOL=ON
 .endif
 
 .if !defined(WITHOUT_MYSQL)
-WANT_MYSQL_VER=	50
-USE_MYSQL=	yes
+WANT_MYSQL_VER=		50
+USE_MYSQL=		yes
 .endif
 
 .if !defined(WITHOUT_FIREBIRD)
 WITH_FIREBIRD_VER=	2
-USE_FIREBIRD=	yes
+USE_FIREBIRD=		yes
 .endif
 
 .include "${PORTSDIR}/Mk/bsd.database.mk"
 
 .if ${ARCH} == "sparc64"
-BROKEN=		Does not compile
+BROKEN=	Does not compile
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|".*\.c\.in"|"${FILESDIR}/CheckTypeSize.c.in"|' \
-	${WRKSRC}/builds/cmake/CheckTypeSize.cmake
-
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/macroscope/distinfo b/net-mgmt/macroscope/distinfo
index 3caaf9692b35..17b13548c978 100644
--- a/net-mgmt/macroscope/distinfo
+++ b/net-mgmt/macroscope/distinfo
@@ -1,3 +1,3 @@
-MD5 (macroscope-1.0.2278.tar.bz2) = f154030429e114766df18461d2617a17
-SHA256 (macroscope-1.0.2278.tar.bz2) = 357fcfaab822e12716bfa165a5e0b6fd9a7191925339fd4c78d97e6e7583ba5d
-SIZE (macroscope-1.0.2278.tar.bz2) = 2030330
+MD5 (macroscope-1.0.2938.tar.bz2) = 50c483b419092d58a2864ec77f1c72c4
+SHA256 (macroscope-1.0.2938.tar.bz2) = 038a619a540a44ef16d109ae2d099dc6d78c83891c2daee66639dfb05682abcc
+SIZE (macroscope-1.0.2938.tar.bz2) = 2025959
diff --git a/net-mgmt/macroscope/files/CheckTypeSize.c.in b/net-mgmt/macroscope/files/CheckTypeSize.c.in
deleted file mode 100644
index 8c9a0163e524..000000000000
--- a/net-mgmt/macroscope/files/CheckTypeSize.c.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#cmakedefine CHECK_TYPE_SIZE_TYPE @CHECK_TYPE_SIZE_TYPE@
-#ifdef CHECK_TYPE_SIZE_TYPE
-
-@CHECK_TYPE_SIZE_PREINCLUDE@
-#ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
-
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
-#endif /* HAVE_STDINT_H */
-
-#ifdef HAVE_STDDEF_H
-#  include <stddef.h>
-#endif /* HAVE_STDDEF_H */
-
-@CHECK_TYPE_SIZE_PREMAIN@
-
-#ifdef __CLASSIC_C__
-int main(){
-  int ac;
-  char*av[];
-#else
-int main(int ac, char*av[]){
-#endif
-  if(ac > 1000){return *av[0];}
-  return sizeof(CHECK_TYPE_SIZE_TYPE);
-}
-
-#else  /* CHECK_TYPE_SIZE_TYPE */
-
-#  error "CHECK_TYPE_SIZE_TYPE has to specify the type"
-
-#endif /* CHECK_TYPE_SIZE_TYPE */
diff --git a/net-mgmt/macroscope/pkg-descr b/net-mgmt/macroscope/pkg-descr
index 5be90b7a7e17..7b2edb2b4c20 100644
--- a/net-mgmt/macroscope/pkg-descr
+++ b/net-mgmt/macroscope/pkg-descr
@@ -1,9 +1,10 @@
-Macroscope is a squid, sendmail, courier, bpft log files analizer,
+Macroscope is a squid, sendmail, courier, exim, bpft log files analizer,
   IP sniffer and HTML report generator.
 Features:
   squid log file parser.
   sendmail log file parser.
   courier log file parser.
+  exim log file parser.
   bpft(ports/net-mgmt/bpft) log file parser.
   Database backends support: MySQL, Firebird.
   IP sniffer via pcap library (ports/net/libpcap).
@@ -12,7 +13,7 @@ Features:
   Traffic dynamic HTML reports generating via CGI (Web interface).
   Multithreading architecture.
   Portable: BSD os'es and Windows NT family supported, but tested at this time
-            only under FreeBSD 5.x 6.x amd64 i386 and Windows 2000 XP 2003.
+            only under FreeBSD 5.x 6.x 7.x amd64 i386 and Windows 2000 XP 2003.
 
 WWW: http://developer.berlios.de/projects/macroscope/