- 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, 6 insertions, 6 deletions

diff --git a/multimedia/mpegedit/files/patch-aj b/multimedia/mpegedit/files/patch-aj
index 5f6ad7158183..2ee226bf7942 100644
--- a/multimedia/mpegedit/files/patch-aj
+++ b/multimedia/mpegedit/files/patch-aj
@@ -16,7 +16,7 @@
  OBJS     = main.o globals/version.o
  ARCHIVES = editor/editor.a ui/ui.a MpegCodec/mpeg.a
 -    LIBS = -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm
-+    LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lnetpbm -lm
++    LIBS = -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lnetpbm -lm
  #
  #  CPPFLAGS     -Wall     all warnings
  #               -pipe     speeds up compilation (remove only if not using g++)
@@ -30,7 +30,7 @@
 -	      -IMpegCodec/encoder -Ieditor 
 -CPPFLAGS    = -Wall -pipe -O4
 -CFLAGS      = -Wall -pipe -O4
-+	      -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include 
++	      -IMpegCodec/encoder -Ieditor -I$(LOCALBASE)/include 
 +CPPFLAGS    = ${CXXFLAGS}
 +#CFLAGS     = -Wall -pipe -O4
  SHMEM	    = -DSH_MEM
diff --git a/multimedia/mpegedit/files/patch-ar b/multimedia/mpegedit/files/patch-ar
index 0ce818430deb..04c4c362b93e 100644
--- a/multimedia/mpegedit/files/patch-ar
+++ b/multimedia/mpegedit/files/patch-ar
@@ -12,7 +12,7 @@
  RANLIB   = ranlib
  
 -INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder
-+INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -I$(X11BASE)/include
++INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -I$(LOCALBASE)/include
  DEPFILE  = Dependancies
  SUBDIRS  = decoder encoder
  HEADERS  = bstream.H frame.H mpeg.H
diff --git a/multimedia/mpegedit/files/patch-au b/multimedia/mpegedit/files/patch-au
index f514b164212e..69f37c8c42b8 100644
--- a/multimedia/mpegedit/files/patch-au
+++ b/multimedia/mpegedit/files/patch-au
@@ -9,7 +9,7 @@
 +#CC		= gcc
 +CPP 		= ${CXX}
  RANLIB          = ranlib
-+INCLUDES	= -I$(X11BASE)/include
++INCLUDES	= -I$(LOCALBASE)/include
  DEPFILE 	= Dependencies
  CCOPTIMISATIONS = -O6 -funroll-loops -fomit-frame-pointer
  ANALYSIS 	= -DANALYSIS
diff --git a/multimedia/mpegedit/files/patch-az b/multimedia/mpegedit/files/patch-az
index a0a3117b1d5f..962200f5240c 100644
--- a/multimedia/mpegedit/files/patch-az
+++ b/multimedia/mpegedit/files/patch-az
@@ -12,7 +12,7 @@
  RM       = rm -f
  INCLUDES = -I../globals -I../ui -I../MpegCodec -I../MpegCodec/decoder \
 -	   -I../MpegCodec/encoder -I$(PBMDIR) 
-+	   -I../MpegCodec/encoder -I$(PBMDIR) -I$(X11BASE)/include
++	   -I../MpegCodec/encoder -I$(PBMDIR) -I$(LOCALBASE)/include
  
  DEPFILE  = Dependancies
  HEADERS  = yuv.H 2x2_window.H mono_window.H bw_window.H effects.H \
diff --git a/multimedia/mpegedit/files/patch-ba b/multimedia/mpegedit/files/patch-ba
index 041f337d9935..78af8152aa86 100644
--- a/multimedia/mpegedit/files/patch-ba
+++ b/multimedia/mpegedit/files/patch-ba
@@ -8,7 +8,7 @@
 +CPP      = ${CXX}
  RANLIB   = ranlib
  RM       = rm -f
-+INCLUDES = -I../globals -I$(X11BASE)/include
++INCLUDES = -I../globals -I$(LOCALBASE)/include
  
  #  CPPFLAGS     -Wall     all warnings
  #               -pipe     speeds up compilation (remove only if not using g++)