---- grass-6.4.2/lib/gis/Makefile.orig 2011-03-10 10:54:19.000000000 +0100
-+++ grass-6.4.2/lib/gis/Makefile 2012-10-20 14:32:27.320283161 +0200
-@@ -12,7 +12,7 @@
+--- grass-7.0.3/lib/gis/Makefile.orig 2016-04-03 19:35:16.596262959 +0200
++++ grass-7.0.3/lib/gis/Makefile 2016-04-03 21:12:20.269351895 +0200
+@@ -22,7 +22,7 @@
- LIB_OBJS := $(subst .c,.o,$(wildcard *.c))
- LIB_OBJS := $(filter-out fmode.o dllmain.o,$(LIB_OBJS))
--ifneq ($(MINGW),)
-+ifeq ($(MINGW),yes)
- LIB_OBJS := $(LIB_OBJS) dllmain.o fmode.o
- endif
+ default: lib $(FMODE_OBJ) $(PROJFILES) $(COLORFILES) $(ETC)/colors.desc $(ETC)/renamed_options
-@@ -34,7 +34,7 @@
-
- ifneq ($(GDAL_DYNAMIC),)
- EXTRA_CFLAGS += -DGDAL_DYNAMIC=1
--ifneq ($(MINGW),)
+-ifdef MINGW
+ifeq ($(MINGW),yes)
- EXTRA_LIBS += -lkernel32
- else
- EXTRA_LIBS += $(DLLIB)
+ $(FMODE_OBJ): $(OBJDIR)/fmode.o
+ $(INSTALL) $< $@
+ endif
--- grass-6.4.2/lib/init/Makefile.orig 2011-06-08 12:30:46.000000000 +0200
+++ grass-6.4.2/lib/init/Makefile 2012-10-20 14:33:08.316948107 +0200
@@ -60,7 +60,7 @@
FILES += \
$(ETC)/Init.bat \
$(ETC)/winlocale$(EXE) \
---- grass-6.4.2/Makefile.orig 2011-05-13 21:01:14.000000000 +0200
-+++ grass-6.4.2/Makefile 2012-10-20 14:34:32.893611225 +0200
-@@ -49,7 +49,7 @@
- man \
- macosx
-
--ifeq ($(strip $(MINGW)),)
-+ifneq ($(strip $(MINGW)),yes)
- SUBDIRS += gem
- endif
-
-@@ -115,7 +115,7 @@
- @if [ `cat "$(ERRORLOG)" | wc -l` -gt 8 ] ; then false ; else true ; fi
-
- manifests:
--ifneq ($(strip $(MINGW)),)
-+ifeq ($(strip $(MINGW)),yes)
- find $(ARCH_DISTDIR) -type f -name '*.exe' | \
- while read file ; do \
- cmd=`basename "$$file" .exe` ; \
-@@ -278,7 +278,7 @@
- -cd ${GISBASE} ; tar cBf - driver | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
- -cd ${GISBASE} ; tar cBf - etc | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
- -cd ${GISBASE} ; tar cBf - fonts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
--ifeq ($(strip $(MINGW)),)
-+ifneq ($(strip $(MINGW)),yes)
- -cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
- endif
- -cd ${GISBASE} ; tar cBf - scripts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
-@@ -299,7 +299,7 @@
- -sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap
- @##### -chmod -R 1777 ${INST_DIR}/locks 2>/dev/null
- -chmod -R a+rX ${INST_DIR} 2>/dev/null
--ifeq ($(strip $(MINGW)),)
-+ifneq ($(strip $(MINGW)),yes)
- @#GEM installation
- -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
---- grass-6.4.2/lib/python/ctypes/Makefile.orig 2011-05-03 21:27:16.000000000 +0200
-+++ grass-6.4.2/lib/python/ctypes/Makefile 2012-10-20 14:35:23.370275773 +0200
-@@ -57,7 +57,7 @@
- CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC)"
- EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M).py) $(wildcard ctypesgencore/*.pyc) $(wildcard ctypesgencore/*/*.pyc)
+--- grass-7.0.3/lib/python/ctypes/Makefile.orig 2016-04-03 19:35:16.626262959 +0200
++++ grass-7.0.3/lib/python/ctypes/Makefile 2016-04-03 21:13:18.706016110 +0200
+@@ -58,7 +58,7 @@
+ CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -D__GLIBC_HAVE_LONG_LONG"
+ EXTRA_CLEAN_FILES := $(wildcard ctypesgencore/*.pyc) $(wildcard ctypesgencore/*/*.pyc)
-ifneq ($(MINGW),)
+ifeq ($(MINGW),yes)
- INTLLIB = -lintl3
- endif
-
---- grass-6.4.2/visualization/nviz/Makefile.orig 2008-12-23 15:05:57.000000000 +0100
-+++ grass-6.4.2/visualization/nviz/Makefile 2012-10-20 14:36:21.746939990 +0200
-@@ -9,7 +9,7 @@
- PROG=nviz
- INSTALL_DIR=$(GISBASE)/etc/$(NV_VER)
-
--ifneq ($(strip $(MINGW)),)
-+ifeq ($(strip $(MINGW)),yes)
- FIND = find
- else
- FIND = find -L
-@@ -36,7 +36,7 @@
- -$(MKDIR) $(INSTALL_DIR)
- $(INSTALL) src/nvwish$(EXE) $(INSTALL_DIR)/$(PROG)$(EXE)
- $(INSTALL) scripts/$(PROG) $(GISBASE)/bin
--ifneq ($(strip $(MINGW)),)
-+ifeq ($(strip $(MINGW)),yes)
- $(INSTALL) scripts/nviz.bat $(GISBASE)/bin
- endif
- -$(MKDIR) $(INSTALL_DIR)/scripts
---- grass-6.4.2/visualization/nviz/html/Makefile.orig 2008-12-23 15:05:57.000000000 +0100
-+++ grass-6.4.2/visualization/nviz/html/Makefile 2012-10-20 14:36:43.426939080 +0200
-@@ -5,7 +5,7 @@
-
- GRASS_NVIZ_DOCS=$(GISBASE)/docs/html/nviz
-
--ifneq ($(strip $(MINGW)),)
-+ifeq ($(strip $(MINGW)),yes)
- FIND = find
- else
- FIND = find -L
---- grass-6.4.2/gui/tcltk/Makefile.orig 2009-05-11 21:22:34.000000000 +0200
-+++ grass-6.4.2/gui/tcltk/Makefile 2012-10-20 14:39:10.970266222 +0200
-@@ -2,7 +2,7 @@
-
- SUBDIRS = gis.m
-
--ifndef MINGW
-+ifneq ($(MINGW),yes)
- SUBDIRS += d.m
+ INTLLIB = -lintl-8
endif
---- grass-6.4.2/gui/scripts/Makefile.orig 2010-01-15 15:41:17.000000000 +0100
-+++ grass-6.4.2/gui/scripts/Makefile 2012-10-20 14:39:41.100264957 +0200
-@@ -2,7 +2,7 @@
+--- grass-7.0.3/gui/scripts/Makefile.orig 2016-04-03 19:35:16.652929624 +0200
++++ grass-7.0.3/gui/scripts/Makefile 2016-04-03 21:15:10.182678097 +0200
+@@ -6,7 +6,7 @@
- include $(MODULE_TOPDIR)/include/Make/Dir.make
+ DSTDIR = $(GUIDIR)/scripts
-ifdef MINGW
+ifeq ($(MINGW),yes)
- SCRIPT_ACTIONS += create.bat
- endif
-
---- grass-6.4.2/vector/v.transform/Makefile.orig 2008-12-19 21:28:57.000000000 +0100
-+++ grass-6.4.2/vector/v.transform/Makefile 2012-10-20 14:40:59.673594995 +0200
-@@ -5,7 +5,7 @@
-
- include $(MODULE_TOPDIR)/include/Make/Module.make
-
--ifdef MINGW
-+ifeq ($(MINGW),yes)
- EXTRA_LIB=
- else
- EXTRA_LIB=$(VASKLIB) $(CURSES)
---- grass-6.4.2/include/Make/Grass.make.in.orig 2011-04-18 20:13:38.000000000 +0200
-+++ grass-6.4.2/include/Make/Grass.make.in 2012-10-20 14:58:30.123550911 +0200
-@@ -86,7 +86,7 @@
+ PYFILES := $(patsubst %.py, $(DSTDIR)/%_wrapper.py, $(filter %.py, $(PY_SOURCES)))
+ BATFILES := $(patsubst %.py, $(DSTDIR)/%.bat, $(filter %.py, $(PY_SOURCES)))
+ $(DSTDIR)/%_wrapper.py: %.py | $(DSTDIR)
+--- grass-7.0.3/include/Make/Grass.make.orig 2014-11-03 10:57:12.000000000 +0100
++++ grass-7.0.3/include/Make/Grass.make 2016-04-03 21:16:54.589340383 +0200
+@@ -80,7 +80,7 @@
VECT_CFLAGS = $(GDALCFLAGS) $(GEOSCFLAGS)
# Object with _fmode which must be linked to each executable on Windows
-ifdef MINGW
+ifeq ($(MINGW),yes)
- FMODE_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/fmode.o
- endif
+ WINDRES = windres
+ FMODE_OBJ = $(BASE_LIBDIR)/fmode.o
+ # if fmode.o causes trouble, try:
+@@ -235,7 +235,7 @@
+
+ ifneq ($(GDAL_LINK),)
+ ifneq ($(GDAL_DYNAMIC),)
+-ifneq ($(MINGW),)
++ifeq ($(MINGW),yes)
+ RASTERDEPS += -lkernel32
+ else
+ RASTERDEPS += $(DLLIB)
+@@ -277,7 +277,7 @@
---- grass-6.4.2/include/Make/Shlib.make.orig 2012-10-20 14:41:45.603593065 +0200
-+++ grass-6.4.2/include/Make/Shlib.make 2012-10-20 14:59:13.833549075 +0200
-@@ -3,7 +3,7 @@
- SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME)$(SHLIB_SUFFIX)
+ $(foreach lib,$(libs),$(eval $(call lib_rules,$(firstword $(subst :, ,$(lib))),$(lastword $(subst :, ,$(lib))))))
- # Object that calls _setfmode(_O_BINARY) which must be linked to each DLL on Windows
--ifdef MINGW
+-ifneq ($(MINGW),)
+ifeq ($(MINGW),yes)
- ifneq ($(SHLIB_NAME),$(DATETIME_LIBNAME))
- ifneq ($(SHLIB_NAME),$(GIS_LIBNAME))
- DLLMAIN_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/dllmain.o
-@@ -16,7 +16,7 @@
+ GISLIB += $(INTLLIB)
+ endif
+
+--- grass-7.0.3/include/Make/Shlib.make.orig 2016-04-03 19:35:16.679596287 +0200
++++ grass-7.0.3/include/Make/Shlib.make 2016-04-03 21:17:48.062671474 +0200
+@@ -8,7 +8,7 @@
$(SHLIB): $(SHLIB_OBJS)
- $(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
+ $(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
-ifndef MINGW
+ifneq ($(MINGW),yes)
(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
endif
---- grass-6.4.2/include/Make/Script.make.orig 2009-07-05 14:48:37.000000000 +0200
-+++ grass-6.4.2/include/Make/Script.make 2012-10-20 14:59:58.503547201 +0200
-@@ -11,7 +11,7 @@
- include $(MODULE_TOPDIR)/include/Make/Rules.make
+--- grass-7.0.3/include/Make/Script.make.orig 2016-04-03 19:35:16.679596287 +0200
++++ grass-7.0.3/include/Make/Script.make 2016-04-03 21:18:54.369335354 +0200
+@@ -1,7 +1,7 @@
+
+ include $(MODULE_TOPDIR)/include/Make/Vars.make
- SCRIPT_ACTIONS = $(SCRIPT)
+-ifdef MINGW
++ifeq ($(MINGW),yes)
+ SCRIPT = $(SCRIPTDIR)/$(PGM).py
+ else
+ SCRIPT = $(SCRIPTDIR)/$(PGM)
+@@ -18,7 +18,7 @@
+ include $(MODULE_TOPDIR)/include/Make/ScriptRules.make
+
+ SCRIPT_ACTIONS = $(SCRIPT) $(ETCPYFILES) $(ETCPYCFILES) html scriptstrings
-ifdef MINGW
+ifeq ($(MINGW),yes)
SCRIPT_ACTIONS += $(BIN)/$(PGM).bat
+ SCRIPT_DIR = %GISBASE%/scripts
endif
-
--- grass-6.4.3/include/Make/Rules.make.orig 2013-03-02 11:52:07.000000000 +0100
+++ grass-6.4.3/include/Make/Rules.make 2014-06-11 21:22:16.080021691 +0200
@@ -66,7 +66,7 @@
mkpath = $(shell $(TOOLSDIR)/g.echo$(EXE) $(1));$(2)
else
mkpath = $(1):$(2)
---- grass-6.4.2/general/g.version/Makefile.orig 2011-04-18 20:13:39.000000000 +0200
-+++ grass-6.4.2/general/g.version/Makefile 2012-10-21 08:48:28.460856763 +0200
-@@ -29,4 +29,4 @@
- sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
+--- grass-7.0.3/include/Make/GuiScript.make.orig 2014-12-17 14:10:44.000000000 +0100
++++ grass-7.0.3/include/Make/GuiScript.make 2016-04-03 21:20:29.075998049 +0200
+@@ -10,7 +10,7 @@
+ MODULES := $(patsubst g.gui.%.py,%,$(wildcard g.gui.*.py))
+ CMDHTML := $(patsubst %,$(HTMLDIR)/g.gui.%.html,$(MODULES))
+ GUIHTML := $(patsubst %,$(HTMLDIR)/wxGUI.%.html,$(MODULES))
+-ifdef MINGW
++ifeq ($(MINGW),yes)
+ SCRIPTEXT = .py
+ BATFILES := $(patsubst %,$(BIN)/g.gui.%.bat,$(MODULES))
+ else
+--- grass-7.0.3/lib/proj/Makefile.orig 2015-12-17 09:13:35.000000000 +0100
++++ grass-7.0.3/lib/proj/Makefile 2016-04-03 21:20:54.752663637 +0200
+@@ -36,7 +36,7 @@
+ default: lib $(FTOL_OBJ)
+ $(MAKE) $(NAD_DSTFILES) $(CSV_DSTFILES) $(PROJ_DSTFILES) $(NAD_SRCFILES)
- $(OBJDIR)/confparms.h: $(MODULE_TOPDIR)/config.status
-- sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@
-+ sed -n '7s/^#\(.*\)$$/"\1"/p;s/^ac_cs_config="\(.*"\)$$/".\/configure \1/p' $< > $@
---- grass-6.4.4/configure.in~ 2015-07-19 06:50:37.000000000 +0000
-+++ grass-6.4.4/configure.in 2015-07-19 06:51:21.133489471 +0000
+-ifdef MINGW
++ifeq ($(MINGW),yes)
+ $(FTOL_OBJ): $(OBJDIR)/ftol.o
+ $(INSTALL) $< $@
+ endif
+--- grass-7.0.3/configure.in~ 2015-07-19 06:50:37.000000000 +0000
++++ grass-7.0.3/configure.in 2015-07-19 06:51:21.133489471 +0000
@@ -101,10 +101,6 @@
AC_SUBST(ARCH)
-# Use absolute path for aux directory so that install-sh works
-
--AC_CONFIG_AUX_DIR($SRCDIR)
+-AC_CONFIG_AUX_DIR("$SRCDIR")
-
# Set GISBASE and GRASS_BIN
GISBASE="${WINDSTDIR}/dist.${ARCH}"
+--- grass-7.0.3/include/Makefile.orig 2011-11-14 09:26:04.000000000 +0100
++++ grass-7.0.3/include/Makefile 2016-04-03 17:16:49.983278219 +0200
+@@ -46,4 +46,4 @@
+ sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
+
+ $(ARCH_INCDIR)/confparms.h: $(MODULE_TOPDIR)/config.status | $(ARCH_INCDIR)
+- sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@
++ sed -n '7s/^#\(.*\)$$/"\1"/p;s/^ac_cs_config="\(.*"\)$$/".\/configure \1/p' $< > $@
projects / packages / grass.git / blobdiff