hardcoded /usr/local & /usr/X11R6 -> $(LOCALBASE) & $(X11BASE)

graphics/xfig/Makefile

@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.17 2001/03/25 08:33:13 jakob Exp $
+# $OpenBSD: Makefile,v 1.18 2001/03/27 01:03:19 brad Exp $
 
-COMMENT=	CAD drawing program for X11
+COMMENT=	"CAD drawing program for X11"
 
 VERSION=	3.2.3c
 DISTNAME=	xfig.${VERSION}.full
 PKGNAME=	xfig-${VERSION}
 CATEGORIES=	graphics x11
-NEED_VERSION=	1.363
+NEED_VERSION=	1.364
 
 MASTER_SITES=	http://www.xfig.org/xfigdist/ \
 		ftp://www-epb.lbl.gov/xfig/ \
@@ -29,12 +29,11 @@ RUN_DEPENDS=	fig2dev::print/transfig \
 
 WRKDIST=	${WRKDIR}/xfig.${VERSION}
 
-CONFIGURE_STYLE=	imake
-MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
-		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults  \
-		XFIGLIBDIR=${PREFIX}/lib/X11/xfig 
-
-post-patch:
-	perl -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Imakefile
+CONFIGURE_STYLE= imake
+MAKE_FLAGS=	BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man1" \
+		XAPPLOADDIR="${PREFIX}/lib/X11/app-defaults"  \
+		XFIGLIBDIR="${PREFIX}/lib/X11/xfig" \
+		LOCALBASE="${LOCALBASE}" X11BASE="${X11BASE}"
+FAKE_FLAGS+=	${MAKE_FLAGS} DESTDIR="${WRKINST}"
 
 .include <bsd.port.mk>

graphics/xfig/patches/patch-Imakefile

@@ -1,11 +1,13 @@
---- Imakefile.orig	Sun Mar 25 10:21:40 2001
-+++ Imakefile	Sun Mar 25 10:20:12 2001
-@@ -41,7 +41,7 @@
+--- Imakefile.orig	Wed Jul 19 14:14:27 2000
++++ Imakefile	Mon Mar 26 19:43:28 2001
+@@ -40,8 +40,8 @@
+ 
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
- JPEGLIBDIR = /usr/local/lib
+-JPEGLIBDIR = /usr/local/lib
 -JPEGINCDIR = /usr/include/X11
-+JPEGINCDIR = /usr/local/include
++JPEGLIBDIR = $(LOCALBASE)/lib
++JPEGINCDIR = $(LOCALBASE)/include
  #else
  JPEGLIBDIR = ../jpeg
  JPEGINCDIR = $(JPEGLIBDIR)
@@ -21,7 +23,7 @@
  #ifdef USEXPM
  XPMLIBDIR = $(USRLIBDIR)
 -XPMINC = -I/usr/include/X11
-+XPMINC = -I/usr/X11R6/include/X11
++XPMINC = -I$(X11BASE)/include/X11
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons