Add user-destdir installation support.

3 files changed, 26 insertions, 24 deletions

diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 1c241f9512c..87df63b417c 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/03/21 08:37:59 obache Exp $
+# $NetBSD: Makefile,v 1.22 2011/03/21 08:47:12 obache Exp $
 #
 
 # pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000.
@@ -18,6 +18,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://akpublic.research.att.com/sw/tools/sfio/
 COMMENT=	Safe and Fast IO library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=	no
 
 WRKSRC=		${WRKDIR}
diff --git a/devel/sfio/distinfo b/devel/sfio/distinfo
index 9786a6adc14..901bf267e42 100644
--- a/devel/sfio/distinfo
+++ b/devel/sfio/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:33 agc Exp $
+$NetBSD: distinfo,v 1.6 2011/03/21 08:47:12 obache Exp $
 
 SHA1 (sfio_1999.src.unix.cpio) = 6fd3a711ca8f95190c0859934f57a66d02c842a4
 RMD160 (sfio_1999.src.unix.cpio) = 379148273c9979f7a5a921a338465b7579a6ac5e
 Size (sfio_1999.src.unix.cpio) = 647168 bytes
 SHA1 (patch-aa) = 514aafe5eb5f97150742efa6a5b51644bf485bda
-SHA1 (patch-ab) = 5d18fef1b1c2f4a3ce6071a4ab3ebe2d10af5261
+SHA1 (patch-ab) = 184497c28da9db978c2b384d3be526d28e3ebae0
 SHA1 (patch-ac) = 0e3b0aae65393ce98fd086ec593dd73e2b41c283
 SHA1 (patch-ad) = 4298da6e3778890f152c897d2da2849944f4eef3
 SHA1 (patch-ae) = 807cd4fc112fd439eb3431da6ae2b0dc7c7a38b4
diff --git a/devel/sfio/patches/patch-ab b/devel/sfio/patches/patch-ab
index 909aea13d2b..6d670290792 100644
--- a/devel/sfio/patches/patch-ab
+++ b/devel/sfio/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2002/09/10 23:39:44 schmonz Exp $
+$NetBSD: patch-ab,v 1.6 2011/03/21 08:47:12 obache Exp $
 
 Build and installation commands
 
@@ -10,35 +10,35 @@ Build and installation commands
 +	cd src/lib/sfio/Stdio_b; ${MAKE} -f stdio.mk FEATURE/stdio must; ${MAKE} -f stdio.mk
 +
 +install:
-+	${INSTALL} -c -m 0644 src/lib/sfio/libsfio.a ${PREFIX}/lib
-+	${INSTALL} -c -m 0644 src/lib/sfio/libsfio_p.a ${PREFIX}/lib
-+	${INSTALL} -c -m 0644 src/lib/sfio/libsfio_pic.a ${PREFIX}/lib
-+	${INSTALL} -c -m 0644 src/lib/sfio/libsfio.so.1.0 ${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/libsfio.a ${DESTDIR}${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/libsfio_p.a ${DESTDIR}${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/libsfio_pic.a ${DESTDIR}${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/libsfio.so.1.0 ${DESTDIR}${PREFIX}/lib
 +	if [ "${OBJECT_FMT}" = "ELF" ]; then				\
-+		(cd ${PREFIX}/lib; rm -f libsfio.so libsfio.so.1;	\
++		(cd ${DESTDIR}${PREFIX}/lib; rm -f libsfio.so libsfio.so.1;	\
 +		 ln -s libsfio.so.1.0 libsfio.so; 			\
 +		 ln -s libsfio.so.1.0 libsfio.so.1) 			\
 +	fi
-+	${RANLIB} ${PREFIX}/lib/libsfio.a
-+	${RANLIB} ${PREFIX}/lib/libsfio_p.a
-+	${RANLIB} ${PREFIX}/lib/libsfio_pic.a
-+	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio.a ${PREFIX}/lib
-+	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio_p.a ${PREFIX}/lib
-+	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio_pic.a ${PREFIX}/lib
-+	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio.so.1.0 ${PREFIX}/lib
++	${RANLIB} ${DESTDIR}${PREFIX}/lib/libsfio.a
++	${RANLIB} ${DESTDIR}${PREFIX}/lib/libsfio_p.a
++	${RANLIB} ${DESTDIR}${PREFIX}/lib/libsfio_pic.a
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio.a ${DESTDIR}${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio_p.a ${DESTDIR}${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio_pic.a ${DESTDIR}${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio.so.1.0 ${DESTDIR}${PREFIX}/lib
 +	if [ "${OBJECT_FMT}" = "ELF" ]; then				\
-+		(cd ${PREFIX}/lib; rm -f libstdio.so libstdio.so.1;	\
++		(cd ${DESTDIR}${PREFIX}/lib; rm -f libstdio.so libstdio.so.1;	\
 +		 ln -s libstdio.so.1.0 libstdio.so; 			\
 +		 ln -s libstdio.so.1.0 libstdio.so.1) 			\
 +	fi
-+	${RANLIB} ${PREFIX}/lib/libstdio.a
-+	${RANLIB} ${PREFIX}/lib/libstdio_p.a
-+	${RANLIB} ${PREFIX}/lib/libstdio_pic.a
-+	${INSTALL} -c -m 0644 man/man3/sfio.3 ${PREFIX}/man/man3
-+	-/bin/mkdir ${PREFIX}/include/sfio
++	${RANLIB} ${DESTDIR}${PREFIX}/lib/libstdio.a
++	${RANLIB} ${DESTDIR}${PREFIX}/lib/libstdio_p.a
++	${RANLIB} ${DESTDIR}${PREFIX}/lib/libstdio_pic.a
++	${INSTALL} -c -m 0644 man/man3/sfio.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
++	-mkdir ${DESTDIR}${PREFIX}/include/sfio
 +	for f in ast_common.h sfio.h sfio_t.h; do \
-+		${INSTALL} -c -m 0644 src/lib/sfio/$$f ${PREFIX}/include/sfio/$$f; \
++		${INSTALL} -c -m 0644 src/lib/sfio/$$f ${DESTDIR}${PREFIX}/include/sfio/$$f; \
 +	done
-+	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_s/stdio.h ${PREFIX}/include/sfio/stdio.h
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_s/stdio.h ${DESTDIR}${PREFIX}/include/sfio/stdio.h
 +
 +.include <bsd.own.mk>