6 files changed, 184 insertions, 206 deletions

diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index e505a9160e32..9852dcc33cf1 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	grass
-PORTVERSION=	6.0.1
-PORTREVISION=   2
+PORTVERSION=	6.0.2
 PORTEPOCH=	2
 CATEGORIES=	databases
-MASTER_SITES=	ftp://grass.itc.it/pub/grass/grass60/source/\
-		http://grass.itc.it/grass60/source/ \
+MASTER_SITES=	http://grass.itc.it/grass60/source/ \
+		ftp://grass.itc.it/pub/grass/grass60/source/ \
+		http://grass.ibiblio.org/grass60/source/\
+		ftp://www.ibiblio.org/pub/packages/gis/grass/grass60/source/\
+		http://www.geog.uni-hannover.de/grass/grass60/source/\
 		http://grass.meteo.uni.wroc.pl/grass60/source/ \
 		http://grass.ru.ac.za/grass60/source/\
-		ftp://ftp.planetmirror.com/pub/grass/grass60/source/\
 		http://wgrass.media.osaka-cu.ac.jp/grassh/grass60/source/\
 		http://public.planetmirror.com/pub/grass/grass60/source/\
-		ftp://www.ibiblio.org/pub/packages/gis/grass/grass60/source/\
-		http://www.geog.uni-hannover.de/grass/grass60/source/\
-		http://grass.ibiblio.org/grass60/source/\
+		ftp://ftp.planetmirror.com/pub/grass/grass60/source/\
 		http://gulus.usherbrooke.ca/pub/appl/grass/grass60/source/\
 		http://ludique.u-bourgogne.fr/grass/grass60/source/
 
@@ -43,9 +42,7 @@ USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_XLIB=	yes
 USE_FREETYPE=	yes
-USE_PGSQL=	yes
 USE_FFTW=	yes
-USE_REINPLACE=	yes
 USE_TCL_BUILD=	yes
 USE_TCL=	yes
 USE_TK=		yes
@@ -64,14 +61,16 @@ CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-freetype-includes=${LOCALBASE}/include/freetype2 \
 		--with-nls \
 		--with-cxx \
+		--with-readline \
 		--enable-largefile
 
-GRASS_INST_DIR=	${PORTNAME}
 PLIST_SUB=	GRASS_INST_DIR=${GRASS_INST_DIR}
-SUB_FILES=	grass.sh
-SUB_LIST=	GRASS_INST_DIR=${GRASS_INST_DIR}
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/%%GRASS_INST_DIR%%/lib
+USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
+
+OPTIONS=	MYSQL "Enable MySQL support" Off \
+		PGSQL "Enable PostgreSQL support" On
 
 .include <bsd.port.pre.mk>
 
@@ -81,12 +80,33 @@ PLIST_SUB+=	FBSD4=""
 PLIST_SUB+=	FBSD4="@comment "
 .endif
 
+.if !defined (GRASS_INST_DIR)
+GRASS_INST_DIR=	${PORTNAME}
+.endif
+
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=--with-mysql \
+		--with-mysql-includes=${LOCALBASE}/include/mysql \
+		--with-mysql-libs=${LOCALBASE}/lib/mysql
+PLIST_SUB+=	MYSQL=""
+.else
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+.if defined(WITHOUT_PGSQL)
+CONFIGURE_ARGS+=--without-postgres
+PLIST_SUB+=	PGSQL="@comment "
+.else
+USE_PGSQL=	yes
+PLIST_SUB+=	PGSQL=""
+.endif
+
+.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
+
 post-extract:
-	@${REINPLACE_CMD} -e 's/ make mo/ ${GMAKE} mo/g' \
-	${WRKSRC}/locale/Makefile
-	@${REINPLACE_CMD} -E '28s|/grass-.*|/${GRASS_INST_DIR}|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E '28s|/grass-.*|/${GRASS_INST_DIR}|g' \
+	${WRKSRC}/Makefile
 
-post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/grass.sh ${PREFIX}/etc/rc.d/000.grass.sh
+post-install: install-ldconfig-file
 
 .include <bsd.port.post.mk>
diff --git a/databases/grass/distinfo b/databases/grass/distinfo
index 98b9e47a588c..e815dc36a340 100644
--- a/databases/grass/distinfo
+++ b/databases/grass/distinfo
@@ -1,3 +1,3 @@
-MD5 (grass-6.0.1.tar.gz) = 5225e816895d5e6b28bca623f76acaad
-SHA256 (grass-6.0.1.tar.gz) = 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340
-SIZE (grass-6.0.1.tar.gz) = 8508427
+MD5 (grass-6.0.2.tar.gz) = e31887f84ff1f0c830c2b2e8760bbde7
+SHA256 (grass-6.0.2.tar.gz) = dabe7315be1147b40f148a93add29dd405725aca39f366f31826b17230f8437b
+SIZE (grass-6.0.2.tar.gz) = 8640862
diff --git a/databases/grass/files/grass.sh.in b/databases/grass/files/grass.sh.in
deleted file mode 100644
index 530b7f5128aa..000000000000
--- a/databases/grass/files/grass.sh.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		/sbin/ldconfig -m %%PREFIX%%/%%GRASS_INST_DIR%%/lib
-		;;
-	stop)
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/databases/grass/files/patch-visualization_nviz_src_nvizAppInit.c b/databases/grass/files/patch-visualization_nviz_src_nvizAppInit.c
deleted file mode 100644
index 47ad9366fce3..000000000000
--- a/databases/grass/files/patch-visualization_nviz_src_nvizAppInit.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- visualization/nviz/src/nvizAppInit.c.orig	Tue Dec 27 10:55:14 2005
-+++ visualization/nviz/src/nvizAppInit.c	Tue Dec 27 10:55:25 2005
-@@ -22,8 +22,10 @@
-  * Sun shared libraries to be used for Tcl.
- */
- 
-+/*
- extern int matherr();
- int *tclDummyMathPtr = (int *) matherr;
-+*/
- 
- /*
-  *----------------------------------------------------------------------
diff --git a/databases/grass/files/patch-visualization_nviz_src_nvizMain.c b/databases/grass/files/patch-visualization_nviz_src_nvizMain.c
deleted file mode 100644
index 3ca5a3ce5d72..000000000000
--- a/databases/grass/files/patch-visualization_nviz_src_nvizMain.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- visualization/nviz/src/nvizMain.c.orig	Tue Dec 27 10:55:33 2005
-+++ visualization/nviz/src/nvizMain.c	Tue Dec 27 10:55:42 2005
-@@ -11,8 +11,10 @@
-  * Sun shared libraries to be used for Tcl.
-  */
- 
-+/*
- extern int matherr();
--/*int *tclDummyMathPtr = (int *) matherr;*/
-+int *tclDummyMathPtr = (int *) matherr;
-+*/
- 
- 
- extern int NVIZ_AppInit(Tcl_Interp *);
diff --git a/databases/grass/pkg-plist b/databases/grass/pkg-plist
index 108dee65cd0d..13fa94eb1c53 100644
--- a/databases/grass/pkg-plist
+++ b/databases/grass/pkg-plist
@@ -1,5 +1,4 @@
 bin/grass60
-etc/rc.d/000.grass.sh
 %%GRASS_INST_DIR%%/bin/bmif_to_cell
 %%GRASS_INST_DIR%%/bin/d.ask
 %%GRASS_INST_DIR%%/bin/d.barscale
@@ -755,7 +754,8 @@ etc/rc.d/000.grass.sh
 %%GRASS_INST_DIR%%/driver/XDRIVER
 %%GRASS_INST_DIR%%/driver/db/dbf
 %%GRASS_INST_DIR%%/driver/db/ogr
-%%GRASS_INST_DIR%%/driver/db/pg
+%%MYSQL%%%%GRASS_INST_DIR%%/driver/db/mysql
+%%PGSQL%%%%GRASS_INST_DIR%%/driver/db/pg
 %%GRASS_INST_DIR%%/etc/FIPS.code
 %%GRASS_INST_DIR%%/etc/Init.sh
 %%GRASS_INST_DIR%%/etc/VERSION
@@ -1058,106 +1058,106 @@ etc/rc.d/000.grass.sh
 %%GRASS_INST_DIR%%/include/gproj_api.h
 %%GRASS_INST_DIR%%/include/gprojects.h
 %%GRASS_INST_DIR%%/include/graph.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/CC.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/D.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/G3d.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/P_datetime.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/P_site.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/Paintlib.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/V_.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/Vect.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/bdlg_bm.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/bitmap.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/blas.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/btree.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/cdhc.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/codes.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/colors.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/config.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dataquad.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/datetime.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dbmi.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/devlib.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/avl.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/graph.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/graph_v1.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/graph_v2.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/heap.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/helpers.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/tavl.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/tree.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl/type.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dig_atts.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/display.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dlg.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dlg_bm.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/edit.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/form.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/geo.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/geom.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/gis.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/gisdefs.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/glocale.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/gmath.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/gproj_api.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/gprojects.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/graph.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/gstypes.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/gsurf.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/help.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/ibtree.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/icon.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/icon_bm.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/imagedefs.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/imagery.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/interpf.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/keyframe.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/kftypes.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/la.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/label_bm.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/lapack.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/libtrans.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/linkm.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/lock.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/monitors.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/ogsf_proto.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/ortholib.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/patterns.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/pbmplus.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/portable.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/proto_dbmi.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/qtree.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/raster.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/readsites.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/region_bm.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/rowio.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/rtree.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/rtree/card.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/rtree/index.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/rtree/split_l.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/rtree/split_q.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/search.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/segment.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/shapefil.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/shhopt.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/site.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/sitelib.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/spawn.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/sqlp.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/std_incs.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/symbol.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/transform.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vask.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vbuildlib.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vect/dig_defines.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vect/dig_externs.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vect/dig_globs.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vect/dig_macros.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vect/dig_structs.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vect/digit.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/version.h
-%%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/winname.h
+%%GRASS_INST_DIR%%/include/grass/CC.h
+%%GRASS_INST_DIR%%/include/grass/D.h
+%%GRASS_INST_DIR%%/include/grass/G3d.h
+%%GRASS_INST_DIR%%/include/grass/P_datetime.h
+%%GRASS_INST_DIR%%/include/grass/P_site.h
+%%GRASS_INST_DIR%%/include/grass/Paintlib.h
+%%GRASS_INST_DIR%%/include/grass/V_.h
+%%GRASS_INST_DIR%%/include/grass/Vect.h
+%%GRASS_INST_DIR%%/include/grass/bdlg_bm.h
+%%GRASS_INST_DIR%%/include/grass/bitmap.h
+%%GRASS_INST_DIR%%/include/grass/blas.h
+%%GRASS_INST_DIR%%/include/grass/btree.h
+%%GRASS_INST_DIR%%/include/grass/cdhc.h
+%%GRASS_INST_DIR%%/include/grass/codes.h
+%%GRASS_INST_DIR%%/include/grass/colors.h
+%%GRASS_INST_DIR%%/include/grass/config.h
+%%GRASS_INST_DIR%%/include/grass/dataquad.h
+%%GRASS_INST_DIR%%/include/grass/datetime.h
+%%GRASS_INST_DIR%%/include/grass/dbmi.h
+%%GRASS_INST_DIR%%/include/grass/devlib.h
+%%GRASS_INST_DIR%%/include/grass/dgl.h
+%%GRASS_INST_DIR%%/include/grass/dgl/avl.h
+%%GRASS_INST_DIR%%/include/grass/dgl/graph.h
+%%GRASS_INST_DIR%%/include/grass/dgl/graph_v1.h
+%%GRASS_INST_DIR%%/include/grass/dgl/graph_v2.h
+%%GRASS_INST_DIR%%/include/grass/dgl/heap.h
+%%GRASS_INST_DIR%%/include/grass/dgl/helpers.h
+%%GRASS_INST_DIR%%/include/grass/dgl/tavl.h
+%%GRASS_INST_DIR%%/include/grass/dgl/tree.h
+%%GRASS_INST_DIR%%/include/grass/dgl/type.h
+%%GRASS_INST_DIR%%/include/grass/dig_atts.h
+%%GRASS_INST_DIR%%/include/grass/display.h
+%%GRASS_INST_DIR%%/include/grass/dlg.h
+%%GRASS_INST_DIR%%/include/grass/dlg_bm.h
+%%GRASS_INST_DIR%%/include/grass/edit.h
+%%GRASS_INST_DIR%%/include/grass/form.h
+%%GRASS_INST_DIR%%/include/grass/geo.h
+%%GRASS_INST_DIR%%/include/grass/geom.h
+%%GRASS_INST_DIR%%/include/grass/gis.h
+%%GRASS_INST_DIR%%/include/grass/gisdefs.h
+%%GRASS_INST_DIR%%/include/grass/glocale.h
+%%GRASS_INST_DIR%%/include/grass/gmath.h
+%%GRASS_INST_DIR%%/include/grass/gproj_api.h
+%%GRASS_INST_DIR%%/include/grass/gprojects.h
+%%GRASS_INST_DIR%%/include/grass/graph.h
+%%GRASS_INST_DIR%%/include/grass/gstypes.h
+%%GRASS_INST_DIR%%/include/grass/gsurf.h
+%%GRASS_INST_DIR%%/include/grass/help.h
+%%GRASS_INST_DIR%%/include/grass/ibtree.h
+%%GRASS_INST_DIR%%/include/grass/icon.h
+%%GRASS_INST_DIR%%/include/grass/icon_bm.h
+%%GRASS_INST_DIR%%/include/grass/imagedefs.h
+%%GRASS_INST_DIR%%/include/grass/imagery.h
+%%GRASS_INST_DIR%%/include/grass/interpf.h
+%%GRASS_INST_DIR%%/include/grass/keyframe.h
+%%GRASS_INST_DIR%%/include/grass/kftypes.h
+%%GRASS_INST_DIR%%/include/grass/la.h
+%%GRASS_INST_DIR%%/include/grass/label_bm.h
+%%GRASS_INST_DIR%%/include/grass/lapack.h
+%%GRASS_INST_DIR%%/include/grass/libtrans.h
+%%GRASS_INST_DIR%%/include/grass/linkm.h
+%%GRASS_INST_DIR%%/include/grass/lock.h
+%%GRASS_INST_DIR%%/include/grass/monitors.h
+%%GRASS_INST_DIR%%/include/grass/ogsf_proto.h
+%%GRASS_INST_DIR%%/include/grass/ortholib.h
+%%GRASS_INST_DIR%%/include/grass/patterns.h
+%%GRASS_INST_DIR%%/include/grass/pbmplus.h
+%%GRASS_INST_DIR%%/include/grass/portable.h
+%%GRASS_INST_DIR%%/include/grass/proto_dbmi.h
+%%GRASS_INST_DIR%%/include/grass/qtree.h
+%%GRASS_INST_DIR%%/include/grass/raster.h
+%%GRASS_INST_DIR%%/include/grass/readsites.h
+%%GRASS_INST_DIR%%/include/grass/region_bm.h
+%%GRASS_INST_DIR%%/include/grass/rowio.h
+%%GRASS_INST_DIR%%/include/grass/rtree.h
+%%GRASS_INST_DIR%%/include/grass/rtree/card.h
+%%GRASS_INST_DIR%%/include/grass/rtree/index.h
+%%GRASS_INST_DIR%%/include/grass/rtree/split_l.h
+%%GRASS_INST_DIR%%/include/grass/rtree/split_q.h
+%%GRASS_INST_DIR%%/include/grass/search.h
+%%GRASS_INST_DIR%%/include/grass/segment.h
+%%GRASS_INST_DIR%%/include/grass/shapefil.h
+%%GRASS_INST_DIR%%/include/grass/shhopt.h
+%%GRASS_INST_DIR%%/include/grass/site.h
+%%GRASS_INST_DIR%%/include/grass/sitelib.h
+%%GRASS_INST_DIR%%/include/grass/spawn.h
+%%GRASS_INST_DIR%%/include/grass/sqlp.h
+%%GRASS_INST_DIR%%/include/grass/std_incs.h
+%%GRASS_INST_DIR%%/include/grass/symbol.h
+%%GRASS_INST_DIR%%/include/grass/transform.h
+%%GRASS_INST_DIR%%/include/grass/vask.h
+%%GRASS_INST_DIR%%/include/grass/vbuildlib.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_defines.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_externs.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_globs.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_macros.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_structs.h
+%%GRASS_INST_DIR%%/include/grass/vect/digit.h
+%%GRASS_INST_DIR%%/include/grass/version.h
+%%GRASS_INST_DIR%%/include/grass/winname.h
 %%GRASS_INST_DIR%%/include/gstypes.h
 %%GRASS_INST_DIR%%/include/gsurf.h
 %%GRASS_INST_DIR%%/include/help.h
@@ -1212,84 +1212,84 @@ etc/rc.d/000.grass.sh
 %%GRASS_INST_DIR%%/include/vect/digit.h
 %%GRASS_INST_DIR%%/include/version.h
 %%GRASS_INST_DIR%%/include/winname.h
-%%GRASS_INST_DIR%%/lib/libgrass_D.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_D.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_D.so
-%%GRASS_INST_DIR%%/lib/libgrass_I.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_I.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_I.so
-%%GRASS_INST_DIR%%/lib/libgrass_Iortho.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_Iortho.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_Iortho.so
-%%GRASS_INST_DIR%%/lib/libgrass_bitmap.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_bitmap.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_bitmap.so
-%%GRASS_INST_DIR%%/lib/libgrass_btree.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_btree.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_btree.so
-%%GRASS_INST_DIR%%/lib/libgrass_cdhc.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_cdhc.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_cdhc.so
-%%GRASS_INST_DIR%%/lib/libgrass_datetime.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_datetime.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_datetime.so
-%%GRASS_INST_DIR%%/lib/libgrass_dbmibase.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmibase.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_dbmibase.so
-%%GRASS_INST_DIR%%/lib/libgrass_dbmiclient.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmiclient.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_dbmiclient.so
-%%GRASS_INST_DIR%%/lib/libgrass_dbmidriver.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmidriver.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_dbmidriver.so
-%%GRASS_INST_DIR%%/lib/libgrass_dbstubs.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbstubs.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_dbstubs.so
-%%GRASS_INST_DIR%%/lib/libgrass_dgl.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_dgl.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_dgl.so
-%%GRASS_INST_DIR%%/lib/libgrass_dig2.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_dig2.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_dig2.so
-%%GRASS_INST_DIR%%/lib/libgrass_display.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_display.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_display.so
 %%GRASS_INST_DIR%%/lib/libgrass_driver.a
-%%GRASS_INST_DIR%%/lib/libgrass_dspf.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_dspf.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_dspf.so
-%%GRASS_INST_DIR%%/lib/libgrass_edit.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_edit.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_edit.so
-%%GRASS_INST_DIR%%/lib/libgrass_form.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_form.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_form.so
-%%GRASS_INST_DIR%%/lib/libgrass_g3d.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_g3d.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_g3d.so
-%%GRASS_INST_DIR%%/lib/libgrass_gis.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_gis.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_gis.so
-%%GRASS_INST_DIR%%/lib/libgrass_gmath.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_gmath.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_gmath.so
-%%GRASS_INST_DIR%%/lib/libgrass_gproj.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_gproj.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_gproj.so
-%%GRASS_INST_DIR%%/lib/libgrass_image.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_image.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_image.so
-%%GRASS_INST_DIR%%/lib/libgrass_interpdata.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_interpdata.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_interpdata.so
-%%GRASS_INST_DIR%%/lib/libgrass_interpfl.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_interpfl.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_interpfl.so
 %%GRASS_INST_DIR%%/lib/libgrass_ismap.a
-%%GRASS_INST_DIR%%/lib/libgrass_linkm.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_linkm.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_linkm.so
 %%GRASS_INST_DIR%%/lib/libgrass_manage.a
-%%GRASS_INST_DIR%%/lib/libgrass_ogsf.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_ogsf.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_ogsf.so
-%%GRASS_INST_DIR%%/lib/libgrass_qtree.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_qtree.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_qtree.so
-%%GRASS_INST_DIR%%/lib/libgrass_raster.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_raster.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_raster.so
-%%GRASS_INST_DIR%%/lib/libgrass_rowio.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_rowio.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_rowio.so
-%%GRASS_INST_DIR%%/lib/libgrass_rtree.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_rtree.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_rtree.so
-%%GRASS_INST_DIR%%/lib/libgrass_segment.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_segment.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_segment.so
-%%GRASS_INST_DIR%%/lib/libgrass_shape.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_shape.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_shape.so
-%%GRASS_INST_DIR%%/lib/libgrass_sites.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_sites.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_sites.so
-%%GRASS_INST_DIR%%/lib/libgrass_sqlp.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_sqlp.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_sqlp.so
-%%GRASS_INST_DIR%%/lib/libgrass_symb.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_symb.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_symb.so
-%%GRASS_INST_DIR%%/lib/libgrass_trans.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_trans.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_trans.so
-%%GRASS_INST_DIR%%/lib/libgrass_vask.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_vask.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_vask.so
-%%GRASS_INST_DIR%%/lib/libgrass_vect.6.0.1.so
+%%GRASS_INST_DIR%%/lib/libgrass_vect.6.0.2.so
 %%GRASS_INST_DIR%%/lib/libgrass_vect.so
 %%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grasslibs.mo
 %%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grassmods.mo
@@ -1661,9 +1661,9 @@ etc/rc.d/000.grass.sh
 @dirrm %%GRASS_INST_DIR%%/lib
 @dirrm %%GRASS_INST_DIR%%/include/vect
 @dirrm %%GRASS_INST_DIR%%/include/rtree
-@dirrm %%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/vect
-@dirrm %%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/rtree
-@dirrm %%GRASS_INST_DIR%%/include/%%GRASS_INST_DIR%%/dgl
+@dirrm %%GRASS_INST_DIR%%/include/grass/vect
+@dirrm %%GRASS_INST_DIR%%/include/grass/rtree
+@dirrm %%GRASS_INST_DIR%%/include/grass/dgl
 @dirrm %%GRASS_INST_DIR%%/include/grass
 @dirrm %%GRASS_INST_DIR%%/include/dgl
 @dirrm %%GRASS_INST_DIR%%/include