diff options
-rw-r--r-- | devel/shapelib/Makefile | 2 | ||||
-rw-r--r-- | devel/shapelib/distinfo | 2 | ||||
-rw-r--r-- | devel/shapelib/files/patch-Makefile (renamed from devel/shapelib/files/patch-aa) | 29 |
3 files changed, 24 insertions, 9 deletions
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile index a658f6bb44c7..15689471185f 100644 --- a/devel/shapelib/Makefile +++ b/devel/shapelib/Makefile @@ -6,7 +6,7 @@ # PORTNAME= shapelib -PORTVERSION= 1.2.8 +PORTVERSION= 1.2.10 CATEGORIES= devel MASTER_SITES= ftp://gdal.velocet.ca/pub/outgoing/ diff --git a/devel/shapelib/distinfo b/devel/shapelib/distinfo index ff1416e1d09e..427e2f688b67 100644 --- a/devel/shapelib/distinfo +++ b/devel/shapelib/distinfo @@ -1 +1 @@ -MD5 (shapelib-1.2.8.tar.gz) = e2e0cfee2ad8d7a518512355734c635e +MD5 (shapelib-1.2.10.tar.gz) = 4d96bd926167193d27bf14d56e2d484e diff --git a/devel/shapelib/files/patch-aa b/devel/shapelib/files/patch-Makefile index add8dee42a54..f9f333903518 100644 --- a/devel/shapelib/files/patch-aa +++ b/devel/shapelib/files/patch-Makefile @@ -1,13 +1,23 @@ ---- Makefile.orig Tue Mar 28 15:36:27 2000 -+++ Makefile Wed Feb 19 20:32:54 2003 -@@ -91,23 +91,23 @@ +--- Makefile.orig Tue Oct 7 05:32:36 2003 ++++ Makefile Tue Oct 7 05:33:10 2003 +@@ -1,6 +1,6 @@ + + #LINKOPT = /usr/local/lib/libdbmalloc.a +-CFLAGS = -g ++#CFLAGS = -g + + default: all + +@@ -93,33 +93,33 @@ + + # ----------------------------------------------------------------------------- # The following is contributed by Jan-Oliver Wagner, and should allow for -# creating shared libraries on most platforms with gcc, and libtool installed. +# creating shared libraries on most platforms with $(CC), and libtool installed. --SHPLIB_VERSION=1.2.7 +-SHPLIB_VERSION=1.2.9 -LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry -+SHPLIB_VERSION=1.2.8 ++SHPLIB_VERSION=1.2.10 +LIBSHP_VERSION=1 # still once to be changed manually (see for 1:1:0), sorry lib: @@ -35,9 +45,14 @@ + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c dbfopen.c -o dbfopen.o >/dev/null 2>&1 mv -f .libs/dbfopen.lo dbfopen.lo - /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo -+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.* -@@ -117,3 +117,2 @@ + rm -fr .libs/libshp.lax + mkdir .libs/libshp.lax + /usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc - (cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) ++ #(cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) (cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) + ar cru .libs/libshp.a shpopen.o shptree.o dbfopen.o + ranlib .libs/libshp.a |