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

9 files changed, 15 insertions, 15 deletions

diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile
index 2a52744fe28a..7d14ce300ee2 100644
--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chipmunk
 PORTVERSION=	5.64
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
 DISTFILES=	psys-1.59.tar.gz log-5.64.tar.gz netcmp-1.13.tar.gz \
@@ -23,7 +23,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An electronic CAD system
 
 NO_WRKSUBDIR=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/cad/chipmunk/files/patch-ad b/cad/chipmunk/files/patch-ad
index e8172429f0a3..2da2708fe5d7 100644
--- a/cad/chipmunk/files/patch-ad
+++ b/cad/chipmunk/files/patch-ad
@@ -16,7 +16,7 @@
  ## first one for OS X.
  
 -XINCLUDEDIR = .
-+XINCLUDEDIR = ${X11BASE}/include
++XINCLUDEDIR = ${LOCALBASE}/include
  
 -BINDIR = ../../bin
 +BINDIR = ${PREFIX}/bin
@@ -28,7 +28,7 @@
  ##
  
 -LIBX11 = -lX11
-+LIBX11 = -lX11 -L${X11BASE}/lib
++LIBX11 = -lX11 -L${LOCALBASE}/lib
  
  ##
  ## (2) Library additions
diff --git a/cad/chipmunk/files/patch-ae b/cad/chipmunk/files/patch-ae
index 1f3c9cf4b01b..daad30801186 100644
--- a/cad/chipmunk/files/patch-ae
+++ b/cad/chipmunk/files/patch-ae
@@ -5,7 +5,7 @@
  
  LOCINC = ../../../psys/include
 -XINCLUDEDIR = .
-+XINCLUDEDIR = ${X11BASE}/include
++XINCLUDEDIR = ${LOCALBASE}/include
  
  ##
  ##  (1) Choosing your compiler
diff --git a/cad/chipmunk/files/patch-af b/cad/chipmunk/files/patch-af
index 42cb5657c720..ae3b823ddd69 100644
--- a/cad/chipmunk/files/patch-af
+++ b/cad/chipmunk/files/patch-af
@@ -23,7 +23,7 @@
  ## first one for OS X.
  
 -XINCLUDEDIR = .
-+XINCLUDEDIR = ${X11BASE}/include
++XINCLUDEDIR = ${LOCALBASE}/include
  
  ##
  ## If X isn't in the library path (the case for many MachTen and Linux 
@@ -32,7 +32,7 @@
  ##
  
 -LIBX11 = -lX11
-+LIBX11 = -lX11 -L${X11BASE}/lib
++LIBX11 = -lX11 -L${LOCALBASE}/lib
  
  ##
  ## (3) Adding appropriate flags
diff --git a/cad/chipmunk/files/patch-ah b/cad/chipmunk/files/patch-ah
index 927e879ae677..c505043be0f3 100644
--- a/cad/chipmunk/files/patch-ah
+++ b/cad/chipmunk/files/patch-ah
@@ -16,7 +16,7 @@
  ##
  
 -XINCLUDEDIR = . 
-+XINCLUDEDIR = ${X11BASE}/include
++XINCLUDEDIR = ${LOCALBASE}/include
  
  ##
  ##  (1) Choosing your compiler
diff --git a/cad/chipmunk/files/patch-aj b/cad/chipmunk/files/patch-aj
index 0bf129592ad2..9560ddc1338a 100644
--- a/cad/chipmunk/files/patch-aj
+++ b/cad/chipmunk/files/patch-aj
@@ -5,7 +5,7 @@
  
  
 -XINCLUDEDIR = .
-+XINCLUDEDIR = ${X11BASE}/include
++XINCLUDEDIR = ${LOCALBASE}/include
  
  ##
  ## If X isn't in the library path (the case for many MachTen and Linux 
@@ -14,7 +14,7 @@
  
  
 -LIBX11 = -lX11
-+LIBX11 = -lX11 -L${X11BASE}/lib
++LIBX11 = -lX11 -L${LOCALBASE}/lib
  
  
  LIBP2C = ../../psys/src/libp2c.a
diff --git a/cad/chipmunk/files/patch-au b/cad/chipmunk/files/patch-au
index e9419618c2ff..5a382b46885a 100644
--- a/cad/chipmunk/files/patch-au
+++ b/cad/chipmunk/files/patch-au
@@ -5,7 +5,7 @@
  ##
  
 -XINCLUDEDIR = .
-+XINCLUDEDIR = ${X11BASE}/include
++XINCLUDEDIR = ${LOCALBASE}/include
  
  ##
  ## If X isn't in the library path (the case for many MachTen and Linux 
@@ -14,7 +14,7 @@
  ##
  
 -LIBX11 = -lX11
-+LIBX11 = -lX11 -L${X11BASE}/lib
++LIBX11 = -lX11 -L${LOCALBASE}/lib
  
  LIBP2C = ../psys/src/libp2c.a
  
diff --git a/cad/chipmunk/files/patch-ay b/cad/chipmunk/files/patch-ay
index 23aed95d9a78..895747049150 100644
--- a/cad/chipmunk/files/patch-ay
+++ b/cad/chipmunk/files/patch-ay
@@ -5,7 +5,7 @@
  ##
  
 -XINCLUDEDIR = .
-+XINCLUDEDIR = ${X11BASE}/include
++XINCLUDEDIR = ${LOCALBASE}/include
  
  ##
  ## If X isn't in the library path (the case for many MachTen and Linux 
@@ -14,7 +14,7 @@
  ##
  
 -LIBX11 = -lX11
-+LIBX11 = -lX11 -L${X11BASE}/lib
++LIBX11 = -lX11 -L${LOCALBASE}/lib
  
  
  
diff --git a/cad/chipmunk/files/patch-az b/cad/chipmunk/files/patch-az
index 2bd2b0fbdb7a..9e62e2354a44 100644
--- a/cad/chipmunk/files/patch-az
+++ b/cad/chipmunk/files/patch-az
@@ -14,7 +14,7 @@
  ##
  
 -XINCLUDEDIR = .
-+XINCLUDEDIR = ${X11BASE}/include
++XINCLUDEDIR = ${LOCALBASE}/include
  
  
  ##