1. Make ``make install'' actually install files.

   (I wish whoever committed this port had checked that make install and make
   package work, at least.)
2. Try to restart cannaserver in post-install: as pkg-plist @exec it.
3. Try to restart cannaserver only when it seems to be running.
4. Instead of patching up distfile's Makefile using patch-aa to
   modify its all: target, use ALL_TARGET.
5. Instead of echo'ing note about configuration in post-install:,
   use pkg-message, so that pkg_add will display it, too.
6. Now that ja-Canna in the ports collection has been updated, let this
   port generate dictionary files for newer version.
7. Remove unnecessary definition of ${DISTNAME} from the Makefile.
Reviewed and Approved by:	maintainer

5 files changed, 31 insertions, 36 deletions

diff --git a/japanese/cannadic/Makefile b/japanese/cannadic/Makefile
index d2553c2b8e40..01ef999cc952 100644
--- a/japanese/cannadic/Makefile
+++ b/japanese/cannadic/Makefile
@@ -9,15 +9,15 @@ PORTNAME=	cannadic
 PORTVERSION=	0.92
 CATEGORIES=	japanese
 MASTER_SITES=	http://cgi3.osk.3web.ne.jp/~nowaki/computer/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	toga@puyo.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/canna/dic/canna/dics.dir:${PORTSDIR}/japanese/Canna
 BUILD_DEPENDS=	mkbindic:${PORTSDIR}/japanese/Canna
 
-DICS=		gcanna.d gcannaf.d
-FQS=		gcanna.fq gcannaf.fq
+ALL_TARGET=	bindic
+
+DICS=		gcanna.cbd gcanna.cld gcannaf.cbd gcannaf.cld
 DICSFILE=	dics.dir
 ORIGDICSFILE=	dics.dir.orig
 CANNADICSFILE=	dics.dir.gpl_canna
@@ -28,23 +28,15 @@ do-install:
 	cd ${WRKSRC};\
 	${CP} ${DICDIR}/${DICSFILE} ./${ORIGDICSFILE}; \
 	${CAT} ./${ORIGDICSFILE} ./${CANNADICSFILE} > ./${DICSFILE}; \
-	${INSTALL_DATA} -g bin -m 664 -o bin ${DICS} ${FQS} ${DICDIR};\
-	${INSTALL_DATA} -g bin -m 664 -o bin ${DICSFILE} ${CANNADICSFILE} ${ORIGDICSFILE} ${DICDIR}
+	${INSTALL} -c -g bin -m 664 -o bin ${DICS} ${DICDIR} ; \
+	${INSTALL} -c -g bin -m 664 -o bin ${DICSFILE} ${CANNADICSFILE} ${ORIGDICSFILE} ${DICDIR}
 
 post-install:
-	@( \
-	${ECHO} ; \
-	${ECHO} ; \
-	${ECHO} "After installing, you have to restart cannaserver" ; \
-	${ECHO} "and add lines to your .canna."; \
-	${ECHO} "(use-dictionary" ; \
-	${ECHO} "\"iroha\" ; and more...." ; \
-	${ECHO} ; \
-	${ECHO} "\"gcanna\"  ; add this!" ;\
-	${ECHO} "\"gcannaf\" ; add this!" ;\
-	${ECHO} ")";\
-	${ECHO} ; \
-	${ECHO} ; \
-	)
+	@if [ -e /tmp/.iroha_unix/IROHA ]; then \
+	   ${ECHO} "Restarting Canna server..."; \
+	   ${CANNASH} stop > /dev/null 2>&1 ; \
+	   ${CANNASH} start > /dev/null 2>&1 ; \
+	 fi
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/cannadic/files/patch-aa b/japanese/cannadic/files/patch-aa
index 9206e09df279..c3c737522514 100644
--- a/japanese/cannadic/files/patch-aa
+++ b/japanese/cannadic/files/patch-aa
@@ -1,14 +1,5 @@
 --- Makefile.orig	Fri Feb 16 03:12:21 2001
 +++ Makefile	Sun Apr  8 08:33:24 2001
-@@ -30,7 +30,7 @@
- MAINDIC         = gcanna.t
- SUBDIC          = gcannaf.t
- 
--all: help
-+all: bindic-old-version
- 
- help:
- 	echo "see README."
 @@ -40,10 +40,6 @@
  	mkbindic -s ${SUBDIC}
  
diff --git a/japanese/cannadic/files/patch-ac b/japanese/cannadic/files/patch-ac
index d61294abccbb..154accab39ef 100644
--- a/japanese/cannadic/files/patch-ac
+++ b/japanese/cannadic/files/patch-ac
@@ -3,7 +3,7 @@
 ***************
 *** 0 ****
 --- 1,4 ----
-+ gcanna.d(gcanna.mwd)     -gcanna---
-+ gcanna.fq(gcanna.mwd)    -gcanna---
-+ gcannaf.d(gcannaf.swd)   -gcannaf---
-+ gcannaf.fq(gcannaf.swd)  -gcannaf---
++ gcanna.cld(gcanna.mwd)     -gcanna---
++ gcanna.cbd(gcanna.mwd)    -gcanna---
++ gcannaf.cld(gcannaf.swd)   -gcannaf---
++ gcannaf.cbd(gcannaf.swd)  -gcannaf---
diff --git a/japanese/cannadic/pkg-message b/japanese/cannadic/pkg-message
new file mode 100644
index 000000000000..4f7b5d2d5933
--- /dev/null
+++ b/japanese/cannadic/pkg-message
@@ -0,0 +1,10 @@
+
+After the installation, lines like the following need to be added to
+your .canna.
+
+    (use-dictionary
+      "iroha"; and more....
+      "gcanna"  ; add this!
+      "gcannaf" ; add this!
+    )
+
diff --git a/japanese/cannadic/pkg-plist b/japanese/cannadic/pkg-plist
index 2b0bc822d459..c0155c1eec9f 100644
--- a/japanese/cannadic/pkg-plist
+++ b/japanese/cannadic/pkg-plist
@@ -1,5 +1,7 @@
 lib/canna/dic/canna/dics.dir.gpl_canna
-@exec (%D/etc/rc.d/canna.sh stop ; mv %D/lib/canna/dic/canna/dics.dir %D/lib/canna/dic/canna/dics.dir.orig ; cat %D/lib/canna/dic/canna/dics.dir.orig %D/lib/canna/dic/canna/dics.dir.gpl_canna > %D/lib/canna/dic/canna/dics.dir ; chown bin:bin %D/lib/canna/dic/canna/dics.dir ; chmod 464 %D/lib/canna/dic/canna/dics.dir ; %D/etc/rc.d/canna.sh start)
-@unexec (%D/etc/rc.d/canna.sh stop ; mv %D/lib/canna/dic/canna/dics.dir.orig %D/lib/canna/dic/canna/dics.dir ; %D/etc/rc.d/canna.sh start)
-lib/canna/dic/canna/gcanna.d
-lib/canna/dic/canna/gcanna.fq
+@exec (echo "Updating %D/lib/canna/dic/canna/dics.dir" ; mv %D/lib/canna/dic/canna/dics.dir %D/lib/canna/dic/canna/dics.dir.orig ; cat %D/lib/canna/dic/canna/dics.dir.orig %D/lib/canna/dic/canna/dics.dir.gpl_canna > %D/lib/canna/dic/canna/dics.dir ; chown bin:bin %D/lib/canna/dic/canna/dics.dir ; chmod 464 %D/lib/canna/dic/canna/dics.dir ; if [ -e /tmp/.iroha_unix/IROHA ] ; then echo "Restarting Canna server..." ; %D/etc/rc.d/canna.sh stop > /dev/null 2>&1; %D/etc/rc.d/canna.sh start > /dev/null 2>&1 ; fi)
+@unexec (echo "Restoring old %D/lib/canna/dic/canna/dics.dir..." ; mv %D/lib/canna/dic/canna/dics.dir.orig %D/lib/canna/dic/canna/dics.dir ; if [ -e /tmp/.iroha_unix/IROHA ]; then echo "Restarting Canna server..." ; %D/etc/rc.d/canna.sh stop > /dev/null 2>&1 ; %D/etc/rc.d/canna.sh start > /dev/null 2>&1 ; fi)
+lib/canna/dic/canna/gcanna.cld
+lib/canna/dic/canna/gcanna.cbd
+lib/canna/dic/canna/gcannaf.cld
+lib/canna/dic/canna/gcannaf.cbd