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

5 files changed, 9 insertions, 7 deletions

diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile
index aa441a551d8e..cce38ebab3de 100644
--- a/german/ksteak/Makefile
+++ b/german/ksteak/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile
index 3dd4737b1ecd..b2b9e88cb8ca 100644
--- a/german/staroffice5/Makefile
+++ b/german/staroffice5/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 NO_LATEST_LINK=	yes
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 NO_CDROM=	'Sie muessen StarOffice manuell via WWW-Interface herunterladen.'
 IS_INTERACTIVE=	yes
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index 2c6923953167..7b6267965657 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -34,7 +34,7 @@ FETCH_DEPENDS=	${LINUX_BASE_PORT}
 NO_LATEST_LINK=	yes
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 NO_CDROM=	'Sie muessen StarOffice manuell via WWW-Interface herunterladen.'
 CD_MOUNTPT=	'/cdrom'
 IS_INTERACTIVE=	yes
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 16ed5dd79799..40c7b7805174 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -36,7 +36,7 @@ NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'
 IS_INTERACTIVE=	yes
 NO_BUILD=	yes
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 SOVERSION=	${PORTNAME}${PORTVERSION}
 WRKSRC=		${WRKDIR}/${SOVERSION}
 TMPDIR=		${WRKDIR}/tmp
diff --git a/german/steak/Makefile b/german/steak/Makefile
index ab68b402610e..2e3a4e21589d 100644
--- a/german/steak/Makefile
+++ b/german/steak/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	steak
 PORTVERSION=	1.7.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	german
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		http://www.tm.informatik.uni-frankfurt.de/%7Erazi/steak/program/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	Steak.${PORTVERSION}
@@ -19,6 +19,8 @@ COMMENT=	An english <-> german dictionary under the GPL
 
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
+USE_XORG=	xt
+
 .if defined(WITHOUT_XSTEAK)
 USE_XORG=	x11
 .else
@@ -38,7 +40,7 @@ post-patch:
 	${REINPLACE_CMD} -e "s,\$$HOME/bin/Steak/Datensatz,${PREFIX}/share/steak/Datensatz,; \
 			s,BINDIR=\$$HOME/bin/Steak,BINDIR=${DATADIR},; \
 			s,$$BINDIR/help.txt,${DATADIR}/help.txt,g" ${WRKSRC}/woerterbuch
-	${REINPLACE_CMD} -e "s,/usr/X11R6/,${X11BASE}/,g" ${WRKSRC}/Printbuffer/Makefile
+	${REINPLACE_CMD} -e "s,/usr/X11R6/,${LOCALBASE}/,g" ${WRKSRC}/Printbuffer/Makefile
 
 do-install:
 .if !defined(WITHOUT_XSTEAK)