From 4ff5c24a85b83e777de8ea6a80be5cf50ae5f023 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 3 Sep 2009 12:35:32 +0000
Subject: DESTDIR support, don't depend on libtool mode detection.

---
 security/rsaref/Makefile         | 16 +++++++++-------
 security/rsaref/distinfo         |  4 ++--
 security/rsaref/patches/patch-ag |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'security')

diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 8d5c95cb139..7b8817418df 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/05/19 08:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2009/09/03 12:35:32 joerg Exp $
 #
 
 DISTNAME=		rsaref
@@ -20,22 +20,24 @@ WRKSRC=			${WRKDIR}/install
 CRYPTO=			yes
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 MAKE_FILE=		unix/makefile
 BUILD_TARGET=		librsaref.la
 
+INSTALLATION_DIRS=	lib include/rsaref share/doc/rsaref
+
 do-configure:
 	@${RM} -f ${WRKDIR}/source/rsaref && ${LN} -sf . ${WRKDIR}/source/rsaref
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib
-	${INSTALL_DATA_DIR} ${PREFIX}/include/rsaref
-	cd ${WRKSRC} && ${LIBTOOL} ${INSTALL_DATA} librsaref.la ${PREFIX}/lib
+	cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
+	    librsaref.la ${DESTDIR}${PREFIX}/lib
 .for file in des.h global.h md2.h md5.h rsa.h rsaref.h
-	${INSTALL_DATA} ${WRKDIR}/source/${file} ${PREFIX}/include/rsaref/
+	${INSTALL_DATA} ${WRKDIR}/source/${file} ${DESTDIR}${PREFIX}/include/rsaref/
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rsaref
-	cd ${WRKDIR}/doc && ${INSTALL_DATA} info.txt rsaref.txt ${PREFIX}/share/doc/rsaref/
+	cd ${WRKDIR}/doc && ${INSTALL_DATA} info.txt rsaref.txt \
+	    ${DESTDIR}${PREFIX}/share/doc/rsaref/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/rsaref/distinfo b/security/rsaref/distinfo
index d1205ddb370..d77f00dd483 100644
--- a/security/rsaref/distinfo
+++ b/security/rsaref/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:10:12 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/09/03 12:35:32 joerg Exp $
 
 SHA1 (rsaref.tar.Z) = 9515c7d58150aa949e1fb01ea939131fca638dc6
 RMD160 (rsaref.tar.Z) = 8901e19d9186a1201c1a4060f9fa01fb9ae0a838
@@ -9,5 +9,5 @@ SHA1 (patch-ac) = 498ff6a59786afbbc5273ecc65d93e73c5e5467c
 SHA1 (patch-ad) = c9b9736e3a53c50dfb6c1d82b4a056cc47aacdd2
 SHA1 (patch-ae) = 9e775eaa0122f4bf638b6064eea17206f9f4b1ad
 SHA1 (patch-af) = e58db0e6c66943763227f52b4410944fb8a6e9dd
-SHA1 (patch-ag) = 51195195bb4ebf7dc3e25e7849dc7f4d451bfc26
+SHA1 (patch-ag) = a7b13157872b804c3c34327d6ac2d3abf267a1f2
 SHA1 (patch-ah) = 9202ff78fc31d86707b2e2b6b0ca3e1d7fcbafce
diff --git a/security/rsaref/patches/patch-ag b/security/rsaref/patches/patch-ag
index 7e80c917fa0..53e6d0a0097 100644
--- a/security/rsaref/patches/patch-ag
+++ b/security/rsaref/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.7 2004/02/04 19:02:43 fredb Exp $
+$NetBSD: patch-ag,v 1.8 2009/09/03 12:35:32 joerg Exp $
 
 --- unix/makefile.orig	1994-03-25 13:01:31.000000000 -0600
 +++ unix/makefile
@@ -8,7 +8,7 @@ $NetBSD: patch-ag,v 1.7 2004/02/04 19:02:43 fredb Exp $
  # commands
 -CC = cc
 -LIB = ar
-+CC := ${LIBTOOL} ${CC}
++CC := ${LIBTOOL} --mode=compile ${CC}
  
  # name of temporary library script
  TEMPFILE = $(TEMP)/temp.mak
-- 
cgit v1.2.3