pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/inputmethod * Convert to USE_TOOLS+=itools instead of ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c52507ca540a
branches: trunk
changeset: 515621:c52507ca540a
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Jul 05 04:48:28 2006 +0000
description:
* Convert to USE_TOOLS+=itools instead of including nbitools/buildlink3.mk.
* Fully convert to the pkginstall framework by using it to manage
directories required at install time.
* Rewrite the canna rc.d script to ensure that all needed directories
are present before the daemon is started.
* Miscellaneous touch ups to the DESCR and MESSAGE files.
* Remove the need to explicitly set PREFIX. These packages now install
into ${LOCALBASE} and use symlinks and file copies to put the files
into the ${IMDICTDIR}.
Bump the PKGREVISIONs for the canna* packages.
diffstat:
inputmethod/canna-canuum/MESSAGE | 11 +++--
inputmethod/canna-canuum/Makefile | 42 ++++++----------------
inputmethod/canna-canuum/PLIST | 3 +-
inputmethod/canna-dict/Makefile | 70 ++++++++++++++++++++++++++-----------
inputmethod/canna-dict/PLIST | 35 +++++++++---------
inputmethod/canna-lib/Makefile | 22 +++++------
inputmethod/canna-server/Makefile | 31 +++++++---------
inputmethod/canna/DESCR | 2 +-
inputmethod/canna/Makefile | 9 ++--
inputmethod/canna/Makefile.common | 27 ++++++++++----
inputmethod/canna/Makefile.include | 5 --
inputmethod/canna/Makefile.version | 13 -------
inputmethod/canna/files/canna.sh | 43 ++++++++++++++++-------
13 files changed, 165 insertions(+), 148 deletions(-)
diffs (truncated from 484 to 300 lines):
diff -r f9c5c913bd99 -r c52507ca540a inputmethod/canna-canuum/MESSAGE
--- a/inputmethod/canna-canuum/MESSAGE Wed Jul 05 04:39:14 2006 +0000
+++ b/inputmethod/canna-canuum/MESSAGE Wed Jul 05 04:48:28 2006 +0000
@@ -1,8 +1,9 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2003/09/23 15:06:58 uebayasi Exp $
+$NetBSD: MESSAGE,v 1.2 2006/07/05 04:48:28 jlam Exp $
+
+You at least should set up key functions in ~/.canna, e.g.:
-You at least should set up key functions in "${HOME}/.canna".
-such as:
-(set-key 'alpha-mode "\C-i" 'japanese-mode)
-(set-key 'empty-mode "\C-i" 'alpha-mode)
+ (set-key 'alpha-mode "\C-i" 'japanese-mode)
+ (set-key 'empty-mode "\C-i" 'alpha-mode)
+
===========================================================================
diff -r f9c5c913bd99 -r c52507ca540a inputmethod/canna-canuum/Makefile
--- a/inputmethod/canna-canuum/Makefile Wed Jul 05 04:39:14 2006 +0000
+++ b/inputmethod/canna-canuum/Makefile Wed Jul 05 04:48:28 2006 +0000
@@ -1,43 +1,25 @@
-# $NetBSD: Makefile,v 1.5 2006/01/12 01:57:31 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.6 2006/07/05 04:48:28 jlam Exp $
+
+PKGREVISION= 1
+CANNA_MODULE= canuum
+
.include "../../inputmethod/canna/Makefile.common"
-CANNA_MODULE= canuum
-
MAINTAINER= oishi%ims.ac.jp@localhost
MAKE_ARGS+= PREFIX=${PREFIX}
INSTALLATION_DIRS= man/ja_JP.EUC/man1
+CONFIGURE_DIRS= ${WRKSRC} ${WRKSRC}/canuum
+BUILD_DIRS= ${WRKSRC}/canuum
+
+.include "../../inputmethod/canna-lib/buildlink3.mk"
+
pre-configure:
@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/canuum
@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/canuum
-
-do-configure:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
- ${MAKE_PROGRAM} ${MAKE_ARGS} Makefile; \
- ${MAKE_PROGRAM} ${MAKE_ARGS} cannaconf.h
- @cd ${WRKSRC}/canuum; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
- ${MAKE_PROGRAM} ${MAKE_ARGS} Makefile; \
- ${MAKE_PROGRAM} ${MAKE_ARGS} includes
- @${LN} ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
- @${LN} ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
- @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} depend
+ ${LN} -fs ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
+ ${LN} -fs ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
-do-build:
- @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} all
-
-pre-install:
- @${MKDIR} ${WRKSRC}/canuum/misc
-
-do-install:
- @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} install
-
-post-install:
- @${INSTALL_MAN} ${WRKSRC}/canuum/canuum.jmn \
- ${PREFIX}/man/ja_JP.EUC/man1/canuum.1
-
-.include "../../devel/nbitools/buildlink3.mk"
-.include "../../inputmethod/canna-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f9c5c913bd99 -r c52507ca540a inputmethod/canna-canuum/PLIST
--- a/inputmethod/canna-canuum/PLIST Wed Jul 05 04:39:14 2006 +0000
+++ b/inputmethod/canna-canuum/PLIST Wed Jul 05 04:48:28 2006 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2003/09/23 15:06:59 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/05 04:48:28 jlam Exp $
bin/canuum
+man/man1/canuum.1
man/ja_JP.EUC/man1/canuum.1
diff -r f9c5c913bd99 -r c52507ca540a inputmethod/canna-dict/Makefile
--- a/inputmethod/canna-dict/Makefile Wed Jul 05 04:39:14 2006 +0000
+++ b/inputmethod/canna-dict/Makefile Wed Jul 05 04:48:28 2006 +0000
@@ -1,38 +1,66 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:23 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.10 2006/07/05 04:48:28 jlam Exp $
+
+PKGREVISION= 1
+CANNA_MODULE= dict
+
.include "../../inputmethod/canna/Makefile.common"
-CANNA_MODULE= dict
-
BUILD_DEPENDS+= Canna-server>=${CANNA_VERSION}:../../inputmethod/canna-server
-NO_MTREE= yes
-OWN_DIRS= ${PREFIX}/canna
-
EVAL_PREFIX+= CANNASERVERBINDIR=Canna-server
.for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC
-CANNA_CMD_SED_SCRIPT+=-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
+CANNA_CMD_SED_SCRIPT+= \
+ -e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
.endfor
+CONFIGURE_DIRS= ${DICT_WRKSRC}
+DICT_WRKSRC= ${WRKSRC}/dic/ideo
+CANNA_DICTDIR= ${PREFIX}/libdata/canna
+
+PKG_GROUPS= ${CANNA_GROUP}
+PKG_USERS= ${CANNA_USER}:${CANNA_GROUP}
+
+INSTALL_DICT_DIR= \
+ ${INSTALL} -d -o ${CANNA_USER} -g ${CANNA_GROUP} -m 0775
+INSTALL_DICT= \
+ ${INSTALL} ${COPY} -o ${CANNA_USER} -g ${CANNA_GROUP} -m 0664
+
post-patch:
@${MV} ${WRKSRC}/Canna.conf ${WRKSRC}/Canna.conf.orig
- @${SED} -e 's|\(DicDir.*=\).*|\1${IMDICTDIR}/canna|' \
+ @${SED} -e 's|\(DicDir.*=\).*|\1${IMDICTDIR}/canna|' \
${WRKSRC}/Canna.conf.orig > ${WRKSRC}/Canna.conf
@for file in `${FIND} ${WRKSRC}/dic/ideo -name Imakefile -print`; do \
- ${MV} $$file $$file.orig; \
+ ${MV} $$file $$file.orig; \
${SED} ${CANNA_CMD_SED_SCRIPT} $$file.orig > $$file; \
- done
-
-do-configure:
- @cd ${WRKSRC}/dic/ideo; ${XMKMF}
-
-do-build:
- @cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+ done
do-install:
- @cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install
+ ${INSTALL_DICT_DIR} ${CANNA_DICTDIR}
+ ${INSTALL_DICT} ${DICT_WRKSRC}/grammar/fuzokugo.cbd ${CANNA_DICTDIR}
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/bushu.cld ${CANNA_DICTDIR}
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/dics.dir ${CANNA_DICTDIR}
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/iroha.cbd ${CANNA_DICTDIR}
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/iroha.cld ${CANNA_DICTDIR}
-.include "../../inputmethod/canna/Makefile.include"
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/chimei.t \
+ ${CANNA_DICTDIR}/chimei.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/hojomwd.t \
+ ${CANNA_DICTDIR}/hojomwd.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/hojoswd.t \
+ ${CANNA_DICTDIR}/hojoswd.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/kanasmpl.t \
+ ${CANNA_DICTDIR}/kanasmpl.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/katakana.t \
+ ${CANNA_DICTDIR}/katakana.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/keishiki.t \
+ ${CANNA_DICTDIR}/keishiki.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/necgaiji.t \
+ ${CANNA_DICTDIR}/necgaiji.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/number.t \
+ ${CANNA_DICTDIR}/number.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/software.t \
+ ${CANNA_DICTDIR}/software.ctd
+ ${INSTALL_DICT} ${DICT_WRKSRC}/words/suffix.t \
+ ${CANNA_DICTDIR}/suffix.ctd
-# Need to set this here _after_ bsd.pkg.mk
-PREFIX= ${IMDICTDIR}
+.include "../../mk/bsd.pkg.mk"
diff -r f9c5c913bd99 -r c52507ca540a inputmethod/canna-dict/PLIST
--- a/inputmethod/canna-dict/PLIST Wed Jul 05 04:39:14 2006 +0000
+++ b/inputmethod/canna-dict/PLIST Wed Jul 05 04:48:28 2006 +0000
@@ -1,18 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/23 15:06:59 uebayasi Exp $
-canna/canna/bushu.cld
-canna/canna/chimei.ctd
-canna/canna/dics.dir
-canna/canna/fuzokugo.cbd
-canna/canna/hojomwd.ctd
-canna/canna/hojoswd.ctd
-canna/canna/iroha.cbd
-canna/canna/iroha.cld
-canna/canna/kanasmpl.ctd
-canna/canna/katakana.ctd
-canna/canna/keishiki.ctd
-canna/canna/necgaiji.ctd
-canna/canna/number.ctd
-canna/canna/software.ctd
-canna/canna/suffix.ctd
-@dirrm canna/canna
-@dirrm canna
+@comment $NetBSD: PLIST,v 1.3 2006/07/05 04:48:28 jlam Exp $
+libdata/canna/bushu.cld
+libdata/canna/chimei.ctd
+libdata/canna/dics.dir
+libdata/canna/fuzokugo.cbd
+libdata/canna/hojomwd.ctd
+libdata/canna/hojoswd.ctd
+libdata/canna/iroha.cbd
+libdata/canna/iroha.cld
+libdata/canna/kanasmpl.ctd
+libdata/canna/katakana.ctd
+libdata/canna/keishiki.ctd
+libdata/canna/necgaiji.ctd
+libdata/canna/number.ctd
+libdata/canna/software.ctd
+libdata/canna/suffix.ctd
+@dirrm libdata/canna
diff -r f9c5c913bd99 -r c52507ca540a inputmethod/canna-lib/Makefile
--- a/inputmethod/canna-lib/Makefile Wed Jul 05 04:39:14 2006 +0000
+++ b/inputmethod/canna-lib/Makefile Wed Jul 05 04:48:28 2006 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2005/12/29 15:33:45 joerg Exp $
-#
-.include "../../inputmethod/canna/Makefile.common"
+# $NetBSD: Makefile,v 1.9 2006/07/05 04:48:28 jlam Exp $
+PKGREVISION= 1
CANNA_MODULE= lib
-INSTALL_TARGET= install install.man
+.include "../../inputmethod/canna/Makefile.common"
# (1) Change SUBDIRS.
# (2) Don't install `forcpp', `kpdic'.
+#
post-patch:
@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
@${SED} -e 's|\(SUBDIRS = lib canna\).*\( misc\)|\1 cmd/forcpp cmd/kpdic dic/phono\2|' \
@@ -19,22 +19,20 @@
> ${WRKSRC}/cmd/${f}/Imakefile
.endfor
-# We need to pass ${MAKE_ENV} to ${XMKMF}
-do-configure:
- @cd ${WRKSRC} && \
- ${SETENV} ${SCRIPTS_ENV} ${MAKE_ENV} ${XMKMF}
-
post-configure:
@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
.include "../../mk/bsd.prefs.mk"
+# XXX Work around bug in nbitools where the correct DragonFly library
+# XXX symlinks are not created.
+# XXX
.if ${OPSYS} == "DragonFly"
post-install:
-.for f in RKC RKC16 canna canna16
+. for f in RKC RKC16 canna canna16
${LN} -s lib${f}.so.1.1 ${PREFIX}/lib/lib${f}.so.1
${LN} -s lib${f}.so.1 ${PREFIX}/lib/lib${f}.so
-.endfor
+. endfor
.endif
-.include "../../inputmethod/canna/Makefile.include"
+.include "../../mk/bsd.pkg.mk"
diff -r f9c5c913bd99 -r c52507ca540a inputmethod/canna-server/Makefile
--- a/inputmethod/canna-server/Makefile Wed Jul 05 04:39:14 2006 +0000
+++ b/inputmethod/canna-server/Makefile Wed Jul 05 04:48:28 2006 +0000
@@ -1,26 +1,29 @@
-# $NetBSD: Makefile,v 1.16 2006/04/23 00:12:37 jlam Exp $
-#
-.include "../../inputmethod/canna/Makefile.common"
+# $NetBSD: Makefile,v 1.17 2006/07/05 04:48:28 jlam Exp $
-PKGREVISION= 1
+PKGREVISION= 2
+CANNA_MODULE= server
-CANNA_MODULE= server
+.include "../../inputmethod/canna/Makefile.common"
INSTALL_TARGET= instserver
-.include "../../mk/bsd.prefs.mk"
-
BUILD_DEFS+= CANNA_USER CANNA_GROUP
-MESSAGE_SUBST+= CANNA_USER="${CANNA_USER}"
-MESSAGE_SUBST+= CANNA_GROUP="${CANNA_GROUP}"
+MESSAGE_SUBST+= CANNA_USER=${CANNA_USER}
+MESSAGE_SUBST+= CANNA_GROUP=${CANNA_GROUP}
PKG_GROUPS= ${CANNA_GROUP}
PKG_USERS= ${CANNA_USER}:${CANNA_GROUP}
-OWN_DIRS_PERMS= ${CANNA_SPOOL} ${CANNA_USER} ${CANNA_GROUP} ${CANNA_MODE}
+MAKE_DIRS+= ${IMDICTDIR}
+OWN_DIRS+= ${IMDICTDIR}/canna
+OWN_DIRS+= ${IMDICTDIR}/canna/canna
+OWN_DIRS_PERMS+= ${CANNA_SPOOL} \
Home |
Main Index |
Thread Index |
Old Index