diff options
| author | jlam <jlam> | 2006-07-05 04:48:28 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-05 04:48:28 +0000 |
| commit | abaf886d39ed32c89b08ff8548455d1f1cc3da25 (patch) | |
| tree | e586b33fcc2b9c10ff7c8eb3ce08e6464ee33b4a /inputmethod/canna-server | |
| parent | f0bce8cb1dfd230536bc58065b8fb170362404f9 (diff) | |
| download | pkgsrc-abaf886d39ed32c89b08ff8548455d1f1cc3da25.tar.gz | |
* 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 (limited to 'inputmethod/canna-server')
| -rw-r--r-- | inputmethod/canna-server/Makefile | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile index 32dd7b6fa0d..e1480f6d4cc 100644 --- a/inputmethod/canna-server/Makefile +++ b/inputmethod/canna-server/Makefile @@ -1,26 +1,29 @@ -# $NetBSD: Makefile,v 1.16 2006/04/23 00:12:37 jlam Exp $ -# -.include "../../inputmethod/canna/Makefile.common" - -PKGREVISION= 1 +# $NetBSD: Makefile,v 1.17 2006/07/05 04:48:28 jlam Exp $ +PKGREVISION= 2 CANNA_MODULE= server -INSTALL_TARGET= instserver +.include "../../inputmethod/canna/Makefile.common" -.include "../../mk/bsd.prefs.mk" +INSTALL_TARGET= instserver 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} \ + ${CANNA_USER} ${CANNA_GROUP} ${CANNA_MODE} RCD_SCRIPTS= canna +.include "../../inputmethod/canna-lib/buildlink3.mk" + post-patch: ${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig ${SED} -e 's|\(SUBDIRS = \).*|\1 canna lib server cmd doc|' \ @@ -30,10 +33,4 @@ post-patch: ${SED} -e 's|\(DicDir.*=\).*|\1${IMDICTDIR}/canna|' \ ${WRKSRC}/Canna.conf.orig > ${WRKSRC}/Canna.conf -do-configure: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF} - -.include "../../devel/nbitools/buildlink3.mk" -.include "../../inputmethod/canna-lib/buildlink3.mk" - -.include "../../inputmethod/canna/Makefile.include" +.include "../../mk/bsd.pkg.mk" |