Add destdir support. There was a custom install-data-local install rule

which was missing $(DESTDIR).

4 files changed, 39 insertions, 14 deletions

diff --git a/cad/tnt-mmtl/Makefile b/cad/tnt-mmtl/Makefile
index 271489de925..7a8ba2f343a 100644
--- a/cad/tnt-mmtl/Makefile
+++ b/cad/tnt-mmtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/12/03 13:06:52 asau Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/27 03:21:06 dmcmahill Exp $
 #
 
 DISTNAME=	tnt-1.2.2
@@ -14,6 +14,7 @@ COMMENT=	Multilayer Multiconductor Transmission Line 2-D and 2.5-D simulator
 BUILD_DEPENDS+=	latex2html-[0-9]*:../../textproc/latex2html
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	autoconf automake gmake
diff --git a/cad/tnt-mmtl/distinfo b/cad/tnt-mmtl/distinfo
index 760f945d966..8f82174be28 100644
--- a/cad/tnt-mmtl/distinfo
+++ b/cad/tnt-mmtl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/04/30 21:35:59 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2010/02/27 03:21:06 dmcmahill Exp $
 
 SHA1 (tnt-1.2.2.tar.gz) = bd089863ca2cd939009253e83f4ab75317191047
 RMD160 (tnt-1.2.2.tar.gz) = 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d
@@ -9,8 +9,8 @@ SHA1 (patch-ac) = 32b2a6721a3c1790366c278816c2f188dfa38214
 SHA1 (patch-ad) = 8084532ba3a3387fddfbbfeee019c21e4e139be7
 SHA1 (patch-ae) = 5fabada892e8c82af60ba41c27ae5cafa0520654
 SHA1 (patch-af) = a68a9b2a77450006361cfb9647424be0bd65533a
-SHA1 (patch-ag) = a9afe4562b51b01b912ec72a70953820abb19467
-SHA1 (patch-ah) = ec3cb9822e8dd168e6b6d74bb14cd631717187c7
+SHA1 (patch-ag) = 0b973184d087ca0d42cac4d87ff3c167fd700850
+SHA1 (patch-ah) = 97368422014ab65139ecc2cd77d89c4e3b2fa026
 SHA1 (patch-ai) = 2ab6aa6bd4cd0883725c66bb7d4fa59e9e3172a4
 SHA1 (patch-aj) = 7ec0c75d0e29c2adce2eea442e4b3309455965e7
 SHA1 (patch-ak) = d17baa2b591126cda87c79768136a3d6086d229e
diff --git a/cad/tnt-mmtl/patches/patch-ag b/cad/tnt-mmtl/patches/patch-ag
index 5c739f1055a..7ca2f435b1b 100644
--- a/cad/tnt-mmtl/patches/patch-ag
+++ b/cad/tnt-mmtl/patches/patch-ag
@@ -1,13 +1,25 @@
-$NetBSD: patch-ag,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2010/02/27 03:21:06 dmcmahill Exp $
 
---- doc/Makefile.am.orig	Wed Jul 21 15:45:26 2004
-+++ doc/Makefile.am
-@@ -43,7 +43,7 @@ AUTOMAKE_OPTIONS = foreign
- #
+--- doc/Makefile.am.orig	2004-07-21 15:45:26.000000000 +0000
++++ doc/Makefile.am	2010-02-27 03:15:00.000000000 +0000
+@@ -44,5 +44,5 @@
  #---------------------------------------------------------------
  
 -docdir = $(prefix)/doc
 +docdir = $(pkgdatadir)
  doc_DATA = \
  	user-guide.pdf 
+@@ -77,9 +77,9 @@
+ install-data-local:
+ 	for f in $(doc_DATA); do \
+-	  $(mkinstalldirs) $(docdir); \
+-	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
++	  $(mkinstalldirs) $(DESTDIR)$(docdir); \
++	  $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
+ 	  d=`basename $$f .pdf`; \
+-	  $(mkinstalldirs) $(docdir)/$$d; \
+-	  $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
++	  $(mkinstalldirs) $(DESTDIR)$(docdir)/$$d; \
++	  $(INSTALL_DATA) $$d/* $(DESTDIR)$(docdir)/$$d; \
+ 	done
  
diff --git a/cad/tnt-mmtl/patches/patch-ah b/cad/tnt-mmtl/patches/patch-ah
index 7b6d9aee223..ff0d871840c 100644
--- a/cad/tnt-mmtl/patches/patch-ah
+++ b/cad/tnt-mmtl/patches/patch-ah
@@ -1,13 +1,25 @@
-$NetBSD: patch-ah,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2010/02/27 03:21:06 dmcmahill Exp $
 
---- doc/Makefile.in.orig	Thu Jul 29 16:58:47 2004
-+++ doc/Makefile.in
-@@ -157,7 +157,7 @@ AUTOMAKE_OPTIONS = foreign
- #  in a special 'doc' dir.
+--- doc/Makefile.in.orig	2004-09-10 22:15:34.000000000 +0000
++++ doc/Makefile.in	2010-02-27 03:17:35.000000000 +0000
+@@ -143,5 +143,5 @@
  #
  #---------------------------------------------------------------
 -docdir = $(prefix)/doc
 +docdir = $(pkgdatadir)
  doc_DATA = \
  	user-guide.pdf 
+@@ -331,9 +331,9 @@
+ install-data-local:
+ 	for f in $(doc_DATA); do \
+-	  $(mkinstalldirs) $(docdir); \
+-	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
++	  $(mkinstalldirs) $(DESTDIR)$(docdir); \
++	  $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
+ 	  d=`basename $$f .pdf`; \
+-	  $(mkinstalldirs) $(docdir)/$$d; \
+-	  $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
++	  $(mkinstalldirs) $(DESTDIR)$(docdir)/$$d; \
++	  $(INSTALL_DATA) $$d/* $(DESTDIR)$(docdir)/$$d; \
+ 	done