[134514] users/mojca/ports/gis/grass
mojca at macports.org
mojca at macports.org
Fri Mar 27 14:41:29 PDT 2015
Revision: 134514
https://trac.macports.org/changeset/134514
Author: mojca at macports.org
Date: 2015-03-27 14:41:29 -0700 (Fri, 27 Mar 2015)
Log Message:
-----------
mojca/grass: incomplete attempt to switch to grass 7.0 (#44056)
Modified Paths:
--------------
users/mojca/ports/gis/grass/Portfile
users/mojca/ports/gis/grass/files/patch-configure.diff
users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff
Added Paths:
-----------
users/mojca/ports/gis/grass/files/patch-macosx-Makefile.diff
Modified: users/mojca/ports/gis/grass/Portfile
===================================================================
--- users/mojca/ports/gis/grass/Portfile 2015-03-27 21:27:54 UTC (rev 134513)
+++ users/mojca/ports/gis/grass/Portfile 2015-03-27 21:41:29 UTC (rev 134514)
@@ -7,8 +7,7 @@
name grass
epoch 1
-version 7.0.0beta3
-revision 1
+version 7.0.0
maintainers nomaintainer
categories gis
license GPL-2+
@@ -21,8 +20,8 @@
homepage http://grass.osgeo.org/
master_sites ${homepage}grass[join [lrange [split ${version} .] 0 1] {}]/source/
-checksums rmd160 1d5fb0242ab5e6c999890f02873468c92ea9461e \
- sha256 5804b82bd2ffdc40dc1c5bed10d95f66bce87242d6e8849f7cc5d70c9849f09b
+checksums rmd160 dc66614f77da98780b402c203eae171e7cb8dfd7 \
+ sha256 1324556514cc38aced1c6dce27933ce386be027b1e2594f807f67250fb55436a
depends_build port:pkgconfig
depends_lib port:fftw-3 \
@@ -45,7 +44,8 @@
patchfiles patch-configure.diff \
patch-include-Make-Install.make.diff \
patch-is_void.diff \
- patch-lib-init-grass.sh.diff
+ patch-lib-init-grass.sh.diff \
+ patch-macosx-Makefile.diff
post-patch {
reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" ${worksrcpath}/configure
@@ -191,7 +191,7 @@
# TODO: this doesn't seem to have any effect any longer
reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.sh
- # Ensure usage of python26/python27
+ # Ensure usage of python27
# (insteaf of the currently active python)
# Work around bug http://trac.osgeo.org/grass/ticket/1758
fs-traverse f ${worksrcpath} {
@@ -204,7 +204,7 @@
# TODO: in principle wxWidgets is optional and could be disable with
# --disable-wxwidgets if there is demand for that
-variant wxwidgets30 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
+variant wxwidgets30 description {Use Cocoa-based wxWidgets 3.0} {
wxWidgets.use wxPython-3.0
depends_lib-append port:${wxWidgets.port}
configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
Modified: users/mojca/ports/gis/grass/files/patch-configure.diff
===================================================================
--- users/mojca/ports/gis/grass/files/patch-configure.diff 2015-03-27 21:27:54 UTC (rev 134513)
+++ users/mojca/ports/gis/grass/files/patch-configure.diff 2015-03-27 21:41:29 UTC (rev 134514)
@@ -1,11 +1,11 @@
--- configure.orig
+++ configure
-@@ -1432,9 +1432,9 @@ fi
+@@ -1425,9 +1425,9 @@ fi
# Set INST_DIR
if test -n "$MACOSX_APP" ; then
- INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
-+ INSTDIR='@@APPLICATIONS_DIR@@'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
++ INSTDIR='@@APPLICATIONS_DIR@@'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app"
else
- INSTDIR='${prefix}'"/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
+ INSTDIR='${prefix}'"/share/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
Modified: users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff
===================================================================
--- users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff 2015-03-27 21:27:54 UTC (rev 134513)
+++ users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff 2015-03-27 21:41:29 UTC (rev 134514)
@@ -3,7 +3,7 @@
--- include/Make/Install.make.orig
+++ include/Make/Install.make
-@@ -48,21 +48,21 @@
+@@ -50,21 +50,21 @@
fi
install-check-parent:
@@ -29,7 +29,7 @@
echo " Perhaps you need root access." >&2 ; \
echo " Installation aborted, exiting Make." >&2 ; \
exit 1; \
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,7 @@
install-check-prefix:
@ result=`echo "$(INST_DIR)" | awk '{ if ($$1 ~ /grass/) print $$1 }'`; \
if [ "$$result" = "" ] ; then \
@@ -38,7 +38,7 @@
echo " does not contain the word 'grass'." >&2 ; \
echo " It is highly recommended that the word 'grass' be part" >&2 ; \
echo " of your install directory to avoid conflicts." >&2 ; \
-@@ -94,35 +94,30 @@
+@@ -96,35 +96,30 @@
PLATMAKE = include/Make/Platform.make
GRASSMAKE = include/Make/Grass.make
@@ -90,7 +90,7 @@
sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
-e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
-e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
-@@ -143,16 +138,16 @@
+@@ -145,16 +135,16 @@
-e 's#^\(ARCH_BINDIR.[^=]*\).*#\1= $(UNIX_BIN)#g' $< > $@
endef
Added: users/mojca/ports/gis/grass/files/patch-macosx-Makefile.diff
===================================================================
--- users/mojca/ports/gis/grass/files/patch-macosx-Makefile.diff (rev 0)
+++ users/mojca/ports/gis/grass/files/patch-macosx-Makefile.diff 2015-03-27 21:41:29 UTC (rev 134514)
@@ -0,0 +1,40 @@
+--- macosx/Makefile.orig
++++ macosx/Makefile
+@@ -79,20 +79,23 @@ else
+ endif
+
+ install-macosxapp:
+- -$(MAKE_DIR_CMD) ${INST_DIR_TARGET}/bin
+- -$(MAKE_DIR_CMD) ${INST_DIR_TARGET}/etc
+- -$(MAKE_DIR_CMD) ${PREFIX_TARGET}/${MACOSX_APP_NAME}/Contents/Resources/Scripts
+- -$(MAKE_DIR_CMD) ${PREFIX_TARGET}/${MACOSX_APP_NAME}/Contents/Resources/English.lproj/MainMenu.nib
+- $(INSTALL) app/build_html_user_index.sh ${INST_DIR_TARGET}/etc
+- $(INSTALL) app/build_gui_user_menu.sh ${INST_DIR_TARGET}/etc
+- $(INSTALL) app/python_wrapper ${INST_DIR_TARGET}/bin/python
+- $(INSTALL_DATA) app/app.icns ${PREFIX_TARGET}/${MACOSX_APP_NAME}/Contents/Resources
+- $(INSTALL_DATA) app/${OBJDIR}/Info.plist ${PREFIX_TARGET}/${MACOSX_APP_NAME}/Contents
+- $(INSTALL_DATA) app/PkgInfo ${PREFIX_TARGET}/${MACOSX_APP_NAME}/Contents
+- $(INSTALL) app/${OBJDIR}/GRASS.scpt ${PREFIX_TARGET}/${MACOSX_APP_NAME}/Contents/Resources/Scripts/
+- $(INSTALL) app/${OBJDIR}/grass.sh ${INST_DIR_TARGET}
+- $(INSTALL) app/${OBJDIR}/GRASS ${INST_DIR_TARGET}
+- $(INSTALL_DATA) app/English.lproj/MainMenu.nib/* ${PREFIX_TARGET}/${MACOSX_APP_NAME}/Contents/Resources/English.lproj/MainMenu.nib
++ echo "INST_DIR: ${INST_DIR}"
++ echo "INST_DIR_TARGET: ${INST_DIR_TARGET}"
++ echo "PREFIX_TARGET ${PREFIX_TARGET}"
++ -$(MAKE_DIR_CMD) $(DESTDIR)${INST_DIR_TARGET}/Contents/MacOS/bin
++ -$(MAKE_DIR_CMD) $(DESTDIR)${INST_DIR_TARGET}/Contents/MacOS/etc
++ -$(MAKE_DIR_CMD) $(DESTDIR)${INST_DIR_TARGET}/Contents/Resources/Scripts
++ -$(MAKE_DIR_CMD) $(DESTDIR)${INST_DIR_TARGET}/Contents/Resources/English.lproj/MainMenu.nib
++ $(INSTALL) app/build_html_user_index.sh $(DESTDIR)${INST_DIR_TARGET}/Contents/MacOS/etc
++ $(INSTALL) app/build_gui_user_menu.sh $(DESTDIR)${INST_DIR_TARGET}/Contents/MacOS/etc
++ $(INSTALL) app/python_wrapper $(DESTDIR)${INST_DIR_TARGET}/Contents/MacOS/bin/python
++ $(INSTALL_DATA) app/app.icns $(DESTDIR)${INST_DIR_TARGET}/Contents/Resources
++ $(INSTALL_DATA) app/${OBJDIR}/Info.plist $(DESTDIR)${INST_DIR_TARGET}/Contents
++ $(INSTALL_DATA) app/PkgInfo $(DESTDIR)${INST_DIR_TARGET}/Contents
++ $(INSTALL) app/${OBJDIR}/GRASS.scpt $(DESTDIR)${INST_DIR_TARGET}/Contents/Resources/Scripts
++ $(INSTALL) app/${OBJDIR}/grass.sh $(DESTDIR)${INST_DIR_TARGET}/Contents/MacOS/bin
++ $(INSTALL) app/${OBJDIR}/GRASS $(DESTDIR)${INST_DIR_TARGET}/Contents/MacOS/bin
++ $(INSTALL_DATA) app/English.lproj/MainMenu.nib/* $(DESTDIR)${INST_DIR_TARGET}/Contents/Resources/English.lproj/MainMenu.nib
+
+ install-basic-macosx:
+ -tar cBCf $(GISBASE) - . | tar xBCf $(INST_DIR_TARGET) - 2>/dev/null
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150327/4c0b4da4/attachment-0001.html>
More information about the macports-changes
mailing list