simplify with using BUILD_DIRS.

4 files changed, 13 insertions, 19 deletions

diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile
index 4cd6ea44664..b327826fcd2 100644
--- a/editors/leim21/Makefile
+++ b/editors/leim21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/03/21 06:12:19 obache Exp $
+# $NetBSD: Makefile,v 1.9 2011/03/21 06:32:33 obache Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT=	Libraries of Emacs Input Methods (for emacs21)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/emacs-${VERSION}/leim
+WRKSRC=		${WRKDIR}/emacs-${VERSION}
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
@@ -21,20 +21,14 @@ VERSION=	21.4
 
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox
 
-CONFIG_GUESS_OVERRIDE=	../config.guess
-CONFIG_SUB_OVERRIDE=	../config.sub
-
 EMACS21_FILESDIR=	${.CURDIR}/../../editors/emacs21/files
 
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 INSTALLATION_DIRS+=	share/emacs/${VERSION}/leim
 
+BUILD_DIRS=		leim
 post-extract:
-	@${ECHO} '#!/bin/sh' >${WRKSRC}/configure
-	@${ECHO} 'cd ..' >>${WRKSRC}/configure
-	@${ECHO} 'exec ./configure $$*' >>${WRKSRC}/configure
-	@${CHMOD} +x ${WRKSRC}/configure
-	${CP} ${EMACS21_FILESDIR}/dragonfly.h ${WRKSRC}/../src/s
+	${CP} ${EMACS21_FILESDIR}/dragonfly.h ${WRKSRC}/src/s
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/editors/leim21/distinfo b/editors/leim21/distinfo
index 5d6833b862e..ed2651c7768 100644
--- a/editors/leim21/distinfo
+++ b/editors/leim21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2007/10/29 13:41:29 uebayasi Exp $
+$NetBSD: distinfo,v 1.4 2011/03/21 06:32:33 obache Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -6,5 +6,5 @@ Size (emacs-21.4a.tar.gz) = 20403483 bytes
 SHA1 (leim-21.4.tar.gz) = dd63f9aca1a58d40d9d426dd410fb627230974f7
 RMD160 (leim-21.4.tar.gz) = 89e1108bfe06425a0d6b4d941f9c297551bafcca
 Size (leim-21.4.tar.gz) = 3291433 bytes
-SHA1 (patch-aa) = a29b97515f4fea8feded6952d4ccd56c05d9f94d
-SHA1 (patch-ab) = 276155b59878d1cd14c2b66a4036522db0ee9a46
+SHA1 (patch-aa) = 0fd55a9585b4b44c2aa068971ef3e2481e6b1fcc
+SHA1 (patch-ab) = 96a41def977ab42dc29de55f8fae2733648ca4f7
diff --git a/editors/leim21/patches/patch-aa b/editors/leim21/patches/patch-aa
index ba1c5891ad0..0d2375590cb 100644
--- a/editors/leim21/patches/patch-aa
+++ b/editors/leim21/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2007/10/29 13:41:29 uebayasi Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/21 06:32:34 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/leim21/patches/patch-ab b/editors/leim21/patches/patch-ab
index 4490f7ab099..215d0ddb192 100644
--- a/editors/leim21/patches/patch-ab
+++ b/editors/leim21/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2007/10/29 13:41:29 uebayasi Exp $
+$NetBSD: patch-ab,v 1.2 2011/03/21 06:32:34 obache Exp $
 
---- ../configure.orig	2003-03-18 14:19:12.000000000 +0000
-+++ ../configure
+--- configure.orig	2003-03-18 14:19:12.000000000 +0000
++++ configure
 @@ -822,9 +822,13 @@ case "${canonical}" in
        sparc*-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;