Date: Sun, 2 Mar 2014 02:23:42 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346732 - in head/comms/kb: . files Message-ID: <201403020223.s222Ngfv095914@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Sun Mar 2 02:23:41 2014 New Revision: 346732 URL: http://svnweb.freebsd.org/changeset/ports/346732 QAT: https://qat.redports.org/buildarchive/r346732/ Log: - stagify - remove obsolete support for speaker.h Modified: head/comms/kb/Makefile head/comms/kb/files/patch-support.c (contents, props changed) head/comms/kb/pkg-plist (contents, props changed) Modified: head/comms/kb/Makefile ============================================================================== --- head/comms/kb/Makefile Sun Mar 2 02:08:57 2014 (r346731) +++ head/comms/kb/Makefile Sun Mar 2 02:23:41 2014 (r346732) @@ -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> Modified: head/comms/kb/files/patch-support.c ============================================================================== --- head/comms/kb/files/patch-support.c Sun Mar 2 02:08:57 2014 (r346731) +++ head/comms/kb/files/patch-support.c Sun Mar 2 02:23:41 2014 (r346732) @@ -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; Modified: head/comms/kb/pkg-plist ============================================================================== --- head/comms/kb/pkg-plist Sun Mar 2 02:08:57 2014 (r346731) +++ head/comms/kb/pkg-plist Sun Mar 2 02:23:41 2014 (r346732) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403020223.s222Ngfv095914>