From 32ab3656e8de82ad9c67e7a5725e2d82c3b7b814 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 10 Mar 2006 16:03:44 +0000
Subject: Use the pkginstall framework to generate the INSTALL script from the
 supplied template in ${FILESDIR}/INSTALL, and remove the unnecessary
 additional targets for manual generation of the same.

---
 inputmethod/ja-freewnn-lib/Makefile.common | 11 ++---------
 inputmethod/ja-freewnn-lib/files/INSTALL   |  2 ++
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'inputmethod')

diff --git a/inputmethod/ja-freewnn-lib/Makefile.common b/inputmethod/ja-freewnn-lib/Makefile.common
index 1057d7d9dbf..68aa1867c2e 100644
--- a/inputmethod/ja-freewnn-lib/Makefile.common
+++ b/inputmethod/ja-freewnn-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/05/05 19:37:22 kei Exp $
+# $NetBSD: Makefile.common,v 1.10 2006/03/10 16:03:44 jlam Exp $
 #
 
 DISTNAME=	FreeWnn-1.10
@@ -27,8 +27,8 @@ SEDSCRIPT+=	-e 's|$$([CK]*WNNJLIBSRC)/lib\([ck]*wnn\).a|-l\1|'
 SEDSCRIPT+=	-e 's|\(:.*\)$$(WNNJLIB)|\1|'
 .elif defined(WNN_TARGET) && (${WNN_TARGET} == "DICT")
 MAKE_ENV+=	"WNN_TARGET=DICT"
-INSTALL_FILE=	${WRKDIR}/INSTALL
 INSTALL_SRC=	${FILESDIR}/INSTALL
+FILES_SUBST+=	WNNOWNER=${WNNOWNER}
 .else
 MAKE_ENV+=	"WNN_TARGET=LIBRARY"
 .endif
@@ -88,13 +88,6 @@ pre-build:
 	@${MV} ${WRKSRC}/Wnn/Makefile ${WRKSRC}/Wnn/Makefile.orig2
 	@${SED} -e 's|\(MKDIRHIER.*=\).*|\1 ${TRUE}|' \
 		${WRKSRC}/Wnn/Makefile.orig2 > ${WRKSRC}/Wnn/Makefile
-
-post-build:
-	@${SED} -e 's|$${WNNOWNER}|${WNNOWNER}|g'	\
-		${INSTALL_SRC} > ${INSTALL_FILE}
-
-pre-install:
-	@${SETENV} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ja-freewnn-lib/files/INSTALL b/inputmethod/ja-freewnn-lib/files/INSTALL
index 5b0b37e7686..3515ca59305 100644
--- a/inputmethod/ja-freewnn-lib/files/INSTALL
+++ b/inputmethod/ja-freewnn-lib/files/INSTALL
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+WNNOWNER="@WNNOWNER@"
+
 case $2 in
 PRE-INSTALL)
 	uid=`id -u ${WNNOWNER} 2> /dev/null`
-- 
cgit v1.2.3