Add DESTDIR support

3 files changed, 21 insertions, 15 deletions

diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index 45145645d3e..ccffe09540e 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/05/26 21:13:01 agc Exp $
+# $NetBSD: Makefile,v 1.21 2007/08/30 23:05:14 agc Exp $
 #
 
 DISTNAME=	libutf-3.0
@@ -12,6 +12,7 @@ COMMENT=	UTF-8 character set support library, including regular expressions
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 BUILD_TARGET=	tst
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
diff --git a/misc/libutf/distinfo b/misc/libutf/distinfo
index 121e9e3ce7d..ac36d1ec3b4 100644
--- a/misc/libutf/distinfo
+++ b/misc/libutf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/05/26 21:13:01 agc Exp $
+$NetBSD: distinfo,v 1.6 2007/08/30 23:05:14 agc Exp $
 
 SHA1 (libutf-3.0.tar.gz) = 7259fedf0d51107e4e4c03147f8a59e22d19e437
 RMD160 (libutf-3.0.tar.gz) = 243a030d9cb0b278ddc3263648a39d88e25f489a
 Size (libutf-3.0.tar.gz) = 55529 bytes
-SHA1 (patch-aa) = b5585f63b3f18c38d4e65b52d4d72305bdfdb205
+SHA1 (patch-aa) = df5296781a155e5d25663f6fee1439cdf73b1968
diff --git a/misc/libutf/patches/patch-aa b/misc/libutf/patches/patch-aa
index dabd53f5768..f26d304d6ec 100644
--- a/misc/libutf/patches/patch-aa
+++ b/misc/libutf/patches/patch-aa
@@ -1,10 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2006/05/26 21:13:01 agc Exp $
+$NetBSD: patch-aa,v 1.4 2007/08/30 23:05:14 agc Exp $
 
 Patches to use NetBSD's libtool and PKG_SYSCONFDIR.
+DESTDIR patches too
 
---- Makefile.in.orig	Mon Oct 20 14:51:34 1997
-+++ Makefile.in
-@@ -9,6 +9,7 @@ LIBDIR= $(exec_prefix)/lib
+--- Makefile.in.orig	2006-05-26 21:14:56.000000000 +0100
++++ Makefile.in	2007-08-30 23:51:57.000000000 +0100
+@@ -9,6 +9,7 @@
  INCDIR= $(prefix)/include
  MANDIR= $(prefix)/man
  ETCDIR= $(prefix)/etc
@@ -12,7 +13,7 @@ Patches to use NetBSD's libtool and PKG_SYSCONFDIR.
  
  # SVR4, I hate you. What ****idiot**** dreamed this up????
  # Yeah, like all csh or rc users need this crap...
-@@ -26,31 +27,38 @@ INSTALL_DATA= @INSTALL_DATA@
+@@ -26,31 +27,38 @@
  RANLIB= @RANLIB@
  
  $(LIBS) : $(OBJS)
@@ -25,14 +26,18 @@ Patches to use NetBSD's libtool and PKG_SYSCONFDIR.
  install: $(LIBS)
 -	$(srcdir)/mkinstalldirs $(LIBDIR) $(INCDIR) $(ETCDIR) $(MANDIR)/man3
 -	$(INSTALL_DATA) $(LIBS) $(LIBDIR) ; $(RANLIB) $(LIBDIR)/$(LIBS)
-+	$(srcdir)/mkinstalldirs $(LIBDIR) $(INCDIR) $(EGDIR) $(MANDIR)/man3
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBS:.a=.la} ${PREFIX}/lib
- 	$(INSTALL_DATA) $(srcdir)/ure.h $(INCDIR)
- 	$(INSTALL_DATA) $(srcdir)/utf.h $(INCDIR)
+-	$(INSTALL_DATA) $(srcdir)/ure.h $(INCDIR)
+-	$(INSTALL_DATA) $(srcdir)/utf.h $(INCDIR)
 -	$(INSTALL_DATA) $(srcdir)/langcoll.utf $(ETCDIR)
-+	$(INSTALL_DATA) $(srcdir)/langcoll.utf $(EGDIR)
- 	$(INSTALL_DATA) $(srcdir)/utf.3 $(MANDIR)/man3
- 	$(INSTALL_DATA) $(srcdir)/ure.3 $(MANDIR)/man3
+-	$(INSTALL_DATA) $(srcdir)/utf.3 $(MANDIR)/man3
+-	$(INSTALL_DATA) $(srcdir)/ure.3 $(MANDIR)/man3
++	$(srcdir)/mkinstalldirs ${DESTDIR}$(LIBDIR) ${DESTDIR}$(INCDIR) ${DESTDIR}$(EGDIR) ${DESTDIR}$(MANDIR)/man3
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBS:.a=.la} ${DESTDIR}${PREFIX}/lib
++	$(INSTALL_DATA) $(srcdir)/ure.h ${DESTDIR}$(INCDIR)
++	$(INSTALL_DATA) $(srcdir)/utf.h ${DESTDIR}$(INCDIR)
++	$(INSTALL_DATA) $(srcdir)/langcoll.utf ${DESTDIR}$(EGDIR)
++	$(INSTALL_DATA) $(srcdir)/utf.3 ${DESTDIR}$(MANDIR)/man3
++	$(INSTALL_DATA) $(srcdir)/ure.3 ${DESTDIR}$(MANDIR)/man3
  
  uninstall:
  	rm -f $(LIBDIR)/libure.a