- Fix build after xorg cleanup

Submitted by:	pointyhat

6 files changed, 14 insertions, 8 deletions

diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index c30d2c73038d..991a69088308 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmcalendar
 PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +19,7 @@ LIB_DEPENDS=	ical.27:${PORTSDIR}/devel/libical
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 
+USE_XORG=	xpm
 USE_GNOME=	gtk20
 MAKE_ARGS=	CC="${CC}" \
 		LFLAGS="`pkg-config --libs gtk+-2.0` -L${LOCALBASE}/lib" \
@@ -26,6 +27,8 @@ MAKE_ARGS=	CC="${CC}" \
 		INCDIR="`pkg-config --cflags gtk+-2.0` -I${LOCALBASE}/include" \
 		LIBDIR="" \
 		LIBS="-lical -lXpm"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		wmCalendar.1
 PLIST_FILES=	bin/wmCalendar
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 0e31e13016f3..1801dd08ef37 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -18,9 +18,12 @@ COMMENT=	A media player based on BMP and XMMS
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_XORG=	x11 sm
 USE_GNOME=	gtk20 libglade2
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		audacious.1 audtool.1
 
diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index 1330a6994359..b5c96f9fd8a4 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gajim
 PORTVERSION=	20080309
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://ports.internal.vlink.ru/distfiles/
 PKGNAMESUFFIX=	-devel
@@ -19,7 +19,7 @@ COMMENT=	Gajim is a Jabber client based on a plugin system
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl
 
-USE_XORG=	x11 xext
+USE_XORG=	x11 xext xscrnsaver
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pygtk2
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 076991d23ba0..2c3ec4e2b10e 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gajim
 PORTVERSION=	0.11.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/ \
 		http://ports.internal.vlink.ru/distfiles/
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pygtk2
 USE_PYTHON=	2.4+
-USE_XORG=	x11 xext
+USE_XORG=	x11 xext xscrnsaver
 
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I ${LOCALBASE}/include" \
 		LDFLAGS="-L ${LOCALBASE}/lib" PYTHON=${PYTHON_CMD}
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index e1011d592a9e..3674b9d9feee 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	rox-filer
 PORTVERSION=	2.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	SF/rox
 DISTNAME=	rox-filer-${PORTVERSION}
@@ -21,7 +21,7 @@ PLIST_SUB+=	LOCALBASE=${LOCALBASE}
 USE_AUTOTOOLS=	autoconf:213
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XORG=	x11
+USE_XORG=	x11 sm xaw xproto
 USE_GNOME=	pkgconfig glib20 gtk20 libxml2 gnomevfs2 pango libglade2
 HAS_CONFIGURE=	yes
 
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index d0e129130125..aef20202b5f7 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.winischhofer.net/sis/
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Display Control Panel for XFree86/X.org SiS driver
 
-USE_XORG=	x11 ice xxf86vm xinerama xv xrandr
+USE_XORG=	x11 ice xxf86vm xinerama xv xrandr xext sm
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes