- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

7 files changed, 5 insertions, 10 deletions

diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index f0a82c8ec362..a2bc82908526 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dsniff
 PORTVERSION=	2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://naughty.monkey.org/~dugsong/dsniff/
 
@@ -42,7 +42,7 @@ USE_GNOME+=	glib20
 .endif
 
 .if !defined(WITHOUT_X11)
-USE_XLIB=	yes
+USE_XORG=	x11 xmu
 PLIST_SUB+=	X11=''
 MAN8+=		webspy.8
 .else
diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index 98639e1c1a58..40e8272520a8 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Figaro's Password Manager, an app to securely store your passwords
 
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile
index b03e14d599da..9f8f319c862c 100644
--- a/security/gnome-ssh-askpass/Makefile
+++ b/security/gnome-ssh-askpass/Makefile
@@ -20,7 +20,6 @@ BUILD_WRKSRC=	${WRKSRC}/contrib
 ALL_TARGET=	gnome-ssh-askpass2
 
 PLIST_FILES=	bin/gnome-ssh-askpass2
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
 .include <bsd.port.pre.mk>
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index e7d0852836e8..bafe4dd532b7 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	gringotts.2:${PORTSDIR}/security/libgringotts \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 WANT_GNOME=	yes
diff --git a/security/gtk-knocker/Makefile b/security/gtk-knocker/Makefile
index cf7023a178f6..f2e2b3f5961d 100644
--- a/security/gtk-knocker/Makefile
+++ b/security/gtk-knocker/Makefile
@@ -17,9 +17,8 @@ DISTNAME=	gtk-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple and easy to use TCP only port scanner (GTK+ version)
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 USE_GNOME=	gtk12
 
 MAN1=		gtk-knocker.1
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index 89c86d8feab8..5cd344e57001 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://members.chello.nl/~h.lai/libgnomesu/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library and frontend for running commands as root
 
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 79e91a119e66..e9d245deaf25 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ssh
 PORTVERSION=	1.2.33
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.ssh.com/pub/ssh/ \
 		ftp://ftp.nsysu.edu.tw/Unix/Security/ssh/ \
@@ -122,7 +122,7 @@ CONFIGURE_ARGS+=	--with-socks="-L${PREFIX}/lib -lsocks5" --with-socks5
 # Include extra files if X11 is installed
 .if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \
 	&& !defined(WITHOUT_X11))
-USE_XLIB=	yes
+USE_XORG=	x11
 PLIST:=		${WRKDIR}/PLIST
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist.x11 ${PKGDIR}/pkg-plist > ${PLIST}