Various fixes:

- respect CFLAGS;
- correct path to one of the depends: devel/projectionlib --> misc/projectionlib;
- use INSTALL_PROGRAM instead of INSTALL_DATA for shared libs;
- sort PLIST.

3 files changed, 59 insertions, 60 deletions

diff --git a/graphics/vterrain-sdk/Makefile b/graphics/vterrain-sdk/Makefile
index c471b3e84477..7c0d4fe869c6 100644
--- a/graphics/vterrain-sdk/Makefile
+++ b/graphics/vterrain-sdk/Makefile
@@ -10,33 +10,36 @@ PORTVERSION=	010423
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.vterrain.org/pub/vterrain/dist/ \
 		http://www.boost.org/libs/dir_it/
-DISTFILES=	TerrainSDK-${PORTVERSION}.zip \
-	        dir_it.zip
+DISTFILES=	${EXTRACT_ONLY} \
+		dir_it.zip
 EXTRACT_ONLY=	TerrainSDK-${PORTVERSION}.zip
 
 MAINTAINER=	aa8vb@nc.rr.com
 
-LIB_DEPENDS=    netcdf.1:${PORTSDIR}/math/netcdf \
+LIB_DEPENDS=	netcdf.1:${PORTSDIR}/math/netcdf \
 		shp.1:${PORTSDIR}/devel/shapelib \
 		png.4:${PORTSDIR}/graphics/png \
 		osg.1:${PORTSDIR}/graphics/osg \
-		projection.1:${PORTSDIR}/devel/projectionlib
+		projection.1:${PORTSDIR}/misc/projectionlib
 
 WRKSRC=		${WRKDIR}/TerrainSDK
+
 USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS+=	-a
 USE_X_PREFIX=	yes
 USE_MESA=	yes
-USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
+MAKE_ENV=	CXX="${CXX}" \
+		COPT="${CXXFLAGS} -fpic -DPIC"
 
 post-extract:
 	cd ${WRKSRC}/vtdata && \
 		unzip -aj ${DISTDIR}/dir_it.zip boost/directory.h src/directory.cpp
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/vtdata/libvtdata.so ${PREFIX}/lib/libvtdata.so.1
-	${INSTALL_DATA} ${WRKSRC}/vtlib/vtosg/libvtosg.so ${PREFIX}/lib/libvtosg.so.1
+	${INSTALL_PROGRAM} ${WRKSRC}/vtdata/libvtdata.so ${PREFIX}/lib/libvtdata.so.1
+	${INSTALL_PROGRAM} ${WRKSRC}/vtlib/vtosg/libvtosg.so ${PREFIX}/lib/libvtosg.so.1
 	${LN} -sf libvtdata.so.1 ${PREFIX}/lib/libvtdata.so
 	${LN} -sf libvtosg.so.1 ${PREFIX}/lib/libvtosg.so
 	${MKDIR} ${PREFIX}/include/TerrainSDK
diff --git a/graphics/vterrain-sdk/files/patch-aa b/graphics/vterrain-sdk/files/patch-aa
index 69b9708b4546..44438ff9910c 100644
--- a/graphics/vterrain-sdk/files/patch-aa
+++ b/graphics/vterrain-sdk/files/patch-aa
@@ -1,5 +1,8 @@
+
+$FreeBSD$
+
 --- Make.defs.orig	Wed Apr  4 07:27:18 2001
-+++ Make.defs	Fri Apr 27 20:17:26 2001
++++ Make.defs	Fri Jun  1 11:03:19 2001
 @@ -22,21 +22,6 @@
  # SGI IRIX with GCC  (tested with ver. 2.95.3-test2)
  #   (IRIX Folks:  Read TerrainApps/README.sgi!)
@@ -22,7 +25,7 @@
  ## CC        = gcc
  ## CXX       = g++
  ## AR        = ar ruv
-@@ -44,11 +29,26 @@
+@@ -44,11 +29,25 @@
  ## LD        = $(CXX)
  ## LD_SHARED = $(CXX) -shared
  ## 
@@ -41,7 +44,6 @@
 +#CC        = gcc
 +#CXX       = g++
 +AR        = ar ruv
-+COPT      = -O
 +LD        = $(CXX)
 +LD_SHARED = $(CXX) -shared
 +
@@ -53,7 +55,7 @@
  
  #------------------------------------------------------------------------------
  # Linux with GCC (tested with ver. 2.95.3)
-@@ -92,35 +92,35 @@
+@@ -92,35 +91,35 @@
  VTLIB_DIR        = $(TERRAIN_SDK_DIR)/vtlib
  VTOSG_DIR        = $(VTLIB_DIR)/vtosg
  
@@ -61,62 +63,56 @@
 -NETCDF_LIB = $(APIS_DIR)/NetCDF/lib
 -#NETCDF_INC = /usr/local/include
 -#NETCDF_LIB = /usr/local/lib
--
--SHAPE_INC = $(APIS_DIR)/shapelib/include
--SHAPE_LIB = $(APIS_DIR)/shapelib/lib
--#SHAPE_INC = /usr/local/include
--#SHAPE_LIB = /usr/local/lib
--
--PNG_INC = $(APIS_DIR)/libpng-1.0.8/include
--PNG_LIB = $(APIS_DIR)/libpng-1.0.8/lib
--#PNG_INC = /usr/local/include
--#PNG_LIB = /usr/local/lib
--
--OSG_INC = $(VTP_ROOT)/OpenSceneGraph-0.8/include
--OSG_LIB = $(VTP_ROOT)/OpenSceneGraph-0.8/lib
--#OSG_INC = /usr/local/include
--#OSG_LIB = /usr/local/lib
--
--PROJECTION_INC = $(APIS_DIR)/ProjectionLib
--PROJECTION_LIB = $(APIS_DIR)/ProjectionLib
--#PROJECTION_INC = /usr/local/include
--#PROJECTION_LIB = /usr/local/lib
--
--BOOST_SRC = $(APIS_DIR)/boost
--BOOST_INC = $(APIS_DIR)
--
--VTDATA_INST_DIR = $(VTDATA_DIR)
--VTOSG_INST_DIR  = $(VTOSG_DIR)
--#VTDATA_INST_DIR = /usr/local/lib
--#VTOSG_INST_DIR  = /usr/local/lib
 +#NETCDF_INC = $(APIS_DIR)/NetCDF/include
 +#NETCDF_LIB = $(APIS_DIR)/NetCDF/lib
 +NETCDF_INC = $(LOCALBASE)/include
 +NETCDF_LIB = $(LOCALBASE)/lib
-+
+ 
+-SHAPE_INC = $(APIS_DIR)/shapelib/include
+-SHAPE_LIB = $(APIS_DIR)/shapelib/lib
+-#SHAPE_INC = /usr/local/include
+-#SHAPE_LIB = /usr/local/lib
 +#SHAPE_INC = $(APIS_DIR)/shapelib/include
 +#SHAPE_LIB = $(APIS_DIR)/shapelib/lib
 +SHAPE_INC = $(LOCALBASE)/include
 +SHAPE_LIB = $(LOCALBASE)/lib
-+
+ 
+-PNG_INC = $(APIS_DIR)/libpng-1.0.8/include
+-PNG_LIB = $(APIS_DIR)/libpng-1.0.8/lib
+-#PNG_INC = /usr/local/include
+-#PNG_LIB = /usr/local/lib
 +#PNG_INC = $(APIS_DIR)/libpng-1.0.8/include
 +#PNG_LIB = $(APIS_DIR)/libpng-1.0.8/lib
 +PNG_INC = $(LOCALBASE)/include
 +PNG_LIB = $(LOCALBASE)/lib
-+
+ 
+-OSG_INC = $(VTP_ROOT)/OpenSceneGraph-0.8/include
+-OSG_LIB = $(VTP_ROOT)/OpenSceneGraph-0.8/lib
+-#OSG_INC = /usr/local/include
+-#OSG_LIB = /usr/local/lib
 +#OSG_INC = $(VTP_ROOT)/OpenSceneGraph-0.8/include
 +#OSG_LIB = $(VTP_ROOT)/OpenSceneGraph-0.8/lib
 +OSG_INC = $(LOCALBASE)/include
 +OSG_LIB = $(LOCALBASE)/lib
-+
+ 
+-PROJECTION_INC = $(APIS_DIR)/ProjectionLib
+-PROJECTION_LIB = $(APIS_DIR)/ProjectionLib
+-#PROJECTION_INC = /usr/local/include
+-#PROJECTION_LIB = /usr/local/lib
 +#PROJECTION_INC = $(APIS_DIR)/ProjectionLib
 +#PROJECTION_LIB = $(APIS_DIR)/ProjectionLib
 +PROJECTION_INC = $(LOCALBASE)/include
 +PROJECTION_LIB = $(LOCALBASE)/lib
-+
+ 
+-BOOST_SRC = $(APIS_DIR)/boost
+-BOOST_INC = $(APIS_DIR)
 +BOOST_SRC = $(VTDATA_DIR)
 +BOOST_INC = $(VTDATA_DIR)
-+
+ 
+-VTDATA_INST_DIR = $(VTDATA_DIR)
+-VTOSG_INST_DIR  = $(VTOSG_DIR)
+-#VTDATA_INST_DIR = /usr/local/lib
+-#VTOSG_INST_DIR  = /usr/local/lib
 +#VTDATA_INST_DIR = $(VTDATA_DIR)
 +#VTOSG_INST_DIR  = $(VTOSG_DIR)
 +VTDATA_INST_DIR = $(LOCALBASE)/lib
diff --git a/graphics/vterrain-sdk/pkg-plist b/graphics/vterrain-sdk/pkg-plist
index ccdcf70b3039..fe3a4f024731 100644
--- a/graphics/vterrain-sdk/pkg-plist
+++ b/graphics/vterrain-sdk/pkg-plist
@@ -1,4 +1,5 @@
 include/TerrainSDK/vtdata/Array.h
+include/TerrainSDK/vtdata/Array.inl
 include/TerrainSDK/vtdata/Building.h
 include/TerrainSDK/vtdata/BuildingArray.h
 include/TerrainSDK/vtdata/ByteOrder.h
@@ -10,14 +11,12 @@ include/TerrainSDK/vtdata/MathTypes.h
 include/TerrainSDK/vtdata/Plants.h
 include/TerrainSDK/vtdata/Projections.h
 include/TerrainSDK/vtdata/RoadMap.h
-include/TerrainSDK/vtdata/Selectable.h
 include/TerrainSDK/vtdata/SOG.h
+include/TerrainSDK/vtdata/Selectable.h
 include/TerrainSDK/vtdata/Triangulate.h
+include/TerrainSDK/vtdata/directory.h
 include/TerrainSDK/vtdata/utm_cproj.h
 include/TerrainSDK/vtdata/vtDIB.h
-include/TerrainSDK/vtdata/directory.h
-include/TerrainSDK/vtdata/Array.inl
-@dirrm include/TerrainSDK/vtdata
 include/TerrainSDK/vtlib/core/AreaMap.h
 include/TerrainSDK/vtlib/core/AttribMap.h
 include/TerrainSDK/vtlib/core/Base.h
@@ -26,44 +25,45 @@ include/TerrainSDK/vtlib/core/Building3d.h
 include/TerrainSDK/vtlib/core/CustomTerrain.h
 include/TerrainSDK/vtlib/core/DynTerrain.h
 include/TerrainSDK/vtlib/core/Engine.h
-include/TerrainSDK/vtlib/core/Fences.h
 include/TerrainSDK/vtlib/core/FP8.h
-include/TerrainSDK/vtlib/core/Light.h
+include/TerrainSDK/vtlib/core/Fences.h
 include/TerrainSDK/vtlib/core/FrameTimer.h
 include/TerrainSDK/vtlib/core/HeightField.h
 include/TerrainSDK/vtlib/core/IntersectionEngine.h
 include/TerrainSDK/vtlib/core/LKTerrain.h
+include/TerrainSDK/vtlib/core/Light.h
 include/TerrainSDK/vtlib/core/LocalGrid.h
 include/TerrainSDK/vtlib/core/LocalProjection.h
 include/TerrainSDK/vtlib/core/Location.h
 include/TerrainSDK/vtlib/core/LodGrid.h
 include/TerrainSDK/vtlib/core/NavEngines.h
 include/TerrainSDK/vtlib/core/Roads.h
-include/TerrainSDK/vtlib/core/SkyDome.h
-include/TerrainSDK/vtlib/core/Trees.h
 include/TerrainSDK/vtlib/core/SMTerrain.h
+include/TerrainSDK/vtlib/core/SkyDome.h
+include/TerrainSDK/vtlib/core/TParams.h
+include/TerrainSDK/vtlib/core/TVTerrain.h
 include/TerrainSDK/vtlib/core/Terrain.h
 include/TerrainSDK/vtlib/core/TerrainErr.h
 include/TerrainSDK/vtlib/core/TerrainPatch.h
 include/TerrainSDK/vtlib/core/TerrainScene.h
 include/TerrainSDK/vtlib/core/TerrainSurface.h
 include/TerrainSDK/vtlib/core/TimeEngines.h
-include/TerrainSDK/vtlib/core/TParams.h
-include/TerrainSDK/vtlib/core/TVTerrain.h
+include/TerrainSDK/vtlib/core/Trees.h
 include/TerrainSDK/vtlib/core/vtSOG.h
 include/TerrainSDK/vtlib/core/vtString.h
 include/TerrainSDK/vtlib/core/winglue.h
-@dirrm include/TerrainSDK/vtlib/core
+include/TerrainSDK/vtlib/vtlib.h
 include/TerrainSDK/vtlib/vtosg/ImageOSG.h
 include/TerrainSDK/vtlib/vtosg/MathOSG.h
 include/TerrainSDK/vtlib/vtosg/MeshMat.h
 include/TerrainSDK/vtlib/vtosg/NodeOSG.h
 include/TerrainSDK/vtlib/vtosg/SceneOSG.h
-@dirrm include/TerrainSDK/vtlib/vtosg
-include/TerrainSDK/vtlib/vtlib.h
-@dirrm include/TerrainSDK/vtlib
-@dirrm include/TerrainSDK
 lib/libvtdata.so
 lib/libvtdata.so.1
 lib/libvtosg.so
 lib/libvtosg.so.1
+@dirrm include/TerrainSDK/vtlib/vtosg
+@dirrm include/TerrainSDK/vtlib/core
+@dirrm include/TerrainSDK/vtlib
+@dirrm include/TerrainSDK/vtdata
+@dirrm include/TerrainSDK