diff options
| author | Charlie Sharpsteen | 2012-04-21 14:26:32 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2012-04-21 14:57:22 -0700 |
| commit | 193ca71d33eef7ab20dcbe2aea762c9cacfa70b2 (patch) | |
| tree | 13d91b30f74ecb76d1f51d88a4aa12d57b37bdc8 /Library | |
| parent | c69fb53d6795ae0dde981d4c3f3a298f7ec682b4 (diff) | |
| download | homebrew-193ca71d33eef7ab20dcbe2aea762c9cacfa70b2.tar.bz2 | |
GRASS: Don't install stuff outside of --prefix
Add a small patch to the GRASS makefile that removes a command that installs
stuff to `/Library/Documentation/Help`---this is outside of the prefix and we
don't have permissions for this directory.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/grass.rb | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb index d1ac34f16..92bc4fa5b 100644 --- a/Library/Formula/grass.rb +++ b/Library/Formula/grass.rb @@ -24,7 +24,8 @@ class Grass < Formula depends_on "cairo" if MacOS.leopard? - # Patch to ensure 32 bit system python is used for wxWidgets + # Patches ensure 32 bit system python is used for wxWidgets and that files + # are not installed outside of the prefix. def patches; DATA; end def options @@ -121,6 +122,10 @@ has been modified to use the OS X system Python and to start it in 32 bit mode. end __END__ +Patch 1: +Force 32-bit system Python to be used for the WxPython GUI. + + diff --git a/lib/init/init.sh b/lib/init/init.sh index 8c87fe1..2d1a2a3 100644 --- a/lib/init/init.sh @@ -143,3 +148,23 @@ index 8c87fe1..2d1a2a3 100644 # the following is only meant to be an internal variable for debugging this script. # use 'g.gisenv set="DEBUG=[0-5]"' to turn GRASS debug mode on properly. if [ -z "$GRASS_DEBUG" ] ; then + + +Patch 2: +Remove two lines of the Makefile that try to install stuff to +/Library/Documentation---which is outside of the prefix and usually fails due +to permissions issues. + +diff --git a/Makefile b/Makefile +index f1edea6..be404b0 100644 +--- a/Makefile ++++ b/Makefile +@@ -304,8 +304,6 @@ ifeq ($(strip $(MINGW)),) + -tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null + -${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null + endif +- @# enable OSX Help Viewer +- @if [ "`cat include/Make/Platform.make | grep -i '^ARCH.*darwin'`" ] ; then /bin/ln -sfh "${INST_DIR}/docs/html" /Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR} ; fi + + + install-strip: FORCE |