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

2 files changed, 2 insertions, 2 deletions

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 806faf9c614b..3a67ecfb0523 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -49,7 +49,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|exec ./scmlit|exec $$SCMLIT|g' ${WRKSRC}/build
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
 		 s|%%CFLAGS%%|${CFLAGS}|g ; \
-		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/build.scm
+		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm
 
 post-build:
 	@cd ${WRKSRC} \
diff --git a/lang/scm/files/patch-build.scm b/lang/scm/files/patch-build.scm
index a7a9a3f16228..8e2ea75a001a 100644
--- a/lang/scm/files/patch-build.scm
+++ b/lang/scm/files/patch-build.scm
@@ -31,7 +31,7 @@
  		 (cond
  		  ((equal? (car fnames) "edline") "-lreadline")
 -		  ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
-+		  ((equal? (car fnames) "x") "-L%%X11BASE%%/lib -lSM -lICE -lXext -lX11 -lxpg4")
++		  ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11 -lxpg4")
  		  (else ""))
  		 "-o" (string-append (car fnames) ".so")
  		 (map (lambda (fname) (string-append fname ".o")) fnames))