3 files changed, 16 insertions, 44 deletions

diff --git a/comms/kb/Makefile b/comms/kb/Makefile
index 79626e3233cc..f3e170a0c125 100644
--- a/comms/kb/Makefile
+++ b/comms/kb/Makefile
@@ -1,4 +1,3 @@
-# Created by: Diane Bruce <db@db.net>
 # $FreeBSD$
 
 PORTNAME=	kb
@@ -17,8 +16,6 @@ USE_GNOME=	libgnome gtk20 libbonobo
 NO_WRKSUBDIR=	yes
 PKGMESSAGE=	${FILESDIR}/pkg_message
 
-MAN1=		kb.1
-
 DESKTOP_ENTRIES="KB" \
 		"Kick Butt logger" \
 		"${PREFIX}/share/pixmaps/kb/icons/kb-icon.png" \
@@ -26,42 +23,28 @@ DESKTOP_ENTRIES="KB" \
 		"" \
 		true
 
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
 pre-configure:
 	@${CP}	${FILESDIR}/Makefile ${WRKSRC}
-.if !exists(/usr/include/dev/speaker/speaker.h)
-	@${REINPLACE_CMD} -e 's|-DSPKR|-DOLDSPKR|' ${WRKSRC}/Makefile
-.endif
 
 do-install:
-	${INSTALL_SCRIPT}	${FILESDIR}/kb ${LOCALBASE}/bin
-	${INSTALL_PROGRAM}	${WRKSRC}/kb ${LOCALBASE}/bin/kb_bin
-	${INSTALL_PROGRAM}	${WRKSRC}/kb_server ${LOCALBASE}/bin
-	${INSTALL_DATA}		${FILESDIR}/kb.1 ${MANPREFIX}/man/man1
-	${MKDIR}		${DATADIR}
+	${INSTALL_SCRIPT}	${FILESDIR}/kb ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM}	${WRKSRC}/kb ${STAGEDIR}${PREFIX}/bin/kb_bin
+	${INSTALL_PROGRAM}	${WRKSRC}/kb_server ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA}		${FILESDIR}/kb.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${MKDIR}		${STAGEDIR}${DATADIR}
 .for f in COUNTY.CQP DEFAULT.INI CALL_LIB.LST CALL_SS.LST \
 	CALL_FD.LST  HELP.LST COUNTRY.LST HELPFD.LST \
 	SECTION.LST STATE.LST
-	${INSTALL_DATA} ${WRKSRC}/$f ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
 .endfor
-	${MKDIR} ${PREFIX}/share/pixmaps/kb/icons
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps/kb/icons
 	${INSTALL_DATA} ${FILESDIR}/kb-icon.png \
-		${PREFIX}/share/pixmaps/kb/icons/kb-icon.png
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA}	${FILESDIR}/README_TIPS ${DOCSDIR}
-	${INSTALL_DATA}	${WRKSRC}/kb_bsd/README_BSD ${DOCSDIR}
+		${STAGEDIR}${PREFIX}/share/pixmaps/kb/icons/kb-icon.png
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA}	${FILESDIR}/README_TIPS ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA}	${WRKSRC}/kb_bsd/README_BSD ${STAGEDIR}${DOCSDIR}
 .for f in LICENSE README README_KINKS README_SRC
-	${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	@${ECHO} ""
-	@${ECHO} "Docs are in ${DOCSDIR} pay particular attention to README_BSD"
-	@${ECHO} ""
 
 .include <bsd.port.mk>
diff --git a/comms/kb/files/patch-support.c b/comms/kb/files/patch-support.c
index 3afb6d6f0504..ae388f0825c4 100644
--- a/comms/kb/files/patch-support.c
+++ b/comms/kb/files/patch-support.c
@@ -1,18 +1,6 @@
---- support.c.orig	2008-03-30 09:31:55.000000000 -0400
-+++ support.c	2008-05-14 08:05:30.000000000 -0400
-@@ -4,7 +4,11 @@
- #include <signal.h>
- 
- #ifdef BSD
-+#ifdef OLDSPKR
-+#include <machine/speaker.h>
-+#else
- #include <dev/speaker/speaker.h>
-+#endif
- #include "bsd_bells.c"
- #endif
- 
-@@ -1199,31 +1203,21 @@
+--- support.c.orig	2008-03-30 08:31:55.000000000 -0500
++++ support.c	2014-03-01 21:19:48.000000000 -0500
+@@ -1199,31 +1199,21 @@
  static gint get_running_pid(const gchar *filnam)
  {
    FILE *fp;
diff --git a/comms/kb/pkg-plist b/comms/kb/pkg-plist
index b967898a6caa..4a6b6c527d0c 100644
--- a/comms/kb/pkg-plist
+++ b/comms/kb/pkg-plist
@@ -1,6 +1,7 @@
 bin/kb
 bin/kb_bin
 bin/kb_server
+man/man1/kb.1.gz
 %%DATADIR%%/CALL_FD.LST
 %%DATADIR%%/CALL_LIB.LST
 %%DATADIR%%/CALL_SS.LST