$OpenBSD: patch-fig2dev_Imakefile,v 1.5 2003/04/04 14:28:36 naddy Exp $
--- fig2dev/Imakefile.orig	Thu Dec 19 18:33:44 2002
+++ fig2dev/Imakefile	Thu Apr  3 01:33:40 2003
@@ -20,13 +20,13 @@ XCOMM ******
 XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
 XCOMM and installed xfig.
 
-XFIGLIBDIR =	/usr/local/lib/X11/xfig
+XFIGLIBDIR =	$(LIBDIR)/xfig
 
 XCOMM ******
 XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
 XCOMM comment out NEED_STRERROR with an XCOMM comment.
 
-NEED_STRERROR = -DNEED_STRERROR
+XCOMM NEED_STRERROR = -DNEED_STRERROR
 
 XCOMM The following probably only applies to Windows 9x/NT:
 XCOMM If your system can open files in text and binary modes and has the
@@ -39,7 +39,7 @@ XCOMM Uncomment the following line if yo
 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 ****************
 XCOMM Change RGB if necessary, to point to your rgb.txt color database
@@ -60,8 +60,8 @@ XCOMM Redefine the following if your PNG
 XCOMM are in different places
 
 #ifdef USEPNG
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/include/X11
+PNGLIBDIR = ${LOCALBASE}/lib
+PNGINC = -I${LOCALBASE}/include/libpng
 #endif
 
 XCOMM ****************
@@ -73,11 +73,11 @@ XCOMM Change XPMLIBDIR if necessary to p
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
 XCOMM
 
-XCOMM #define USEXPM
+#define USEXPM
 
 #ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = ${X11BASE}/lib
+XPMINC = -I${X11BASE}/include/X11
 #endif
 
 XCOMM ****************
@@ -126,7 +126,7 @@ XCOMM Comment out the next line if you h
 
 #ifdef I18N
 I18N_DEFS = -DI18N 
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
+FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
 I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
 
 install::
@@ -154,7 +154,7 @@ XCOMM **********************************
 XCOMM *** You shouldn't have to change anything below this point ***
 XCOMM **************************************************************
 
-DIR_DEFS=	-DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\"
+DIR_DEFS=	-DBITMAPDIR=\\\"$(XFIGLIBDIR)/bitmaps\\\"
 
 #ifdef USEPNG
 DUSEPNG = -DUSE_PNG
@@ -177,7 +177,7 @@ DEFINES = $(NEED_STRERROR) $(HAVE_NO_STR
 
 IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM)
 
-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
+DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
 		$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
 
 #define IHaveSubdirs
