pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/inputmethod/ja-freewnn-lib Use the pkginstall framewor...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3bda6e28402
branches:  trunk
changeset: 509456:e3bda6e28402
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Mar 10 16:03:44 2006 +0000

description:
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.

diffstat:

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

diffs (44 lines):

diff -r 88cb0628cbe0 -r e3bda6e28402 inputmethod/ja-freewnn-lib/Makefile.common
--- a/inputmethod/ja-freewnn-lib/Makefile.common        Fri Mar 10 15:34:22 2006 +0000
+++ b/inputmethod/ja-freewnn-lib/Makefile.common        Fri Mar 10 16:03:44 2006 +0000
@@ -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|\(:.*\)$$(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 @@
        @${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 -r 88cb0628cbe0 -r e3bda6e28402 inputmethod/ja-freewnn-lib/files/INSTALL
--- a/inputmethod/ja-freewnn-lib/files/INSTALL  Fri Mar 10 15:34:22 2006 +0000
+++ b/inputmethod/ja-freewnn-lib/files/INSTALL  Fri Mar 10 16:03:44 2006 +0000
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+WNNOWNER="@WNNOWNER@"
+
 case $2 in
 PRE-INSTALL)
        uid=`id -u ${WNNOWNER} 2> /dev/null`



Home | Main Index | Thread Index | Old Index