From 6b3a37c4f52299e38e435815a546f4389f6912ca Mon Sep 17 00:00:00 2001 From: Masafumi Max NAKANE Date: Wed, 21 Nov 2001 00:42:18 +0000 Subject: [PATCH] Adjust post-install and pkg-plist so that all necessary directories are created with proper mode/ownership at installation time, and thus, possible to pkg_delete cleanly. --- japanese/Canna/Makefile | 9 ++++++--- japanese/Canna/pkg-plist | 12 ++++++------ japanese/canna-lib/Makefile | 9 ++++++--- japanese/canna-lib/pkg-plist | 12 ++++++------ japanese/canna-server/Makefile | 9 ++++++--- japanese/canna-server/pkg-plist | 12 ++++++------ 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index 15212209c8a4..638e71989ab0 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -48,13 +48,16 @@ MLINKS= uilibs.3 XKanjiControl.3 uilibs.3 XLookupKanjiString.3 \ STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/canna.sh -pre-install: +post-install: ${MKDIR} /var/run/canna ${CHOWN} bin:bin /var/run/canna +.for f in user user/user group + ${MKDIR} ${PREFIX}/lib/canna/dic/$f + ${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f + ${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f +.endfor @${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \ >${WRKDIR}/canna.sh - -post-install: if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist index b3b48620199c..5b2eecaf85e5 100644 --- a/japanese/Canna/pkg-plist +++ b/japanese/Canna/pkg-plist @@ -111,15 +111,15 @@ sbin/cannaserver sbin/cannakill @exec mkdir /var/run/canna @exec chown bin.bin /var/run/canna -@exec chown bin.bin %D/lib/canna/dic/canna -@exec chmod 775 %D/lib/canna/dic/canna -@exec chown bin.bin %D/lib/canna/dic -@exec chmod 775 %D/lib/canna/dic -@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user -@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user +@exec mkdir -p %D/lib/canna/dic/user/user %D/lib/canna/dic/group +@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group +@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group @unexec /bin/rmdir /var/run/canna @dirrm lib/canna/sample/src @dirrm lib/canna/sample +@dirrm lib/canna/dic/user/user +@dirrm lib/canna/dic/user +@dirrm lib/canna/dic/group @dirrm lib/canna/dic/canna @dirrm lib/canna/dic @dirrm lib/canna diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index 15212209c8a4..638e71989ab0 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -48,13 +48,16 @@ MLINKS= uilibs.3 XKanjiControl.3 uilibs.3 XLookupKanjiString.3 \ STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/canna.sh -pre-install: +post-install: ${MKDIR} /var/run/canna ${CHOWN} bin:bin /var/run/canna +.for f in user user/user group + ${MKDIR} ${PREFIX}/lib/canna/dic/$f + ${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f + ${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f +.endfor @${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \ >${WRKDIR}/canna.sh - -post-install: if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist index b3b48620199c..5b2eecaf85e5 100644 --- a/japanese/canna-lib/pkg-plist +++ b/japanese/canna-lib/pkg-plist @@ -111,15 +111,15 @@ sbin/cannaserver sbin/cannakill @exec mkdir /var/run/canna @exec chown bin.bin /var/run/canna -@exec chown bin.bin %D/lib/canna/dic/canna -@exec chmod 775 %D/lib/canna/dic/canna -@exec chown bin.bin %D/lib/canna/dic -@exec chmod 775 %D/lib/canna/dic -@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user -@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user +@exec mkdir -p %D/lib/canna/dic/user/user %D/lib/canna/dic/group +@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group +@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group @unexec /bin/rmdir /var/run/canna @dirrm lib/canna/sample/src @dirrm lib/canna/sample +@dirrm lib/canna/dic/user/user +@dirrm lib/canna/dic/user +@dirrm lib/canna/dic/group @dirrm lib/canna/dic/canna @dirrm lib/canna/dic @dirrm lib/canna diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 15212209c8a4..638e71989ab0 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -48,13 +48,16 @@ MLINKS= uilibs.3 XKanjiControl.3 uilibs.3 XLookupKanjiString.3 \ STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/canna.sh -pre-install: +post-install: ${MKDIR} /var/run/canna ${CHOWN} bin:bin /var/run/canna +.for f in user user/user group + ${MKDIR} ${PREFIX}/lib/canna/dic/$f + ${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f + ${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f +.endfor @${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \ >${WRKDIR}/canna.sh - -post-install: if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist index b3b48620199c..5b2eecaf85e5 100644 --- a/japanese/canna-server/pkg-plist +++ b/japanese/canna-server/pkg-plist @@ -111,15 +111,15 @@ sbin/cannaserver sbin/cannakill @exec mkdir /var/run/canna @exec chown bin.bin /var/run/canna -@exec chown bin.bin %D/lib/canna/dic/canna -@exec chmod 775 %D/lib/canna/dic/canna -@exec chown bin.bin %D/lib/canna/dic -@exec chmod 775 %D/lib/canna/dic -@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user -@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user +@exec mkdir -p %D/lib/canna/dic/user/user %D/lib/canna/dic/group +@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group +@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group @unexec /bin/rmdir /var/run/canna @dirrm lib/canna/sample/src @dirrm lib/canna/sample +@dirrm lib/canna/dic/user/user +@dirrm lib/canna/dic/user +@dirrm lib/canna/dic/group @dirrm lib/canna/dic/canna @dirrm lib/canna/dic @dirrm lib/canna