I beg you pardon. Last time i changed one patch and haven't tested it...
Should look this way:
cat patches/patch-src_gapcmon_gapcmon_c
$OpenBSD$
--- src/gapcmon/gapcmon.c.orig Sat Jan 19 21:43:52 2008
+++ src/gapcmon/gapcmon.c Sat Feb 2 10:26:27 2008
@@ -75,6 +75,7 @@
#include <sys/types.h> /* socket() */
#include <sys/socket.h> /* socket() */
#include <arpa/inet.h> /* ntohs() */
+#include <netinet/in.h> /* sockaddr_in */
#include <netdb.h> /* gethostbyname() */
#include <errno.h>
#include <string.h> /* memset() */
@@ -4080,7 +4081,7 @@ static gboolean gapc_util_load_icons(PGAPC_CONFIG pcfg
gchar pch_file[GAPC_MAX_ARRAY];
gchar *pch_2 = "./";
gchar *pch_3 = "../pixmaps/";
- gchar *pch_4 = "/usr/share/pixmaps/";
+ gchar *pch_4 = "${PREFIX}/share/misc/apcupsd/pixmaps";
gchar *pch_image_names[] = {
"online.png",
"onbatt.png",
On Tue, February 12, 2008 14:25, Michael wrote:
> Hi,
>
> Kirill S. Bychkov schrieb:
>> Needs testing, cause I have no hardware to test on. Any comments?
>
> Build fails on OpenBSD-current with FLAVORS client and x11.
>
>
>
>
>
> Configuration on Tue Feb 12 12:20:51 CET 2008:
>
> Host: i386-unknown-openbsd4.2 -- openbsd 4.2
> Apcupsd version: 3.14.3 (20 January 2008)
> Source code location: .
> Install binaries: /usr/local/sbin
> Install config files: /etc/apcupsd
> Install man files: /usr/local/man
> Nologin file in: /tmp
> PID directory: /var/run
> LOG dir (events, status) /var/log
> LOCK dir (for serial port) /tmp
> Power Fail dir /etc/apcupsd
> Compiler: c++ 3.3.5
> Compiler flags: -O2 -pipe -Wall
> Linker: cc
> Linker flags: -g -O -pthread
> Host and version: openbsd 4.2
> Shutdown Program: /sbin/shutdown
> Port/Device: /dev/cua01
> Network Info Port (CGI): 3551
> UPSTYPE net
> UPSCABLE ether
>
> drivers (no-* are disabled): no-apcsmart no-dumb net bsd-usb no-snmp
> no-pcnet no-test
>
> enable-nis: yes
> with-nisip: no
> enable-cgi: no
> with-cgi-bin: /etc/apcupsd
> with-libwrap:
> enable-nls: no
> enable-libintl: no
> enable-powerflute: no
> enable-pthreads: yes
> enable-dist-install: no
> enable-gapcmon: yes
>
> ===> Building for apcupsd-3.14.3-client
> gmake[1]: Entering directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/lib'
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apcconfig.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apcerror.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apcevents.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apcexec.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apcfile.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apclibnis.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apclock.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apclog.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apcsignal.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> apcstatus.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> asys.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> newups.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> md5.c
> ar rc libapc.a apcconfig.o apcerror.o apcevents.o apcexec.o apcfile.o
> apclibnis.o apclock.o apclog.o apcsignal.o apcstatus.o asys.o newups.o md5.o
> /usr/bin/ranlib libapc.a
> gmake[1]: Leaving directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/lib'
> gmake[1]: Entering directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/libusbhid'
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> parse.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> data.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> descr.c
> ar rc libusbhid.a parse.o data.o descr.o
> /usr/bin/ranlib libusbhid.a
> gmake[1]: Leaving directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/libusbhid'
> gmake[1]: Entering directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/drivers'
> gmake[2]: Entering directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/drivers/net'
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> net.c
> rm -f libnet.a
> ar rc libnet.a net.o
> /usr/bin/ranlib libnet.a
> gmake[2]: Leaving directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/drivers/net'
> gmake[2]: Entering directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/drivers/usb'
> gmake[3]: Entering directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/drivers/usb/bsd'
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> -I..
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/libusbhid
> bsd-usb.c
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> -I..
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/libusbhid
> hidutils.c
> hidutils.c: In function `const char* hidu_get_string(int, int)':
> hidutils.c:388: warning: comparison between signed and unsigned integer
> expressions
> rm -f libpusb.a
> ar rc libpusb.a bsd-usb.o hidutils.o
> /usr/bin/ranlib libpusb.a
> gmake[3]: Leaving directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/drivers/usb/bsd'
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> usb.c
> rm -f libusb.a
> ar rc libusb.a usb.o
> /usr/bin/ranlib libusb.a
> gmake[2]: Leaving directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/drivers/usb'
> c++ -c -fno-exceptions -fno-rtti -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> drivers.c
> touch net_stamp
> touch usb_stamp
> touch drivers_stamp
> rm -f libdrivers.a
> ar cru libdrivers.a drivers.o net/*.o usb/*.o usb/bsd/*.o
> /usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/libusbhid/*.o
> /usr/bin/ranlib libdrivers.a
> gmake[1]: Leaving directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/drivers'
> gmake[1]: Entering directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/gapcmon'
> cc -c -O2 -pipe -Wall -pthread
> -I/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/include
> -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include
> -I/usr/local/include/pango-1.0 -I/usr/X11R6/include
> -I/usr/X11R6/include/freetype2 -I/usr/local/include/atk-1.0
> -I/usr/local/include/cairo -I/usr/local/include
> -I/usr/local/include/libpng -I/usr/local/include/gconf/2
> -I/usr/local/include/orbit-2.0 -I/usr/local/include/glib-2.0
> -I/usr/local/lib/glib-2.0/include -DVERSION=\"3.14.3\"
> -DHAVE_FUNC_GETHOSTBYNAME_R_0 gapcmon.c
> gapcmon.c: In function `sknet_net_open':
> gapcmon.c:2497: warning: passing arg 2 of `inet_aton' from incompatible
> pointer type
> gapcmon.c: In function `gapc_util_load_icons':
> gapcmon.c:4086: error: syntax error before "gchar"
> gapcmon.c:4077: warning: unused variable `i_x'
> gapcmon.c:4077: warning: unused variable `x'
> gapcmon.c:4078: warning: unused variable `gerror'
> gapcmon.c:4079: warning: unused variable `pixbuf'
> gapcmon.c:4080: warning: unused variable `b_rc'
> gapcmon.c:4081: warning: unused variable `pch_file'
> gapcmon.c:4082: warning: unused variable `pch_2'
> gapcmon.c:4083: warning: unused variable `pch_3'
> gapcmon.c:4084: warning: unused variable `pch_4'
> gapcmon.c:4085: warning: unused variable `pch_5'
> gapcmon.c: At top level:
> gapcmon.c:4096: error: syntax error before "void"
> gapcmon.c:1675: warning: `cb_monitor_dedicated_one_time_refresh' defined
> but not used
> gapcmon.c:2734: warning: `gapc_util_point_filter_reset' defined but not used
> gapcmon.c:458: warning: `lg_graph_set_y_label_text' defined but not used
> gapcmon.c:494: warning: `lg_graph_set_chart_title_color' defined but not
> used
> gapcmon.c:489: warning: `lg_graph_set_chart_scales_color' defined but
> not used
> gapcmon.c:484: warning: `lg_graph_set_chart_window_fg_color' defined but
> not used
> gapcmon.c:478: warning: `lg_graph_set_chart_window_bg_color' defined but
> not used
> gapcmon.c:107: warning: `lg_graph_create' declared `static' but never
> defined
> gapcmon.c:1204: warning: `lg_graph_set_ranges' defined but not used
> gapcmon.c:409: warning: `lg_graph_data_series_add' defined but not used
> gapcmon.c:371: warning: `lg_graph_data_series_remove_all' defined but
> not used
> gapcmon.c:289: warning: `lg_graph_data_series_add_value' defined but not
> used
> gapcmon.c:1313: warning: `lg_graph_configure_event_cb' defined but not used
> gapcmon.c:1394: warning: `lg_graph_expose_event_cb' defined but not used
> gapcmon.c:552: warning: `lg_graph_motion_notify_event_cb' defined but
> not used
> gapcmon.c:522: warning: `lg_graph_button_press_event_cb' defined but not
> used
> gapcmon.c:148: warning: `cb_util_line_chart_refresh' used but never defined
> gapcmon.c:152: warning: `cb_util_manage_iconify_event' declared `static'
> but never defined
> gapcmon.c:160: warning: `cb_main_interface_button_quit' declared
> `static' but never defined
> gapcmon.c:161: warning: `gapc_monitor_interface_destroy' declared
> `static' but never defined
> gapcmon.c:163: warning: `gapc_monitor_interface_create' used but never
> defined
> gapcmon.c:165: warning: `cb_panel_monitor_list_activated' used but never
> defined
> gapcmon.c:166: warning: `gapc_panel_glossary_page' declared `static' but
> never defined
> gapcmon.c:167: warning: `gapc_panel_graph_property_page' declared
> `static' but never defined
> gapcmon.c:1409: warning: `cb_util_popup_menu_response_exit' defined but
> not used
> gapcmon.c:1432: warning: `cb_util_popup_menu_response_jumpto' defined
> but not used
> gapcmon.c:1460: warning: `cb_panel_property_color_reset' defined but not
> used
> gapcmon.c:1527: warning: `cb_panel_property_color_change' defined but
> not used
> gapcmon.c:1599: warning: `cb_util_line_chart_refresh_control' defined
> but not used
> gapcmon.c:2673: warning: `gapc_net_thread_qwork' defined but not used
> gapcmon.c:2973: warning: `gapc_util_barchart_create' defined but not used
> gapcmon.c:3049: warning: `gapc_panel_monitor_model_rec_add' defined but
> not used
> gapcmon.c:3321: warning: `gapc_panel_systray_icon_create' defined but
> not used
> gapcmon.c:3389: warning: `gapc_panel_systray_icon_remove' defined but
> not used
> gapcmon.c:3423: warning: `cb_panel_prefs_button_add_rec' defined but not
> used
> gapcmon.c:3435: warning: `cb_panel_prefs_button_remove_rec' defined but
> not used
> gapcmon.c:3447: warning: `cb_panel_prefs_button_use_systray' defined but
> not used
> gapcmon.c:3855: warning: `gapc_panel_preferences_model_init' defined but
> not used
> gapcmon.c:4000: warning: `gapc_panel_monitors_model_init' defined but
> not used
> gapcmon.c:4076: warning: `gapc_util_load_icons' defined but not used
> gmake[1]: *** [gapcmon.o] Error 1
> gmake[1]: Leaving directory
> `/usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3/src/gapcmon'
> gmake: *** [all-subdirs] Error 2
> *** Error code 2
>
> Stop in
> /usr/ports/mystuff/apcupsd/w-apcupsd-3.14.3-client-x11/apcupsd-3.14.3
> (line 149 of Makefile).
> *** Error code 1
>
> Stop in /usr/ports/mystuff/apcupsd (line 2092 of
> /usr/ports/infrastructure/mk/bsd.port.mk).
> *** Error code 1
>
> Stop in /usr/ports/mystuff/apcupsd (line 1392 of
> /usr/ports/infrastructure/mk/bsd.port.mk).
> *** Error code 1
>
> Stop in /usr/ports/mystuff/apcupsd (line 1392 of
> /usr/ports/infrastructure/mk/bsd.port.mk).
> *** Error code 1
>
> Stop in /usr/ports/mystuff/apcupsd (line 1890 of
> /usr/ports/infrastructure/mk/bsd.port.mk).
>
--
() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments
