Move per-package default XAW_TYPE setting above the inclusion of

bsd.prefs.mk so that it is actually used.  Where possible, include
xaw.buildlink.mk instead of setting USE_XAW, and use LIBXAW where needed.

3 files changed, 14 insertions, 12 deletions

diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 755676198f5..f359d10ebc2 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/08/20 04:17:43 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/08/23 04:26:54 jlam Exp $
 #
 
 DISTNAME=		xfig.3.2.3d.full
@@ -15,16 +15,16 @@ COMMENT=		CAD-like 2D drawing tool, good for colorful scale drawings & ISOs
 DEPENDS+=		transfig>=3.2.3.4:../../print/transfig
 
 USE_IMAKE=		YES
-USE_XAW=		YES
 XAW_TYPE?=		3d
 
 NO_INSTALL_MANPAGES=	YES	# install.all does install.man
 INSTALL_TARGET=		install install.all
 CFLAGS+=		-I${BUILDLINK_DIR}/include/X11
+MAKE_ENV+=		X11PREFIX=${X11PREFIX}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${XAW_TYPE} != "3d"
+.if defined(XAW_TYPE) && (${XAW_TYPE} != "3d" && ${XAW_TYPE} != "xpm")
 pre-configure:
 	cd ${WRKSRC} &&	\
 	  if [ ! -f Imakefile.bak ]; then ${MV} Imakefile Imakefile.bak; fi && \
@@ -46,4 +46,5 @@ post-install:
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index 453292773aa..0c971f695ac 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/08/09 15:59:51 tron Exp $
+$NetBSD: distinfo,v 1.5 2001/08/23 04:26:54 jlam Exp $
 
 SHA1 (xfig.3.2.3d.full.tar.gz) = 49806d4e081c722bb35e335b3d34a8ad9f7d78af
 Size (xfig.3.2.3d.full.tar.gz) = 2846844 bytes
 SHA1 (patch-aa) = dd528f771d7b30a7f2504d2e9043cdce7a98f0c1
-SHA1 (patch-ab) = aa4a6b97fd626e668eaf726251a58b9723f91308
+SHA1 (patch-ab) = b47e24ce46894e8c7aa710e3cae8c2559b9676ec
 SHA1 (patch-ac) = 1d18e319873a4aa20d60b477318fd05c951c6b16
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index 40f7479bea4..1ebb7117d29 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
+$NetBSD: patch-ab,v 1.5 2001/08/23 04:26:54 jlam Exp $
 
---- Imakefile.orig	Tue May 29 20:32:11 2001
-+++ Imakefile	Thu Aug  9 17:54:04 2001
+--- Imakefile.orig	Tue May 29 14:32:11 2001
++++ Imakefile
 @@ -47,8 +47,8 @@
  
  #ifdef USEJPEG
@@ -35,8 +35,9 @@ $NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
 +#define USEXPM_ICON
  
  #ifdef USEXPM
- XPMLIBDIR = $(USRLIBDIR)
+-XPMLIBDIR = $(USRLIBDIR)
 -XPMINC = -I/usr/include/X11
++XPMLIBDIR = $(BUILDLINK_DIR)/lib
 +XPMINC = -I$(BUILDLINK_DIR)/include/X11
  #endif
  
@@ -46,7 +47,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
  
  #ifdef XAW3D
 -XAW3DINC = -I/usr/include/X11/Xaw3d
-+XAW3DINC = -I$(INCDIR)/X11/Xaw3d
++XAW3DINC = -I$(BUILDLINK_DIR)/include/X11/Xaw3d
  DUSEXAW3D = -DXAW3D
  XAWLIB = -lXaw3d
  #endif
@@ -82,7 +83,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
  
  #ifdef USEINSTALLEDJPEG
 -JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
-+JPEGLIB = -Wl,-R$(PREFIX)/lib -L$(JPEGLIBDIR) -ljpeg
++JPEGLIB = -Wl,-R$(LOCALBASE)/lib -L$(JPEGLIBDIR) -ljpeg
  #else
  JPEGCONF = configure
  JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
@@ -99,7 +100,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/09 15:59:52 tron Exp $
  #ifdef USEXPM
  DUSEXPM = -DUSE_XPM
 -XPMLIBS = -L$(XPMLIBDIR) -lXpm
-+XPMLIBS = -Wl,-R$(BUILDLINK_PREFIX.xpm) -L$(XPMLIBDIR) -lXpm
++XPMLIBS = -Wl,-R$(X11PREFIX)/lib -L$(XPMLIBDIR) -lXpm
  READXPMS = f_readxpm.c
  READXPMO = f_readxpm.o
  #ifdef USEXPM_ICON