Date: Sun, 12 Apr 2009 16:00:33 +0100 (BST) From: Thomas Sandford <freebsduser@paradisegreen.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/133661: [PATCH] sysutils/upsdaemon: Unbreak, take maintainership Message-ID: <200904121500.n3CF0X8W047728@miriam.paradisegreen.co.uk> Resent-Message-ID: <200904121520.n3CFK4C9031976@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133661 >Category: ports >Synopsis: [PATCH] sysutils/upsdaemon: Unbreak, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Apr 12 15:20:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Thomas Sandford >Release: FreeBSD 7.0-RELEASE-p6 i386 >Organization: Paradise Green Technical Services >Environment: System: FreeBSD miriam.paradisegreen.co.uk 7.0-RELEASE-p6 FreeBSD 7.0-RELEASE-p6 #0: Mon Nov 24 06:43:33 UTC 2008 >Description: - Unbreak by creating an additional patch file which: * adds stdlib.h to includes (gets rid of a warning about exit() ) * moves a function prototype out of the main() definition (which was upsetting GCC) - Take maintainership Added file(s): - files/patch-upsdaemon.c Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- upsdaemon-1.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/sysutils/upsdaemon_orig/Makefile /usr/ports/sysutils/upsdaemon/Makefile --- /usr/ports/sysutils/upsdaemon_orig/Makefile 2008-12-31 07:11:33.000000000 +0000 +++ /usr/ports/sysutils/upsdaemon/Makefile 2009-04-12 15:56:04.000000000 +0100 @@ -11,7 +11,7 @@ MASTER_SITES= http://www.ederbs.org/pub/ \ ftp://ederbs.org/pub/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsduser@paradisegreen.co.uk COMMENT= Simple APC UPS Daemon MAN8= upsdaemon.8 @@ -22,10 +22,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/sysutils/upsdaemon_orig/files/patch-upsdaemon.c /usr/ports/sysutils/upsdaemon/files/patch-upsdaemon.c --- /usr/ports/sysutils/upsdaemon_orig/files/patch-upsdaemon.c 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/sysutils/upsdaemon/files/patch-upsdaemon.c 2009-04-12 15:51:55.000000000 +0100 @@ -0,0 +1,26 @@ +--- src/upsdaemon.c.orig 2006-06-20 01:50:23.000000000 +0100 ++++ src/upsdaemon.c 2009-04-12 15:48:34.000000000 +0100 +@@ -32,6 +32,7 @@ + #include <errno.h> /* Error number definitions */ + #include <termios.h> /* POSIX terminal control definitions */ + #include <syslog.h> /* Definitions for system error logging */ ++#include <stdlib.h> /* exit() definition */ + + #define PROG " UpsDaemon" + #define VERSION " 1.0" +@@ -50,6 +51,7 @@ + #define SH_RECOVERY "/usr/local/libexec/upsdaemon/upsdaemon-alerts -recovery" + + int makepid(char *s); ++static void runcommand(); + + int main(int argc, char **argv) + { +@@ -71,7 +73,6 @@ + char *failed = SH_FAILED; + char *recovery = SH_RECOVERY; + +- static void runcommand(); + + if(argc > 2) { + errx(1,"Usage: upsdaemon <port serial open>: %s\n", strerror(errno)); --- upsdaemon-1.0.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?200904121500.n3CF0X8W047728>