Fixes for solaris:

- use ${MACHINE_GNU_PLATFORM} in place of ${MACHINE_GNU_ARCH}--netbsd
- check for -lossaudio in ./configure instead of linking with it
  unconditionally
- fixe Makefiles for bmake or gmake on solaris2
While I'm there merge back a change from configure to configure.in

6 files changed, 127 insertions, 23 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 69a910f8b37..e1c434b57bf 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/10/08 21:12:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 1999/12/06 14:24:01 bouyer Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
 
 DISTNAME=	xemacs-21.1.6
@@ -45,7 +45,7 @@ DEPENDS+=	faces-1.6.1:../../mail/faces
 WITH_XFACE=	--with-xface=no
 .endif
 
-CONFIGURE_ARGS+=	${MACHINE_GNU_ARCH}--netbsd --prefix=${PREFIX} \
+CONFIGURE_ARGS+=	${MACHINE_GNU_PLATFORM} --prefix=${PREFIX} \
 			--with-clash-detection --with-mule=yes \
 			--with-ncurses=no --with-session=yes \
 			${WITH_DIALOGS} ${WITH_XFACE} \
diff --git a/editors/xemacs/files/patch-sum b/editors/xemacs/files/patch-sum
index 45a47817715..e2bc60ee07f 100644
--- a/editors/xemacs/files/patch-sum
+++ b/editors/xemacs/files/patch-sum
@@ -1,11 +1,12 @@
-$NetBSD: patch-sum,v 1.4 1999/12/06 01:24:12 tron Exp $
+$NetBSD: patch-sum,v 1.5 1999/12/06 14:24:02 bouyer Exp $
 
-MD5 (patch-aa) = dfef970e6c88d79ff47c62533e43c99d
+MD5 (patch-aa) = c5d92bd8fd195c22694f38ee2fb9f6bb
 MD5 (patch-ab) = 9e71184efe53a2cd48fa65aed224abc5
 MD5 (patch-ac) = 74da7f3c4b7320b72c9332e1b737144c
 MD5 (patch-ad) = c9ff11d00130b14e1cdd29e85ebad5ab
-MD5 (patch-af) = 1a0aeecbd582e90b6a7440eb2bdd1de8
+MD5 (patch-af) = b1e83f33763647b9498d454e54888824
 MD5 (patch-ag) = 504f7f2faabecc5b3c9d56f915bd8ca0
 MD5 (patch-ah) = 3aff089ff0c45df8e99614f257e2bd82
 MD5 (patch-ai) = 76c200f59a51fd7e5c8dc9333ffc0e7e
-MD5 (patch-ak) = 206c0a4b0cbd67ffe045a07050a5f24d
+MD5 (patch-ak) = 30f473fa474bc7d48bb7fe6afd66aeb1
+MD5 (patch-al) = 46cb11814be5fa3f01c7d2fca56fd450
diff --git a/editors/xemacs/patches/patch-aa b/editors/xemacs/patches/patch-aa
index 67d4bf80ce4..7004099271c 100644
--- a/editors/xemacs/patches/patch-aa
+++ b/editors/xemacs/patches/patch-aa
@@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.1 1999/06/29 23:13:39 tron Exp $
+$NetBSD: patch-aa,v 1.2 1999/12/06 14:24:02 bouyer Exp $
 
---- configure.orig	Wed May 12 16:29:01 1999
-+++ configure	Tue Jun 29 21:44:35 1999
-@@ -1007,6 +1007,7 @@
+--- configure.orig	Sun Aug 15 03:29:45 1999
++++ configure	Mon Dec  6 11:20:35 1999
+@@ -1018,6 +1018,7 @@
  machine='' opsys=''
  
  case "$canonical" in
-+  arm*-*-*	   ) machine=arm ;;
++  arm-*-*	   ) machine=arm ;;
    sparc-*-*        ) machine=sparc ;;
    alpha*-*-*       ) machine=alpha ;;
    vax-*-*          ) machine=vax ;;
-@@ -1075,9 +1076,10 @@
+@@ -1086,9 +1087,10 @@
      case "$canonical" in
        i[3-9]86-*-netbsd*) machine=intel386 ;;
        hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
 -                                            machine=hp9000s300 ;;
-+                                            machine=m68k ;;
++                      machine=m68k ;;
        pc532-*-netbsd* | ns32k-*-netbsd* )  machine=ns32000 ;;
        pmax-*-netbsd*  | mips-*-netbsd*  )  machine=pmax ;;
 +      alpha-*-netbsd* ) machine=alpha ;;
      esac
    ;;
  
-@@ -2527,7 +2529,7 @@
+@@ -2711,7 +2713,7 @@
      decosf* | linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -31,3 +31,59 @@ $NetBSD: patch-aa,v 1.1 1999/06/29 23:13:39 tron Exp $
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
          
  if test "$GCC" = "yes"; then
+@@ -10907,8 +10909,47 @@
+     eval "with_${feature}=no"
+   done
+ fi 
++
++echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
++echo "configure:10915: checking for main in -lossaudio" >&5
++ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
++
++xe_check_libs=" -lossaudio "
++cat > conftest.$ac_ext <<EOF
++#line 10920 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++
++int main() {
++main()
++; return 0; }
++EOF
++if { (eval echo configure:10931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++xe_check_libs=""
++
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
++  echo "$ac_t""yes" 1>&6
++  LIBOSSAUDIO=-lossaudio
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++
++
+ test "$with_x11" = "yes" -o "$with_tty" = "yes" && extra_objs="$extra_objs event-unixoid.o" &&  if test "$extra_verbose" = "yes"; then
+    echo "    xemacs will be linked with \"event-unixoid.o\""
+  fi
+ 
+ 
+@@ -12626,6 +12667,7 @@
+ s%@dnd_objs@%$dnd_objs%g
+ s%@lwlib_objs@%$lwlib_objs%g
+ s%@ALLOCA@%$ALLOCA%g
++s%@LIBOSSAUDIO@%$LIBOSSAUDIO%g
+ s%@dll_ld@%$dll_ld%g
+ s%@dll_cflags@%$dll_cflags%g
+ s%@dll_oflags@%$dll_oflags%g
diff --git a/editors/xemacs/patches/patch-af b/editors/xemacs/patches/patch-af
index 5c1f9b73d22..3c772dfed1c 100644
--- a/editors/xemacs/patches/patch-af
+++ b/editors/xemacs/patches/patch-af
@@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.2 1999/06/29 23:13:41 tron Exp $
+$NetBSD: patch-af,v 1.3 1999/12/06 14:24:02 bouyer Exp $
 
---- configure.in.orig	Mon Feb  9 20:58:57 1998
-+++ configure.in	Sat Mar  6 11:09:17 1999
-@@ -940,6 +940,7 @@
+--- configure.in.orig	Sun Aug 15 03:29:49 1999
++++ configure.in	Mon Dec  6 11:20:27 1999
+@@ -1027,6 +1027,7 @@
  
  dnl Straightforward machine determination
  case "$canonical" in
 +  arm-*-*	   ) machine=arm ;;
    sparc-*-*        ) machine=sparc ;;
-   alpha-*-*        ) machine=alpha ;;
+   alpha*-*-*       ) machine=alpha ;;
    vax-*-*          ) machine=vax ;;
-@@ -1013,10 +1014,10 @@
+@@ -1101,10 +1102,10 @@
      case "$canonical" in
        i[[3-9]]86-*-netbsd*) machine=intel386 ;;
        hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
@@ -23,3 +23,22 @@ $NetBSD: patch-af,v 1.2 1999/06/29 23:13:41 tron Exp $
      esac
    ;;
  
+@@ -1941,7 +1942,7 @@
+     decosf* | linux* | irix*) dash_r="-rpath " ;;
+     *)
+       dash_r=""
+-      for try_dash_r in "-R" "-R " "-rpath "; do
++      for try_dash_r in "-Wl,-R" "-R" "-R " "-rpath "; do
+         xe_check_libs="${try_dash_r}/no/such/file-or-directory"
+         XE_PROTECT_LINKER_FLAGS(xe_check_libs)
+         AC_TRY_LINK(, , dash_r="$try_dash_r")
+@@ -3485,6 +3486,9 @@
+     eval "with_${feature}=no"
+   done
+ fi dnl with_tty
++
++AC_CHECK_LIB(ossaudio, main, LIBOSSAUDIO=-lossaudio)
++AC_SUBST(LIBOSSAUDIO)
+ 
+ dnl Do we need event-unixoid.o ?
+ test "$with_x11" = "yes" -o "$with_tty" = "yes" && XE_ADD_OBJS(event-unixoid.o)
diff --git a/editors/xemacs/patches/patch-ak b/editors/xemacs/patches/patch-ak
index b2c950808c1..64be153fccf 100644
--- a/editors/xemacs/patches/patch-ak
+++ b/editors/xemacs/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.2 1999/07/03 15:43:33 tron Exp $
+$NetBSD: patch-ak,v 1.3 1999/12/06 14:24:03 bouyer Exp $
 
 --- src/Makefile.in.in.orig	Sat Jun 20 02:58:42 1998
-+++ src/Makefile.in.in	Sat Jul  3 17:30:31 1999
++++ src/Makefile.in.in	Mon Dec  6 00:42:14 1999
 @@ -52,8 +52,8 @@
  RECURSIVE_MAKE=@RECURSIVE_MAKE@
  
@@ -9,7 +9,19 @@ $NetBSD: patch-ak,v 1.2 1999/07/03 15:43:33 tron Exp $
 -ld_switch_all=@ld_switch_all@
 -ld_libs_all=@ld_libs_all@
 +ld_switch_all=@ld_switch_all@ @LDFLAGS@
-+ld_libs_all=@ld_libs_all@ -lossaudio
++ld_libs_all=@ld_libs_all@ @LIBOSSAUDIO@
  ld_dynamic_link_flags=@ld_dynamic_link_flags@
  
  extra_objs=@extra_objs@
+@@ -133,9 +133,9 @@
+ 
+ #ifdef SOLARIS2
+ %.o : %.c
+-#else
+-.c.o:
++	$(CC) -c $(cflags) $<
+ #endif
++.c.o:
+ 	$(CC) -c $(cflags) $<
+ 
+ ## Create preprocessor output (debugging purposes only)
diff --git a/editors/xemacs/patches/patch-al b/editors/xemacs/patches/patch-al
new file mode 100644
index 00000000000..4a017b31689
--- /dev/null
+++ b/editors/xemacs/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.1 1999/12/06 14:24:03 bouyer Exp $
+
+--- lwlib/Makefile.in.in.old	Mon Dec  6 00:34:23 1999
++++ lwlib/Makefile.in.in	Mon Dec  6 00:34:40 1999
+@@ -59,9 +59,9 @@
+ 
+ #ifdef SOLARIS2
+ %.o : %.c
+-#else
+-.c.o:
++	$(CC) -c $(cflags) $<
+ #endif
++.c.o:
+ 	$(CC) -c $(cflags) $<
+ 
+ ## Create preprocessor output (debugging purposes only)