===================================================================
RCS file: /cvs/ports/sysutils/apcupsd/Attic/Makefile,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -r1.7 -r1.10
--- ports/sysutils/apcupsd/Attic/Makefile	2009/08/03 15:17:30	1.7
+++ ports/sysutils/apcupsd/Attic/Makefile	2010/04/19 15:09:31	1.10
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2009/08/03 14:17:30 yason Exp $
+# $OpenBSD: Makefile,v 1.10 2010/04/19 14:09:31 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.7
+DISTNAME =		apcupsd-3.14.8
 PKGNAME-main =		${DISTNAME}
 PKGNAME-cgi =		${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =		${DISTNAME:S/-/-x11-/}
@@ -40,6 +40,8 @@
 			--with-lock-dir=/var/run \
 			--with-nisip=127.0.0.1 \
 			--enable-usb
+CONFIGURE_ENV = 	CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \
+			LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread'
 
 PSEUDO_FLAVORS = 	no_x11
 FLAVORS =		snmp
@@ -62,13 +64,15 @@
 			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 xcb-render \
+			xcb-render-util 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
+RUN_DEPENDS-x11 = 	::devel/desktop-file-utils
 .endif
 
 .if ${FLAVOR:L:Msnmp}
@@ -77,9 +81,6 @@
 WANTLIB-main += 	crypto
 .endif
 
-pre-configure:
-	@perl -pi -e 's|_PREFIX_|${PREFIX}|g' \
-	${WRKSRC}/src/gapcmon/gapcmon.c
 post-install:
 .for i in apcupsd apcupsd/status apcupsd/rpt apcupsd/etc
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/$i
@@ -89,22 +90,11 @@
 		${PREFIX}/share/examples/apcupsd/status
 	${INSTALL_DATA} ${WRKSRC}/examples/rpt/* \
 		${PREFIX}/share/examples/apcupsd/rpt
-	${INSTALL_DATA} ${WRKSRC}/platforms/openbsd/apccontrol \
-		${PREFIX}/share/examples/apcupsd/etc
-	${INSTALL_SCRIPT} ${WRKSRC}/platforms/openbsd/apcupsd \
-		${PREFIX}/sbin/apcupsctl
-.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
-.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/openbsd/README \
 		${PREFIX}/share/doc/apcupsd/README.openbsd
-	${INSTALL_DATA} ${WRKSRC}/src/cgi/apcupsd.css \
-		${PREFIX}/share/examples/apcupsd/etc
 	${INSTALL_DATA} ${WRKSRC}/src/cgi/README \
 		${WRKINST}/${WEB_ROOT}/cgi-bin/apcupsd/README.CGI