Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	17 Jun 2010 18:43:43 -0000	1.3
+++ Makefile	22 Aug 2010 20:22:46 -0000
@@ -5,9 +5,11 @@
 COMMENT-x11 =		gapcmon - GUI for apcupsd
 
 DISTNAME =		apcupsd-3.14.8
-PKGNAME-main =		${DISTNAME}p1
+PKGNAME-main =		${DISTNAME}
+REVISION-main = 	2
 PKGNAME-cgi =		${DISTNAME:S/-/-cgi-/}
-PKGNAME-x11 =		${DISTNAME:S/-/-x11-/}p0
+PKGNAME-x11 =		${DISTNAME:S/-/-x11-/}
+REVISION-x11 = 		1
 
 CATEGORIES =		sysutils
 
@@ -53,23 +55,22 @@
 MULTI_PACKAGES +=	-cgi
 PREFIX-cgi =		${WEB_ROOT}
 CONFIGURE_ARGS +=	--enable-cgi
-LIB_DEPENDS-cgi =	gd::graphics/gd
+WANTLIB-cgi = 		${WANTLIB} gd
+LIB_DEPENDS-cgi =	::graphics/gd
 RUN_DEPENDS-cgi =
 
 .if !${FLAVOR:L:Mno_x11}
 MULTI_PACKAGES +=	-x11
 USE_X11 =		Yes
 CONFIGURE_ARGS +=	--enable-gapcmon
-LIB_DEPENDS-x11 =	atk-1.0.>=2009::devel/atk \
-			cairo.>=7::graphics/cairo \
-			gconf-2.>=6::devel/gconf2 \
+LIB_DEPENDS-x11 =	::devel/gconf2 \
 			${MODGETTEXT_LIB_DEPENDS}
 RUN_DEPENDS-x11 =	:desktop-file-utils-*:devel/desktop-file-utils \
 			${MODGETTEXT_RUN_DEPENDS}
 
-WANTLIB-x11 += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
-WANTLIB-x11 += Xfixes Xi Xinerama Xrandr Xrender dbus-1 expat fontconfig
-WANTLIB-x11 += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB-x11 += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB-x11 += Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 expat fontconfig
+WANTLIB-x11 += freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB-x11 += glitz gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
 WANTLIB-x11 += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
 WANTLIB-x11 += pthread-stubs xcb xcb-render xcb-render-util z ${WANTLIB}
@@ -77,8 +78,8 @@
 
 .if ${FLAVOR:L:Msnmp}
 CONFIGURE_ARGS +=	--enable-net-snmp
-LIB_DEPENDS-main +=	netsnmp::net/net-snmp
-WANTLIB-main =		${WANTLIB} crypto
+LIB_DEPENDS-main +=	::net/net-snmp
+WANTLIB-main =		${WANTLIB} crypto netsnmp
 .endif
 
 FAKE_FLAGS =		sysconfdir=${TRUEPREFIX}/share/examples/apcupsd/etc