- Remove USE_X_PREFIX

- Use SF macro
- USE_XPM --> USE_XORG=xpm
- Bump portrevision

8 files changed, 16 insertions, 30 deletions

diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 26f97b5bc3c8..32b8584a7072 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	bookmarkbridge
 PORTVERSION=	0.72
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	bookmarkbridge
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Synchronize bookmarks between multiple browsers
@@ -19,7 +18,6 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 
 USE_PERL5_BUILD=yes
 USE_QT_VER=	3
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-mt --program-prefix="" \
diff --git a/www/cheetah/Makefile b/www/cheetah/Makefile
index 63ed807c2c2b..03250a4c5762 100644
--- a/www/cheetah/Makefile
+++ b/www/cheetah/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	cheetah
 PORTVERSION=	0.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ based light-weight web browser
@@ -19,7 +18,6 @@ LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/cssed/Makefile b/www/cssed/Makefile
index ac145eec9997..b3887bf01523 100644
--- a/www/cssed/Makefile
+++ b/www/cssed/Makefile
@@ -8,15 +8,13 @@
 
 PORTNAME=	cssed
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An application to help CSS style sheets creation and maintenance
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget gtk20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/mmosaic/Makefile b/www/mmosaic/Makefile
index e02bf27e7f9f..82bf86a3917c 100644
--- a/www/mmosaic/Makefile
+++ b/www/mmosaic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mmosaic
 PORTVERSION=	3.7.2
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.enst.fr/pub/mbone/mMosaic/ \
 		ftp://ftp.uni-koeln.de/net/inet/WWW/mosaic/unix/ \
@@ -23,7 +23,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 RESTRICTED=	"academic, research and internal business purposes only, without a fee"
 PLIST=		${WRKDIR}/pkg-plist
 USE_MOTIF=	yes
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mMosaic-src-${PORTVERSION}
 
 post-patch:
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 38dc023426b1..c986582a5ec6 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -7,21 +7,19 @@
 
 PORTNAME=	screem
 PORTVERSION=	0.16.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nice GNOME/GTK-based HTML editor
 
 LIB_DEPENDS=	croco-0.6.3:${PORTSDIR}/textproc/libcroco
 
-USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	desktopfileutils gnomehack gnomemenus gnomeprefix gnometarget \
 		gtksourceview intlhack libgnomeprintui libgnomeui libgtkhtml
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 38dc023426b1..c986582a5ec6 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -7,21 +7,19 @@
 
 PORTNAME=	screem
 PORTVERSION=	0.16.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nice GNOME/GTK-based HTML editor
 
 LIB_DEPENDS=	croco-0.6.3:${PORTSDIR}/textproc/libcroco
 
-USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	desktopfileutils gnomehack gnomemenus gnomeprefix gnometarget \
 		gtksourceview intlhack libgnomeprintui libgnomeui libgtkhtml
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/sidplug/Makefile b/www/sidplug/Makefile
index 449d9c1552d9..4a13380d9db1 100644
--- a/www/sidplug/Makefile
+++ b/www/sidplug/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sidplug
 PORTVERSION=	1.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
@@ -17,7 +17,6 @@ COMMENT=	A Commodore 64 psid audio plugin for Mozilla or Opera
 
 RUN_DEPENDS=	xsidplay:${PORTSDIR}/audio/xsidplay
 
-USE_X_PREFIX=	yes
 MAKE_ARGS=	CC="${CC}" OPTIMIZER="${CFLAGS} -I${X11BASE}/include"
 
 .include <bsd.port.pre.mk>
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index 8b7ea7902122..6a1561fbf26e 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -9,10 +9,9 @@
 
 PORTNAME=	syndigator
 PORTVERSION=	0.15.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An RSS feed reader based on Gtk2
@@ -27,7 +26,6 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-T
 		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		${SITE_PERL}/${PERL_ARCH}/Gtk2/Html2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2-Html2
 
-USE_XLIB=	yes
 USE_GNOME=	gnomehier
 USE_PERL5=	yes
 NO_BUILD=	yes