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

6 files changed, 10 insertions, 10 deletions

diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile
index 6cc8a85f750a..a3d5ad5b9a89 100644
--- a/russian/artwiz-ru/Makefile
+++ b/russian/artwiz-ru/Makefile
@@ -25,10 +25,10 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/fonts
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-FONTDIR=	${X11BASE}/lib/X11/fonts/${PORTNAME}
+FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}
 
 post-patch:
-	@${SED} -e 's,X11BASE,${X11BASE},g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${SED} -e 's,LOCALBASE,${LOCALBASE},g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 
 do-install:
 	${MKDIR} ${FONTDIR}
diff --git a/russian/artwiz-ru/files/pkg-message.in b/russian/artwiz-ru/files/pkg-message.in
index 3e8fa97a8bee..04de2512ddae 100644
--- a/russian/artwiz-ru/files/pkg-message.in
+++ b/russian/artwiz-ru/files/pkg-message.in
@@ -1,8 +1,8 @@
 ============================================================
-You'll have to add X11BASE/lib/X11/fonts/artwiz-ru
+You'll have to add LOCALBASE/lib/X11/fonts/artwiz-ru
 to your X font path by either:
 
-$ xset fp+ X11BASE/lib/X11/fonts/artwiz-ru
+$ xset fp+ LOCALBASE/lib/X11/fonts/artwiz-ru
 $ xset fp rehash
 
 or by adding it to your X-server configuration file and 
diff --git a/russian/libcyrillic/Makefile b/russian/libcyrillic/Makefile
index 9ec234e985ef..ffcffec0acc9 100644
--- a/russian/libcyrillic/Makefile
+++ b/russian/libcyrillic/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Text manipulation and autodetection for 6 major cyrillic charsets
 
 MAKE_ENV=	WRKSRC="${WRKSRC}" CFLAGS="${CFLAGS}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .if !defined(WITHOUT_OPTIMIZE)
 CFLAGS+=	-O2
diff --git a/russian/prawda/Makefile b/russian/prawda/Makefile
index f3e0dc7695fb..595367bb40c5 100644
--- a/russian/prawda/Makefile
+++ b/russian/prawda/Makefile
@@ -17,7 +17,7 @@ COMMENT=	English-Russian translator
 USE_BZIP2=	yes
 NO_WRKSUBDIR=	yes
 USE_XORG=	x11 xaw xmu xt sm
-CXXFLAGS+=	-I${X11BASE}/include -L${X11BASE}/lib
+CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|ulong|unsigned long|g;;s|malloc.h|stdlib.h|g" ${WRKSRC}/src/face/video_x.cpp
diff --git a/russian/wmcyrx/files/patch-aa b/russian/wmcyrx/files/patch-aa
index 524d58fac839..27bb15739adc 100644
--- a/russian/wmcyrx/files/patch-aa
+++ b/russian/wmcyrx/files/patch-aa
@@ -3,10 +3,10 @@
 @@ -1,31 +1,34 @@
  
 -I  = -I/usr/openwin/include -I/usr/local/include
-+I  = -I${X11BASE}/include -I${LOCALBASE}/include
++I  = -I${LOCALBASE}/include
  #L  = -Bstatic -lXpm -Bdynamic -lX11 -lXext
 -L  = -L/usr/local/lib -L/usr/openwin/lib -L/usr/X11/lib -lXpm -lX11 -lXext
-+L  = -L${LOCALBASE}/lib -L${X11BASE}/lib -L/usr/lib -lXpm -lX11 -lXext
++L  = -L${LOCALBASE}/lib -L/usr/lib -lXpm -lX11 -lXext
  #CC = gcc -O $I -DXLIB_ILLEGAL_ACCESS
 -CC=CC -O $I -DXLIB_ILLEGAL_ACCESS 
 +CXX ?= c++
diff --git a/russian/xcyrBGR/files/patch-ab b/russian/xcyrBGR/files/patch-ab
index dfe07a78a239..bab25af6110f 100644
--- a/russian/xcyrBGR/files/patch-ab
+++ b/russian/xcyrBGR/files/patch-ab
@@ -1,8 +1,8 @@
 --- Makefile.orig	Sun Sep  8 17:09:50 2002
 +++ Makefile	Sun Sep  8 17:10:42 2002
 @@ -1,18 +1,19 @@
- I  = -I${X11BASE}/include -I${LOCALBASE}/include
- L  = -L${LOCALBASE}/lib -L${X11BASE}/lib -L/usr/lib -lXpm -lX11 -lXext
+ I  = -I${LOCALBASE}/include
+ L  = -L${LOCALBASE}/lib -L/usr/lib -lXpm -lX11 -lXext
  
 -CC+= ${CFLAGS} ${COPT} $I -DXLIB_ILLEGAL_ACCESS
 +CXX?= c++