svn commit: r398286 - in head/databases/grass: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Oct  1 15:50:25 2015
New Revision: 398286
URL: https://svnweb.freebsd.org/changeset/ports/398286

Log:
  - Fix more shebangs
  - Drop unneeded WX_UNICODE
  - Remove useless checks to fix packaging as non-root

Added:
  head/databases/grass/files/patch-Makefile   (contents, props changed)
Modified:
  head/databases/grass/Makefile

Modified: head/databases/grass/Makefile
==============================================================================
--- head/databases/grass/Makefile	Thu Oct  1 15:49:16 2015	(r398285)
+++ head/databases/grass/Makefile	Thu Oct  1 15:50:25 2015	(r398286)
@@ -3,7 +3,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	6.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
@@ -37,14 +37,21 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2 \
 		readline shebangfix tk
 SHEBANG_FILES=	scripts/i.spectral/i.spectral \
-		scripts/r.tileset/r.tileset
+		scripts/r.tileset/r.tileset \
+		visualization/nviz/scripts/nviz2.2_script \
+		visualization/nviz/scripts/script_file_tools \
+		visualization/nviz/scripts/script_get_line \
+		visualization/nviz/scripts/script_play \
+		visualization/nviz/scripts/script_tools
+SHEBANG_LANG=	nviz
+nviz_OLD_CMD=	nviz
+nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
 PATCH_TCL_SCRIPTS=lib/init/init.sh
 PATCH_TK_SCRIPTS=lib/init/init.sh
 USE_XORG=	sm ice x11 xext xi xmu xt
 USE_GL=		glu
 USE_GNOME=	cairo
 USE_WX=		2.8
-WX_UNICODE=	yes
 WX_COMPS=	wx:build python:run
 USE_GCC=	yes
 GNU_CONFIGURE=	yes

Added: head/databases/grass/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/grass/files/patch-Makefile	Thu Oct  1 15:50:25 2015	(r398286)
@@ -0,0 +1,35 @@
+--- Makefile.orig	2014-12-16 22:11:04 UTC
++++ Makefile
+@@ -240,32 +240,12 @@ install: FORCE
+ 	while [ ! -d $$INST_PATH ]; do \
+ 		INST_PATH=`dirname $$INST_PATH`; \
+ 	done; \
+-	if [ ! -d "${INST_DIR}" -a ! -w "$$INST_PATH" ] ; then \
+-		echo "ERROR: Directory $$INST_PATH is a parent directory of your"; \
+-		echo "  install directory ${INST_DIR} and is not writable."; \
+-		echo "  Perhaps you need root access."; \
+-		echo "  Installation aborted, exiting Make."; \
+-		exit; \
+-	fi; \
+-	if [ -d ${INST_DIR} -a ! -w "${INST_DIR}" ] ; then \
+-		echo "ERROR: Your install directory ${INST_DIR} is not writable."; \
+-		echo "  Perhaps you need root access."; \
+-		echo "  Installation aborted, exiting Make."; \
+-		exit; \
+-	fi; \
+ 	result=`echo "${INST_DIR}" | awk '{ if ($$1 ~ /grass/) print $$1 }'`; \
+ 	if [ "$$result" = "" ] ; then \
+ 		echo "WARNING: Your install directory ${INST_DIR}"; \
+ 		echo "  does not contain the word 'grass'."; \
+ 		echo "  It is highly recommended that the word 'grass' be part"; \
+ 		echo "  of your install directory to avoid conflicts."; \
+-		echo "  Do you want to continue? [y/n]"; \
+-		read ans; \
+-		ans=`echo "$$ans" | tr A-Z a-z`; \
+-		if [ "$$ans" != "y" ] ; then \
+-			echo "Installation aborted, exiting Make."; \
+-			exit; \
+-		fi; \
+ 	fi; \
+ 	${MAKE} real-install
+