Upgrade libproj4 to proj.4 4.9.3.

2 files changed, 0 insertions, 72 deletions

diff --git a/math/libproj4/files/patch-Makefile b/math/libproj4/files/patch-Makefile
deleted file mode 100644
index bcc08ade2578..000000000000
--- a/math/libproj4/files/patch-Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
---- Makefile.orig	2008-11-20 18:40:28.000000000 +0100
-+++ Makefile	2014-10-11 18:03:23.000000000 +0200
-@@ -31,7 +31,7 @@
- 
- #prefix = /usr/local
- #prefix = /usr
--prefix = $(HOME)
-+prefix = $(PREFIX)
- 
- # edit to reflect directory where system defaults and inits are located
- LIB = $(prefix)/lib
-@@ -45,7 +45,7 @@
- THREADS=1
- 
- # select local compiler to use
--CC = gcc
-+#CC = gcc
- 
- # normally set on runline when debugging or testing file
- T =
-@@ -134,18 +134,20 @@
- thrf = -DPROJ_HAVE_THREADS=1
- endif
- 
--CFLAGS = -g -O -I./ $(gslf) $(thrf)
-+CFLAGS+= -fPIC -I./ $(gslf) $(thrf)
- #CFLAGS = -g -I./ $(gslf) $(thrf)
- 
--LDFLAGS = -L./ -lproj4 $(gsll) $(thrl) -lm
-+LDFLAGS+= -L./ -lproj4 $(gsll) $(thrl) -lm
- 
- lproj: lproj.o $T $L
--	$(CC) -o lproj -I./ lproj.o $T -L./ -lproj4 $(gsll) $(thrl) -lm 
-+	$(CC) -o lproj -I./ lproj.o $T -L./ -lproj4 $(LDFLAGS)
- 
- lproj.o: lib_proj.h
- 
- libproj4: $(RLIB)
- 	if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then ranlib $L ; fi
-+	$(CC) -shared $(LDFLAGS) -o libproj4.so.0 *.o
-+	ln -sf libproj4.so.0 libproj4.so
- 
- $(RLIB): lib_proj.h
- 
-@@ -154,9 +156,11 @@
- all: libproj4
- 
- install:
--	install -D libproj4.a $(LIB)/libproj4.a
--	install -D lproj $(BIN)/lproj
--	install -D lib_proj.h $(INC)/lib_proj.h
-+	install libproj4.a $(DESTDIR)$(LIB)/libproj4.a
-+	install libproj4.so $(DESTDIR)$(LIB)/libproj4.so
-+	install libproj4.so.0 $(DESTDIR)$(LIB)/libproj4.so.0
-+	install -s lproj $(DESTDIR)$(BIN)/lproj
-+	install lib_proj.h $(DESTDIR)$(INC)/lib_proj.h
- 
- clean:
- 	/bin/rm -f core *.o
diff --git a/math/libproj4/files/patch-proj_ftmerc.c b/math/libproj4/files/patch-proj_ftmerc.c
deleted file mode 100644
index 10ecb31e7930..000000000000
--- a/math/libproj4/files/patch-proj_ftmerc.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./proj_ftmerc.c.orig	2008-11-20 18:40:28.000000000 +0100
-+++ ./proj_ftmerc.c	2014-10-16 21:31:30.000000000 +0200
-@@ -31,6 +31,10 @@
- #define PROJ_LIB__
- #include	<lib_proj.h>
- #include <complex.h>
-+#include <sys/param.h>
-+#if defined(__FreeBSD__) && (__FreeBSD_version < 1000034)
-+# include <missing_complex.h>
-+#endif
- PROJ_HEAD(ftmerc, "French Transverse Mercator") "\n\tCyl, Ell";
- 
- /* forward series constants */