- Remove unneeded dependency from gtk12/gtk20 [1]

- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+

Thanks to all Helpers:
	Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
	ehaupt, nox, itetcu, flz, pav

PR:		116263
Tested on:	pointyhat
Approved by:	portmgr (pav)

15 files changed, 32 insertions, 38 deletions

diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index e32c65c..ce2b700 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	evidence
 PORTVERSION=	0.9.8
 PORTREVISION=	9
 CATEGORIES=	x11-fm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	freebsd@troback.com
 COMMENT=	Enlightened file-manager
@@ -40,8 +39,8 @@ CONFIGURE_ARGS=	--disable-dbus \
 		--disable-thumbnailer-avi \
 		--disable-thumbnailer-mpeg3 \
 		--enable-plugin-ttf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/*
 
diff --git a/x11-fm/ezfm/files/patch-aa b/x11-fm/ezfm/files/patch-aa
index 7f0f349..80b9cd8 100644
--- a/x11-fm/ezfm/files/patch-aa
+++ b/x11-fm/ezfm/files/patch-aa
@@ -18,14 +18,14 @@
  #
 -CC= gcc  -g -DLINUX -I../include
 +CC?= gcc  -g -DLINUX -I../include
-+CFLAGS+= -I$(LOCALBASE)/include -I$(X11BASE)/include
++CFLAGS+= -I$(LOCALBASE)/include
  
  #
  #----------------------------------------------------------------------------------
 -LIBS = libfile.a -L../EZWGL/lib -lEZ -L/usr/X11R6/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -lm  -lc
 -STATICLIBS = libfile.a /usr/local/lib/libEZ.a -L/usr/X11R6/lib -lX11 -lXext  -lm  -lc
-+LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -lm  -lc
-+STATICLIBS = libfile.a ${LOCALBASE}/lib/libEZ.a -L${X11BASE}/lib -lX11 -lXext  -lm  -lc
++LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -lm  -lc
++STATICLIBS = libfile.a ${LOCALBASE}/lib/libEZ.a -L${LOCALBASE}/lib -lX11 -lXext  -lm  -lc
  
  SRC= action.c folder.c atoms.c clientMessage.c main.c icons.c items.c finfo.c \
       signal.c info.c infoBtn.c printer.c misc.c mbtnFile.c mbtnView.c mbtnHelp.c popup.c\
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index b331509..08bdfc5 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Filemanager with FTP capabilities. Uses Tcl/Tk
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 MAKEFILE=	Makefile.freebsd_gcc
-MAKE_ENV+=	X11BASE=${X11BASE}
+MAKE_ENV+=	LOCALBASE=${LOCALBASE}
 
 pre-build:
 #	@ ${RM} ${WRKSRC}/ext.so
diff --git a/x11-fm/filerunner/files/patch-aa b/x11-fm/filerunner/files/patch-aa
index c99e323..f83d3e2 100644
--- a/x11-fm/filerunner/files/patch-aa
+++ b/x11-fm/filerunner/files/patch-aa
@@ -8,7 +8,7 @@
 -X11INC = /usr/X11/include
 +TCLINC = ${PREFIX}/include/tcl8.4
 +TKINC   = ${PREFIX}/include/tk8.4
-+X11INC = ${X11BASE}/include
++X11INC = ${LOCALBASE}/include
  
 -CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
 +CFLAGS += -Wall -fPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC)
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile
index 6dfecb2..7402bde 100644
--- a/x11-fm/fsv/Makefile
+++ b/x11-fm/fsv/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	fsv
 PORTVERSION=	0.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	3D filesystem visualizer
@@ -18,10 +17,10 @@ COMMENT=	3D filesystem visualizer
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
 USE_GETTEXT=	yes
-USE_GL=		yes
+USE_GL=		gl
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-GL-prefix=${X11BASE}/lib
+CONFIGURE_ARGS=	--with-GL-prefix=${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index 348ccc0..2f9f39a 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-commander/1.2
@@ -24,13 +24,11 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 CONFLICTS=	gnome-commander-*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui
-USE_GCC=	3.4+
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_OMF=	yes
 
 MAN1=		gnome-commander.1
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 1018dbc..9a64bf7 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	2.22.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +22,6 @@ INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop eel2 \
 		librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
 GNOME_DESKTOP_VERSION=2
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index f5d3837..e1011d5 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -6,10 +6,9 @@
 
 PORTNAME=	rox-filer
 PORTVERSION=	2.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rox
+MASTER_SITES=	SF/rox
 DISTNAME=	rox-filer-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -22,6 +21,7 @@ PLIST_SUB+=	LOCALBASE=${LOCALBASE}
 USE_AUTOTOOLS=	autoconf:213
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_XORG=	x11
 USE_GNOME=	pkgconfig glib20 gtk20 libxml2 gnomevfs2 pango libglade2
 HAS_CONFIGURE=	yes
 
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index e14466e..fa06145 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -45,7 +45,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}| ; \
 			s|gcc|${CC}| ; s| -lm|| ; \
 			s|/usr/local|${LOCALBASE}|g ; \
-			s|/usr/X11R6|${X11BASE}|g ; \
+			s|/usr/X11R6|${LOCALBASE}|g ; \
 			s|-O2|${CFLAGS}|g' \
 				${WRKSRC}/${COMPILE_SCRIPT}
 
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 53150cf..0b643f8 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x-files
 PORTVERSION=	2.00b1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm tk
 MASTER_SITES=	http://users.tkk.fi/~mkivinie/X-Files/data/
 DISTNAME=	X-Files-${PORTVERSION}
@@ -20,13 +20,12 @@ RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 
 WRKSRC=		${WRKDIR}/X-Files
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 MAN1=		X-Files.1x
 
 pre-install:
 	@tclsh8.3 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
 	@${RM} -f ${WRKSRC}/xfinstall.tcl
-	@${SED} s#@X11BASE@#${X11BASE}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
+	@${SED} s#@PREFIX@#${PREFIX}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
 	@${MV} ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl
 
 do-install:
@@ -36,8 +35,8 @@ do-install:
 .endfor
 	@${CHMOD} 0555 ${PREFIX}/lib/X11/X-Files/X-Files.tcl
 	@${LN} -s ${PREFIX}/lib/X11/X-Files/X-Files.tcl ${PREFIX}/bin/X-Files
-	@${MKDIR} ${X11BASE}/include/X11/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${X11BASE}/include/X11/pixmaps
-	@${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${X11BASE}/man/man1
+	@${MKDIR} ${PREFIX}/include/X11/pixmaps
+	@${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${PREFIX}/include/X11/pixmaps
+	@${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/x-files/files/patch-aa b/x11-fm/x-files/files/patch-aa
index f14dfbc..a5158c7 100644
--- a/x11-fm/x-files/files/patch-aa
+++ b/x11-fm/x-files/files/patch-aa
@@ -5,7 +5,7 @@
 +# The main file for the X-Files
 +# The next line is executed by /bin/sh, but not Tcl \
 +exec wish8.3 $0 ${1+"$@"}
-+set xf(xf_home) "@X11BASE@/lib/X11/X-Files/"
++set xf(xf_home) "@PREFIX@/lib/X11/X-Files/"
  proc MAIN {argc argv} {
  global xf xf_image env menu tk_version
  
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 8127dea..a32ca86 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -34,10 +34,10 @@ BROKEN=		Does not compile
 
 do-build:
 .for i in panels xdiskusage
-	${CXX} ${CXXFLAGS} -I${X11BASE}/include -c \
+	${CXX} ${CXXFLAGS} -I${LOCALBASE}/include -c \
 		${WRKSRC}/${i}.C -o ${WRKSRC}/${i}.o
 .endfor
-	${CXX} ${CXXFLAGS} -L${X11BASE}/lib -o \
+	${CXX} ${CXXFLAGS} -L${LOCALBASE}/lib -o \
 		${WRKSRC}/xdiskusage ${WRKSRC}/panels.o \
 		${WRKSRC}/xdiskusage.o -lfltk -lm -lXext -lX11 ${LDFLAGS}
 
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index 03b2c65..2a75e10 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -17,7 +17,7 @@ COMMENT=	The X File Manager
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		xfm.1 xfmtype.1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index fea15a4..5aaa11d 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xnc
 PORTVERSION=	5.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.xnc.dubna.su/src-5/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -28,8 +28,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xext xt
 CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-fm/xplore/Makefile b/x11-fm/xplore/Makefile
index da23d26..a5f365e 100644
--- a/x11-fm/xplore/Makefile
+++ b/x11-fm/xplore/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Yet another Motif file manager
 
 USE_IMAKE=	yes
 USE_MOTIF=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN1=		xplore.1 xploretype.1