From a1ae991bb6d61d0e2e744412568eb44b74aff84f Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 4 Apr 2008 15:24:56 +0000
Subject: DESTDIR support.

---
 devel/rx/Makefile         |  6 ++++--
 devel/rx/distinfo         |  4 ++--
 devel/rx/patches/patch-ab | 12 +++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'devel/rx')

diff --git a/devel/rx/Makefile b/devel/rx/Makefile
index 84d60818df8..b950a46be82 100644
--- a/devel/rx/Makefile
+++ b/devel/rx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/30 03:44:43 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2008/04/04 15:24:56 joerg Exp $
 
 DISTNAME=	rx-1.5
 PKGREVISION=	1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/rx/rx.html
 COMMENT=	Fast replacement for the GNU regex library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 INFO_FILES=	# PLIST
@@ -27,7 +29,7 @@ INSTALLATION_DIRS=	${PKGINFODIR}
 post-install:
 	cd ${WRKSRC}/doc; for f in rx.info rx.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};	\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rx/distinfo b/devel/rx/distinfo
index 73c734dfdd7..30c5b387c61 100644
--- a/devel/rx/distinfo
+++ b/devel/rx/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:33 agc Exp $
+$NetBSD: distinfo,v 1.6 2008/04/04 15:24:56 joerg Exp $
 
 SHA1 (rx-1.5.tar.bz2) = 6f58203315a1ae5e34b629f7413e21801964a48c
 RMD160 (rx-1.5.tar.bz2) = a68cb446492bd7abda70a7adb68849c600cb0be5
 Size (rx-1.5.tar.bz2) = 415525 bytes
 SHA1 (patch-aa) = 6dd85891f4593c98b34835b56b0c32e89c7175a7
-SHA1 (patch-ab) = 69abb3d80cdc84d9e59e1abf6c4084292b49e330
+SHA1 (patch-ab) = 5c38359f4826ae96cc3843b1e4fb90561c1d2c31
diff --git a/devel/rx/patches/patch-ab b/devel/rx/patches/patch-ab
index e546e117680..0d57d05103d 100644
--- a/devel/rx/patches/patch-ab
+++ b/devel/rx/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/04/16 13:55:30 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2008/04/04 15:24:56 joerg Exp $
 
 --- rx/Makefile.in.orig	Fri Nov 22 13:47:49 1996
 +++ rx/Makefile.in
@@ -13,13 +13,15 @@ $NetBSD: patch-ab,v 1.2 2002/04/16 13:55:30 wiz Exp $
 +all: librx.la
  
  install: all
- 	test -d $(libdir) || mkdir $(libdir)
- 	test -d $(includedir) || mkdir $(includedir)
+-	test -d $(libdir) || mkdir $(libdir)
+-	test -d $(includedir) || mkdir $(includedir)
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(libdir)
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(includedir)
 -	$(INSTALL) librx.a $(libdir)/librx.a
 -	$(RANLIB) $(libdir)/librx.a
 -	$(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
-+	$(LIBTOOL) $(INSTALL) librx.la $(libdir)
-+	$(BSD_INSTALL_DATA) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
++	$(LIBTOOL) $(BSD_INSTALL_LIB) librx.la ${DESTDIR}$(libdir)
++	$(BSD_INSTALL_DATA) $(srcdir)/inst-rxposix.h ${DESTDIR}$(includedir)/rxposix.h
  
  
  uninstall:
-- 
cgit v1.2.3