* simplify with BUILD_DIRS

* add user-destdir installation support

4 files changed, 17 insertions, 21 deletions

diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index ed0dc570a6f..5125e601475 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:31 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2011/03/21 08:11:27 obache Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGREVISION=	6
@@ -12,24 +12,20 @@ COMMENT=	Libraries of Emacs Input Methods
 
 DEPENDS+=	emacs-${VERSION}{,nb[0-9]*}:../../editors/emacs20
 
-WRKSRC=		${WRKDIR}/emacs-20.7/leim
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+WRKSRC=		${WRKDIR}/emacs-20.7
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
 VERSION=	20.7
 
-CONFIG_GUESS_OVERRIDE=	../config.guess
-CONFIG_SUB_OVERRIDE=	../config.sub
-
-post-extract:
-	@${ECHO} '#!/bin/sh' >${WRKSRC}/configure
-	@${ECHO} 'cd ..' >>${WRKSRC}/configure
-	@${ECHO} 'exec ./configure $$*' >>${WRKSRC}/configure
-	@${CHMOD} +x ${WRKSRC}/configure
+BUILD_DIRS=	leim
 
-.include "../../mk/bsd.prefs.mk"
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+INSTALLATION_DIRS+=	share/emacs/20.7/leim
 
 post-install:
-	@${CHOWN} -R ${ROOT_USER} ${PREFIX}/share/emacs/20.7/leim
+	@${CHOWN} -R ${ROOT_USER} ${DESTDIR}${PREFIX}/share/emacs/20.7/leim
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/leim20/distinfo b/editors/leim20/distinfo
index 1ec440ff444..091704e586b 100644
--- a/editors/leim20/distinfo
+++ b/editors/leim20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/01/04 16:58:58 joerg Exp $
+$NetBSD: distinfo,v 1.4 2011/03/21 08:11:27 obache Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
@@ -6,5 +6,5 @@ Size (emacs-20.7.tar.gz) = 15043428 bytes
 SHA1 (leim-20.7.tar.gz) = 63ca19a8bd27d204134f765b7387bba8466733cd
 RMD160 (leim-20.7.tar.gz) = 175c977973138ec49240d359b6ae0f8293855de1
 Size (leim-20.7.tar.gz) = 3288714 bytes
-SHA1 (patch-aa) = a29b97515f4fea8feded6952d4ccd56c05d9f94d
-SHA1 (patch-ab) = 5082218a2fe012f349a603d7adb106862239101c
+SHA1 (patch-aa) = 0fd55a9585b4b44c2aa068971ef3e2481e6b1fcc
+SHA1 (patch-ab) = 48e3e91791e6f86484917acafb136796ab230c41
diff --git a/editors/leim20/patches/patch-aa b/editors/leim20/patches/patch-aa
index 88f2dd1e92e..8b3e01bd8b5 100644
--- a/editors/leim20/patches/patch-aa
+++ b/editors/leim20/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/11 01:12:21 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2011/03/21 08:11:27 obache Exp $
 
---- Makefile.in.orig	Mon Jan 11 12:40:22 1999
-+++ Makefile.in	Tue Dec 28 14:53:29 1999
+--- leim/Makefile.in.orig	Mon Jan 11 12:40:22 1999
++++ leim/Makefile.in	Tue Dec 28 14:53:29 1999
 @@ -37,7 +37,7 @@
  
  # Which Emacs to use to convert TIT files to Emacs Lisp files,
diff --git a/editors/leim20/patches/patch-ab b/editors/leim20/patches/patch-ab
index 31bdc5bc7cf..0c0ed2663aa 100644
--- a/editors/leim20/patches/patch-ab
+++ b/editors/leim20/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2006/01/04 16:58:58 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2011/03/21 08:11:27 obache Exp $
 
---- ../configure.orig	2006-01-04 16:46:20.000000000 +0000
-+++ ../configure
+--- configure.orig	2006-01-04 16:46:20.000000000 +0000
++++ configure
 @@ -1519,6 +1519,7 @@ case "${canonical}" in
        *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
        *-386bsd* )	        opsys=386bsd ;;