Pass X11PREFIX down through the environment, and use it when building.

Makes this package build with xpkgwedge installed

5 files changed, 34 insertions, 17 deletions

diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 9c115e41774..260d5c2851e 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/03/05 20:30:33 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/05/31 12:30:12 agc Exp $
 
 DISTNAME=		dap-2.1.1
 CATEGORIES=		audio
@@ -13,6 +13,8 @@ DEPENDS+=		xforms>=0.88nb1:../../x11/xforms
 
 MAKEFILE=		Makefile.netbsd
 
+MAKE_ENV+=		X11PREFIX=${X11PREFIX}
+
 USE_X11BASE=		YES
 USE_XPM=		YES
 
diff --git a/audio/dap/distinfo b/audio/dap/distinfo
index 8073bf43dce..a903e60db3b 100644
--- a/audio/dap/distinfo
+++ b/audio/dap/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 13:04:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/31 12:30:12 agc Exp $
 
 SHA1 (dap-2.1.1.tgz) = 9dbf2b5ae2f91e737bb6dbc2e4db98cac2b8b274
 Size (dap-2.1.1.tgz) = 285848 bytes
-SHA1 (patch-aa) = ba3d0262457949cbbba9c0da0ae17b711d04996d
+SHA1 (patch-aa) = 259348b27efdf898003e78f35ebd7aaa8c3e6fb0
 SHA1 (patch-ab) = 0ccf4aa10dfc059eb45f60794c10844b28c2fd1a
 SHA1 (patch-ad) = 01d6e14e7e9fffb9e16a85ddfaf60c96cb98afab
 SHA1 (patch-af) = 28d7ef813ea4147b0a2413bbfc3d9fc1bb90993c
-SHA1 (patch-ao) = 737c3dff8ae6d35372873ae7fc8c96c021e4f854
-SHA1 (patch-ap) = 4f383580d9b421ba096c73570a968ad3ed8ad6ec
+SHA1 (patch-ao) = 121724ac62a0879720cd8a9649676cf47a29a316
+SHA1 (patch-ap) = 8f9eefb33e6bdad1035d7d463698a61537663a69
diff --git a/audio/dap/patches/patch-aa b/audio/dap/patches/patch-aa
index 873ec2b8677..9de0fe9d144 100644
--- a/audio/dap/patches/patch-aa
+++ b/audio/dap/patches/patch-aa
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2000/02/29 16:57:45 scw Exp $
+$NetBSD: patch-aa,v 1.5 2001/05/31 12:30:12 agc Exp $
 
---- ./main/Makefile.netbsd.orig	Thu Nov 11 02:17:08 1999
-+++ ./main/Makefile.netbsd	Wed Feb 23 12:12:58 2000
+--- main/Makefile.netbsd.orig	Wed Feb 23 23:56:39 2000
++++ main/Makefile.netbsd	Thu May 31 12:41:20 2001
 @@ -8,11 +8,11 @@
  AUDIOF  = ../libaudiofile
  BACKDIR = ../bak/main
  HOMEDIR = $(HOME)
 -X11DIR  = /usr/X11R6
-+X11DIR  = ${X11BASE}
- INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
+-INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
 -LIBDIR  = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
-+LIBDIR  = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
++X11DIR  = ${X11BASE}
++INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11
++LIBDIR  = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib
  CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
 +DEBUG   = #-g3
diff --git a/audio/dap/patches/patch-ao b/audio/dap/patches/patch-ao
index a07e7df11e9..022638c2f9f 100644
--- a/audio/dap/patches/patch-ao
+++ b/audio/dap/patches/patch-ao
@@ -1,10 +1,13 @@
-$NetBSD: patch-ao,v 1.2 2000/02/29 16:57:47 scw Exp $
+$NetBSD: patch-ao,v 1.3 2001/05/31 12:30:12 agc Exp $
 
 --- spkit/spkit/Makefile.netbsd.orig	Fri Dec  3 22:05:21 1999
 +++ spkit/spkit/Makefile.netbsd	Fri Dec  3 22:06:18 1999
-@@ -9,7 +9,7 @@
+@@ -7,9 +7,9 @@
+ MAINDIR = ../../main
+ HOMEDIR = $(HOME)
  X11DIR  = /usr/X11R6
- INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
+-INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
++INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11
  CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
 +DEBUG   = #-g3
diff --git a/audio/dap/patches/patch-ap b/audio/dap/patches/patch-ap
index ac2e9e7fdfd..bf6765a9728 100644
--- a/audio/dap/patches/patch-ap
+++ b/audio/dap/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.3 2000/04/10 18:36:26 rh Exp $
+$NetBSD: patch-ap,v 1.4 2001/05/31 12:30:12 agc Exp $
 
 --- tooltips/Makefile.netbsd.orig	Thu Feb 24 01:01:26 2000
 +++ tooltips/Makefile.netbsd	Mon Apr 10 20:34:10 2000
-@@ -29,17 +29,17 @@
+@@ -29,17 +29,19 @@
  XFORMS_INCLUDE_DIR = $(HOME)/xforms/FORMS
  
  # Define where the X11 include files are.
@@ -14,7 +14,9 @@ $NetBSD: patch-ap,v 1.3 2000/04/10 18:36:26 rh Exp $
  
  # Define other include file directories.
 -OTHER_INCLUDE_DIR = /usr/X11R6/include
-+OTHER_INCLUDE_DIR = ${X11BASE}/include
++OTHER_INCLUDE_DIR = ${X11PREFIX}/include/X11
++
++X11_BASE_INCLUDE= ${X11BASE}/include
  
  # Uncomment out this line if you do not want debug information included.
  # DEBUG = -g -Wall -ansi -pedantic
@@ -23,3 +25,12 @@ $NetBSD: patch-ap,v 1.3 2000/04/10 18:36:26 rh Exp $
  
  # Set the default optimisation
  OPTIM = -O1
+@@ -47,7 +49,7 @@
+ # Define the utilities to use for compilation.
+ CC         = gcc
+ CCOPTS     = $(DEBUG) $(OPTIM) -I$(XFORMS_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) \
+-             -I$(SUN_INCLUDE_DIR) -I$(OTHER_INCLUDE_DIR)
++             -I$(SUN_INCLUDE_DIR) -I$(OTHER_INCLUDE_DIR) -I${X11_BASE_INCLUDE}
+ AR         = ar
+ AROPTS     = ruv
+ SED        = sed