Convert to ELF and cleanup use of MAN* macros.

2 files changed, 25 insertions, 76 deletions

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index ff38379f60c0..4eddcb0bcc25 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.19 1998/08/15 05:06:04 kuriyama Exp $
+# $Id: Makefile,v 1.20 1998/08/25 00:44:25 asami Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -18,18 +18,17 @@ USE_IMAKE=	yes
 PREFIX?=	${LOCALBASE}
 ALL_TARGET=	canna
 
-MAN1=	cannaserver.1 ctow.1 dicar.1 dpromdic.1 splitword.1 wtoc.1 \
-	mkromdic.1 mkbindic.1 dpbindic.1 cannakill.1 canvert.1 \
-	cannacheck.1 cannastat.1 cshost.1 catdic.1 cpdic.1 lsdic.1 \
-	mkdic.1 mvdic.1 rmdic.1 addwords.1 delwords.1
-MAN3= 	RkRgnBun.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
-	RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3 \
-	RkGetLex.3 RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 \
-	RkIntro.3 RkLeft.3 RkMountD.3 RkNext.3 RkNfer.3 RkPrev.3 \
-	RkRemountDic.3 RkResize.3 RkRight.3 RkShorten.3 RkStoreYomi.3 \
-	RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3 RkCloseRoma.3 \
-	RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 RkCvtRoma.3 \
-	RkCvtZen.3 RkMapPhonogram.3 RkMapRoma.3 RkOpenRoma.3
+MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
+	canvert.1 catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
+	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
+	mvdic.1 rmdic.1 splitword.1 wtoc.1
+MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
+	RkCvtRoma.3 RkCvtZen.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
+	RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3 RkGetLex.3 \
+	RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 RkIntro.3 RkLeft.3 \
+	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
+	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
+	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
 MANCOMPRESSED=	no
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
@@ -39,7 +38,13 @@ pre-install:
 	chown bin.bin /var/run/canna
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
+		${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so; \
+		${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so; \
+		${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so; \
+		${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so; \
+	fi
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
 		echo "Installing ${STARTUP_SCRIPT} startup file."; 	\
 		echo '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist
index d5f5ef9eef68..eb70f2e09d37 100644
--- a/japanese/Canna/pkg-plist
+++ b/japanese/Canna/pkg-plist
@@ -108,75 +108,19 @@ lib/canna/sample/unix.canna
 lib/canna/sample/vje.canna
 lib/canna/sample/vje.iroha
 lib/libRKC.a
+lib/libRKC.so
 lib/libRKC.so.1.0
 lib/libRKC16.a
+lib/libRKC16.so
 lib/libRKC16.so.1.0
 lib/libcanna.a
+lib/libcanna.so
 lib/libcanna.so.1.0
 lib/libcanna16.a
+lib/libcanna16.so
 lib/libcanna16.so.1.0
-@exec ldconfig -m %B
-@unexec /sbin/ldconfig -R
-man/man1/addwords.1.gz
-man/man1/cannacheck.1.gz
-man/man1/cannakill.1.gz
-man/man1/cannaserver.1.gz
-man/man1/cannastat.1.gz
-man/man1/canvert.1.gz
-man/man1/catdic.1.gz
-man/man1/cpdic.1.gz
-man/man1/cshost.1.gz
-man/man1/ctow.1.gz
-man/man1/delwords.1.gz
-man/man1/dicar.1.gz
-man/man1/dpbindic.1.gz
-man/man1/dpromdic.1.gz
-man/man1/lsdic.1.gz
-man/man1/mkbindic.1.gz
-man/man1/mkdic.1.gz
-man/man1/mkromdic.1.gz
-man/man1/mvdic.1.gz
-man/man1/rmdic.1.gz
-man/man1/splitword.1.gz
-man/man1/wtoc.1.gz
-man/man3/RkCloseRoma.3.gz
-man/man3/RkCvtEuc.3.gz
-man/man3/RkCvtHan.3.gz
-man/man3/RkCvtHira.3.gz
-man/man3/RkCvtKana.3.gz
-man/man3/RkCvtRoma.3.gz
-man/man3/RkCvtZen.3.gz
-man/man3/RkDefineDic.3.gz
-man/man3/RkDeleteDic.3.gz
-man/man3/RkEndBun.3.gz
-man/man3/RkEnlarge.3.gz
-man/man3/RkFinalize.3.gz
-man/man3/RkGetDicList.3.gz
-man/man3/RkGetKanji.3.gz
-man/man3/RkGetLex.3.gz
-man/man3/RkGetStat.3.gz
-man/man3/RkGetYomi.3.gz
-man/man3/RkGoto.3.gz
-man/man3/RkInitialize.3.gz
-man/man3/RkIntro.3.gz
-man/man3/RkLeft.3.gz
-man/man3/RkMapPhonogram.3.gz
-man/man3/RkMapRoma.3.gz
-man/man3/RkMountD.3.gz
-man/man3/RkNext.3.gz
-man/man3/RkNfer.3.gz
-man/man3/RkOpenRoma.3.gz
-man/man3/RkPrev.3.gz
-man/man3/RkRemountDic.3.gz
-man/man3/RkResize.3.gz
-man/man3/RkRgnBun.3.gz
-man/man3/RkRight.3.gz
-man/man3/RkShorten.3.gz
-man/man3/RkStoreYomi.3.gz
-man/man3/RkUnmountDic.3.gz
-man/man3/RkXfer.3.gz
-man/man3/cannalib.3.gz
-man/man3/uilib.3.gz
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 sbin/cannakill
 sbin/cannaserver
 @exec mkdir /var/run/canna