--- ./Kinput2.conf.~1~	Tue Dec  9 17:37:39 1997
+++ ./Kinput2.conf	Fri Dec 19 23:40:28 1997
@@ -1,3 +1,7 @@
+XCOMM Redefine $(IMAKE_CMD) for FreeBSD ports (by S. Taoka)
+
+IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(PORT_IMAKE_DEFINES)
+
 XCOMM
 XCOMM Kinput2 global configuration parameters
 XCOMM
@@ -6,6 +10,7 @@
  * README file.
  */
 
+
 /**
  ** Conversion system configuration:
  **	Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
@@ -16,8 +21,8 @@
  **/
 
 /* #define UseWnn */	/* define if you are going to use Wnn */
-#define UseCanna	/* define if you are going to use Canna */
-#define UseSj3		/* define if you are going to use Sj3 */
+/* #define UseCanna */	/* define if you are going to use Canna */
+/* #define UseSj3 */	/* define if you are going to use Sj3 */
 
 
 XCOMM Wnn configuration
@@ -44,19 +49,19 @@
  * in the Wnn source tree.
  */
 XCOMM use installed header files (if config.h is there)
-XCOMM WNNINCDIR = /usr/X11R6/include/wnn
+WNNINCDIR = $(X11BASE)/include/wnn
 XCOMM or header files in the source tree
 XCOMM WNNINCDIR = $(CONTRIBSRC)/programs/Xsi/Wnn/include
 XCOMM use installed library
-XCOMM WNNLIB = -lwnn
+WNNLIB = -L$(X11BASE)/lib -lwnn -lcrypt
 
 /*
  * Or, use library in the source tree..
  */
 XCOMM use library in the source tree
-WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-WNNINCDIR = $(WNNSRC)/include
-WNNLIB = $(WNNSRC)/jlib/libwnn.a
+XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
+XCOMM WNNINCDIR = $(WNNSRC)/include
+XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
 
 
 XCOMM Canna configuration
@@ -72,17 +77,17 @@
  * If you have already installed Canna header files and libraries..
  */
 XCOMM use installed headers/libraries
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
+CANNAINSTDIR = $(LOCALBASE)
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -L$(LOCALBASE)/lib -lcanna16
 
 /*
  * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
  * but not installed yet..
  */
 XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
 
 
 XCOMM SJ3 configuration
@@ -103,14 +108,14 @@
  * (in this case, you don't have to care about SJ3SRC)
  */
 XCOMM use installed header/library
-XCOMM SJ3LIB = -lsj3lib
+SJ3LIB = -L$(LOCALBASE)/lib -lsj3lib
 
 /*
  * Use compiled library in the source tree..
  */
 XCOMM use library in the source tree
-SJ3SRC = $(CONTRIBSRC)/programs/sj3
-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3
+XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
 
 
 /**
