3 files changed, 13 insertions, 18 deletions

diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 7f3006945089..76f28b8a355b 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	grass
-PORTVERSION=	6.2.1
-PORTREVISION=	1
+PORTVERSION=	6.2.3
 PORTEPOCH=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.itc.it/grass62/source/ \
@@ -54,8 +53,7 @@ ALL_TARGET=
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
-		--with-tcltk-includes="${LOCALBASE}/include/tcl8.4 \
-					 ${LOCALBASE}/include/tk8.4" \
+		--with-tcltk-includes="${TCL_INCLUDEDIR} ${TK_INCLUDEDIR}" \
 		--with-opengl-includes=${X11BASE}/include \
 		--with-opengl-libs=${X11BASE}/lib \
 		--with-freetype \
@@ -67,8 +65,6 @@ CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 
 PLIST_SUB=	GRASS_INST_DIR=${GRASS_INST_DIR} \
 		VERSION=${PORTVERSION}
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/%%GRASS_INST_DIR%%/lib
 USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 
 OPTIONS=	MYSQL "Enable MySQL support" Off \
@@ -97,12 +93,8 @@ USE_PGSQL=	yes
 PLIST_SUB+=	PGSQL=""
 .endif
 
-.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
-
 post-extract:
-	@${REINPLACE_CMD} -E '28s|/grass-.*|/${GRASS_INST_DIR}|g' \
+	@${REINPLACE_CMD} -E '/^INST_DIR=/s|/grass-.*|/${GRASS_INST_DIR}|g' \
 	${WRKSRC}/Makefile
 
-post-install: install-ldconfig-file
-
 .include <bsd.port.post.mk>
diff --git a/databases/grass/distinfo b/databases/grass/distinfo
index f7c6c3ee2a75..2973bfe6dfa2 100644
--- a/databases/grass/distinfo
+++ b/databases/grass/distinfo
@@ -1,3 +1,3 @@
-MD5 (grass-6.2.1.tar.gz) = cbe14d34503a75e8102d2f56c7b527a7
-SHA256 (grass-6.2.1.tar.gz) = fb7a1030a51222b586f1fd4cbd6ee2c99a0974dba72c70032d336a6a30b073f9
-SIZE (grass-6.2.1.tar.gz) = 12599109
+MD5 (grass-6.2.3.tar.gz) = 75c8832f90e445ff361d767c8a2c3ece
+SHA256 (grass-6.2.3.tar.gz) = a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61
+SIZE (grass-6.2.3.tar.gz) = 12978605
diff --git a/databases/grass/pkg-plist b/databases/grass/pkg-plist
index 41d0c00f17af..0beae71e12da 100644
--- a/databases/grass/pkg-plist
+++ b/databases/grass/pkg-plist
@@ -961,8 +961,8 @@ bin/grass62
 %%GRASS_INST_DIR%%/driver/PNG
 %%GRASS_INST_DIR%%/driver/XDRIVER
 %%GRASS_INST_DIR%%/driver/db/dbf
-%%GRASS_INST_DIR%%/driver/db/ogr
 %%MYSQL%%%%GRASS_INST_DIR%%/driver/db/mysql
+%%GRASS_INST_DIR%%/driver/db/ogr
 %%PGSQL%%%%GRASS_INST_DIR%%/driver/db/pg
 %%GRASS_INST_DIR%%/etc/BUILD
 %%GRASS_INST_DIR%%/etc/FIPS.code
@@ -1091,7 +1091,6 @@ bin/grass62
 %%GRASS_INST_DIR%%/etc/gem/skeleton/info
 %%GRASS_INST_DIR%%/etc/gem/skeleton/libs
 %%GRASS_INST_DIR%%/etc/gem/skeleton/license
-%%GRASS_INST_DIR%%/etc/gem/skeleton/macosx/bin/make
 %%GRASS_INST_DIR%%/etc/gem/skeleton/name
 %%GRASS_INST_DIR%%/etc/gem/skeleton/post
 %%GRASS_INST_DIR%%/etc/gem/skeleton/uninstall
@@ -1141,6 +1140,7 @@ bin/grass62
 %%GRASS_INST_DIR%%/etc/gm/script/r.recode.rules
 %%GRASS_INST_DIR%%/etc/gm/script/r.support.sh
 %%GRASS_INST_DIR%%/etc/gm/script/v.in.asciipoints
+%%GRASS_INST_DIR%%/etc/gm/script/v.type.sh
 %%GRASS_INST_DIR%%/etc/gm/thematic.tcl
 %%GRASS_INST_DIR%%/etc/gm/tksys.tcl
 %%GRASS_INST_DIR%%/etc/gm/vector.tcl
@@ -1263,11 +1263,14 @@ bin/grass62
 %%GRASS_INST_DIR%%/etc/mon.stop
 %%GRASS_INST_DIR%%/etc/mon.which
 %%GRASS_INST_DIR%%/etc/monitorcap
+%%GRASS_INST_DIR%%/etc/msgs/am.msg
 %%GRASS_INST_DIR%%/etc/msgs/cs.msg
 %%GRASS_INST_DIR%%/etc/msgs/de.msg
+%%GRASS_INST_DIR%%/etc/msgs/es.msg
 %%GRASS_INST_DIR%%/etc/msgs/fr.msg
 %%GRASS_INST_DIR%%/etc/msgs/it.msg
 %%GRASS_INST_DIR%%/etc/msgs/ja.msg
+%%GRASS_INST_DIR%%/etc/msgs/lv.msg
 %%GRASS_INST_DIR%%/etc/msgs/pl.msg
 %%GRASS_INST_DIR%%/etc/msgs/pt_br.msg
 %%GRASS_INST_DIR%%/etc/msgs/ru.msg
@@ -2187,6 +2190,8 @@ bin/grass62
 @dirrm %%GRASS_INST_DIR%%/locale/cs
 @dirrm %%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES
 @dirrm %%GRASS_INST_DIR%%/locale/ar
+@dirrm %%GRASS_INST_DIR%%/locale/am/LC_MESSAGES
+@dirrm %%GRASS_INST_DIR%%/locale/am
 @dirrm %%GRASS_INST_DIR%%/locale
 @dirrm %%GRASS_INST_DIR%%/lib
 @dirrm %%GRASS_INST_DIR%%/include/grass/vect
@@ -2220,8 +2225,6 @@ bin/grass62
 @dirrm %%GRASS_INST_DIR%%/etc/gtcltk
 @dirrm %%GRASS_INST_DIR%%/etc/gm/script
 @dirrm %%GRASS_INST_DIR%%/etc/gm
-@dirrm %%GRASS_INST_DIR%%/etc/gem/skeleton/macosx/bin
-@dirrm %%GRASS_INST_DIR%%/etc/gem/skeleton/macosx
 @dirrm %%GRASS_INST_DIR%%/etc/gem/skeleton
 @dirrm %%GRASS_INST_DIR%%/etc/gem
 @dirrm %%GRASS_INST_DIR%%/etc/form