destdir support. Honour CFLAGS. Prepare for libtool-2.2.

3 files changed, 13 insertions, 11 deletions

diff --git a/geography/shapelib/Makefile b/geography/shapelib/Makefile
index f29fbb6cda5..e0879b9dbab 100644
--- a/geography/shapelib/Makefile
+++ b/geography/shapelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/03/24 19:21:25 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/11/26 00:42:19 joerg Exp $
 #
 
 DISTNAME=		shapelib-1.2.10
@@ -10,6 +10,8 @@ MAINTAINER=		mchittur@cs.nmsu.edu
 HOMEPAGE=		http://shapelib.maptools.org/
 COMMENT=		Library for reading, writing and updating (limited) ESRI Shapefiles
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=		YES
 
 NO_CONFIGURE=		YES
diff --git a/geography/shapelib/distinfo b/geography/shapelib/distinfo
index cf756f95e68..bb2831655b2 100644
--- a/geography/shapelib/distinfo
+++ b/geography/shapelib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/05/11 10:58:52 rillig Exp $
+$NetBSD: distinfo,v 1.3 2009/11/26 00:42:19 joerg Exp $
 
 SHA1 (shapelib-1.2.10.tar.gz) = 436b09b6a90f403e4568460d67560d5730725651
 RMD160 (shapelib-1.2.10.tar.gz) = 9dcd90d5197aa7d6063a703a369a530f6aa1f1c3
 Size (shapelib-1.2.10.tar.gz) = 167219 bytes
-SHA1 (patch-aa) = 2739348bb5fa55d5ec68b793c0ee136a3678c55a
+SHA1 (patch-aa) = 141901a52b09443245954a62663cf25fad229831
diff --git a/geography/shapelib/patches/patch-aa b/geography/shapelib/patches/patch-aa
index 08afa058906..5ce74890bd0 100644
--- a/geography/shapelib/patches/patch-aa
+++ b/geography/shapelib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2006/05/11 10:58:52 rillig Exp $
+$NetBSD: patch-aa,v 1.3 2009/11/26 00:42:19 joerg Exp $
 
 --- Makefile.orig	2003-04-07 15:03:22.000000000 +0200
 +++ Makefile
@@ -40,10 +40,10 @@ $NetBSD: patch-aa,v 1.2 2006/05/11 10:58:52 rillig Exp $
 -	ranlib .libs/libshp.a
 -	rm -fr .libs/libshp.lax
 -	(cd .libs && rm -f libshp.la && ln -s ../libshp.la libshp.la)
-+	${LIBTOOL} --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shpopen.c
-+	${LIBTOOL} --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shptree.c
-+	${LIBTOOL} --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c dbfopen.c
-+	${LIBTOOL} --mode=link gcc  -g -O2  -o libshp.la -rpath ${PREFIX}/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
++	${LIBTOOL} --mode=compile ${CC} -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include ${CFLAGS} -c shpopen.c
++	${LIBTOOL} --mode=compile ${CC} -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include ${CFLAGS} -c shptree.c
++	${LIBTOOL} --mode=compile ${CC} -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include ${CFLAGS} -c dbfopen.c
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS}  -o libshp.la -rpath ${PREFIX}/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
  
  lib_install:
 -	cp .libs/libshp.la .libs/libshp.lai
@@ -59,6 +59,6 @@ $NetBSD: patch-aa,v 1.2 2006/05/11 10:58:52 rillig Exp $
 -	chmod 644 /usr/local/lib/libshp.a
 -	/bin/sh ./mkinstalldirs /usr/local/include/libshp
 -	/usr/bin/install -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h
-+	${LIBTOOL}  --mode=install ${BSD_INSTALL_LIB} -c libshp.la ${PREFIX}/lib/libshp.la
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/libshp
-+	${BSD_INSTALL_DATA} -c -m 644 shapefil.h ${PREFIX}/include/libshp/shapefil.h
++	${LIBTOOL}  --mode=install ${BSD_INSTALL_LIB} -c libshp.la ${DESTDIR}${PREFIX}/lib/libshp.la
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/libshp
++	${BSD_INSTALL_DATA} -c -m 644 shapefil.h ${DESTDIR}${PREFIX}/include/libshp/shapefil.h