4 files changed, 62 insertions, 47 deletions
diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index 653eb67e3b8d..9c4a4580fe7c 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	kismet
-PORTVERSION=	200508.r1
-PORTREVISION=	3
+PORTVERSION=	200604.r1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
-DISTNAME=	kismet-2005-08-R1
+DISTNAME=	kismet-2006-04-R1
 
-MAINTAINER=	eol1@yahoo.com
+MAINTAINER=	peter.thoenen@yahoo.com
 COMMENT=	802.11 layer2 wireless network detector, sniffer, and IDS
 
 GNU_CONFIGURE=	yes
@@ -24,72 +23,87 @@ CONFIGURE_ARGS+=	--enable-syspcap
 OPTIONS=	CURSES "libcurses interface" on \
 		PANEL "libpanels interface" on \
 		SETUID "Install kismet with setuid" on \
-		GPSMAP "Build gpsmap utility" on \
+		GPSMAP "Build gpsmap utility" off \
 		GMAP "Build gpsmap with Google Maps patch *UNOFFICIAL*" off
 
+RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_CURSES)
+.ifdef(WITHOUT_CURSES)
 CONFIGURE_ARGS+=--disable-curses
 .endif
 
-.if defined(WITHOUT_PANEL)
+.ifdef(WITHOUT_PANEL)
 CONFIGURE_ARGS+=--disable-panel
 .endif
 
-.if defined(WITHOUT_SETUID)
+.ifdef(WITHOUT_SETUID)
 CONFIGURE_ARGS+=--disable-setuid
 .endif
 
-.if defined(WITHOUT_GPSMAP)
-CONFIGURE_ARGS+=--disable-gpsmap
-PLIST_SUB+=	GPS="@comment "
-.else
+.ifdef(WITH_GPSMAP)
 PLIST_SUB+=	GPS=""
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		Magick++.10:${PORTSDIR}/graphics/ImageMagick
 BUILD_DEPENDS+=	wget:${PORTSDIR}/ftp/wget
-RUN_DEPENDS+=	wget:${PORTSDIR}/ftp/wget
+MAN1=		gpsmap.1
+.else
+CONFIGURE_ARGS+=--disable-gpsmap
+PLIST_SUB+=	GPS="@comment "
 .endif
 
-.if defined(WITH_GMAP) && !defined(WITHOUT_GPSMAP)
+.ifdef(WITH_GMAP) && defined(WITH_GPSMAP)
 PATCH_SITES=	http://www.parknation.com/gmap/files/
 PATCHFILES=	gpsmap-gmap-0.1.tgz
 PLIST_SUB+=	GMAP=""
-SUB_FILES=	pkg-message
+.ifndef(NOPORTDOC)
+SUB_LIST+=	DOCSDIR=${DOCSDIR}
+SUB_FILES+=	pkg-message
+.endif
+GMAP=		gpsmap-gmap
+PORTDOCS=	${GMAP}/README.txt
 .else
 PLIST_SUB+=	GMAP="@comment "
 .endif
 
-MAN1=		kismet.1 kismet_drone.1 gpsmap.1
+MAN1+=		kismet.1 kismet_drone.1
 MAN5=		kismet.conf.5 kismet_drone.conf.5 kismet_ui.conf.5
 
+PORTDOCS+=	README
+
 .if ${OSVERSION} < 502000
 CONFIGURE_ARGS+=	--disable-pcap
 .endif
 
 post-extract:
-.if defined(WITH_GMAP) && !defined(WITHOUT_GPSMAP)
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} 
-	@${PATCH} -d ${WRKSRC}/gpsmap-gmap-0.1 --forward --quiet < ${PKGDIR}/files/gpsmap-gmap-0.1.diff.patch
-	@${PATCH} -d ${WRKSRC} --forward --quiet < ${WRKSRC}/gpsmap-gmap-0.1/gpsmap-gmap-0.1.diff
+.ifdef(WITH_GMAP) && defined(WITH_GPSMAP)
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES}
+	@${PATCH} -d ${WRKSRC}/${GMAP}-0.1 --forward --quiet < ${PKGDIR}/files/${GMAP}-0.1.diff.patch
+	@${PATCH} -d ${WRKSRC} --forward --quiet < ${WRKSRC}/${GMAP}-0.1/${GMAP}-0.1.diff
 .endif
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
 
 post-install:
-.if defined(WITH_GMAP) && !defined(WITHOUT_GPSMAP)
-	${MKDIR} ${PREFIX}/share/${PORTNAME}/gpsmap-gmap
-	${MKDIR} ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/index.html ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/index.html
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/README.txt ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/README.txt
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/mapfiles/shadow.png ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles/shadow.png
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/mapfiles/wep.png ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles/wep.png
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/mapfiles/open.png ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles/open.png
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/mapfiles/wpa.png ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles/wpa.png
+.ifndef(NOPORTDOC)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
+.ifdef(WITH_GMAP) && defined(WITH_GPSMAP)
+	${MKDIR} ${DATADIR}/${GMAP}/mapfiles
+	${INSTALL_DATA} ${WRKSRC}/${GMAP}-0.1/index.html ${DATADIR}/${GMAP}/index.html
+	${INSTALL_DATA} ${WRKSRC}/${GMAP}-0.1/mapfiles/shadow.png ${DATADIR}/${GMAP}/mapfiles/shadow.png
+	${INSTALL_DATA} ${WRKSRC}/${GMAP}-0.1/mapfiles/wep.png ${DATADIR}/${GMAP}/mapfiles/wep.png
+	${INSTALL_DATA} ${WRKSRC}/${GMAP}-0.1/mapfiles/open.png ${DATADIR}/${GMAP}/mapfiles/open.png
+	${INSTALL_DATA} ${WRKSRC}/${GMAP}-0.1/mapfiles/wpa.png ${DATADIR}/${GMAP}/mapfiles/wpa.png
+.ifndef(NOPORTDOC)
+	@${INSTALL_DATA} ${WRKSRC}/${GMAP}-0.1/README.txt ${DOCSDIR}/${GMAP}
 	@${CAT} ${PKGMESSAGE}
 .endif
+.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/extra/manuf_update.sh ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/conf/kismet.conf ${PREFIX}/etc/kismet.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/kismet_drone.conf ${PREFIX}/etc/kismet_drone.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/kismet_ui.conf ${PREFIX}/etc/kismet_ui.conf.sample
diff --git a/net-mgmt/kismet/distinfo b/net-mgmt/kismet/distinfo
index 3b64cf8d40e3..a5cb72f6ec03 100644
--- a/net-mgmt/kismet/distinfo
+++ b/net-mgmt/kismet/distinfo
@@ -1,6 +1,6 @@
-MD5 (kismet-2005-08-R1.tar.gz) = 17edb7688e04dd28028d5268a77d0ce7
-SHA256 (kismet-2005-08-R1.tar.gz) = 27e657212881186d356907a7c45b168e7431a2f83f3411d2a90366afccf03916
-SIZE (kismet-2005-08-R1.tar.gz) = 986388
+MD5 (kismet-2006-04-R1.tar.gz) = 8ec2de513f2911df1b7edfcba5ad1c26
+SHA256 (kismet-2006-04-R1.tar.gz) = eb8a1c688b07adede53c362355e639d8ac29d30536d69eaee97235d14e6d7e76
+SIZE (kismet-2006-04-R1.tar.gz) = 1005068
 MD5 (gpsmap-gmap-0.1.tgz) = 7c62c841ccdc187812a0fe602d92d97c
 SHA256 (gpsmap-gmap-0.1.tgz) = 66c5e9c4fed70e88d092754746014bb02071b742c23390f1ec795fd14b32317b
 SIZE (gpsmap-gmap-0.1.tgz) = 13845
diff --git a/net-mgmt/kismet/files/pkg-message.in b/net-mgmt/kismet/files/pkg-message.in
index 47af5377f1d5..f0e93df52498 100644
--- a/net-mgmt/kismet/files/pkg-message.in
+++ b/net-mgmt/kismet/files/pkg-message.in
@@ -4,7 +4,7 @@
 You have built gpsmap with Google Maps functionality. 
 This is third-party patch allows you to plot wireless networks
 using Google Maps engine. It's unsupported by Kismet authors,
-please read %%PREFIX%%/share/kismet/gpsmap-gmap/README.txt from
+please read %%DOCSDIR%%/gpsmap-gmap/README.txt from
 step 10, or see http://www.parknation.com/gmap/
 
 =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
diff --git a/net-mgmt/kismet/pkg-plist b/net-mgmt/kismet/pkg-plist
index 301beeb03ed6..7d237f4644c1 100644
--- a/net-mgmt/kismet/pkg-plist
+++ b/net-mgmt/kismet/pkg-plist
@@ -2,6 +2,7 @@ bin/kismet
 bin/kismet_client
 bin/kismet_drone
 bin/kismet_server
+bin/manuf_update.sh
 %%GPS%%bin/gpsmap
 %%GPS%%bin/gpsmap-helper-earthamaps
 etc/ap_manuf
@@ -12,17 +13,17 @@ etc/kismet.conf.sample
 etc/kismet_drone.conf.sample
 @unexec if cmp -s %D/etc/kismet_ui.conf %D/etc/kismet_ui.conf.sample; then rm -f %D/etc/kismet_ui.conf; fi
 etc/kismet_ui.conf.sample
-share/kismet/wav/alert.wav
-share/kismet/wav/junk_traffic.wav
-share/kismet/wav/new_network.wav
-share/kismet/wav/traffic.wav
-%%GMAP%%share/kismet/gpsmap-gmap/README.txt
-%%GMAP%%share/kismet/gpsmap-gmap/index.html
-%%GMAP%%share/kismet/gpsmap-gmap/mapfiles/open.png
-%%GMAP%%share/kismet/gpsmap-gmap/mapfiles/shadow.png
-%%GMAP%%share/kismet/gpsmap-gmap/mapfiles/wep.png
-%%GMAP%%share/kismet/gpsmap-gmap/mapfiles/wpa.png
-%%GMAP%%@dirrm share/kismet/gpsmap-gmap/mapfiles
-%%GMAP%%@dirrm share/kismet/gpsmap-gmap
-@dirrm share/kismet/wav
-@dirrm share/kismet
+%%DATADIR%%/wav/alert.wav
+%%DATADIR%%/wav/junk_traffic.wav
+%%DATADIR%%/wav/new_network.wav
+%%DATADIR%%/wav/traffic.wav
+%%GMAP%%%%DATADIR%%/gpsmap-gmap/README.txt
+%%GMAP%%%%DATADIR%%/gpsmap-gmap/index.html
+%%GMAP%%%%DATADIR%%/gpsmap-gmap/mapfiles/open.png
+%%GMAP%%%%DATADIR%%/gpsmap-gmap/mapfiles/shadow.png
+%%GMAP%%%%DATADIR%%/gpsmap-gmap/mapfiles/wep.png
+%%GMAP%%%%DATADIR%%/gpsmap-gmap/mapfiles/wpa.png
+%%GMAP%%@dirrm %%DATADIR%%/gpsmap-gmap/mapfiles
+%%GMAP%%@dirrm %%DATADIR%%/gpsmap-gmap
+@dirrm %%DATADIR%%/wav
+@dirrm %%DATADIR%%