Bug 117044 - [patch] net-mgmt/spectools replaces net-mgmt/wispy-tools
Summary: [patch] net-mgmt/spectools replaces net-mgmt/wispy-tools
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Erwin Lansing
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-10-09 18:20 UTC by Henrik Brix Andersen
Modified: 2007-10-29 14:19 UTC (History)
0 users

See Also:


Attachments
file.shar (5.63 KB, text/plain)
2007-10-09 18:20 UTC, Henrik Brix Andersen
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Henrik Brix Andersen 2007-10-09 18:20:01 UTC
This is a replacement/upgrade for the net-mgmt/wispy-tools port. The
project was renamed and a new release was made under the new name.

Fix: The new port should be committed as net-mgmt/spectools, MOVED should
be updated with the patch below and the old net-mgmt/wispy-tools port
should be removed.

	



--- spectools.shar ends here -----KlC2wZUDRW1WDNvSjdvpYYwG3kJp0ESZxEhlDVETdO8X8k2X
Content-Type: text/plain; name="MOVED.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="MOVED.diff"

--- MOVED.orig	2007-10-09 19:03:16.000000000 +0200
+++ MOVED	2007-10-09 19:05:05.000000000 +0200
@@ -3271,3 +3271,4 @@
 lang/snobol|lang/snobol4|2007-10-04|Use newer version
 x11-servers/synaptics|x11-drivers/synaptics|2007-10-06|Change to new category
 emulators/linux_base-fc7|emulators/linux_base-f7|2007-10-07|Fedora is no more Core
+net-mgmt/wispy-tools|net-mgmt/spectools|2007-10-09|project renamed
Comment 1 Erwin Lansing freebsd_committer freebsd_triage 2007-10-11 08:16:10 UTC
Responsible Changed
From-To: freebsd-ports-bugs->erwin

I'll handle this.
Comment 2 Erwin Lansing freebsd_committer freebsd_triage 2007-10-11 08:16:20 UTC
State Changed
From-To: open->repocopy

Please copy net-mgmt/wispy-tools to net-mgmt/spectools 


Comment 3 Erwin Lansing freebsd_committer freebsd_triage 2007-10-11 08:16:20 UTC
Responsible Changed
From-To: erwin->portmgr

Please copy net-mgmt/wispy-tools to net-mgmt/spectools
Comment 4 Henrik Brix Andersen 2007-10-11 10:23:40 UTC
Here's an updated patch for when the repocopy is done.

diff -urp wispy-tools/Makefile spectools/Makefile
--- wispy-tools/Makefile	2007-10-11 11:18:04.000000000 +0200
+++ spectools/Makefile	2007-10-09 18:05:59.000000000 +0200
@@ -1,25 +1,24 @@
-# New ports collection makefile for:	wispy-tools
-# Date created:				13 Dec 2006
+# New ports collection makefile for:	spectools
+# Date created:				09 Oct 2007
 # Whom:					Henrik Brix Andersen <henrik@brixandersen.dk>
 #
-# $FreeBSD: ports/net-mgmt/wispy-tools/Makefile,v 1.4 2007/06/22 11:52:49 rafan Exp $
+# $FreeBSD$
 #
 
-PORTNAME=	wispy-tools
-PORTVERSION=	200609.r1
-PORTREVISION=	1
+PORTNAME=	spectools
+PORTVERSION=	200710.r1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
-DISTNAME=	wispy-tools-2006-09-R1
+DISTNAME=	spectools-2007-10-R1
 
 MAINTAINER=	henrik@brixandersen.dk
-COMMENT=	Tools for the 2.4GHz Wi-Spy spectrum analyzer from MetaGeek LLC
+COMMENT=	Tools for the 2.4GHz Wi-Spy spectrum analyzers from MetaGeek LLC
 
 LIB_DEPENDS=	usb-0.1:${PORTSDIR}/devel/libusb
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 
 PORTDOCS=	README
@@ -34,10 +33,10 @@ IGNORE=	is unsupported on systems prior 
 IGNORE=	is unsupported on systems prior to FreeBSD v700027
 .endif
 
-ALL_TARGET=	wispy_curses wispy_log wispy_raw
+ALL_TARGET=	spectool_net spectool_raw
 
 .if defined(WITH_GTK)
-ALL_TARGET+=	wispy_gtk
+ALL_TARGET+=	spectool_gtk
 LIB_DEPENDS+=	gtk:${PORTSDIR}/x11-toolkits/gtk20
 PLIST_SUB=	GTK=""
 .else
@@ -45,17 +44,16 @@ PLIST_SUB=	GTK="@comment "
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wispy_curses ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/wispy_log ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/wispy_raw ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/spectool_net ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/spectool_raw ${PREFIX}/bin
 .if defined(WITH_GTK)
-	${INSTALL_PROGRAM} ${WRKSRC}/wispy_gtk ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/spectool_gtk ${PREFIX}/bin
 .endif
 
 post-install:
-.ifndef(NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff -urp wispy-tools/distinfo spectools/distinfo
--- wispy-tools/distinfo	2007-10-11 11:18:04.000000000 +0200
+++ spectools/distinfo	2007-10-09 17:57:00.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (wispy-tools-2006-09-R1.tar.gz) = c05a18813bca976450262f7b0e98b0cb
-SHA256 (wispy-tools-2006-09-R1.tar.gz) = 41b25d1d63f01f596925dbd39389668b9d4169b28e5b8a2e00e0ac66574d330f
-SIZE (wispy-tools-2006-09-R1.tar.gz) = 135474
+MD5 (spectools-2007-10-R1.tar.gz) = f38ac4d04680a2b62d9bfb9cff6b2ab3
+SHA256 (spectools-2007-10-R1.tar.gz) = e11b150db4c562f365ed77968bf1a3d02a33ddb55c88765656a77cf555e471b7
+SIZE (spectools-2007-10-R1.tar.gz) = 190822
diff -urp wispy-tools/files/patch-configure spectools/files/patch-configure
--- wispy-tools/files/patch-configure	2007-10-11 11:18:04.000000000 +0200
+++ spectools/files/patch-configure	2007-10-09 18:34:23.000000000 +0200
@@ -1,6 +1,19 @@
---- configure.in.orig	Sun Nov 19 18:04:52 2006
-+++ configure.in	Sun Nov 19 18:01:44 2006
-@@ -204,7 +204,7 @@
+--- configure.in.orig	2007-10-08 18:29:44.000000000 +0200
++++ configure.in	2007-10-09 18:28:21.000000000 +0200
+@@ -135,10 +135,10 @@ dnl Let them override the gtk version
+ AC_ARG_WITH(gtk-version,
+ 	[  --with-gtk-version=\[1|2\]     Force a GTK version instead of autodetect ],
+ 	[
+-	if test "$withval" == "1" ; then
++	if test "$withval" = "1" ; then
+ 		AC_MSG_WARN(*** Overriding GTK detection to use GTK1 only ***)
+ 		forcegtk=1
+-	elif test "$withval" == "2" ; then
++	elif test "$withval" = "2" ; then
+ 		AC_MSG_WARN(*** Overriding GTK detection to use GTK2 only ***)
+ 		forcegtk=2
+ 	fi
+@@ -193,7 +193,7 @@ if test "$GTK_CONFIG"x != "x"; then
    		GTKLIBS="$LIBS"
    		LIBS="$olfl"
  
@@ -9,9 +22,23 @@
  			AC_DEFINE(HAVE_LIB_GTK2, 1, we have libgtk2.x)
  		else
  			AC_MSG_WARN(*** GTK1 being used.  GTK2 is preferred and GTK1 support may vanish in future releases ***)
---- configure.orig	Sun Nov 19 18:04:45 2006
-+++ configure	Sun Nov 19 18:01:18 2006
-@@ -4185,7 +4185,7 @@
+--- configure.orig	2007-10-08 18:29:44.000000000 +0200
++++ configure	2007-10-09 18:32:58.000000000 +0200
+@@ -4573,11 +4573,11 @@ fi
+ # Check whether --with-gtk-version was given.
+ if test "${with_gtk_version+set}" = set; then
+   withval=$with_gtk_version;
+-	if test "$withval" == "1" ; then
++	if test "$withval" = "1" ; then
+ 		{ echo "$as_me:$LINENO: WARNING: *** Overriding GTK detection to use GTK1 only ***" >&5
+ echo "$as_me: WARNING: *** Overriding GTK detection to use GTK1 only ***" >&2;}
+ 		forcegtk=1
+-	elif test "$withval" == "2" ; then
++	elif test "$withval" = "2" ; then
+ 		{ echo "$as_me:$LINENO: WARNING: *** Overriding GTK detection to use GTK2 only ***" >&5
+ echo "$as_me: WARNING: *** Overriding GTK detection to use GTK2 only ***" >&2;}
+ 		forcegtk=2
+@@ -4889,7 +4889,7 @@ _ACEOF
    		GTKLIBS="$LIBS"
    		LIBS="$olfl"
  
diff -urp wispy-tools/pkg-descr spectools/pkg-descr
--- wispy-tools/pkg-descr	2007-10-11 11:18:04.000000000 +0200
+++ spectools/pkg-descr	2007-10-09 17:53:52.000000000 +0200
@@ -1,4 +1,4 @@
 A set of open source tools for accessing the 2.4GHz Wi-Spy USB
 spectrum analyzer by Metageek LLC, http://www.metageek.net/
 
-WWW: http://www.kismetwireless.net/wispy.shtml
+WWW: http://www.kismetwireless.net/spectools/
diff -urp wispy-tools/pkg-message spectools/pkg-message
--- wispy-tools/pkg-message	2007-10-11 11:18:04.000000000 +0200
+++ spectools/pkg-message	2007-10-09 19:02:33.000000000 +0200
@@ -1,4 +1,4 @@
 ====
 In order to use the tools you need read/write access to the ugen(4)
-device node corresponding to the Wi-Spy device.
+device node(s) corresponding to the Wi-Spy device(s).
 ====
diff -urp wispy-tools/pkg-plist spectools/pkg-plist
--- wispy-tools/pkg-plist	2007-10-11 11:18:04.000000000 +0200
+++ spectools/pkg-plist	2007-10-09 18:06:54.000000000 +0200
@@ -1,4 +1,3 @@
-bin/wispy_curses
-%%GTK%%bin/wispy_gtk
-bin/wispy_log
-bin/wispy_raw
+%%GTK%%bin/spectool_gtk
+bin/spectool_net
+bin/spectool_raw


-- 
Henrik Brix Andersen <henrik@brixandersen.dk>
Comment 5 Joe Marcus Clarke freebsd_committer freebsd_triage 2007-10-24 05:20:40 UTC
State Changed
From-To: repocopy->open

Repocopy complete. 


Comment 6 Joe Marcus Clarke freebsd_committer freebsd_triage 2007-10-24 05:20:40 UTC
Responsible Changed
From-To: portmgr->erwin

Repocopy complete.
Comment 7 dfilter service freebsd_committer freebsd_triage 2007-10-29 13:27:06 UTC
erwin       2007-10-29 13:26:18 UTC

  FreeBSD ports repository

  Modified files:
    net-mgmt/spectools   Makefile distinfo pkg-descr pkg-message 
                         pkg-plist 
    net-mgmt/spectools/files patch-configure 
  Log:
  Forced commit to mark the repocopy from net-mgmt/wispy-tools
  
  PR:             117044
  Submitted by:   Henrik Brix Andersen <henrik@brixandersen.dk>
  Repocopied by:  marcus
  
  Revision  Changes    Path
  1.5       +0 -0      ports/net-mgmt/spectools/Makefile
  1.2       +0 -0      ports/net-mgmt/spectools/distinfo
  1.2       +0 -0      ports/net-mgmt/spectools/files/patch-configure
  1.2       +0 -0      ports/net-mgmt/spectools/pkg-descr
  1.3       +0 -0      ports/net-mgmt/spectools/pkg-message
  1.3       +0 -0      ports/net-mgmt/spectools/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 8 dfilter service freebsd_committer freebsd_triage 2007-10-29 13:57:22 UTC
erwin       2007-10-29 13:56:05 UTC

  FreeBSD ports repository

  Modified files:
    .                    MOVED 
    net-mgmt/spectools   Makefile distinfo pkg-descr pkg-message 
                         pkg-plist 
    net-mgmt/spectools/files patch-configure 
  Log:
  This is a replacement/upgrade for the net-mgmt/wispy-tools port. The
  project was renamed and a new release was made under the new name.
  
  PR:             117044
  Submitted by:   Henrik Brix Andersen <henrik@brixandersen.dk> (maintainer)
  
  Revision  Changes    Path
  1.1510    +2 -1      ports/MOVED
  1.6       +14 -16    ports/net-mgmt/spectools/Makefile
  1.3       +3 -3      ports/net-mgmt/spectools/distinfo
  1.3       +33 -6     ports/net-mgmt/spectools/files/patch-configure
  1.3       +1 -1      ports/net-mgmt/spectools/pkg-descr
  1.4       +1 -1      ports/net-mgmt/spectools/pkg-message
  1.4       +3 -4      ports/net-mgmt/spectools/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 9 Erwin Lansing freebsd_committer freebsd_triage 2007-10-29 14:19:47 UTC
State Changed
From-To: open->closed

Committed, thanks!