summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-10 19:24:13 +0000
committerjlam <jlam@pkgsrc.org>2006-03-10 19:24:13 +0000
commitdc953ec88faa0301823a37c8f2e8c613b64900f7 (patch)
treee4204f0b208fc172fb387533fb92e7a5124e120b /inputmethod
parent576b9a9ea2cc81026689f28a26b612b039e689b4 (diff)
downloadpkgsrc-dc953ec88faa0301823a37c8f2e8c613b64900f7.tar.gz
Use the pkginstall framework to generate the INSTALL script instead.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/sj3-dict/INSTALL2
-rw-r--r--inputmethod/sj3-dict/Makefile11
-rw-r--r--inputmethod/skkinput/Makefile11
3 files changed, 5 insertions, 19 deletions
diff --git a/inputmethod/sj3-dict/INSTALL b/inputmethod/sj3-dict/INSTALL
index fc05b7f61f5..5cdccc89f20 100644
--- a/inputmethod/sj3-dict/INSTALL
+++ b/inputmethod/sj3-dict/INSTALL
@@ -5,6 +5,6 @@ case $2 in
dic="${PKG_PREFIX}/sj3/user"
mkdir -p $dic
chmod 755 $dic
- chown ${SJ3OWNER}.${SJ3GROUP} $dic
+ chown @SJ3OWNER@:@SJ3GROUP@ $dic
;;
esac
diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile
index 1d719b02bfc..e302c0a2139 100644
--- a/inputmethod/sj3-dict/Makefile
+++ b/inputmethod/sj3-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:23 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/10 19:24:13 jlam Exp $
#
DISTNAME= sj3-2.0.1.20
@@ -27,9 +27,8 @@ SJ3OWNER?= daemon
SJ3GROUP?= daemon
MAKE_ENV+= SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
-
+FILES_SUBST+= SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} IMDICTDIR=${IMDICTDIR}
INSTALL_SRC= ${PKGDIR}/INSTALL
-INSTALL_FILE= ${WRKDIR}/INSTALL
EVAL_PREFIX+= SJ3SERVERBINDIR=sj3-server-bin
@@ -47,12 +46,6 @@ do-configure:
do-build:
@(cd ${WRKSRC}/dict/dict; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM})
-post-build:
- @${SED} -e 's|$${SJ3OWNER}|${SJ3OWNER}|' \
- -e 's|$${SJ3GROUP}|${SJ3GROUP}|' \
- -e 's|$${IMDICTDIR}|${IMDICTDIR}|' \
- ${INSTALL_SRC} > ${INSTALL_FILE}
-
do-install:
@(cd ${WRKSRC}/dict/dict; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install)
diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile
index 743f3edf458..e8c50d3dd15 100644
--- a/inputmethod/skkinput/Makefile
+++ b/inputmethod/skkinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/10 19:30:35 jlam Exp $
DISTNAME= skkinput-2.06.3
PKGREVISION= 1
@@ -14,19 +14,12 @@ BUILD_DEFS+= USE_INET6
USE_IMAKE= YES
PLIST_SUBST+= PKGBASE=${LOCALBASE:Q}
-
-DESCR_SRC= ${WRKDIR}/DESCR
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-post-build:
- ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/DESCR >${DESCR_SRC}
- ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/INSTALL >${INSTALL_FILE}
+INSTALL_SRC= ${PKGDIR}/INSTALL
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/skkinput
${INSTALL_DATA} ${WRKSRC}/README.jis ${PREFIX}/share/doc/skkinput
${INSTALL_DATA} ${WRKSRC}/FAQ.jis ${PREFIX}/share/doc/skkinput
${INSTALL_DATA} ${WRKSRC}/BUGS.jis ${PREFIX}/share/doc/skkinput
- ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
.include "../../mk/bsd.pkg.mk"