6 files changed, 18 insertions, 20 deletions

diff --git a/net-mgmt/spectools/Makefile b/net-mgmt/spectools/Makefile
index a8ca91ed1671..e96485b1384e 100644
--- a/net-mgmt/spectools/Makefile
+++ b/net-mgmt/spectools/Makefile
@@ -34,17 +34,16 @@ IGNORE=	is unsupported on systems prior to FreeBSD v602101
 IGNORE=	is unsupported on systems prior to FreeBSD v700027
 .endif
 
+ALL_TARGET=	wispy_curses wispy_log wispy_raw
 .if defined(WITH_GTK)
-LIB_DEPENDS+=	gtk:${PORTSDIR}/x11-toolkits/gtk20
-PLIST_SUB=	WITH_GTK=""
-.else
-PLIST_SUB=	WITH_GTK="@comment "
+ALL_TARGET+=	wispy_gtk
 .endif
 
-do-build:
-	cd ${WRKSRC} && ${GMAKE} wispy_curses wispy_log wispy_raw
 .if defined(WITH_GTK)
-	cd ${WRKSRC} && ${GMAKE} wispy_gtk
+LIB_DEPENDS+=	gtk:${PORTSDIR}/x11-toolkits/gtk20
+PLIST_SUB=	GTK=""
+.else
+PLIST_SUB=	GTK="@comment "
 .endif
 
 do-install:
@@ -56,7 +55,7 @@ do-install:
 .endif
 
 post-install:
-.ifndef(NOPORTDOC)
+.ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/net-mgmt/spectools/pkg-message b/net-mgmt/spectools/pkg-message
index 37cc221c0389..4845df27dcb4 100644
--- a/net-mgmt/spectools/pkg-message
+++ b/net-mgmt/spectools/pkg-message
@@ -1,4 +1,4 @@
 ====
 In order to use the tools you need read/write access to the ugen(4)
-device node corresponding to your your Wi-Spy device.
+device node corresponding to the Wi-Spy device.
 ====
diff --git a/net-mgmt/spectools/pkg-plist b/net-mgmt/spectools/pkg-plist
index 4d80d344346b..9d17d8dbc686 100644
--- a/net-mgmt/spectools/pkg-plist
+++ b/net-mgmt/spectools/pkg-plist
@@ -1,4 +1,4 @@
 bin/wispy_curses
-%%WITH_GTK%%bin/wispy_gtk
+%%GTK%%bin/wispy_gtk
 bin/wispy_log
 bin/wispy_raw
diff --git a/net-mgmt/wispy-tools/Makefile b/net-mgmt/wispy-tools/Makefile
index a8ca91ed1671..e96485b1384e 100644
--- a/net-mgmt/wispy-tools/Makefile
+++ b/net-mgmt/wispy-tools/Makefile
@@ -34,17 +34,16 @@ IGNORE=	is unsupported on systems prior to FreeBSD v602101
 IGNORE=	is unsupported on systems prior to FreeBSD v700027
 .endif
 
+ALL_TARGET=	wispy_curses wispy_log wispy_raw
 .if defined(WITH_GTK)
-LIB_DEPENDS+=	gtk:${PORTSDIR}/x11-toolkits/gtk20
-PLIST_SUB=	WITH_GTK=""
-.else
-PLIST_SUB=	WITH_GTK="@comment "
+ALL_TARGET+=	wispy_gtk
 .endif
 
-do-build:
-	cd ${WRKSRC} && ${GMAKE} wispy_curses wispy_log wispy_raw
 .if defined(WITH_GTK)
-	cd ${WRKSRC} && ${GMAKE} wispy_gtk
+LIB_DEPENDS+=	gtk:${PORTSDIR}/x11-toolkits/gtk20
+PLIST_SUB=	GTK=""
+.else
+PLIST_SUB=	GTK="@comment "
 .endif
 
 do-install:
@@ -56,7 +55,7 @@ do-install:
 .endif
 
 post-install:
-.ifndef(NOPORTDOC)
+.ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/net-mgmt/wispy-tools/pkg-message b/net-mgmt/wispy-tools/pkg-message
index 37cc221c0389..4845df27dcb4 100644
--- a/net-mgmt/wispy-tools/pkg-message
+++ b/net-mgmt/wispy-tools/pkg-message
@@ -1,4 +1,4 @@
 ====
 In order to use the tools you need read/write access to the ugen(4)
-device node corresponding to your your Wi-Spy device.
+device node corresponding to the Wi-Spy device.
 ====
diff --git a/net-mgmt/wispy-tools/pkg-plist b/net-mgmt/wispy-tools/pkg-plist
index 4d80d344346b..9d17d8dbc686 100644
--- a/net-mgmt/wispy-tools/pkg-plist
+++ b/net-mgmt/wispy-tools/pkg-plist
@@ -1,4 +1,4 @@
 bin/wispy_curses
-%%WITH_GTK%%bin/wispy_gtk
+%%GTK%%bin/wispy_gtk
 bin/wispy_log
 bin/wispy_raw