summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-07-29 19:42:53 +0000
committerjmmv <jmmv>2003-07-29 19:42:53 +0000
commitb447b98f0468cf97062d440729aca15adbed91c6 (patch)
tree6ad2fceb42c5b74fb6210c5c81df96faac6f046b /inputmethod
parent3c50c84bcb57122b55ccd15543226e91b9959d1c (diff)
downloadpkgsrc-b447b98f0468cf97062d440729aca15adbed91c6.tar.gz
Convert to the bsd.pkg.install.mk framework:
- Use RCD_SCRIPTS for automatic generation and handling of the rc.d script. - Use OWN_DIR_PERMS instead of OWN_DIRS to handle permissions for the spool directory and avoid (un)exec commands in PLIST. As a result, bump PKGREVISION to 1.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/canna-server-bin/Makefile17
-rw-r--r--inputmethod/canna-server-bin/PLIST6
-rw-r--r--inputmethod/canna/files/canna.sh (renamed from inputmethod/canna/files/canna)4
3 files changed, 10 insertions, 17 deletions
diff --git a/inputmethod/canna-server-bin/Makefile b/inputmethod/canna-server-bin/Makefile
index 3aa07fb887a..33f2955e9f4 100644
--- a/inputmethod/canna-server-bin/Makefile
+++ b/inputmethod/canna-server-bin/Makefile
@@ -1,13 +1,18 @@
-# $NetBSD: Makefile,v 1.5 2003/05/31 08:28:35 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/29 19:42:54 jmmv Exp $
#
.include "../canna/Makefile.common"
+PKGREVISION= 1
+
CANNA_MODULE= server-bin
USE_BUILDLINK2= # defined
+USE_PKGINSTALL= YES
INSTALL_TARGET= instserver
-OWN_DIRS= ${CANNA_SPOOL}
+OWN_DIRS_PERMS= ${CANNA_SPOOL} ${CANNA_OWNER} ${CANNA_GROUP} ${CANNA_MODE}
+
+RCD_SCRIPTS= canna
post-patch:
${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
@@ -21,19 +26,11 @@ post-patch:
do-configure:
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF}
-post-build:
- @${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/canna \
- > ${WRKDIR}/canna
-
post-install:
@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
@${INSTALL_SCRIPT} ${WRKDIR}/canna ${PREFIX}/etc/rc.d/canna
- @${INSTALL_DATA_DIR} ${CANNA_SPOOL}
- @${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
- @${CHOWN} ${CANNA_OWNER}:${CANNA_GROUP} ${CANNA_SPOOL}
.include "../../devel/nbitools/buildlink2.mk"
.include "../../inputmethod/canna-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../canna/Makefile.include"
diff --git a/inputmethod/canna-server-bin/PLIST b/inputmethod/canna-server-bin/PLIST
index 3306a5b2e27..a09511937a5 100644
--- a/inputmethod/canna-server-bin/PLIST
+++ b/inputmethod/canna-server-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/31 08:28:35 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/29 19:42:54 jmmv Exp $
bin/addwords
bin/canlisp
bin/cannacheck
@@ -74,7 +74,3 @@ man/man1/splitword.1
man/man1/wtoc.1
sbin/cannakill
sbin/cannaserver
-@exec ${MKDIR} ${CANNA_SPOOL}
-@exec ${CHOWN} ${CANNA_OWNER}:${CANNA_GROUP} ${CANNA_SPOOL}
-@exec ${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
-@unexec ${RMDIR} ${CANNA_SPOOL}
diff --git a/inputmethod/canna/files/canna b/inputmethod/canna/files/canna.sh
index f44c2a385e7..72d19e74a7f 100644
--- a/inputmethod/canna/files/canna
+++ b/inputmethod/canna/files/canna.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: canna,v 1.1 2003/05/31 07:24:40 uebayasi Exp $
+# $NetBSD: canna.sh,v 1.1 2003/07/29 19:42:53 jmmv Exp $
#
# PROVIDE: canna
# REQUIRE: DAEMON