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

3 files changed, 11 insertions, 23 deletions

diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile
index d10caa42ed23..e5296f7c1156 100644
--- a/graphics/vertex/Makefile
+++ b/graphics/vertex/Makefile
@@ -41,10 +41,9 @@ post-patch:
 		 s|%%CXX%%|${CXX}|g ; \
 		 s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
 		 s|%%PREFIX%%|${PREFIX}|g ; \
-		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/vertex/platforms.ini
+		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/vertex/platforms.ini
 	@${REINPLACE_CMD} -e \
-		's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/vertex/vmahelp.c
+		's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/vertex/vmahelp.c
 	@${REINPLACE_CMD} -e \
 		's|CC =|CC ?=|g' ${WRKSRC}/pconf/Makefile
 
diff --git a/graphics/vertex/files/patch-platforms.ini b/graphics/vertex/files/patch-platforms.ini
index 647c154d41dd..3548d3f93801 100644
--- a/graphics/vertex/files/patch-platforms.ini
+++ b/graphics/vertex/files/patch-platforms.ini
@@ -1,6 +1,6 @@
---- vertex/platforms.ini.orig	Mon Nov  1 00:35:03 2004
-+++ vertex/platforms.ini	Thu Oct  5 17:14:40 2006
-@@ -22,23 +22,26 @@
+--- ./vertex/platforms.ini.orig	2004-11-01 07:35:03.000000000 +0100
++++ ./vertex/platforms.ini	2008-04-14 10:22:58.000000000 +0200
+@@ -22,23 +22,23 @@
  
  Platform = UNIX
          Description = For most any UNIX system
@@ -18,23 +18,20 @@
          PlatformSearchPathInclude = /usr/include/
 -        PlatformSearchPathInclude = /usr/X11R6/include/
 +        PlatformSearchPathInclude = %%LOCALBASE%%/include/
-+        PlatformSearchPathInclude = %%X11BASE%%/include/
          PlatformSearchPathLib = /lib/
          PlatformSearchPathLib = /usr/lib/
 -        PlatformSearchPathLib = /usr/X11R6/lib/
 +        PlatformSearchPathLib = %%LOCALBASE%%/lib/
-+        PlatformSearchPathLib = %%X11BASE%%/lib/
          PlatformSearchPathEtc = /etc/
          PlatformSearchPathEtc = /usr/etc/
          PlatformSearchPathBin = /bin/
          PlatformSearchPathBin = /usr/bin/
 -        PlatformSearchPathBin = /usr/X11R6/bin/
 +        PlatformSearchPathBin = %%LOCALBASE%%/bin/
-+        PlatformSearchPathBin = %%X11BASE%%/bin/
          PlatformSearchPathData = /usr/share/icons/
          PlatformFeature = debug
                  Description = Just adds -g to the CFLAGS for debugging
-@@ -51,7 +54,7 @@
+@@ -51,7 +51,7 @@
  # Newer versions of Imlib only need to link to -lImlib
  #		FeatureLIBS = -lImlib -lpng -ltiff -ljpeg -lz
  		FeatureLIBS = -lImlib
@@ -43,15 +40,7 @@
                  FeatureDepend = Imlib-lib
                          DependType = Library
                          MustExist = Yes
-@@ -66,6 +69,7 @@
-                 Description = An implementation of OpenGL (ie Mesa3D)
-                 MustExist = Yes
-                 FeatureLIBS = -lGL -lGLU
-+		FeatureLIB_DIR = -L%%X11BASE%%/lib/
-                 FeatureDepend = gl-lib
-                         DependType = Library
-                         MustExist = Yes
-@@ -83,11 +87,11 @@
+@@ -83,11 +83,11 @@
                  MustExist = Yes
                  FeatureCFLAGS = `gtk-config --cflags`
                  FeatureLIBS = `gtk-config --libs`
@@ -65,7 +54,7 @@
                          DependGrepString = gtk_init
                  FeatureDepend = gtk-devel
                          DependType = Program
-@@ -98,7 +102,7 @@
+@@ -98,7 +98,7 @@
                  MustExist = Yes
                  FeatureCFLAGS =
                  FeatureLIBS = -lgtkgl
diff --git a/graphics/vertex/files/patch-vmahelp.c b/graphics/vertex/files/patch-vmahelp.c
index 63dc6bb58d03..550e43dc4152 100644
--- a/graphics/vertex/files/patch-vmahelp.c
+++ b/graphics/vertex/files/patch-vmahelp.c
@@ -15,12 +15,12 @@ $FreeBSD$
 - "/usr/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
 - "/usr/local/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
 - "/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
-+ "%%X11BASE%%/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
++ "%%LOCALBASE%%/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
  \
 - "/usr/X11R6/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
 - "/usr/X11R6/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
-+ "%%X11BASE%%/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
-+ "%%X11BASE%%/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
++ "%%LOCALBASE%%/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
++ "%%LOCALBASE%%/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
  \
   NULL, NULL, NULL \
  }