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

diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 050d793ee199..902c2be44329 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -74,16 +74,16 @@ pre-configure:
 		${REINPLACE_CMD} -e 's|CC = gcc|#CC = gcc|'		\
 			-e 's|LD = gcc|LD = ${CC}|'			\
 			-e 's|LD = g++|LD = ${CXX}|'			\
-			-e 's|-O2|${CFLAGS} -I${X11BASE}/include|'	\
+			-e 's|-O2|${CFLAGS} -I${LOCALBASE}/include|'	\
 			-e 's|wx-config|${WX_CONFIG}|'			\
-			-e 's|LDFLAGS =|LDFLAGS += -L${X11BASE}/lib|'	\
+			-e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|'	\
 			-e 's|libs.linux|libs.${OPSYS}|'		\
 			-e 's|gcc -D|${CC} -D|' $$f ;			\
 	done
 	${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|'	\
 		-e 's|/usr/share/kicad|${PREFIX}/${INSTDIR}|'		\
 		-e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common/gestfich.cpp
-	${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${X11BASE}/bin/xpdf|'	\
+	${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|'	\
 		-e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|'	\
 		${WRKSRC}/common/eda_doc.cpp
 
diff --git a/cad/kicad/files/patch-3d-viewer_makefile.include b/cad/kicad/files/patch-3d-viewer_makefile.include
index 4afef4eda549..e0ae0ad16521 100644
--- a/cad/kicad/files/patch-3d-viewer_makefile.include
+++ b/cad/kicad/files/patch-3d-viewer_makefile.include
@@ -3,7 +3,7 @@
 @@ -1,5 +1,5 @@
  EXTRALIBS =
 -EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew
-+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${X11BASE}/include
++EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${LOCALBASE}/include
  
  CPPFLAGS += $(EXTRACPPFLAGS)
  
diff --git a/cad/kicad/files/patch-cvpcb_makefile.include b/cad/kicad/files/patch-cvpcb_makefile.include
index abe33ee6ad6e..89f4e6c7c105 100644
--- a/cad/kicad/files/patch-cvpcb_makefile.include
+++ b/cad/kicad/files/patch-cvpcb_makefile.include
@@ -5,7 +5,7 @@
  OBJSUFF = o
  
 -EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer
-+EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${X11BASE}/include
++EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
  EXTRALIBS = ../common/common.a
  
  LIBVIEWER3D = ../3d-viewer/3d-viewer.a
diff --git a/cad/kicad/files/patch-gerbview_makefile.include b/cad/kicad/files/patch-gerbview_makefile.include
index 0479d921db13..72f76b601d20 100644
--- a/cad/kicad/files/patch-gerbview_makefile.include
+++ b/cad/kicad/files/patch-gerbview_makefile.include
@@ -4,7 +4,7 @@
  EXTRALIBS = ../common/common.a
  EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing -I./ -I../gerbview -I../include\
 -	-I../share -I../pcbnew -I../3d-viewer
-+	-I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include
++	-I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
  
  #COMMON = pcbnew.h struct.h
  
diff --git a/cad/kicad/files/patch-libs.FreeBSD b/cad/kicad/files/patch-libs.FreeBSD
index ceff2834948a..faea1d41e9a2 100644
--- a/cad/kicad/files/patch-libs.FreeBSD
+++ b/cad/kicad/files/patch-libs.FreeBSD
@@ -116,7 +116,7 @@
 +	-lz\
  	$(LIBREGEX)\
 -        /usr/X11R6/lib/libXinerama.a \
-+        ${X11BASE}/lib/libXinerama.a \
++        ${LOCALBASE}/lib/libXinerama.a \
  		-lgtk-x11-2.0 -lgdk-x11-2.0 \
          -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\
          -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\
@@ -133,8 +133,8 @@
  	$(LIBS3D)\
 -       /usr/X11R6/lib/libXinerama.a \
 -        /usr/X11R6/lib/libXxf86vm.a \
-+	${X11BASE}/lib/libXinerama.a \
-+        ${X11BASE}/lib/libXxf86vm.a \
++	${LOCALBASE}/lib/libXinerama.a \
++        ${LOCALBASE}/lib/libXxf86vm.a \
  		-lgtk-x11-2.0 -lgdk-x11-2.0 \
          -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\
          -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\
@@ -162,11 +162,11 @@
  
  # attention à l'ordre des libairies
 -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\
-+LIBS = -L${LOCALBASE}/lib -L${X11BASE}/lib\
++LIBS = -L${LOCALBASE}/lib\
  	$(EXTRALIBS) $(WXSYSLIB)\
  	$(LIBSTDC) $(PYLIBS)
  
 -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\
-+LIBS_WITH_GL = -L${LOCALBASE}/lib -L${X11BASE}/lib\
++LIBS_WITH_GL = -L${LOCALBASE}/lib\
  	$(EXTRALIBS) $(WXSYSLIB_WITH_GL)\
  	$(LIBSTDC) $(PYLIBS)
diff --git a/cad/kicad/files/patch-pcbnew_makefile.include b/cad/kicad/files/patch-pcbnew_makefile.include
index 69b12eb75c10..d680604d742f 100644
--- a/cad/kicad/files/patch-pcbnew_makefile.include
+++ b/cad/kicad/files/patch-pcbnew_makefile.include
@@ -3,7 +3,7 @@
 @@ -1,5 +1,5 @@
  EXTRALIBS = ../common/common.a
 -EXTRACPPFLAGS += -DPCBNEW  -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer
-+EXTRACPPFLAGS += -DPCBNEW  -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include
++EXTRACPPFLAGS += -DPCBNEW  -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
  
  #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \
  #		class_edge_mod.h class_equipot.h