From 72fdee27eb34ea40edae6fc6cdf53488de9b1fe2 Mon Sep 17 00:00:00 2001
From: spz <spz@pkgsrc.org>
Date: Sat, 14 Feb 2009 19:17:50 +0000
Subject: [PATCH] switch from previous DESTDIRifying src/Makefile.in patch to a
 prettier one by Kaj Niemi <kajtzu@basen.net> (bump pkgrev etc)

---
 net/irrtoolset-nox11/Makefile         |  4 ++--
 net/irrtoolset-nox11/distinfo         |  4 ++--
 net/irrtoolset-nox11/patches/patch-dm | 28 ++++++++++-----------------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index 8cde103904a9..95c53b094cd4 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2009/02/14 17:58:12 spz Exp $
+# $NetBSD: Makefile,v 1.22 2009/02/14 19:17:50 spz Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.5
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=		net
 MASTER_SITES=	ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
 
diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo
index 88cefe5fdb29..f08754c41fb2 100644
--- a/net/irrtoolset-nox11/distinfo
+++ b/net/irrtoolset-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2009/02/14 16:17:06 spz Exp $
+$NetBSD: distinfo,v 1.20 2009/02/14 19:17:50 spz Exp $
 
 SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
 RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
@@ -51,7 +51,7 @@ SHA1 (patch-di) = 294cb20c8327f35a73a8501f9cc24e7acf850a15
 SHA1 (patch-dj) = 25258cbb8e544f0eda9ed6ac4f9f61825266bfdd
 SHA1 (patch-dk) = a1632fa3030ee483c99af5ef039e494295af0b7f
 SHA1 (patch-dl) = 85ab29170a0ce1f82f3058bd58b00c779684fbca
-SHA1 (patch-dm) = 8b881b07a7101a1bc745dda79d7ec87df52e344b
+SHA1 (patch-dm) = 94c7ec10452044f2a7ff34e82ddaac28c8660ab8
 SHA1 (patch-do) = 8f85b97d5067e08a07fe95cb5a7eae84e9f459e3
 SHA1 (patch-dp) = 0b5ee0579aab4d112d10e619e7059bf0b5afb7f0
 SHA1 (patch-dq) = 6004e46320b790ac4e1bc4488e3eb327af84299b
diff --git a/net/irrtoolset-nox11/patches/patch-dm b/net/irrtoolset-nox11/patches/patch-dm
index b72891baa09e..366a6501115f 100644
--- a/net/irrtoolset-nox11/patches/patch-dm
+++ b/net/irrtoolset-nox11/patches/patch-dm
@@ -1,28 +1,20 @@
-$NetBSD: patch-dm,v 1.2 2008/03/08 11:00:35 spz Exp $
+$NetBSD: patch-dm,v 1.3 2009/02/14 19:17:50 spz Exp $
 
 --- src/Makefile.in.orig	2006-06-08 17:16:26.000000000 +0200
 +++ src/Makefile.in
-@@ -34,10 +34,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
+@@ -81,11 +81,11 @@ depend:
  
- # The default location for installation.
--prefix      = @prefix@
-+prefix      = $(DESTDIR)@prefix@
- exec_prefix = @exec_prefix@
- bindir      = @bindir@
--mandir      = @mandir@
-+mandir      = $(DESTDIR)@mandir@
- man1dir     = $(mandir)/man1
- man3dir     = $(mandir)/man3
- 
-@@ -84,8 +84,8 @@ install:
- 		test -d $$i || mkdir -p $$i; \
+ install:
+ 	@for i in $(prefix) $(bindir) $(mandir) $(man1dir) $(man3dir) ; do \
+-		test -d $$i || mkdir -p $$i; \
++		test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i; \
  	done
- 	for i in $(TOOLDIRS); do $(INSTALL_PROGRAM) $$i/$$i $(bindir); done
+-	for i in $(TOOLDIRS); do $(INSTALL_PROGRAM) $$i/$$i $(bindir); done
 -	for i in ../man/man1/*; do $(INSTALL_DATA) $$i $(man1dir); done
 -	for i in ../man/man3/*; do $(INSTALL_DATA) $$i $(man3dir); done
-+	for i in ../man/man1/*.1; do $(INSTALL_DATA) $$i $(man1dir); done
-+	for i in ../man/man3/*.3; do $(INSTALL_DATA) $$i $(man3dir); done
++	for i in $(TOOLDIRS); do $(INSTALL_PROGRAM) $$i/$$i $(DESTDIR)$(bindir); done
++	for i in ../man/man1/*.1; do $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir); done
++	for i in ../man/man3/*.3; do $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir); done
  
  tags:
  	@find `pwd` -name \*.hh -or -name \*.cc -or -name \*.c -or -name \*.h -or -name \*.y -or -name \*.l | xargs etags -t