Convert most of remaining ports that depend on xorg-libraries to

modular xorg.

- supply corresponding USE_XORG for all imake-using ports that need it
- USE_IMAKE no longer implies USE_XLIB in absence of USE_XORG
- retire USE_X_PREFIX which is not really used anywhere after the
  above change
- a few minor nits like whitespace and SF macro

Tested by:	2 tinderbox runs by pav
Approved by:	portmgr (pav)

5 files changed, 9 insertions, 6 deletions

diff --git a/comms/acfax/Makefile b/comms/acfax/Makefile
index e4fb5a78cb88..64c53edea1c6 100644
--- a/comms/acfax/Makefile
+++ b/comms/acfax/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	acfax
 PORTVERSION=	0.981011
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	ftp://ftp.funet.fi/pub/ham/unix/Linux/misc/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0.//}
@@ -21,6 +21,7 @@ PLIST_FILES=	bin/acfax
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xmu xt sm ice
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/acfax.man
diff --git a/comms/ibp/Makefile b/comms/ibp/Makefile
index b1fcc94fa973..99adf30173e0 100644
--- a/comms/ibp/Makefile
+++ b/comms/ibp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ibp
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ \
 		${MASTER_SITE_LOCAL}
@@ -17,8 +17,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	A little program for monitoring amateur radio beacons
 
-USE_XLIB=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11
 
 PLIST_FILES=	bin/ibp
 MAN1=		ibp.1
diff --git a/comms/kb/Makefile b/comms/kb/Makefile
index 45d9cc753832..46e882fa778b 100644
--- a/comms/kb/Makefile
+++ b/comms/kb/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kb
 PORTVERSION=	8.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.db.net/downloads/ \
 		${MASTER_SITE_LOCAL}
@@ -16,7 +16,6 @@ DISTFILES=	kb_src-${PORTVERSION}.tar.gz kb_inst-${PORTVERSION}.tar.gz
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Amateur Radio contest logger
 
-USE_XLIB=	yes
 USE_GNOME=	libgnome gtk20 libbonobo
 NO_WRKSUBDIR=	yes
 PKGMESSAGE=	${FILESDIR}/pkg_message
diff --git a/comms/seyon/Makefile b/comms/seyon/Makefile
index 0da39b78358d..fc04ac0336ad 100644
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	seyon
 PORTVERSION=	2.14b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	ftp://sipb.mit.edu/pub/seyon/
 DISTNAME=	Seyon-${PORTVERSION}
@@ -18,6 +18,7 @@ COMMENT=	A communications package for the X Window system
 
 WRKSRC=		${WRKDIR}/seyon
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xpm xmu xaw xt sm ice
 
 MAN1=		seyon.1
 
diff --git a/comms/viewfax/Makefile b/comms/viewfax/Makefile
index 81ecf5fb5b90..662bb956e935 100644
--- a/comms/viewfax/Makefile
+++ b/comms/viewfax/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	viewfax
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.ping.de/pub/unix/ \
 		ftp://ftp.leo.org/historic/comp/os/unix/networking/mgetty/
@@ -15,6 +16,7 @@ MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Display files containing g3 and/or g4 coded fax pages
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/viewfax lib/viewfax.tif