===================================================================
RCS file: /cvs/ports/sysutils/apcupsd/Attic/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.8
diff -u -r1.1.1.1 -r1.8
--- ports/sysutils/apcupsd/Attic/Makefile	2008/11/10 13:15:33	1.1.1.1
+++ ports/sysutils/apcupsd/Attic/Makefile	2009/08/13 20:55:30	1.8
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/11/10 13:15:33 yason Exp $
+# $OpenBSD: Makefile,v 1.8 2009/08/13 19:55:30 yason Exp $
 
 COMMENT-main =		daemon for controlling APC UPSes
 COMMENT-cgi = 		CGI scripts for web monitoring
 COMMENT-x11 = 		gapcmon - GUI for apcupsd
 
-DISTNAME =		apcupsd-3.14.5
+DISTNAME =		apcupsd-3.14.7
 PKGNAME-main =		${DISTNAME}
 PKGNAME-cgi =		${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =		${DISTNAME:S/-/-x11-/}
@@ -13,7 +13,7 @@
 
 HOMEPAGE =		http://www.apcupsd.com
 
-MAINTAINER =		Kirill S. Bychkov <yason@linklevel.net>
+MAINTAINER =		Kirill Bychkov <yason@linklevel.net>
 
 # GPLv2 
 
@@ -24,8 +24,7 @@
 
 WANTLIB-main =		c pthread
 
-MASTER_SITES = 		ftp://ftp.linklevel.net/
-#MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=apcupsd/}
+MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=apcupsd/}
 
 CONFIGURE_STYLE =	gnu old
 USE_GMAKE = 		Yes
@@ -60,12 +59,13 @@
 CONFIGURE_ARGS += 	--enable-gapcmon
 WANTLIB-x11 = 		ORBit-2 X11 Xau Xcomposite Xcursor Xdamage \
 			Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
-			c expat fontconfig freetype gdk-x11-2.0 \
+			c dbus-1 expat fontconfig freetype gdk-x11-2.0 \
 			gdk_pixbuf-2.0 gtk-x11-2.0 glitz iconv intl m \
 			pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
-			png pthread z
+			png pthread pthread-stubs xcb z
 LIB_DEPENDS-x11 = 	glib-2.0.>=1400.0,gmodule-2.0.>=1400.0::devel/glib2 \
 			gobject-2.0.>=1400.0,gthread-2.0.>=1400::devel/glib2 \
+			gio-2.0.>=1800::devel/glib2 \
 			atk-1.0.>=2009::devel/atk \
 			cairo.>=7::graphics/cairo \
 			gconf-2.>=6::devel/gconf2
@@ -93,25 +93,14 @@
 		${PREFIX}/share/examples/apcupsd/etc
 	${INSTALL_SCRIPT} ${WRKSRC}/platforms/openbsd/apcupsd \
 		${PREFIX}/sbin/apcupsctl
-	${INSTALL_DATA} ${WRKSRC}/platforms/etc/apcupsd.conf \
+.for i in apcupsd.conf changeme commfailure commok hosts.conf \
+		multimon.conf offbattery onbattery
+	${INSTALL_DATA} ${WRKSRC}/platforms/etc/$i \
 		${PREFIX}/share/examples/apcupsd/etc
-	${INSTALL_DATA} ${WRKSRC}/platforms/etc/changeme \
-		${PREFIX}/share/examples/apcupsd/etc
-	${INSTALL_DATA} ${WRKSRC}/platforms/etc/commfailure \
-		${PREFIX}/share/examples/apcupsd/etc
-	${INSTALL_DATA} ${WRKSRC}/platforms/etc/commok \
-		${PREFIX}/share/examples/apcupsd/etc
-	${INSTALL_DATA} ${WRKSRC}/platforms/etc/offbattery \
-		${PREFIX}/share/examples/apcupsd/etc
-	${INSTALL_DATA} ${WRKSRC}/platforms/etc/onbattery \
-		${PREFIX}/share/examples/apcupsd/etc
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/c ${PREFIX}/share/doc/apcupsd/COPYRIGHT
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/apcupsd
 	${INSTALL_DATA} ${WRKSRC}/DISCLAIMER ${PREFIX}/share/doc/apcupsd
-	${INSTALL_DATA} ${WRKSRC}/platforms/etc/hosts.conf \
-		${PREFIX}/share/examples/apcupsd/etc
-	${INSTALL_DATA} ${WRKSRC}/platforms/etc/multimon.conf \
-		${PREFIX}/share/examples/apcupsd/etc
 	${INSTALL_DATA} ${WRKSRC}/platforms/openbsd/README \
 		${PREFIX}/share/doc/apcupsd/README.openbsd
 	${INSTALL_DATA} ${WRKSRC}/src/cgi/apcupsd.css \