From 586953d81831e221398844ef0809e25f0a1e96f5 Mon Sep 17 00:00:00 2001
From: Satoshi Taoka <taoka@FreeBSD.org>
Date: Sun, 17 Sep 2000 15:59:10 +0000
Subject: Recently I updated from Wnn 4.2 to FreeWnn 1.1.1. Then include files
 ${LOCALBASE}/include/wnn/*.h and a archive librarry libwnn.a of FreeWnn
 conflict with ones of Wnn6-lib. So I move Wnn6-lib's include files into
 ${LOCALBASE}/include/wnn6/wnn and remove libwnn.a of Wnn6-lib. Note that
 libwnn6.a can be used instead of libwnn.a for Wnn6-lib.

---
 japanese/Wnn6-lib/Makefile  |  5 ++---
 japanese/Wnn6-lib/pkg-plist | 48 ++++++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

(limited to 'japanese/Wnn6-lib')

diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index 5ef5e4a81f8b..fe3479b4d7a1 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -30,10 +30,9 @@ post-install:
 .if ${PORTOBJFORMAT} == "aout"
 	${LN} -sf libwnn6.so.1.0 ${PREFIX}/lib/libwnn6.so
 .endif
-	${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn.a
 	${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn6.a
-	@${MKDIR} ${PREFIX}/include/wnn
-	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn
+	@${MKDIR} ${PREFIX}/include/wnn6/wnn
+	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn6/wnn
 	@${MKDIR} ${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
diff --git a/japanese/Wnn6-lib/pkg-plist b/japanese/Wnn6-lib/pkg-plist
index b35881a77053..c147ac847f29 100644
--- a/japanese/Wnn6-lib/pkg-plist
+++ b/japanese/Wnn6-lib/pkg-plist
@@ -1,30 +1,30 @@
-include/wnn/commonhd.h
-include/wnn/config.h
-include/wnn/copyright.h
-include/wnn/cplib.h
-include/wnn/demcom.h
-include/wnn/dslib.h
-include/wnn/fi_jdata.h
-include/wnn/hinsi_file.h
-include/wnn/jd_sock.h
-include/wnn/jdata.h
-include/wnn/jh.h
-include/wnn/jlib.h
-include/wnn/jllib.h
-include/wnn/jslib.h
-include/wnn/msg.h
-include/wnn/mt_jlib.h
-include/wnn/mt_jserver.h
-include/wnn/rk_spclval.h
-include/wnn/serverdefs.h
-include/wnn/wnn_os.h
-include/wnn/wnn_string.h
-include/wnn/wnnerror.h
-@dirrm include/wnn
+include/wnn6/wnn/commonhd.h
+include/wnn6/wnn/config.h
+include/wnn6/wnn/copyright.h
+include/wnn6/wnn/cplib.h
+include/wnn6/wnn/demcom.h
+include/wnn6/wnn/dslib.h
+include/wnn6/wnn/fi_jdata.h
+include/wnn6/wnn/hinsi_file.h
+include/wnn6/wnn/jd_sock.h
+include/wnn6/wnn/jdata.h
+include/wnn6/wnn/jh.h
+include/wnn6/wnn/jlib.h
+include/wnn6/wnn/jllib.h
+include/wnn6/wnn/jslib.h
+include/wnn6/wnn/msg.h
+include/wnn6/wnn/mt_jlib.h
+include/wnn6/wnn/mt_jserver.h
+include/wnn6/wnn/rk_spclval.h
+include/wnn6/wnn/serverdefs.h
+include/wnn6/wnn/wnn_os.h
+include/wnn6/wnn/wnn_string.h
+include/wnn6/wnn/wnnerror.h
+@dirrm include/wnn6/wnn
+@dirrm include/wnn6
 lib/libwnn6_fromsrc.a
 lib/libwnn6.a
 lib/libwnn6.so
 lib/libwnn6.so.1
-lib/libwnn.a
 share/doc/ja-Wnn6-lib/README
 @dirrm share/doc/ja-Wnn6-lib
-- 
cgit v1.2.3