A long overdue update of this port to 5.0.0pre3. Also enable a bunch of

additional functionality like the NVIZ interface and PostgreSQL support.

Submitted by:	Andreas Lange <Andreas.Lange@Rhein-Main.de> (in part)

4 files changed, 87 insertions, 0 deletions

diff --git a/databases/grass-i18n/files/patch-Makefile.in b/databases/grass-i18n/files/patch-Makefile.in
new file mode 100644
index 000000000000..a1cb8714f6e3
--- /dev/null
+++ b/databases/grass-i18n/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	Tue Feb 12 11:38:08 2002
++++ Makefile.in	Tue Feb 12 12:11:45 2002
+@@ -170,8 +170,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"
+ 	${SHELL} -c "chmod a+x ${BINDIR}/grass${NAME_VER} ; true"
+-	${SHELL} -c "$(INSTALL) ${GRASS_BIN}/gmake${NAME_VER} ${BINDIR} ; true"
+-	${SHELL} -c "$(INSTALL) ${GRASS_BIN}/gmakelinks${NAME_VER} ${BINDIR} ; true"
+ 	${SHELL} -c "cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
+ 	${SHELL} -c "cd ${GISBASE} ; tar cBf - bwidget | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
+ 	${SHELL} -c "cd ${GISBASE} ; tar cBf - documents | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
+@@ -196,6 +194,8 @@
+ 	fi
+ 	${SHELL} -c "sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/monitorcap > ${INST_DIR}/etc/monitorcap ; true"
+ 	${SHELL} -c "chmod -R 1777 ${INST_DIR}/locks 2>/dev/null ; true"
++	${SHELL} -c "sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/paint/driver.rsh > ${INST_DIR}/etc/paint/driver.rsh ; true"
++	${SHELL} -c "chmod 755 ${INST_DIR}/etc/paint/driver.rsh ; true"
+ 
+ uninstall: FORCE
+ 	@ # NOTE: if anything is changed for uninstall then the same change
diff --git a/databases/grass-i18n/files/patch-configure.in b/databases/grass-i18n/files/patch-configure.in
new file mode 100644
index 000000000000..c3571ebfefda
--- /dev/null
+++ b/databases/grass-i18n/files/patch-configure.in
@@ -0,0 +1,42 @@
+--- configure.in.orig	Tue Feb 12 01:01:28 2002
++++ configure.in	Tue Feb 12 01:27:53 2002
+@@ -247,7 +247,7 @@
+ 	AC_MSG_ERROR([*** You must supply a directory list to --with-libs.])
+ 	;;
+ esac
+-AC_MSG_RESULT($LIBRARY_DIRS)
++AC_MSG_RESULT($with_libs)
+ 
+ if test -n "$with_libs"; then
+     for dir in $with_libs; do
+@@ -392,9 +392,9 @@
+ ])])
+ AC_SUBST(DLLIB)
+ 
+-AC_CHECK_FUNC(iconv, ICONVLIB=, [
+-AC_CHECK_LIB(giconv, iconv, ICONVLIB=-lgiconv, [
+-    AC_MSG_WARN([*** Unable to locate iconv() function.])
++AC_CHECK_FUNC(libiconv, ICONVLIB=, [
++AC_CHECK_LIB(giconv, libiconv, ICONVLIB=-lgiconv, [
++    AC_MSG_WARN([*** Unable to locate libiconv() function.])
+     ICONVLIB=
+ ])])
+ AC_SUBST(ICONVLIB)
+@@ -439,7 +439,7 @@
+ 
+ LOC_CHECK_INC_PATH(dbm,DBM,DBMINCPATH)
+ 
+-LOC_CHECK_INCLUDES(dbm.h,DBM,$DBMINCPATH)
++LOC_CHECK_INCLUDES(gdbm.h,DBM,$DBMINCPATH)
+ 
+ # With DBM library directory
+ 
+@@ -745,7 +745,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,,)
+ 
diff --git a/databases/grass-i18n/files/patch-src.contrib::GMSL::NVIZ2.2::html::Gmakefile b/databases/grass-i18n/files/patch-src.contrib::GMSL::NVIZ2.2::html::Gmakefile
new file mode 100644
index 000000000000..f0ecd4a884b9
--- /dev/null
+++ b/databases/grass-i18n/files/patch-src.contrib::GMSL::NVIZ2.2::html::Gmakefile
@@ -0,0 +1,8 @@
+--- 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
+@@ -3,4 +3,4 @@
+ all:
+ 	if [ ! -d $(GRASS_NVIZ_DOCS) ]; then mkdir $(GRASS_NVIZ_DOCS); fi
+ #fix for CVS and Gmakefile:
+-	(tar -cf - *  | (cd $(GRASS_NVIZ_DOCS); tar  -xf - 2>/dev/null ); true)
++	(tar -cf - [a-z]* | (cd $(GRASS_NVIZ_DOCS); tar  -xf - 2>/dev/null ); true)
diff --git a/databases/grass-i18n/files/patch-src::general::init::init.sh b/databases/grass-i18n/files/patch-src::general::init::init.sh
new file mode 100644
index 000000000000..1dde7a048f01
--- /dev/null
+++ b/databases/grass-i18n/files/patch-src::general::init::init.sh
@@ -0,0 +1,17 @@
+--- 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 @@
+ fi
+ 
+ if [ ! "$GRASS_TCLSH" ] ; then
+-    GRASS_TCLSH=tclsh
++    GRASS_TCLSH=tclsh8.3
+     export GRASS_TCLSH
+ fi
+ 
+ if [ ! "$GRASS_WISH" ] ; then
+-    GRASS_WISH=wish
++    GRASS_WISH=wish8.3
+     export GRASS_WISH
+ fi
+