[gentoo-commits] repo/gentoo:master commit in: sci-libs/ogdi/files/ - gentoo-commits

From:	David Seifert <soap@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sci-libs/ogdi/files/
Date:	Sun, 29 Jan 2017 20:11:45
Message-Id:	`1485720579.f59566aa9bf56d44d6d2e1c50ea52e3ea623dbbb.soap@gentoo`

1

commit:     f59566aa9bf56d44d6d2e1c50ea52e3ea623dbbb

2

Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>

3

AuthorDate: Sun Jan 29 09:13:48 2017 +0000

4

Commit:     David Seifert <soap <AT> gentoo <DOT> org>

5

CommitDate: Sun Jan 29 20:09:39 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59566aa

7

8

sci-libs/ogdi: remove unused patches

9

10

Closes: https://github.com/gentoo/gentoo/pull/3709

11

12

 sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch          | 177 ---------------------

13

 sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch |  13 --

14

 2 files changed, 190 deletions(-)

15

16

diff --git a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch

17

deleted file mode 100644

18

index 33fb561..00000000

19

--- a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch

20

+++ /dev/null

21

@@ -1,177 +0,0 @@

22

-Only in ogdi-3.1.5.orig: bin

23

-Only in ogdi-3.1.5.orig/config: Linux.mak

24

-Only in ogdi-3.1.5.orig: config.cache

25

-Only in ogdi-3.1.5.orig: config.log

26

-Only in ogdi-3.1.5.orig: config.status

27

-Only in ogdi-3.1.5.orig/external/expat: OBJ.Linux

28

-diff -ur ogdi-3.1.5/external/expat/makefile ogdi-3.1.5.orig/external/expat/makefile

29

---- ogdi-3.1.5/external/expat/makefile	2001-08-27 14:11:10.000000000 +0000

30

-+++ ogdi-3.1.5.orig/external/expat/makefile	2005-08-01 18:57:49.020052368 +0000

31

-@@ -36,7 +36,7 @@

32

- # Compilation flags

33

- #

34

- INCLUDES = $(CURRENT_INCLUDE)

35

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) \

36

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC \

37

- 	-DVERSION=\"expat_1.95.1\" -DPACKAGE="expat"

38

-

39

- ifeq ($(BIG_ENDIAN),1)

40

-Only in ogdi-3.1.5.orig/external/zlib: OBJ.Linux

41

-diff -ur ogdi-3.1.5/external/zlib/makefile ogdi-3.1.5.orig/external/zlib/makefile

42

---- ogdi-3.1.5/external/zlib/makefile	2001-04-19 05:26:46.000000000 +0000

43

-+++ ogdi-3.1.5.orig/external/zlib/makefile	2005-08-01 18:58:47.984088472 +0000

44

-@@ -46,7 +46,7 @@

45

- # Compilation flags

46

- #

47

- INCLUDES = $(CURRENT_INCLUDE)

48

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

49

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

50

-

51

- #

52

- # Primary target

53

-Only in ogdi-3.1.5.orig/lib: Linux

54

-Only in ogdi-3.1.5.orig/ogdi/c-api: OBJ.Linux

55

-diff -ur ogdi-3.1.5/ogdi/c-api/makefile ogdi-3.1.5.orig/ogdi/c-api/makefile

56

---- ogdi-3.1.5/ogdi/c-api/makefile	2001-04-19 05:29:31.000000000 +0000

57

-+++ ogdi-3.1.5.orig/ogdi/c-api/makefile	2005-08-01 18:53:51.936094608 +0000

58

-@@ -23,7 +23,7 @@

59

- 		$(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \

60

- 		$(EXPAT_INCLUDE)

61

-

62

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

63

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

64

-

65

- LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \

66

- 		$(PROJ_STATICLIB) $(MATH_LINKLIB)

67

-Only in ogdi-3.1.5.orig/ogdi/datum_driver/canada: OBJ.Linux

68

-diff -ur ogdi-3.1.5/ogdi/datum_driver/canada/makefile ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile

69

---- ogdi-3.1.5/ogdi/datum_driver/canada/makefile	2001-02-19 04:12:21.000000000 +0000

70

-+++ ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile	2005-08-01 19:03:00.932634448 +0000

71

-@@ -17,7 +17,7 @@

72

- SOURCES = nadconv.c dtcanada.c

73

-

74

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)

75

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

76

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

77

-

78

- LINK_LIBS= 

79

-

80

-Only in ogdi-3.1.5.orig/ogdi/datum_driver/usa: OBJ.Linux

81

-diff -ur ogdi-3.1.5/ogdi/datum_driver/usa/makefile ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile

82

---- ogdi-3.1.5/ogdi/datum_driver/usa/makefile	2001-02-19 04:12:21.000000000 +0000

83

-+++ ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile	2005-08-01 19:03:24.883993288 +0000

84

-@@ -17,7 +17,7 @@

85

- SOURCES = dtusa.c

86

-

87

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)

88

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

89

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

90

-

91

- LINK_LIBS= $(PROJ_STATICLIB)

92

-

93

-Only in ogdi-3.1.5.orig/ogdi/driver/adrg: OBJ.Linux

94

-diff -ur ogdi-3.1.5/ogdi/driver/adrg/makefile ogdi-3.1.5.orig/ogdi/driver/adrg/makefile

95

---- ogdi-3.1.5/ogdi/driver/adrg/makefile	2001-06-22 16:37:50.000000000 +0000

96

-+++ ogdi-3.1.5.orig/ogdi/driver/adrg/makefile	2005-08-01 19:06:07.422283712 +0000

97

-@@ -18,7 +18,7 @@

98

-

99

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)

100

-

101

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

102

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

103

-

104

- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB) 

105

-

106

-Only in ogdi-3.1.5.orig/ogdi/driver/dted: OBJ.Linux

107

-diff -ur ogdi-3.1.5/ogdi/driver/dted/makefile ogdi-3.1.5.orig/ogdi/driver/dted/makefile

108

---- ogdi-3.1.5/ogdi/driver/dted/makefile	2001-02-19 04:12:21.000000000 +0000

109

-+++ ogdi-3.1.5.orig/ogdi/driver/dted/makefile	2005-08-01 19:06:31.460629328 +0000

110

-@@ -17,7 +17,7 @@

111

- SOURCES = dted.c utils.c object.c

112

-

113

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)

114

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

115

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

116

-

117

- LINK_LIBS= $(OGDI_LINKLIB)  $(GLUTIL_STATICLIB) 

118

-

119

-Only in ogdi-3.1.5.orig/ogdi/driver/network: OBJ.Linux

120

-diff -ur ogdi-3.1.5/ogdi/driver/network/makefile ogdi-3.1.5.orig/ogdi/driver/network/makefile

121

---- ogdi-3.1.5/ogdi/driver/network/makefile	2001-02-19 04:12:21.000000000 +0000

122

-+++ ogdi-3.1.5.orig/ogdi/driver/network/makefile	2005-08-01 19:06:52.242470008 +0000

123

-@@ -17,7 +17,7 @@

124

- SOURCES = remote.c ecs_clnt.c 

125

-

126

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GRASS_INCLUDE) $(PROJ_INCLUDE)

127

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

128

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

129

-

130

- LINK_LIBS= $(OGDI_LINKLIB) $(RPC_LINKLIB) $(WIN_LINKLIB)  

131

-

132

-Only in ogdi-3.1.5.orig/ogdi/driver/rpf: OBJ.Linux

133

-diff -ur ogdi-3.1.5/ogdi/driver/rpf/makefile ogdi-3.1.5.orig/ogdi/driver/rpf/makefile

134

---- ogdi-3.1.5/ogdi/driver/rpf/makefile	2001-02-19 04:12:21.000000000 +0000

135

-+++ ogdi-3.1.5.orig/ogdi/driver/rpf/makefile	2005-08-01 19:07:39.956216416 +0000

136

-@@ -19,7 +19,7 @@

137

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) \

138

- 	   $(GRASS_INCLUDE) $(PROJ_INCLUDE)

139

-

140

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

141

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

142

-

143

- LINK_LIBS= $(OGDI_LINKLIB) $(VPF_STATICLIB) $(GLUTIL_STATICLIB) $(WIN_LINKLIB) $(MATH_LINKLIB)

144

-

145

-Only in ogdi-3.1.5.orig/ogdi/driver/skeleton: OBJ.Linux

146

-diff -ur ogdi-3.1.5/ogdi/driver/skeleton/makefile ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile

147

---- ogdi-3.1.5/ogdi/driver/skeleton/makefile	2001-02-19 04:12:21.000000000 +0000

148

-+++ ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile	2005-08-01 19:07:15.500934184 +0000

149

-@@ -18,7 +18,7 @@

150

-

151

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GLUTIL_INCLUDE) $(PROJ_INCLUDE)

152

-

153

--CFLAGS 	= $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS)

154

-+CFLAGS 	= $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS) -fPIC -DPIC

155

-

156

- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)

157

-

158

-Only in ogdi-3.1.5.orig/ogdi/driver/vrf: OBJ.Linux

159

-diff -ur ogdi-3.1.5/ogdi/driver/vrf/makefile ogdi-3.1.5.orig/ogdi/driver/vrf/makefile

160

---- ogdi-3.1.5/ogdi/driver/vrf/makefile	2001-06-20 21:49:31.000000000 +0000

161

-+++ ogdi-3.1.5.orig/ogdi/driver/vrf/makefile	2005-08-01 19:08:03.541630888 +0000

162

-@@ -17,7 +17,7 @@

163

- SOURCES = vrf.c utils.c feature.c object.c open.c swq.c vrfswq.c

164

-

165

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(VPF_INCLUDE) $(PROJ_INCLUDE) $(GLUTIL_INCLUDE)

166

--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)

167

-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

168

-

169

- LINK_LIBS= $(OGDI_LINKLIB) $(WIN_LINKLIB) $(VPF_STATICLIB) $(MATH_LINKLIB)

170

-

171

-Only in ogdi-3.1.5.orig/ogdi/gltpd: OBJ.Linux

172

-Only in ogdi-3.1.5.orig/ogdi/glutil: OBJ.Linux

173

-Only in ogdi-3.1.5.orig/proj: OBJ.Linux

174

-diff -ur ogdi-3.1.5/proj/makefile ogdi-3.1.5.orig/proj/makefile

175

---- ogdi-3.1.5/proj/makefile	2001-04-09 16:20:08.000000000 +0000

176

-+++ ogdi-3.1.5.orig/proj/makefile	2005-08-01 19:01:03.573475752 +0000

177

-@@ -42,7 +42,7 @@

178

-

179

- INCLUDES     	= $(CURRENT_INCLUDE)

180

-

181

--CFLAGS 		= $(INCLUDES) $(COMMON_CFLAGS) 

182

-+CFLAGS 		= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC

183

-

184

- include $(TOPDIR)/config/common.mak

185

-

186

-Only in ogdi-3.1.5.orig/vpflib: OBJ.Linux

187

-diff -ur ogdi-3.1.5/vpflib/makefile ogdi-3.1.5.orig/vpflib/makefile

188

---- ogdi-3.1.5/vpflib/makefile	2001-02-20 04:25:20.000000000 +0000

189

-+++ ogdi-3.1.5.orig/vpflib/makefile	2005-08-01 19:09:48.072739744 +0000

190

-@@ -31,7 +31,7 @@

191

- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(VPF_INCLUDE)

192

-

193

- CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) $(UNIX_DEFINE) \

194

--	-DSYS_BIG_ENDIAN=$(BIG_ENDIAN)

195

-+	-DSYS_BIG_ENDIAN=$(BIG_ENDIAN) -fPIC -DPIC

196

-

197

- include $(TOPDIR)/config/common.mak

198

-

199

200

diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch b/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch

201

deleted file mode 100644

202

index df96ddf..00000000

203

--- a/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch

204

+++ /dev/null

205

@@ -1,13 +0,0 @@

206

-diff --git a/makefile b/makefile

207

-index 8c62a03..3ecb0f0 100644

208

---- a/makefile

209

-+++ b/makefile

210

-@@ -17,7 +17,7 @@ include $(TOPDIR)/config/common.mak

211

- #

212

- # Sub-directories that need to be built

213

- #

214

--subdirs	= external vpflib ogdi contrib

215

-+subdirs	= vpflib ogdi contrib

216

-

217

- ifneq ($(PROJ_SETTING),external)

218

- subdirs := proj $(subdirs)

1	commit: f59566aa9bf56d44d6d2e1c50ea52e3ea623dbbb
2	Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3	AuthorDate: Sun Jan 29 09:13:48 2017 +0000
4	Commit: David Seifert <soap <AT> gentoo <DOT> org>
5	CommitDate: Sun Jan 29 20:09:39 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59566aa
7
8	sci-libs/ogdi: remove unused patches
9
10	Closes: https://github.com/gentoo/gentoo/pull/3709
11
12	sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch \| 177 ---------------------
13	sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch \| 13 --
14	2 files changed, 190 deletions(-)
15
16	diff --git a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch
17	deleted file mode 100644
18	index 33fb561..00000000
19	--- a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch
20	+++ /dev/null
21	@@ -1,177 +0,0 @@
22	-Only in ogdi-3.1.5.orig: bin
23	-Only in ogdi-3.1.5.orig/config: Linux.mak
24	-Only in ogdi-3.1.5.orig: config.cache
25	-Only in ogdi-3.1.5.orig: config.log
26	-Only in ogdi-3.1.5.orig: config.status
27	-Only in ogdi-3.1.5.orig/external/expat: OBJ.Linux
28	-diff -ur ogdi-3.1.5/external/expat/makefile ogdi-3.1.5.orig/external/expat/makefile
29	---- ogdi-3.1.5/external/expat/makefile 2001-08-27 14:11:10.000000000 +0000
30	-+++ ogdi-3.1.5.orig/external/expat/makefile 2005-08-01 18:57:49.020052368 +0000
31	-@@ -36,7 +36,7 @@
32	- # Compilation flags
33	- #
34	- INCLUDES = $(CURRENT_INCLUDE)
35	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) \
36	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC \
37	- -DVERSION=\"expat_1.95.1\" -DPACKAGE="expat"
38	-
39	- ifeq ($(BIG_ENDIAN),1)
40	-Only in ogdi-3.1.5.orig/external/zlib: OBJ.Linux
41	-diff -ur ogdi-3.1.5/external/zlib/makefile ogdi-3.1.5.orig/external/zlib/makefile
42	---- ogdi-3.1.5/external/zlib/makefile 2001-04-19 05:26:46.000000000 +0000
43	-+++ ogdi-3.1.5.orig/external/zlib/makefile 2005-08-01 18:58:47.984088472 +0000
44	-@@ -46,7 +46,7 @@
45	- # Compilation flags
46	- #
47	- INCLUDES = $(CURRENT_INCLUDE)
48	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
49	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
50	-
51	- #
52	- # Primary target
53	-Only in ogdi-3.1.5.orig/lib: Linux
54	-Only in ogdi-3.1.5.orig/ogdi/c-api: OBJ.Linux
55	-diff -ur ogdi-3.1.5/ogdi/c-api/makefile ogdi-3.1.5.orig/ogdi/c-api/makefile
56	---- ogdi-3.1.5/ogdi/c-api/makefile 2001-04-19 05:29:31.000000000 +0000
57	-+++ ogdi-3.1.5.orig/ogdi/c-api/makefile 2005-08-01 18:53:51.936094608 +0000
58	-@@ -23,7 +23,7 @@
59	- $(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \
60	- $(EXPAT_INCLUDE)
61	-
62	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
63	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
64	-
65	- LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
66	- $(PROJ_STATICLIB) $(MATH_LINKLIB)
67	-Only in ogdi-3.1.5.orig/ogdi/datum_driver/canada: OBJ.Linux
68	-diff -ur ogdi-3.1.5/ogdi/datum_driver/canada/makefile ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile
69	---- ogdi-3.1.5/ogdi/datum_driver/canada/makefile 2001-02-19 04:12:21.000000000 +0000
70	-+++ ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile 2005-08-01 19:03:00.932634448 +0000
71	-@@ -17,7 +17,7 @@
72	- SOURCES = nadconv.c dtcanada.c
73	-
74	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
75	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
76	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
77	-
78	- LINK_LIBS=
79	-
80	-Only in ogdi-3.1.5.orig/ogdi/datum_driver/usa: OBJ.Linux
81	-diff -ur ogdi-3.1.5/ogdi/datum_driver/usa/makefile ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile
82	---- ogdi-3.1.5/ogdi/datum_driver/usa/makefile 2001-02-19 04:12:21.000000000 +0000
83	-+++ ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile 2005-08-01 19:03:24.883993288 +0000
84	-@@ -17,7 +17,7 @@
85	- SOURCES = dtusa.c
86	-
87	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
88	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
89	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
90	-
91	- LINK_LIBS= $(PROJ_STATICLIB)
92	-
93	-Only in ogdi-3.1.5.orig/ogdi/driver/adrg: OBJ.Linux
94	-diff -ur ogdi-3.1.5/ogdi/driver/adrg/makefile ogdi-3.1.5.orig/ogdi/driver/adrg/makefile
95	---- ogdi-3.1.5/ogdi/driver/adrg/makefile 2001-06-22 16:37:50.000000000 +0000
96	-+++ ogdi-3.1.5.orig/ogdi/driver/adrg/makefile 2005-08-01 19:06:07.422283712 +0000
97	-@@ -18,7 +18,7 @@
98	-
99	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
100	-
101	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
102	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
103	-
104	- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
105	-
106	-Only in ogdi-3.1.5.orig/ogdi/driver/dted: OBJ.Linux
107	-diff -ur ogdi-3.1.5/ogdi/driver/dted/makefile ogdi-3.1.5.orig/ogdi/driver/dted/makefile
108	---- ogdi-3.1.5/ogdi/driver/dted/makefile 2001-02-19 04:12:21.000000000 +0000
109	-+++ ogdi-3.1.5.orig/ogdi/driver/dted/makefile 2005-08-01 19:06:31.460629328 +0000
110	-@@ -17,7 +17,7 @@
111	- SOURCES = dted.c utils.c object.c
112	-
113	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
114	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
115	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
116	-
117	- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
118	-
119	-Only in ogdi-3.1.5.orig/ogdi/driver/network: OBJ.Linux
120	-diff -ur ogdi-3.1.5/ogdi/driver/network/makefile ogdi-3.1.5.orig/ogdi/driver/network/makefile
121	---- ogdi-3.1.5/ogdi/driver/network/makefile 2001-02-19 04:12:21.000000000 +0000
122	-+++ ogdi-3.1.5.orig/ogdi/driver/network/makefile 2005-08-01 19:06:52.242470008 +0000
123	-@@ -17,7 +17,7 @@
124	- SOURCES = remote.c ecs_clnt.c
125	-
126	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GRASS_INCLUDE) $(PROJ_INCLUDE)
127	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
128	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
129	-
130	- LINK_LIBS= $(OGDI_LINKLIB) $(RPC_LINKLIB) $(WIN_LINKLIB)
131	-
132	-Only in ogdi-3.1.5.orig/ogdi/driver/rpf: OBJ.Linux
133	-diff -ur ogdi-3.1.5/ogdi/driver/rpf/makefile ogdi-3.1.5.orig/ogdi/driver/rpf/makefile
134	---- ogdi-3.1.5/ogdi/driver/rpf/makefile 2001-02-19 04:12:21.000000000 +0000
135	-+++ ogdi-3.1.5.orig/ogdi/driver/rpf/makefile 2005-08-01 19:07:39.956216416 +0000
136	-@@ -19,7 +19,7 @@
137	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) \
138	- $(GRASS_INCLUDE) $(PROJ_INCLUDE)
139	-
140	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
141	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
142	-
143	- LINK_LIBS= $(OGDI_LINKLIB) $(VPF_STATICLIB) $(GLUTIL_STATICLIB) $(WIN_LINKLIB) $(MATH_LINKLIB)
144	-
145	-Only in ogdi-3.1.5.orig/ogdi/driver/skeleton: OBJ.Linux
146	-diff -ur ogdi-3.1.5/ogdi/driver/skeleton/makefile ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile
147	---- ogdi-3.1.5/ogdi/driver/skeleton/makefile 2001-02-19 04:12:21.000000000 +0000
148	-+++ ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile 2005-08-01 19:07:15.500934184 +0000
149	-@@ -18,7 +18,7 @@
150	-
151	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GLUTIL_INCLUDE) $(PROJ_INCLUDE)
152	-
153	--CFLAGS = $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS)
154	-+CFLAGS = $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS) -fPIC -DPIC
155	-
156	- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
157	-
158	-Only in ogdi-3.1.5.orig/ogdi/driver/vrf: OBJ.Linux
159	-diff -ur ogdi-3.1.5/ogdi/driver/vrf/makefile ogdi-3.1.5.orig/ogdi/driver/vrf/makefile
160	---- ogdi-3.1.5/ogdi/driver/vrf/makefile 2001-06-20 21:49:31.000000000 +0000
161	-+++ ogdi-3.1.5.orig/ogdi/driver/vrf/makefile 2005-08-01 19:08:03.541630888 +0000
162	-@@ -17,7 +17,7 @@
163	- SOURCES = vrf.c utils.c feature.c object.c open.c swq.c vrfswq.c
164	-
165	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(VPF_INCLUDE) $(PROJ_INCLUDE) $(GLUTIL_INCLUDE)
166	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
167	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
168	-
169	- LINK_LIBS= $(OGDI_LINKLIB) $(WIN_LINKLIB) $(VPF_STATICLIB) $(MATH_LINKLIB)
170	-
171	-Only in ogdi-3.1.5.orig/ogdi/gltpd: OBJ.Linux
172	-Only in ogdi-3.1.5.orig/ogdi/glutil: OBJ.Linux
173	-Only in ogdi-3.1.5.orig/proj: OBJ.Linux
174	-diff -ur ogdi-3.1.5/proj/makefile ogdi-3.1.5.orig/proj/makefile
175	---- ogdi-3.1.5/proj/makefile 2001-04-09 16:20:08.000000000 +0000
176	-+++ ogdi-3.1.5.orig/proj/makefile 2005-08-01 19:01:03.573475752 +0000
177	-@@ -42,7 +42,7 @@
178	-
179	- INCLUDES = $(CURRENT_INCLUDE)
180	-
181	--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
182	-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
183	-
184	- include $(TOPDIR)/config/common.mak
185	-
186	-Only in ogdi-3.1.5.orig/vpflib: OBJ.Linux
187	-diff -ur ogdi-3.1.5/vpflib/makefile ogdi-3.1.5.orig/vpflib/makefile
188	---- ogdi-3.1.5/vpflib/makefile 2001-02-20 04:25:20.000000000 +0000
189	-+++ ogdi-3.1.5.orig/vpflib/makefile 2005-08-01 19:09:48.072739744 +0000
190	-@@ -31,7 +31,7 @@
191	- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(VPF_INCLUDE)
192	-
193	- CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) $(UNIX_DEFINE) \
194	-- -DSYS_BIG_ENDIAN=$(BIG_ENDIAN)
195	-+ -DSYS_BIG_ENDIAN=$(BIG_ENDIAN) -fPIC -DPIC
196	-
197	- include $(TOPDIR)/config/common.mak
198	-
199
200	diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch b/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch
201	deleted file mode 100644
202	index df96ddf..00000000
203	--- a/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch
204	+++ /dev/null
205	@@ -1,13 +0,0 @@
206	-diff --git a/makefile b/makefile
207	-index 8c62a03..3ecb0f0 100644
208	---- a/makefile
209	-+++ b/makefile
210	-@@ -17,7 +17,7 @@ include $(TOPDIR)/config/common.mak
211	- #
212	- # Sub-directories that need to be built
213	- #
214	--subdirs = external vpflib ogdi contrib
215	-+subdirs = vpflib ogdi contrib
216	-
217	- ifneq ($(PROJ_SETTING),external)
218	- subdirs := proj $(subdirs)

Gentoo Archives: gentoo-commits