3 files changed, 31 insertions, 23 deletions

diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index ec581e8c3858..45674b114dae 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -18,14 +18,11 @@ ALL_TARGET=	lib
 INSTALLS_SHLIB=	yes
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/.libs/libshp.la ${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/.libs/libshp.so.1 ${PREFIX}/lib/
+	${INSTALL_PROGRAM} ${WRKSRC}/.libs/libshp.so.1 ${PREFIX}/lib
 	${LN} -sf libshp.so.1 ${PREFIX}/lib/libshp.so
 	${INSTALL_DATA} ${WRKSRC}/.libs/libshp.a ${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/shapefil.h ${PREFIX}/include
 	${MKDIR} ${PREFIX}/share/doc/shapelib
-	${INSTALL_DATA} ${WRKSRC}/shapelib.html ${PREFIX}/share/doc/shapelib
-	${INSTALL_DATA} ${WRKSRC}/shp_api.html ${PREFIX}/share/doc/shapelib
-	${INSTALL_DATA} ${WRKSRC}/dbf_api.html ${PREFIX}/share/doc/shapelib
+	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/shapelib
 
 .include <bsd.port.mk>
diff --git a/devel/shapelib/files/patch-aa b/devel/shapelib/files/patch-aa
index cf1a1355e684..1efd1a0cff62 100644
--- a/devel/shapelib/files/patch-aa
+++ b/devel/shapelib/files/patch-aa
@@ -1,8 +1,14 @@
---- Makefile.orig	Tue Mar 28 10:36:27 2000
-+++ Makefile	Mon Apr 23 22:53:27 2001
-@@ -91,31 +91,30 @@
+
+$FreeBSD$
+
+--- Makefile.orig	Tue Mar 28 18:36:27 2000
++++ Makefile	Thu May 31 13:19:38 2001
+@@ -89,33 +89,32 @@
+ 
+ # -----------------------------------------------------------------------------
  # 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 gcc, and libtool installed.
++# creating shared libraries on most platforms with $(CC), and libtool installed.
  
 -SHPLIB_VERSION=1.2.7
 -LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry
@@ -11,24 +17,30 @@
  
  lib:
 -	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shpopen.c
-+	/bin/sh /usr/local/bin/libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shpopen.c
- 	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
- 	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1
++	/bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c shpopen.c
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c  -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shpopen.c -o shpopen.o >/dev/null 2>&1
  	mv -f .libs/shpopen.lo shpopen.lo
 -	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shptree.c
-+	/bin/sh /usr/local/bin/libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shptree.c
++	/bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c shptree.c
  	rm -f .libs/shptree.lo
- 	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shptree.c -o .libs/shptree.lo
- 	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shptree.c -o .libs/shptree.lo
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c  -fPIC -DPIC shptree.c -o .libs/shptree.lo
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shptree.c -o shptree.o >/dev/null 2>&1
  	mv -f .libs/shptree.lo shptree.lo
 -	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c dbfopen.c
-+	/bin/sh /usr/local/bin/libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c dbfopen.c
++	/bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    $(CFLAGS) -c dbfopen.c
  	rm -f .libs/dbfopen.lo
- 	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo
- 	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c  -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo
++	$(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 /usr/local/bin/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 /usr/local/bin/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.*
  	rm -fr .libs/libshp.lax
  	mkdir .libs/libshp.lax
diff --git a/devel/shapelib/pkg-plist b/devel/shapelib/pkg-plist
index 55ab0958bc8b..e187f8086422 100644
--- a/devel/shapelib/pkg-plist
+++ b/devel/shapelib/pkg-plist
@@ -1,9 +1,8 @@
 include/shapefil.h
-lib/libshp.la
-lib/libshp.so.1
-lib/libshp.so
 lib/libshp.a
+lib/libshp.so
+lib/libshp.so.1
+share/doc/shapelib/dbf_api.html
 share/doc/shapelib/shapelib.html
 share/doc/shapelib/shp_api.html
-share/doc/shapelib/dbf_api.html
 @dirrm share/doc/shapelib