On Fri, Sep 30, 2005 at 12:36:05PM +0200, Matthias Kilian wrote:
> So I'll just change the port to exlude gpsmap-helper-earthamaps
> since it's useless now. In the meantime, you can test ;-)
Updated patch against CVS, the only change is the @commented
gpsmap-helper-earthamaps.
diff -x CVS -rNu ../kismet/Makefile ./Makefile
--- ../kismet/Makefile Tue Aug 16 22:35:58 2005
+++ ./Makefile Fri Sep 30 12:51:14 2005
@@ -3,10 +3,12 @@
# and, last but not least, Pedro la Peu.
COMMENT= "802.11 layer2 wireless network detector, sniffer, and IDS"
+COMMENT-gpsmap= "reads GPS and Network XML datafiles and plots networks"
V= 2005-08-R1
DISTNAME= kismet-${V}
-PKGNAME= kismet-${V:S,-,,g}
+PKGNAME= kismet-${V:S,-,,g}p0
+PKGNAME-gpsmap= kismet-gpsmap-${V:S,-,,g}
CATEGORIES= net security
HOMEPAGE= http://www.kismetwireless.net/
@@ -20,7 +22,7 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m ncurses panel stdc++
+WANTLIB= c m ncurses panel stdc++ z
CONFIGURE_STYLE= autoconf old
AUTOCONF_VERSION= 2.59
@@ -28,7 +30,7 @@
CONFDIR= ${SYSCONFDIR}/kismet
SUBST_VARS+= CONFDIR
-CONFIGURE_ARGS= --disable-gpsmap --sysconfdir=${CONFDIR}
+CONFIGURE_ARGS= --sysconfdir=${CONFDIR}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
@@ -40,6 +42,30 @@
# They don't have tests.
NO_REGRESS= Yes
+
+PSEUDO_FLAVORS= no_gpsmap
+FLAVOR?=
+
+GPSM_DEPENDS= Magick.8::graphics/ImageMagick \
+ gmp.6::devel/gmp \
+ expat.4::textproc/expat
+
+.if !${FLAVOR:L:Mno_gpsmap}
+MULTI_PACKAGES= -gpsmap
+BUILD_DEPENDS+= ${GPSM_DEPENDS}
+.else
+CONFIGURE_ARGS+= --disable-gpsmap
+.endif
+
+SUBPACKAGE?=
+
+.if defined(PACKAGING)
+. if ${SUBPACKAGE} == "-gpsmap"
+WANTLIB= c m ICE SM freetype Xt pthread Xext X11 z \
+ stdc++ lcms jasper xml2 bz2 jbig jpeg tiff png
+LIB_DEPENDS= ${GPSM_DEPENDS}
+. endif
+.endif
post-configure:
@cd ${WRKSRC} && ${GMAKE} depend
diff -x CVS -rNu ../kismet/patches/patch-conf_kismet_conf_in
./patches/patch-conf_kismet_conf_in
--- ../kismet/patches/patch-conf_kismet_conf_in Tue Aug 16 22:35:59 2005
+++ ./patches/patch-conf_kismet_conf_in Fri Sep 30 12:51:14 2005
@@ -1,6 +1,6 @@
$OpenBSD: patch-conf_kismet_conf_in,v 1.2 2005/08/16 20:35:59 robert Exp $
--- conf/kismet.conf.in.orig Tue Aug 16 03:22:41 2005
-+++ conf/kismet.conf.in Tue Aug 16 10:36:49 2005
++++ conf/kismet.conf.in Wed Sep 28 15:49:47 2005
@@ -10,7 +10,7 @@ version=2005.06.R1
servername=Kismet
@@ -10,7 +10,18 @@
# Sources are defined as:
# source=sourcetype,interface,name[,initialchannel]
-@@ -169,7 +169,7 @@ writeinterval=300
+@@ -19,6 +19,10 @@ suiduser=your_user_here
+ # The initial channel is optional, if hopping is not enabled it can be used
+ # to set the channel the interface listens on.
+ # YOU MUST CHANGE THIS TO BE THE SOURCE YOU WANT TO USE
++# OpenBSD examples:
++# a/b: source=radiotap_bsd_ab,ath0,radiotap_bsd_ab
++# b: source=radiotap_bsd_b,ipw0,radiotap_bsd_b
++# b (wi(4)) source=prism2_openbsd,wi0,prism2_openbsd
+ source=none,none,addme
+
+ # Comma-separated list of sources to enable. This is only needed if you
defined
+@@ -169,7 +173,7 @@ writeinterval=300
# server itself will play sound. Primarily for headless or automated systems.
sound=false
# Path to sound player
@@ -19,7 +30,7 @@
# Optional parameters to pass to the player
# soundopts=--volume=.3
# New network found
-@@ -223,7 +223,7 @@ metric=false
+@@ -223,7 +227,7 @@ metric=false
# recent versions of GPSDrive's native support of Kismet.
waypoints=false
# GPSDrive waypoint file. This WILL be truncated.
@@ -28,7 +39,15 @@
# Do we want ESSID or BSSID as the waypoint name ?
waypoint_essid=false
-@@ -324,7 +324,7 @@ piddir=/var/run/
+@@ -317,14 +321,14 @@ logdefault=Kismet
+ # crypt/Pok-Dec-20-01-1
+ # and so on. The "dump", "crypt", etc, dirs must exist before kismet is run
+ # in this case.
+-logtemplate=%n-%d-%i.%l
++logtemplate=/var/log/kismet/%n-%d-%i.%l
+
+ # Where do we store the pid file of the server?
+ piddir=/var/run/
# Where state info, etc, is stored. You shouldnt ever need to change this.
# This is a directory.
diff -x CVS -rNu ../kismet/patches/patch-configure_in
./patches/patch-configure_in
--- ../kismet/patches/patch-configure_in Tue Aug 16 22:35:59 2005
+++ ./patches/patch-configure_in Fri Sep 30 12:51:14 2005
@@ -1,5 +1,5 @@
--- configure.in.orig Tue Aug 16 03:22:51 2005
-+++ configure.in Tue Aug 16 10:39:12 2005
++++ configure.in Sat Sep 10 12:52:13 2005
@@ -127,7 +127,7 @@ else
esac
fi
@@ -9,7 +9,24 @@
AC_CONFIG_SRCDIR([kismet_server.cc])
AC_CONFIG_HEADER([config.h])
-@@ -856,6 +856,11 @@ else
+@@ -752,7 +752,6 @@ if test "$wantgpsmap" = "yes"; then
+ save_cxxflags="$CXXFLAGS"
+ save_libs="$LIBS"
+ save_ldflags="$LDFLAGS"
+- AC_CHECK_PROG(wget, [wget --version], yes, no)
+ AC_CHECK_PROG(magickconfig, [Magick-config --version], yes, no)
+
+ if test "$magickconfig" = "yes"; then
+@@ -774,8 +773,6 @@ if test "$wantgpsmap" = "yes"; then
+ AC_MSG_WARN(*** Old version of ImageMagick ($magickversion)
found. Please upgrade to 5.4.7 or newer. gpsmap will not be built. ***)
+ elif test $magickconfig = "no"; then
+ AC_MSG_WARN(*** Missing Magick-config (or it is not in the
path). gpsmap will not be built. ***)
+- elif test $wget = "no"; then
+- AC_MSG_WARN(*** Missing wget (or it is not in the path).
gpsmap will not be build. ***)
+ else
+ #CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`
-I`Magick-config --prefix`/include"
+ CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"
+@@ -856,6 +853,11 @@ else
gmpl="no"
gpslc=""
pthr="no"
diff -x CVS -rNu ../kismet/patches/patch-gpsmap_cc ./patches/patch-gpsmap_cc
--- ../kismet/patches/patch-gpsmap_cc Thu Jan 1 01:00:00 1970
+++ ./patches/patch-gpsmap_cc Fri Sep 30 12:51:14 2005
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- gpsmap.cc.orig Tue Aug 16 03:22:51 2005
++++ gpsmap.cc Sat Sep 10 12:50:18 2005
+@@ -97,7 +97,7 @@ const char url_template_ti[] = "http://t
+ const char url_template_em[] = "gpsmap-helper-earthamaps %s %f %f %d %d %ld";
+
+ // Download template for sources that we fetch using wget
+-const char download_template[] = "wget \"%s\" -O %s";
++const char download_template[] = "/usr/bin/ftp -o %s \"%s\"";
+
+ // Image scales we try to autofetch
+ long int scales[] = { 1000, 2000, 5000, 10000, 20000, 30000, 50000, 60000,
+@@ -4177,7 +4177,7 @@ int main(int argc, char *argv[]) {
+ }
+ } else {
+ char geturl[1024];
+- snprintf(geturl, 1024, download_template, url, mapname);
++ snprintf(geturl, 1024, download_template, mapname, url);
+ system(geturl);
+ }
+
diff -x CVS -rNu ../kismet/patches/patch-man_gpsmap_1
./patches/patch-man_gpsmap_1
--- ../kismet/patches/patch-man_gpsmap_1 Thu Jan 1 01:00:00 1970
+++ ./patches/patch-man_gpsmap_1 Fri Sep 30 12:51:14 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- man/gpsmap.1.orig Tue Aug 16 03:22:39 2005
++++ man/gpsmap.1 Sat Sep 10 13:20:41 2005
+@@ -67,7 +67,7 @@ sample points.
+ .TP
+ .B
+ \fB-S\fP, \fB--map-source\fP SOURCE
+-Source to download maps from (-1 = Null; 0 = Mapblast; 1 = MapPoint(broken);
2 = Terraserver; 3 = Tiger Census; 4 = Earthamap; 5 = Terraserver Topographic).
Default: 4
++Source to download maps from (-1 = Null; 0 = Mapblast(broken); 1 =
MapPoint(broken); 2 = Terraserver; 3 = Tiger Census; 4 = Earthamap(doesn't
work); 5 = Terraserver Topographic). Default: -1
+ .TP
+ .B
+ \fB-D\fP, \fB--keep-gif\fP
diff -x CVS -rNu ../kismet/pkg/DESCR-gpsmap ./pkg/DESCR-gpsmap
--- ../kismet/pkg/DESCR-gpsmap Thu Jan 1 01:00:00 1970
+++ ./pkg/DESCR-gpsmap Fri Sep 30 12:51:14 2005
@@ -0,0 +1,3 @@
+gpsmap reads GPS and Network XML datafiles from Kismet and plots
+wireless networks on downloaded vector maps or satellite photos
+or user-supplied images.
diff -x CVS -rNu ../kismet/pkg/MESSAGE-gpsmap ./pkg/MESSAGE-gpsmap
--- ../kismet/pkg/MESSAGE-gpsmap Thu Jan 1 01:00:00 1970
+++ ./pkg/MESSAGE-gpsmap Fri Sep 30 12:51:14 2005
@@ -0,0 +1 @@
+Note: for now, only map source types 2, 3, and 5 are working.
diff -x CVS -rNu ../kismet/pkg/PLIST-gpsmap ./pkg/PLIST-gpsmap
--- ../kismet/pkg/PLIST-gpsmap Thu Jan 1 01:00:00 1970
+++ ./pkg/PLIST-gpsmap Fri Sep 30 12:51:44 2005
@@ -0,0 +1,4 @@
[EMAIL PROTECTED] $OpenBSD$
+bin/gpsmap
[EMAIL PROTECTED] bin/gpsmap-helper-earthamaps
[EMAIL PROTECTED] man/man1/gpsmap.1
