Update to 5.0.2, and add a little bit of deinstall logic.

PR:		ports/57931
Submitted by:	TAKATSU Tomonari <tota@rtfm.jp>

8 files changed, 57 insertions, 25 deletions

diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 40a8721fc898..661edb1d031e 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	grass
-PORTVERSION=	5.0.0
-PORTREVISION=	2
+PORTVERSION=	5.0.2
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://grass.itc.it/grass5/source/ \
@@ -36,7 +35,7 @@ RUN_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83 \
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude *CVS*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
 USE_XLIB=	yes
 USE_MESA=	yes
diff --git a/databases/grass/distinfo b/databases/grass/distinfo
index 662622946b77..62522d5edf0c 100644
--- a/databases/grass/distinfo
+++ b/databases/grass/distinfo
@@ -1 +1 @@
-MD5 (grass-5.0.0_src.tar.gz) = de8d4bb462f989cc85f5c80704d2986b
+MD5 (grass-5.0.2_src.tar.gz) = 20b2dc4eff13b2d0abca1b44d2b22310
diff --git a/databases/grass/files/patch-Makefile.in b/databases/grass/files/patch-Makefile.in
index 93630def4d43..2335abcaa0ae 100644
--- a/databases/grass/files/patch-Makefile.in
+++ b/databases/grass/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon May 13 09:41:58 2002
-+++ Makefile.in	Sat May 18 21:23:45 2002
+--- Makefile.in.orig	Fri Oct 11 06:06:36 2002
++++ Makefile.in	Thu Oct  9 22:59:48 2003
 @@ -172,8 +172,6 @@
  	test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
  	${SHELL} -c "sed -e \"s#^GISBASE.*#GISBASE=${INST_DIR}#\" ${GRASS_BIN}/grass${NAME_VER} > ${BINDIR}/grass${NAME_VER} ; true"
diff --git a/databases/grass/files/patch-configure.in b/databases/grass/files/patch-configure.in
index 505cfdb7b74b..aa1e4b63cc1e 100644
--- a/databases/grass/files/patch-configure.in
+++ b/databases/grass/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Tue Feb 12 01:01:28 2002
-+++ configure.in	Tue Feb 12 01:27:53 2002
-@@ -247,7 +247,7 @@
+--- configure.in.orig	Sun Mar 16 21:25:19 2003
++++ configure.in	Thu Oct  9 23:00:51 2003
+@@ -295,7 +295,7 @@
  	AC_MSG_ERROR([*** You must supply a directory list to --with-libs.])
  	;;
  esac
@@ -9,7 +9,7 @@
  
  if test -n "$with_libs"; then
      for dir in $with_libs; do
-@@ -439,7 +439,7 @@
+@@ -502,7 +502,7 @@
  
  LOC_CHECK_INC_PATH(dbm,DBM,DBMINCPATH)
  
@@ -18,12 +18,12 @@
  
  # With DBM library directory
  
-@@ -745,7 +745,7 @@
+@@ -842,7 +842,7 @@
  
  LOC_CHECK_LIB_PATH(opengl,OpenGL,OPENGL_LIB_PATH)
  
 -LOC_CHECK_LIBS(GL,glBegin,OpenGL,$OPENGL_LIB_PATH,OPENGLLIB,$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,,-lpthread)
 +LOC_CHECK_LIBS(GL,glBegin,OpenGL,$OPENGL_LIB_PATH,OPENGLLIB,$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,,-pthread -lXext)
  
- LOC_CHECK_LIBS(GLU,gluBeginCurve,GLU,$OPENGL_LIB_PATH,OPENGLULIB,$OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,)
+ LOC_CHECK_LIBS(GLU,gluBeginCurve,GLU,$OPENGL_LIB_PATH,OPENGLULIB,$OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,,-lstdc++)
  
diff --git a/databases/grass/files/patch-src.contrib::GMSL::NVIZ2.2::html::Gmakefile b/databases/grass/files/patch-src.contrib::GMSL::NVIZ2.2::html::Gmakefile
index f0ecd4a884b9..be6fc931b39f 100644
--- a/databases/grass/files/patch-src.contrib::GMSL::NVIZ2.2::html::Gmakefile
+++ b/databases/grass/files/patch-src.contrib::GMSL::NVIZ2.2::html::Gmakefile
@@ -1,5 +1,5 @@
---- src.contrib/GMSL/NVIZ2.2/html/Gmakefile.orig	Tue Feb 12 11:41:59 2002
-+++ src.contrib/GMSL/NVIZ2.2/html/Gmakefile	Tue Feb 12 11:42:25 2002
+--- src.contrib/GMSL/NVIZ2.2/html/Gmakefile.orig	Tue Jan 22 13:51:38 2002
++++ src.contrib/GMSL/NVIZ2.2/html/Gmakefile	Thu Oct  9 23:13:37 2003
 @@ -3,4 +3,4 @@
  all:
  	if [ ! -d $(GRASS_NVIZ_DOCS) ]; then mkdir $(GRASS_NVIZ_DOCS); fi
diff --git a/databases/grass/files/patch-src::general::init::init.sh b/databases/grass/files/patch-src::general::init::init.sh
index 1dde7a048f01..acf9a0fa0062 100644
--- a/databases/grass/files/patch-src::general::init::init.sh
+++ b/databases/grass/files/patch-src::general::init::init.sh
@@ -1,6 +1,6 @@
---- src/general/init/init.sh.orig	Tue Feb 12 11:32:40 2002
-+++ src/general/init/init.sh	Tue Feb 12 11:32:52 2002
-@@ -76,12 +76,12 @@
+--- src/general/init/init.sh.orig	Sun Mar 16 21:25:20 2003
++++ src/general/init/init.sh	Thu Oct  9 23:09:58 2003
+@@ -165,12 +165,12 @@
  fi
  
  if [ ! "$GRASS_TCLSH" ] ; then
diff --git a/databases/grass/pkg-deinstall b/databases/grass/pkg-deinstall
new file mode 100644
index 000000000000..cde6ddc0e77f
--- /dev/null
+++ b/databases/grass/pkg-deinstall
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# remove lockfile so that deinstallation can complete
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+
+echo "Removing lockfiles, if any ..."
+rm -rf ${PKG_PREFIX}/grass5/locks/*
diff --git a/databases/grass/pkg-plist b/databases/grass/pkg-plist
index 663e99788eb3..de7dd535ac91 100644
--- a/databases/grass/pkg-plist
+++ b/databases/grass/pkg-plist
@@ -145,7 +145,6 @@ grass5/bin/m.ll2gc
 grass5/bin/m.ll2u
 grass5/bin/m.lulc.USGS
 grass5/bin/m.lulc.read
-grass5/bin/m.proj
 grass5/bin/m.proj2
 grass5/bin/m.qcalc
 grass5/bin/m.region.ll
@@ -278,6 +277,7 @@ grass5/bin/r.spreadpath
 grass5/bin/r.statistics
 grass5/bin/r.stats
 grass5/bin/r.sum
+grass5/bin/r.sun
 grass5/bin/r.sunmask
 grass5/bin/r.support
 grass5/bin/r.surf.area
@@ -325,6 +325,7 @@ grass5/bin/s.territory
 grass5/bin/s.to.rast
 grass5/bin/s.to.vect
 grass5/bin/s.univar
+grass5/bin/s.vol.rst
 grass5/bin/s.voronoi
 grass5/bin/s.what
 grass5/bin/s.windavg
@@ -347,7 +348,6 @@ grass5/bin/v.export
 grass5/bin/v.extract
 grass5/bin/v.import
 grass5/bin/v.in.arc
-grass5/bin/v.in.arc.pg
 grass5/bin/v.in.ascii
 grass5/bin/v.in.atlas
 grass5/bin/v.in.dlg
@@ -363,6 +363,7 @@ grass5/bin/v.in.tig.basic
 grass5/bin/v.in.tig.lndmk
 grass5/bin/v.in.transects
 grass5/bin/v.info
+grass5/bin/v.label
 grass5/bin/v.llabel
 grass5/bin/v.mkgrid
 grass5/bin/v.mkquads
@@ -1349,6 +1350,7 @@ grass5/documents/html/pg.in.dbf.html
 grass5/documents/html/photo.2image.html
 grass5/documents/html/photo.2target.html
 grass5/documents/html/photo.camera.html
+grass5/documents/html/photo.camera.png
 grass5/documents/html/photo.html
 grass5/documents/html/photo.init.html
 grass5/documents/html/photo.rectify.html
@@ -1495,6 +1497,7 @@ grass5/documents/html/r.surf.random.html
 grass5/documents/html/r.thin.html
 grass5/documents/html/r.timestamp.html
 grass5/documents/html/r.to.gnuplot.html
+grass5/documents/html/r.to.pg.html
 grass5/documents/html/r.to.sites.html
 grass5/documents/html/r.topidx.html
 grass5/documents/html/r.topmodel.html
@@ -1526,6 +1529,7 @@ grass5/documents/html/r3.to.sites.html
 grass5/documents/html/raster.html
 grass5/documents/html/rgb.hsv.sh.html
 grass5/documents/html/s.buffer.html
+grass5/documents/html/s.cellstats.html
 grass5/documents/html/s.datum.shift.html
 grass5/documents/html/s.db.rim.html
 grass5/documents/html/s.delaunay.html
@@ -1541,6 +1545,7 @@ grass5/documents/html/s.in.mif.html
 grass5/documents/html/s.in.shape.html
 grass5/documents/html/s.info.html
 grass5/documents/html/s.kcv.html
+grass5/documents/html/s.kernel.html
 grass5/documents/html/s.label.html
 grass5/documents/html/s.mask.html
 grass5/documents/html/s.medp.html
@@ -1582,6 +1587,7 @@ grass5/documents/html/sites.html
 grass5/documents/html/sites.occur.html
 grass5/documents/html/sites.report.html
 grass5/documents/html/slide.show.sh.html
+grass5/documents/html/spearfish_directorytree.html
 grass5/documents/html/split.sh.html
 grass5/documents/html/terminology.html
 grass5/documents/html/tig.rim.sh.html
@@ -1660,6 +1666,7 @@ grass5/documents/html/v.reclass.inf.html
 grass5/documents/html/v.reclass.pg.html
 grass5/documents/html/v.reclass.scs.html
 grass5/documents/html/v.report.html
+grass5/documents/html/v.rm.dangles.html
 grass5/documents/html/v.rmdup.html
 grass5/documents/html/v.rmedge.html
 grass5/documents/html/v.scale.random.html
@@ -1770,6 +1777,7 @@ grass5/documents/raster.html
 grass5/documents/scripts.html
 grass5/documents/searchhtml.html
 grass5/documents/sites.html
+grass5/documents/spearfish_directorytree.html
 grass5/documents/terminology.html
 grass5/documents/tips_and_tricks.html
 grass5/documents/vector.html
@@ -2114,6 +2122,7 @@ grass5/etc/bin/cmd/r.spreadpath
 grass5/etc/bin/cmd/r.statistics
 grass5/etc/bin/cmd/r.stats
 grass5/etc/bin/cmd/r.sum
+grass5/etc/bin/cmd/r.sun
 grass5/etc/bin/cmd/r.sunmask
 grass5/etc/bin/cmd/r.support
 grass5/etc/bin/cmd/r.surf.area
@@ -2159,6 +2168,7 @@ grass5/etc/bin/cmd/s.territory
 grass5/etc/bin/cmd/s.to.rast
 grass5/etc/bin/cmd/s.to.vect
 grass5/etc/bin/cmd/s.univar
+grass5/etc/bin/cmd/s.vol.rst
 grass5/etc/bin/cmd/s.voronoi
 grass5/etc/bin/cmd/s.what
 grass5/etc/bin/cmd/s.windavg
@@ -2192,6 +2202,7 @@ grass5/etc/bin/cmd/v.in.tig.basic
 grass5/etc/bin/cmd/v.in.tig.lndmk
 grass5/etc/bin/cmd/v.in.transects
 grass5/etc/bin/cmd/v.info
+grass5/etc/bin/cmd/v.label
 grass5/etc/bin/cmd/v.llabel
 grass5/etc/bin/cmd/v.mkgrid
 grass5/etc/bin/cmd/v.mkquads
@@ -2267,7 +2278,6 @@ grass5/etc/bin/inter/i.target
 grass5/etc/bin/inter/i.vpoints
 grass5/etc/bin/inter/m.examine.tape
 grass5/etc/bin/inter/m.futil
-grass5/etc/bin/inter/m.proj
 grass5/etc/bin/inter/p.colors
 grass5/etc/bin/inter/p.icons
 grass5/etc/bin/inter/p.labels
@@ -2300,7 +2310,6 @@ grass5/etc/bin/inter/v.export
 grass5/etc/bin/inter/v.extract
 grass5/etc/bin/inter/v.import
 grass5/etc/bin/inter/v.in.arc
-grass5/etc/bin/inter/v.in.arc.pg
 grass5/etc/bin/inter/v.mkgrid
 grass5/etc/bin/inter/v.out.mapinfo
 grass5/etc/bin/inter/v.out.moss
@@ -3214,6 +3223,7 @@ grass5/etc/imagery/photo.target
 grass5/etc/imagery/subgroup
 grass5/etc/imagery/title
 grass5/etc/in_arc
+grass5/etc/license
 grass5/etc/lister/cell
 grass5/etc/lister/dig
 grass5/etc/lister/site_lists
@@ -3298,14 +3308,14 @@ grass5/etc/nviz2.2/scripts/unique.tcl
 grass5/etc/nviz2.2/scripts/widgets.tcl
 grass5/etc/nviz2.2/scripts/wirecolorPopup.tcl
 grass5/etc/paint/char.test
-grass5/etc/paint/driver/ppm
-grass5/etc/paint/driver/preview
-grass5/etc/paint/driver/preview2
 grass5/etc/paint/driver.rsh
 grass5/etc/paint/driver.sh/preview
 grass5/etc/paint/driver.sh/preview2
 grass5/etc/paint/driver.shell
 grass5/etc/paint/driver.uninst/ppm
+grass5/etc/paint/driver/ppm
+grass5/etc/paint/driver/preview
+grass5/etc/paint/driver/preview2
 grass5/etc/paint/header
 grass5/etc/paint/hres.test
 grass5/etc/paint/patcc
@@ -3381,8 +3391,11 @@ grass5/locale/ru/LC_MESSAGES/g.column.pg.mo
 grass5/locale/ru/LC_MESSAGES/g.select.pg.mo
 grass5/locale/ru/LC_MESSAGES/g.stats.pg.mo
 grass5/locale/ru/LC_MESSAGES/g.table.pg.mo
+grass5/locale/ru/LC_MESSAGES/libgis.mo
+grass5/locale/ru/LC_MESSAGES/libraster.mo
 grass5/locale/ru/LC_MESSAGES/pg.in.dbf.mo
 grass5/locale/ru/LC_MESSAGES/s.surf.rst.mo
+grass5/locale/ru/LC_MESSAGES/v.digit.mo
 grass5/locale/ru/LC_MESSAGES/v.in.arc.pg.mo
 grass5/locale/ru/LC_MESSAGES/v.in.shape.pg.mo
 grass5/locale/ru/LC_MESSAGES/v.reclass.pg.mo
@@ -3740,6 +3753,7 @@ grass5/man/man1/r.surf.random.1
 grass5/man/man1/r.thin.1
 grass5/man/man1/r.timestamp.1
 grass5/man/man1/r.to.gnuplot.1
+grass5/man/man1/r.to.pg.1
 grass5/man/man1/r.to.sites.1
 grass5/man/man1/r.topidx.1
 grass5/man/man1/r.topmodel.1
@@ -3770,6 +3784,7 @@ grass5/man/man1/r3.timestamp.1
 grass5/man/man1/r3.to.sites.1
 grass5/man/man1/rgb.hsv.sh.1
 grass5/man/man1/s.buffer.1
+grass5/man/man1/s.cellstats.1
 grass5/man/man1/s.datum.shift.1
 grass5/man/man1/s.db.rim.1
 grass5/man/man1/s.delaunay.1
@@ -3785,6 +3800,7 @@ grass5/man/man1/s.in.mif.1
 grass5/man/man1/s.in.shape.1
 grass5/man/man1/s.info.1
 grass5/man/man1/s.kcv.1
+grass5/man/man1/s.kernel.1
 grass5/man/man1/s.label.1
 grass5/man/man1/s.mask.1
 grass5/man/man1/s.medp.1
@@ -3898,6 +3914,7 @@ grass5/man/man1/v.reclass.inf.1
 grass5/man/man1/v.reclass.pg.1
 grass5/man/man1/v.reclass.scs.1
 grass5/man/man1/v.report.1
+grass5/man/man1/v.rm.dangles.1
 grass5/man/man1/v.rmdup.1
 grass5/man/man1/v.rmedge.1
 grass5/man/man1/v.scale.random.1
@@ -4123,7 +4140,6 @@ grass5/tcltkgrass/module/i.cluster
 grass5/tcltkgrass/module/i.fft
 grass5/tcltkgrass/module/i.gensig
 grass5/tcltkgrass/module/i.gensigset
-grass5/tcltkgrass/module/i.grey.scale
 grass5/tcltkgrass/module/i.his.rgb
 grass5/tcltkgrass/module/i.ifft
 grass5/tcltkgrass/module/i.in.erdas
@@ -4200,6 +4216,7 @@ grass5/tcltkgrass/module/r.out.tiff
 grass5/tcltkgrass/module/r.patch
 grass5/tcltkgrass/module/r.poly
 grass5/tcltkgrass/module/r.profile
+grass5/tcltkgrass/module/r.proj
 grass5/tcltkgrass/module/r.random
 grass5/tcltkgrass/module/r.reclass
 grass5/tcltkgrass/module/r.report
@@ -4217,12 +4234,14 @@ grass5/tcltkgrass/module/r.transect
 grass5/tcltkgrass/module/r.volume
 grass5/tcltkgrass/module/r.watershed
 grass5/tcltkgrass/module/r.what
+grass5/tcltkgrass/module/s.cellstats
 grass5/tcltkgrass/module/s.geom
 grass5/tcltkgrass/module/s.in.ascii
 grass5/tcltkgrass/module/s.in.garmin
 grass5/tcltkgrass/module/s.info
 grass5/tcltkgrass/module/s.mask
 grass5/tcltkgrass/module/s.out.ascii
+grass5/tcltkgrass/module/s.proj
 grass5/tcltkgrass/module/s.surf.idw
 grass5/tcltkgrass/module/s.surf.krig
 grass5/tcltkgrass/module/s.surf.rst
@@ -4418,6 +4437,8 @@ grass5/txt/WEIGHT/dir
 grass5/txt/WEIGHT/general
 grass5/txt/WEIGHT/intro
 grass5/txt/WEIGHT/syntax
+share/nls/POSIX
+share/nls/en_US.US-ASCII
 @dirrm grass5/txt/WEIGHT
 @dirrm grass5/txt/MONITOR
 @dirrm grass5/txt/DIGIT2