diff -ur kismet.orig/Makefile kismet/Makefile
--- kismet.orig/Makefile	Thu Jan 12 00:10:27 2006
+++ kismet/Makefile	Thu Jan 12 00:32:14 2006
@@ -16,43 +16,46 @@
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 CONFIGURE_ARGS+=	--enable-syspcap
 
-.ifdef DISABLE_CURSES
-CONFIGURE_ARGS+=	--disable-curses
+OPTIONS=	CURSES "libcurses interface" on \
+		PANEL "libpanels interface" on \
+		SETUID "Install kismet with setuid" on \
+		GPSMAP "Build gpsmap utility" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_CURSES)
+CONFIGURE_ARGS+=--disable-curses
 .endif
 
-.ifdef DISABLE_PANEL
-CONFIGURE_ARGS+=	--disable-panel
+.if defined(WITHOUT_PANEL)
+CONFIGURE_ARGS+=--disable-panel
 .endif
 
-.ifdef DISABLE_SETUID
-CONFIGURE_ARGS+=	--disable-setuid
+.if defined(WITHOUT_SETUID)
+CONFIGURE_ARGS+=--disable-setuid
 .endif
 
-MAN1=		kismet.1 kismet_drone.1
-MAN5=		kismet.conf.5 kismet_drone.conf.5 kismet_ui.conf.5
+.if defined(WITHOUT_GPSMAP)
+CONFIGURE_ARGS+=--disable-gpsmap
+PLIST_SUB+=	GPS="@comment "
+.else
+PLIST_SUB+=	GPS=""
+LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	Magick++.9:${PORTSDIR}/graphics/ImageMagick
+.endif
 
-.include <bsd.port.pre.mk>
+MAN1=		kismet.1 kismet_drone.1 gpsmap.1
+MAN5=		kismet.conf.5 kismet_drone.conf.5 kismet_ui.conf.5
 
 .if ${OSVERSION} < 502000
 BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
 .endif
-
-pre-fetch:
-	@${ECHO_MSG} ""
-.ifndef DISABLE_CURSES
-	@${ECHO_MSG} " define DISABLE_CURSES to build without ncurses interface"
-.endif
-.ifndef DISABLE_PANEL
-	@${ECHO_MSG} " define DISABLE_PANEL to build without libpanel interface"
-.endif
-.ifndef DISABLE_SETUID
-	@${ECHO_MSG} " define DISABLE_SETUID to disable setuid/privdrop ability (not reccomended)"
-.endif
-	@${ECHO_MSG} ""
-	@${TRUE}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/conf/kismet.conf ${PREFIX}/etc/kismet.conf.sample
diff -ur kismet.orig/pkg-plist kismet/pkg-plist
--- kismet.orig/pkg-plist	Thu Jan 12 00:10:27 2006
+++ kismet/pkg-plist	Thu Jan 12 00:30:39 2006
@@ -2,6 +2,7 @@
 bin/kismet_client
 bin/kismet_drone
 bin/kismet_server
+%%GPS%%bin/gpsmap
 etc/ap_manuf
 etc/client_manuf
 @unexec if cmp -s %D/etc/kismet.conf %D/etc/kismet.conf.sample; then rm -f %D/etc/kismet.conf; fi