]> git.pld-linux.org Git - packages/grass.git/blame - grass-ac.patch
projects / packages / grass.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
upgraded to 6.4.4
[packages/grass.git] / grass-ac.patch
CommitLineData
7f1c1d86
JB		 1--- grass-6.4.2/lib/gis/Makefile.orig 2011-03-10 10:54:19.000000000 +0100
2+++ grass-6.4.2/lib/gis/Makefile 2012-10-20 14:32:27.320283161 +0200
3@@ -12,7 +12,7 @@
4
5 LIB_OBJS := $(subst .c,.o,$(wildcard *.c))
6 LIB_OBJS := $(filter-out fmode.o dllmain.o,$(LIB_OBJS))
7-ifneq ($(MINGW),)
8+ifeq ($(MINGW),yes)
9 LIB_OBJS := $(LIB_OBJS) dllmain.o fmode.o
10 endif
11
12@@ -34,7 +34,7 @@
13
14 ifneq ($(GDAL_DYNAMIC),)
15 EXTRA_CFLAGS += -DGDAL_DYNAMIC=1
16-ifneq ($(MINGW),)
17+ifeq ($(MINGW),yes)
18 EXTRA_LIBS += -lkernel32
19 else
20 EXTRA_LIBS += $(DLLIB)
21--- grass-6.4.2/lib/init/Makefile.orig 2011-06-08 12:30:46.000000000 +0200
22+++ grass-6.4.2/lib/init/Makefile 2012-10-20 14:33:08.316948107 +0200
23@@ -60,7 +60,7 @@
24 $(ETC)/html_browser_mac.sh
25 endif
26
27-ifneq ($(strip $(MINGW)),)
28+ifeq ($(strip $(MINGW)),yes)
29 FILES += \
30 $(ETC)/Init.bat \
31 $(ETC)/winlocale$(EXE) \
32--- grass-6.4.2/Makefile.orig 2011-05-13 21:01:14.000000000 +0200
33+++ grass-6.4.2/Makefile 2012-10-20 14:34:32.893611225 +0200
34@@ -49,7 +49,7 @@
35 man \
36 macosx
37
38-ifeq ($(strip $(MINGW)),)
39+ifneq ($(strip $(MINGW)),yes)
40 SUBDIRS += gem
41 endif
42
43@@ -115,7 +115,7 @@
44 @if [ `cat "$(ERRORLOG)" | wc -l` -gt 8 ] ; then false ; else true ; fi
45
46 manifests:
47-ifneq ($(strip $(MINGW)),)
48+ifeq ($(strip $(MINGW)),yes)
49 find $(ARCH_DISTDIR) -type f -name '*.exe' | \
50 while read file ; do \
51 cmd=`basename "$$file" .exe` ; \
52@@ -278,7 +278,7 @@
53 -cd ${GISBASE} ; tar cBf - driver | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
54 -cd ${GISBASE} ; tar cBf - etc | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
55 -cd ${GISBASE} ; tar cBf - fonts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
56-ifeq ($(strip $(MINGW)),)
57+ifneq ($(strip $(MINGW)),yes)
58 -cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
59 endif
60 -cd ${GISBASE} ; tar cBf - scripts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
61@@ -299,7 +299,7 @@
62 -sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap
63 @##### -chmod -R 1777 ${INST_DIR}/locks 2>/dev/null
64 -chmod -R a+rX ${INST_DIR} 2>/dev/null
65-ifeq ($(strip $(MINGW)),)
66+ifneq ($(strip $(MINGW)),yes)
67 @#GEM installation
68 -tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
69 -${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null
70--- grass-6.4.2/lib/python/ctypes/Makefile.orig 2011-05-03 21:27:16.000000000 +0200
71+++ grass-6.4.2/lib/python/ctypes/Makefile 2012-10-20 14:35:23.370275773 +0200
72@@ -57,7 +57,7 @@
73 CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC)"
74 EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M).py) $(wildcard ctypesgencore/*.pyc) $(wildcard ctypesgencore/*/*.pyc)
75
76-ifneq ($(MINGW),)
77+ifeq ($(MINGW),yes)
78 INTLLIB = -lintl3
79 endif
80
81--- grass-6.4.2/visualization/nviz/Makefile.orig 2008-12-23 15:05:57.000000000 +0100
82+++ grass-6.4.2/visualization/nviz/Makefile 2012-10-20 14:36:21.746939990 +0200
83@@ -9,7 +9,7 @@
84 PROG=nviz
85 INSTALL_DIR=$(GISBASE)/etc/$(NV_VER)
86
87-ifneq ($(strip $(MINGW)),)
88+ifeq ($(strip $(MINGW)),yes)
89 FIND = find
90 else
91 FIND = find -L
92@@ -36,7 +36,7 @@
93 -$(MKDIR) $(INSTALL_DIR)
94 $(INSTALL) src/nvwish$(EXE) $(INSTALL_DIR)/$(PROG)$(EXE)
95 $(INSTALL) scripts/$(PROG) $(GISBASE)/bin
96-ifneq ($(strip $(MINGW)),)
97+ifeq ($(strip $(MINGW)),yes)
98 $(INSTALL) scripts/nviz.bat $(GISBASE)/bin
99 endif
100 -$(MKDIR) $(INSTALL_DIR)/scripts
101--- grass-6.4.2/visualization/nviz/html/Makefile.orig 2008-12-23 15:05:57.000000000 +0100
102+++ grass-6.4.2/visualization/nviz/html/Makefile 2012-10-20 14:36:43.426939080 +0200
103@@ -5,7 +5,7 @@
104
105 GRASS_NVIZ_DOCS=$(GISBASE)/docs/html/nviz
106
107-ifneq ($(strip $(MINGW)),)
108+ifeq ($(strip $(MINGW)),yes)
109 FIND = find
110 else
111 FIND = find -L
112--- grass-6.4.2/gui/tcltk/Makefile.orig 2009-05-11 21:22:34.000000000 +0200
113+++ grass-6.4.2/gui/tcltk/Makefile 2012-10-20 14:39:10.970266222 +0200
114@@ -2,7 +2,7 @@
115
116 SUBDIRS = gis.m
117
118-ifndef MINGW
119+ifneq ($(MINGW),yes)
120 SUBDIRS += d.m
121 endif
122
123--- grass-6.4.2/gui/scripts/Makefile.orig 2010-01-15 15:41:17.000000000 +0100
124+++ grass-6.4.2/gui/scripts/Makefile 2012-10-20 14:39:41.100264957 +0200
125@@ -2,7 +2,7 @@
126
127 include $(MODULE_TOPDIR)/include/Make/Dir.make
128
129-ifdef MINGW
130+ifeq ($(MINGW),yes)
131 SCRIPT_ACTIONS += create.bat
132 endif
133
134--- grass-6.4.2/raster/Makefile.orig 2011-04-22 16:09:26.000000000 +0200
135+++ grass-6.4.2/raster/Makefile 2012-10-20 14:40:31.790262831 +0200
136@@ -129,7 +129,7 @@
137
138 include $(MODULE_TOPDIR)/include/Make/Platform.make
139
140-ifndef MINGW
141+ifneq ($(MINGW),yes)
142 SUBDIRS += r.li
143 endif
144
145--- grass-6.4.2/vector/v.transform/Makefile.orig 2008-12-19 21:28:57.000000000 +0100
146+++ grass-6.4.2/vector/v.transform/Makefile 2012-10-20 14:40:59.673594995 +0200
147@@ -5,7 +5,7 @@
148
149 include $(MODULE_TOPDIR)/include/Make/Module.make
150
151-ifdef MINGW
152+ifeq ($(MINGW),yes)
153 EXTRA_LIB=
154 else
155 EXTRA_LIB=$(VASKLIB) $(CURSES)
156--- grass-6.4.2/include/Make/Grass.make.in.orig 2011-04-18 20:13:38.000000000 +0200
157+++ grass-6.4.2/include/Make/Grass.make.in 2012-10-20 14:58:30.123550911 +0200
158@@ -86,7 +86,7 @@
159 VECT_CFLAGS = $(GDALCFLAGS) $(GEOSCFLAGS)
160
161 # Object with _fmode which must be linked to each executable on Windows
162-ifdef MINGW
163+ifeq ($(MINGW),yes)
164 FMODE_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/fmode.o
165 endif
166
167--- grass-6.4.2/include/Make/Shlib.make.orig 2012-10-20 14:41:45.603593065 +0200
168+++ grass-6.4.2/include/Make/Shlib.make 2012-10-20 14:59:13.833549075 +0200
169@@ -3,7 +3,7 @@
170 SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME)$(SHLIB_SUFFIX)
171
172 # Object that calls _setfmode(_O_BINARY) which must be linked to each DLL on Windows
173-ifdef MINGW
174+ifeq ($(MINGW),yes)
175 ifneq ($(SHLIB_NAME),$(DATETIME_LIBNAME))
176 ifneq ($(SHLIB_NAME),$(GIS_LIBNAME))
177 DLLMAIN_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/dllmain.o
178@@ -16,7 +16,7 @@
179
180 $(SHLIB): $(SHLIB_OBJS)
181 $(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
182-ifndef MINGW
183+ifneq ($(MINGW),yes)
184 (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
185 endif
186
187--- grass-6.4.2/include/Make/Script.make.orig 2009-07-05 14:48:37.000000000 +0200
188+++ grass-6.4.2/include/Make/Script.make 2012-10-20 14:59:58.503547201 +0200
189@@ -11,7 +11,7 @@
190 include $(MODULE_TOPDIR)/include/Make/Rules.make
191
192 SCRIPT_ACTIONS = $(SCRIPT)
193-ifdef MINGW
194+ifeq ($(MINGW),yes)
195 SCRIPT_ACTIONS += $(BIN)/$(PGM).bat
196 endif
197
d62d471a
JB		 198--- grass-6.4.3/include/Make/Rules.make.orig 2013-03-02 11:52:07.000000000 +0100
199+++ grass-6.4.3/include/Make/Rules.make 2014-06-11 21:22:16.080021691 +0200
200@@ -66,7 +66,7 @@
201 %.tab.h %.tab.c: %.y
202 $(YACC) -b$* -p$* $(YACCFLAGS) $<
203
204-ifneq ($(MINGW),)
205+ifeq ($(MINGW),yes)
206 mkpath = $(shell $(TOOLSDIR)/g.echo$(EXE) $(1));$(2)
207 else
208 mkpath = $(1):$(2)
7f1c1d86
JB		 209--- grass-6.4.2/general/g.version/Makefile.orig 2011-04-18 20:13:39.000000000 +0200
210+++ grass-6.4.2/general/g.version/Makefile 2012-10-21 08:48:28.460856763 +0200
211@@ -29,4 +29,4 @@
212 sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
213
214 $(OBJDIR)/confparms.h: $(MODULE_TOPDIR)/config.status
215- sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@
216+ sed -n '7s/^#\(.*\)$$/"\1"/p;s/^ac_cs_config="\(.*"\)$$/".\/configure \1/p' $< > $@
The Geographic Resources Analysis Support System
This page took 0.046712 seconds and 4 git commands to generate.