Fix some issues where DESTDIR ended up included twice...

4 files changed, 11 insertions, 12 deletions

diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile
index 1ace19c7c2f..ce607e68f88 100644
--- a/lang/tcl-itcl/Makefile
+++ b/lang/tcl-itcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2010/02/04 01:28:59 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/11 13:44:02 joerg Exp $
 
 DISTNAME=	itcl3.2.1_src
 PKGNAME=	tcl-itcl-3.2.1
@@ -28,8 +28,7 @@ CONFIGURE_ENV+=	AR=${AR:Q}
 MAKE_ENV+=	TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl
 
 INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} \
-			prefix=${DESTDIR}${PREFIX} \
-			exec_prefix=${DESTDIR}${PREFIX}
+			includedir=${DESTDIR}${PREFIX}/include
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/lang/tcl-itcl/distinfo b/lang/tcl-itcl/distinfo
index 7e3f9ab27ec..d7c5d12cad2 100644
--- a/lang/tcl-itcl/distinfo
+++ b/lang/tcl-itcl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2005/11/17 23:43:04 rillig Exp $
+$NetBSD: distinfo,v 1.9 2010/02/11 13:44:02 joerg Exp $
 
 SHA1 (itcl3.2.1_src.tgz) = 890f56e61826a9c3522fb24bf3c08f73cea8a1dd
 RMD160 (itcl3.2.1_src.tgz) = 6a6bbc5596e3c7b8bfd6783533d26d07b1c3a7c1
 Size (itcl3.2.1_src.tgz) = 427026 bytes
 SHA1 (patch-aa) = 5357555498f874a5d90de6451847e50df167ab9f
-SHA1 (patch-ab) = f78dd17f2da70187a1b8aca0f484a6813876625c
+SHA1 (patch-ab) = 7d27e16f77fd4723d6bb639cf5be6cdb35149509
 SHA1 (patch-ac) = 7885a8d126449068f3af7e748193b2cdf3051fce
-SHA1 (patch-ad) = 9131b2aa318410100f5477a70a7ce5221133f49b
+SHA1 (patch-ad) = 4f21f77b68fa3c406f9e3d24d01c7158f6a7825a
 SHA1 (patch-ag) = 3d12b3a2cf0cd35c39f622cf8f9b4872772c12c6
 SHA1 (patch-ah) = 759946f4f066b5e6d41a4120c983b1a169dff3df
diff --git a/lang/tcl-itcl/patches/patch-ab b/lang/tcl-itcl/patches/patch-ab
index 8d237e90541..661b9fac089 100644
--- a/lang/tcl-itcl/patches/patch-ab
+++ b/lang/tcl-itcl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2005/10/26 04:22:38 minskim Exp $
+$NetBSD: patch-ab,v 1.4 2010/02/11 13:44:02 joerg Exp $
 
 --- itcl/Makefile.in.orig	Tue Aug 29 03:58:00 2000
 +++ itcl/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.3 2005/10/26 04:22:38 minskim Exp $
  SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@
  
 -ITCL_LIBRARY = $(prefix)/lib/itcl$(VERSION)
-+ITCL_LIBRARY = $(prefix)/lib/tcl/itcl$(VERSION)
++ITCL_LIBRARY = ${DESTDIR}$(prefix)/lib/tcl/itcl$(VERSION)
  
  ITCL_GENERIC_DIR_NATIVE = @ITCL_GENERIC_DIR_NATIVE@
  ITCL_UNIX_DIR_NATIVE = @ITCL_UNIX_DIR_NATIVE@
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.3 2005/10/26 04:22:38 minskim Exp $
  
  pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
 -pkglibdir = $(libdir)/@PACKAGE@@VERSION@
-+pkglibdir = $(libdir)/tcl/@PACKAGE@@VERSION@
++pkglibdir = ${DESTDIR}$(libdir)/tcl/@PACKAGE@@VERSION@
  pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
  
  top_builddir = .
diff --git a/lang/tcl-itcl/patches/patch-ad b/lang/tcl-itcl/patches/patch-ad
index 87a91782b4c..e933ae8f058 100644
--- a/lang/tcl-itcl/patches/patch-ad
+++ b/lang/tcl-itcl/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2005/10/26 04:22:38 minskim Exp $
+$NetBSD: patch-ad,v 1.4 2010/02/11 13:44:02 joerg Exp $
 
 --- itk/Makefile.in.orig	Tue Aug 29 03:58:00 2000
 +++ itk/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.3 2005/10/26 04:22:38 minskim Exp $
  SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@
  
 -ITK_LIBRARY = $(prefix)/lib/itk$(VERSION)
-+ITK_LIBRARY = $(prefix)/lib/tcl/itk$(VERSION)
++ITK_LIBRARY = ${DESTDIR}$(prefix)/lib/tcl/itk$(VERSION)
  
  ITK_GENERIC_DIR_NATIVE = @ITK_GENERIC_DIR_NATIVE@
  ITK_UNIX_DIR_NATIVE = @ITK_UNIX_DIR_NATIVE@
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.3 2005/10/26 04:22:38 minskim Exp $
  
  pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
 -pkglibdir = $(libdir)/@PACKAGE@@VERSION@
-+pkglibdir = $(libdir)/tcl/@PACKAGE@@VERSION@
++pkglibdir = ${DESTDIR}$(libdir)/tcl/@PACKAGE@@VERSION@
  pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
  
  top_builddir = .