--- Imakefile.orig	Wed Dec 11 18:36:32 1996
+++ Imakefile	Thu Jan  9 18:17:25 1997
@@ -17,13 +17,13 @@
 
 XCOMM If you get an error "Cannot find xpm.h" while compiling, set
 XCOMM XPMINC to the directory X11/xpm.h is in.  Below is a guess.
-          XPMINC = -I/usr/local/include
+XCOMM          XPMINC = -I/usr/local/include
 XCOMM SGI's ViewKit (use with -DHAS_XPMINC)
 XCOMM     XPMINC = -I/usr/include/Vk
 
 XCOMM If you get an error "Connot find libXpm" while linking, set XPMLIBPATH
 XCOMM to the directory libXpm.* is in.  Below is a guess.
-          XPMLIB = -L/usr/local/lib -lXpm
+          XPMLIB = -lXpm
 
 #endif
 
@@ -255,7 +255,12 @@
      PIXMAPTYPE = x11
        FLAGTYPE = sysv
 #else
-#if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(i386BsdArchitecture)
+#if defined(FreeBSDArchitecture) 
+       SLEEPDEF = -DHAS_USLEEP
+     BITMAPTYPE = bsd
+     PIXMAPTYPE = bsd
+       FLAGTYPE = freebsd
+#elif defined(NetBSDArchitecture) || defined(i386BsdArchitecture)
        SLEEPDEF = -DHAS_USLEEP
      BITMAPTYPE = bsd
      PIXMAPTYPE = bsd
@@ -329,9 +334,9 @@
 XCOMM  -DSTAFF_NETGROUP=\"/etc/xlock.netgroup\"  netgroup that is exempt
 
 XCOMM May have to combine in one long line if "+=" does not work
-        OPTDEF = -DUSE_VROOT -DALWAYS_ALLOW_ROOT
+XCOMM        OPTDEF = -DUSE_VROOT -DALWAYS_ALLOW_ROOT
 XCOMM        OPTDEF += -DSYSLOG
-XCOMM        OPTDEF += -DMOUSE_MOTION
+        OPTDEF += -DMOUSE_MOTION
 XCOMM        OPTDEF += -DMULTIPLE_ROOT
 XCOMM        OPTDEF += -DOLD_EVENT_LOOP
 XCOMM        0PTDEF += -DUSE_XLOCKRC
@@ -357,8 +362,8 @@
     IMAGEBITMAP = $(MEDIUMBITMAP)
 XCOMM    IMAGEBITMAP = l-bob
 XCOMM    IMAGEBITMAP = m-xlock
-XCOMM     LIFEBITMAP = $(SMALLBITMAP)
-     LIFEBITMAP = s-grelb
+     LIFEBITMAP = $(SMALLBITMAP)
+XCOMM     LIFEBITMAP = s-grelb
    LIFE1DBITMAP = $(TINYBITMAP)
      MAZEBITMAP = $(LARGEBITMAP)
 XCOMM     MAZEBITMAP = m-xlock