[nas] A couple more small patches

[Steve McIntyre]

I've had a couple of bugs bite me in the Debian nas package over the
last few days:

XFree86 v4.1.0 imake has changed how InstallManPageLong() works,
breaking the nas build

HPArchitecture implies HP-UX, which causes problems for the HPPA Linux
port

The attached patches fix these.

-- 
Steve McIntyre, Cambridge, UK.                   stevem at chiark.greenend.org.uk
Use Debian GNU/Linux - upgrade your Windoze box today!  http://www.debian.org/
"Can't keep my eyes from the circling sky,                 +------------------
"Tongue-tied & twisted, Just an earth-bound misfit, I..."  |Finger for PGP key
-------------- next part --------------
--- nas-1.4.2.orig/config/NetAudio.tmpl
+++ nas-1.4.2/config/NetAudio.tmpl
@@ -226,9 +226,9 @@
        @(rel=`cat $(TOP)/RELEASE | \                                       @@\
          sed 's/Network Audio System Release //'`; \                       @@\
          sed -f $(TOP)/config/mungeman \                                   @@\
-             -e "s/_RELEASE_/$$rel/" < file.man > tmp.man)                 @@\
-       InstallManPageLong(tmp,destdir,dest)                                @@\
-       @$(RM) tmp.man
+             -e "s/_RELEASE_/$$rel/" < file.man > wibble.man; mv -f file.man tmp.man ; mv -f wibble.man file.man)     
                    @@\
+       InstallManPageLong(file,destdir,dest)                               @@\
+       mv -f tmp.man file.man
 
 #define SingleAudioProgram(program)                                        @@\
        InstallProgram(program,$(BINDIR))                                   @@\
-------------- next part --------------
--- nas-1.4.2.orig/server/Imakefile
+++ nas-1.4.2/server/Imakefile
@@ -91,7 +91,7 @@
 #define BuildSGIServer
 #endif
 
-#ifdef HPArchitecture
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
 #define CanBuildAuServer        YES
 ALL1 = nasd
 RCMANDIR = $(MANDIR)
--- nas-1.4.2.orig/server/os/Imakefile
+++ nas-1.4.2/server/os/Imakefile
@@ -42,7 +42,7 @@
 #define OtherObjects iopreader.o
 #endif
 
-#ifdef HPArchitecture
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
 #define OtherSources hpsocket.c 
 #define OtherObjects hpsocket.o dbm.o 
 #endif
@@ -108,7 +108,7 @@
  DEPEND_DEFINES = $(DBM_DEFINES)
        LINTLIBS = ../dix/llib-ldix.ln
 
-#ifdef HPArchitecture
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
          DBMLIB = /usr/lib/libdbm.a
     XLIBSYSVDIR = $(TOP)/lib/X/sysV
 #endif /* HPArchitecture */
@@ -122,7 +122,7 @@
 LintLibraryTarget(os,$(SRCS))
 NormalLintTarget($(SRCS))
 
-#ifdef HPArchitecture
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
 XCOMM
 XCOMM The following kludge is necessary because dbm already has a global 
 XCOMM routine named "bcopy" that is implemented in a silly way.  So, we have to