- 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)

1 files changed, 4 insertions, 5 deletions

diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 2c41a6c0c872..f9564fcf9c1c 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.3.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES?=	x11-toolkits ipv6
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
@@ -30,7 +30,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 USE_BZIP2=	yes
 REINPLACE_ARGS=	-i ""
-USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -77,10 +76,10 @@ PACKAGE_COOKIE=	${WRKDIR}/.package_done.${PORTNAME}.${PREFIX:S/\//_/g}
 
 PREFIX_REAL!=	/bin/realpath ${PREFIX}
 
-# The previous Qt port versions installed qmake and qmake's specs under X11BASE
+# The previous Qt port versions installed qmake and qmake's specs under LOCALBASE
 # The new devel/qmake port installs them under LOCALBASE. We can use
 # either one here, but we prefer the newer:
-.for d in ${X11BASE} ${LOCALBASE} ${PREFIX}
+.for d in ${LOCALBASE} ${PREFIX}
 .	if exists($d/share/qt/mkspecs/freebsd-g++/qplatformdefs.h)
 QTBASE=$d
 PLATFORM=${QTBASE}/share/qt/mkspecs/freebsd-g++
@@ -157,7 +156,7 @@ CONFLICTS+=	qt-3.3.*
 CONFLICTS+=	qt-copy-[0-9]*
 .endif
 
-.if exists(${X11BASE}/include/qt2/qapp.h)
+.if exists(${LOCALBASE}/include/qt2/qapp.h)
 BROKEN=	You have QT2 headers installed!  Installing this port
 BROKEN+=will result in conflicts between QT3 and QT2!
 .endif