Date: Mon, 23 Jan 2006 17:38:33 +0300 (MSK) From: Anton Karpov <toxa@toxahost.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: eol1@yahoo.com Subject: ports/92204: changes to net-mgmt/kismet: OPTIONS and gpsmap Message-ID: <20060123143833.0F90E78D93@mail.ank-pki.ru> Resent-Message-ID: <200601231440.k0NEe8AV007218@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92204
>Category: ports
>Synopsis: changes to net-mgmt/kismet: OPTIONS and gpsmap
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 23 14:40:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Anton Karpov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD laptoxa.toxa.lan 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Tue Jan 3 13:36:29 MSK 2006 root@laptoxa.toxa.lan:/usr/obj/usr/src/sys/LAPTOXA i386
>Description:
I'd like to propose a patch for kismet port.
The changes are:
- Use OPTIONS instead of DISABLE_FOO. IMHO, it's much more clean
- Use additional tweaking and dependancy tracking to build gpsmap along
with kismet. I wonder why not to build gpsmap with kismet, then it is
included in kismet distro? Current port fails with gpsmap. My fixes
allows gpsmap to be built.
I've decide to submit patch to ports@ after two emails I sent to maintainer,
but didn't get his reply. The changes are not so big and dramatical, so I hope
he is ok to it.
>How-To-Repeat:
>Fix:
see proposed patch
--- kismet.patch begins here ---
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
--- kismet.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060123143833.0F90E78D93>