$OpenBSD: patch-Imakefile,v 1.8 2005/04/17 21:32:00 espie Exp $
--- Imakefile.orig	Thu Dec 19 18:57:11 2002
+++ Imakefile	Thu Jan 27 22:15:35 2005
@@ -48,8 +48,8 @@ XCOMM XAPPLOADDIR = /home/user/xfig
 XCOMM Redefine the following if your PNG library and/or include file
 XCOMM are in different places
 
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGLIBDIR = ${DEPBASE}/lib
+PNGINC = -I${DEPBASE}/include/libpng
 
 XCOMM If don't want JPEG support, comment out the #define USEJPEG line
 XCOMM Uncomment the #define for USEJPEG if you want to be able to import
@@ -68,8 +68,8 @@ XCOMM You must have version 5b or newer 
 
 #ifdef USEJPEG
 #ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINC = -I/usr/include/X11
+JPEGLIBDIR = ${DEPBASE}/lib
+JPEGINC = -I${DEPBASE}/include
 #else
 JPEGLIBDIR = ../jpeg
 JPEGINC = -I$(JPEGLIBDIR)
@@ -87,12 +87,12 @@ XCOMM   in /contrib/libraries.
 XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
 
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
 
 #ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = ${X11BASE}/lib
+XPMINC = -I${X11BASE}/include/X11
 #endif
 
 XCOMM Uncomment the following definiton if you want to use the small icons
@@ -105,7 +105,7 @@ XCOMM the 3d Athena Widget Set (highly r
 XCOMM Then be sure to change the XAW3DINC to point to the directory where your
 XCOMM 3D Athena widget headers are located
 
-XCOMM #define XAW3D
+#define XAW3D
 
 #ifdef XAW3D
 XAW3DINC = -I/usr/include/X11/Xaw3d
@@ -147,14 +147,16 @@ XCOMM add -DSETLOCALE to I18N_DEFS.
 
 XCOMM If using an input tablet uncomment the following
 
+#if BuildInputExt == YES
 TABLIB = $(XILIB)
 USETAB = -DUSE_TAB
+#endif
 
 XCOMM uncomment the following line if your compiler supports
 XCOMM inline functions. With the "INLINE" keyword, you should notice that
 XCOMM the display will be a bit faster in complex figures
 
-XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
 
 XCOMM use (and change) the following if you want the multi-key data base file
 XCOMM somewhere other than the standard X11 library directory
@@ -234,7 +236,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
 #endif /* USEJPEG */
 
 #ifdef I18N
-I18N_DEFS = -DI18N -DSETLOCALE
+I18N_DEFS = -DI18N #-DSETLOCALE
 I18N_SRC = w_i18n.c
 I18N_OBJ = w_i18n.o
 #endif