diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-05 04:48:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-05 04:48:28 +0000 |
| commit | f60a595adda723c3c88ded7c82380a06e0a7cc7b (patch) | |
| tree | e586b33fcc2b9c10ff7c8eb3ce08e6464ee33b4a /inputmethod/canna-lib | |
| parent | 3f84ca011e5b7079ed396bb5aa9ff9dada0b9b0e (diff) | |
| download | pkgsrc-f60a595adda723c3c88ded7c82380a06e0a7cc7b.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-lib')
| -rw-r--r-- | inputmethod/canna-lib/Makefile | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile index c722a3e8b6b..979906adbc7 100644 --- a/inputmethod/canna-lib/Makefile +++ b/inputmethod/canna-lib/Makefile @@ -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 @@ post-patch: > ${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" |