Reliably detect NAS headers when NAS is enabled, and remove references to

/usr/pkg/{include,lib} from the configure script.  SDL now really meets
the criteria for USE_BUILDLINK_ONLY.

3 files changed, 27 insertions, 11 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 025136307f4..5652634ce8f 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/07/03 06:17:32 rh Exp $
+# $NetBSD: Makefile,v 1.20 2001/07/14 15:45:34 jlam Exp $
 #
 
 DISTNAME=	SDL-1.2.1
@@ -38,6 +38,7 @@ NASMFLAGS=		-f aoutb
 CONFIGURE_ARGS+=	--disable-nas
 .endif
 
+CONFIGURE_ARGS+=	--disable-arts
 CONFIGURE_ARGS+=	--disable-pthread-sem
 CONFIGURE_ENV+=		NASMFLAGS="${NASMFLAGS}"
 MAKE_ENV+=		NASMFLAGS="${NASMFLAGS}"
@@ -54,4 +55,5 @@ post-configure:
 .include "../../audio/esound/buildlink.mk"
 .include "../../devel/pth/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
+.include "../../mk/ossaudio.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index bb0f268a05b..a0b215f85cf 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2001/07/03 06:17:32 rh Exp $
+$NetBSD: distinfo,v 1.8 2001/07/14 15:45:34 jlam Exp $
 
 SHA1 (SDL-1.2.1.tar.gz) = c2968bfd3dc4f5b3c8a2b0f541796390ce90d0a5
 Size (SDL-1.2.1.tar.gz) = 1478755 bytes
@@ -10,7 +10,7 @@ SHA1 (patch-ae) = 48be5569eb631b095c0a8af3b3a295c3f34958a6
 SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e
 SHA1 (patch-ah) = f509c0c146002cf2525bd9b7c7532fbca7aa4fb6
 SHA1 (patch-ai) = 9c732852520b86e2ffa4b467d4b5220a53c9ecc6
-SHA1 (patch-aj) = d69dc748ed59ecbdd29d3480daf7805c91d22c08
+SHA1 (patch-aj) = ccb2ec084e5f7d7cfadc0b6ea6739a2f7b60182e
 SHA1 (patch-ak) = 657947be674831c98850f044315e4681fe58ea29
 SHA1 (patch-an) = b875bc9e173d69cb5fcc1b4ea3e7039b7633d187
 SHA1 (patch-aq) = 45f63636a9caa338274db68596c8cf8c1d3cd0f0
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 3255cde7c0c..309e3e9d997 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,8 +1,20 @@
-$NetBSD: patch-aj,v 1.6 2001/07/03 06:17:33 rh Exp $
+$NetBSD: patch-aj,v 1.7 2001/07/14 15:45:35 jlam Exp $
 
---- configure.in.orig	Mon Jun 18 17:21:38 2001
+--- configure.in.orig	Mon Jun 18 11:21:38 2001
 +++ configure.in
-@@ -410,7 +410,7 @@
+@@ -354,10 +354,7 @@
+                   , enable_nas=yes)
+     if test x$enable_audio = xyes -a x$enable_nas = xyes; then
+         AC_MSG_CHECKING(for NAS audio support)
+-        have_nas=no
+-        if test -r /usr/X11R6/include/audio/audiolib.h; then
+-            have_nas=yes
+-        fi
++        have_nas=yes
+         AC_MSG_RESULT($have_nas)
+         if test x$have_nas = xyes; then
+             CFLAGS="$CFLAGS -DNAS_SUPPORT"
+@@ -410,7 +407,7 @@
                    NASMFLAGS="-f win32"
                    ;;
                *)
@@ -11,16 +23,18 @@ $NetBSD: patch-aj,v 1.6 2001/07/03 06:17:33 rh Exp $
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -890,7 +890,7 @@
+@@ -889,8 +886,8 @@
+             pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
-             pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
+-            pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
 -            pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
-+            pthread_lib="-L/usr/pkg/lib -lpthread"
++            pthread_cflags="-D_REENTRANT"
++            pthread_lib="-lpthread"
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1577,7 +1577,11 @@
+@@ -1577,7 +1574,11 @@
              COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h)
              COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c)
              COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h)
@@ -33,7 +47,7 @@ $NetBSD: patch-aj,v 1.6 2001/07/03 06:17:33 rh Exp $
              COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h)
              COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c)
              COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h)
-@@ -1956,6 +1960,10 @@
+@@ -1956,6 +1957,10 @@
  
  if test $ARCH = solaris; then
    SDL_RLD_FLAGS="-R\${exec_prefix}/lib"