diff options
| author | obache <obache@pkgsrc.org> | 2010-05-28 11:06:34 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-05-28 11:06:34 +0000 |
| commit | 249a531cf270680d4b628ba3d6d38b1556bb1b56 (patch) | |
| tree | cf9a729c47f8da901d300c3784f508d5e9506a09 | |
| parent | c397b61a5e42f1cb89eeeea4da86cb474b4ac207 (diff) | |
| download | pkgsrc-249a531cf270680d4b628ba3d6d38b1556bb1b56.tar.gz | |
Drop dependency on nbitools.
nbitools is not enough to maintain for recent platforms and no good support for
user-destdir (now, canna-lib and canna-canuum is user-destdir ready)
no objection in tech-pkg-ja@ about three months.
| -rw-r--r-- | inputmethod/canna-canuum/Makefile | 6 | ||||
| -rw-r--r-- | inputmethod/canna-lib/Makefile | 17 | ||||
| -rw-r--r-- | inputmethod/canna/Makefile.common | 7 |
3 files changed, 11 insertions, 19 deletions
diff --git a/inputmethod/canna-canuum/Makefile b/inputmethod/canna-canuum/Makefile index 3f6ab20c1c8..72113c9cac9 100644 --- a/inputmethod/canna-canuum/Makefile +++ b/inputmethod/canna-canuum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/02/20 10:37:24 obache Exp $ +# $NetBSD: Makefile,v 1.11 2010/05/28 11:06:34 obache Exp $ PKGREVISION= 3 CANNA_MODULE= canuum @@ -7,13 +7,15 @@ CANNA_MODULE= canuum MAINTAINER= pkgsrc-users@NetBSD.org -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir INSTALLATION_DIRS= ${PKGMANDIR}/ja_JP.EUC/man1 CONFIGURE_DIRS= . canuum BUILD_DIRS= canuum +INSTALL_MAKE_FLAGS+= INSTUGIDFLAGS= + SPECIAL_PERMS+= bin/canuum ${SETUID_ROOT_PERMS} .include "../../inputmethod/canna-lib/buildlink3.mk" diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile index 9e637781303..9b2360339d3 100644 --- a/inputmethod/canna-lib/Makefile +++ b/inputmethod/canna-lib/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2009/12/23 21:46:10 abs Exp $ +# $NetBSD: Makefile,v 1.12 2010/05/28 11:06:34 obache Exp $ PKGREVISION= 2 CANNA_MODULE= lib -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir .include "../../inputmethod/canna/Makefile.common" @@ -24,17 +24,4 @@ post-patch: 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 - ${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 -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common index 592761e0410..fe060489241 100644 --- a/inputmethod/canna/Makefile.common +++ b/inputmethod/canna/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2010/02/20 10:41:59 obache Exp $ +# $NetBSD: Makefile.common,v 1.21 2010/05/28 11:06:34 obache Exp $ # # Canna common makefile. # @@ -23,7 +23,6 @@ FILESDIR= ${.CURDIR}/../../inputmethod/canna/files DISTINFO_FILE= ${.CURDIR}/../../inputmethod/canna/distinfo PATCHDIR= ${.CURDIR}/../../inputmethod/canna/patches -USE_TOOLS+= itools USE_IMAKE= yes CANNA_SPOOL= ${VARBASE}/spool/canna CANNA_MODE= 0755 @@ -40,3 +39,7 @@ MAKE_ENV+= ${CANNA_ENV} SCRIPTS_ENV+= ${CANNA_ENV} PLIST_SUBST+= ${CANNA_ENV} FILES_SUBST+= ${CANNA_ENV} + +INSTALL_MAKE_FLAGS+= CHOWN=${TRUE} +INSTALL_MAKE_FLAGS+= CHGRP=${TRUE} +INSTALL_MAKE_FLAGS+= CHMOD=${TRUE} |