$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 11:54:52 agc Exp $

--- Makefile.orig	Sun Apr  8 19:58:28 2001
+++ Makefile	Sun Apr  8 20:03:43 2001
@@ -157,8 +157,8 @@
   STD_CPP_DEFINES =
 
      STD_INCLUDES = -I$(LOCALINCLUDEROOT)
-      STD_DEFINES = -Dsun -DSVR4
-       STD_LDLIBS = -lsocket -lnsl -lw
+      STD_DEFINES =
+       STD_LDLIBS =
       STD_LDFLAGS = -L$(LOCALUSRLIBDIR)
 
 # Project-specific include file directories, defines, etc.
@@ -170,7 +170,7 @@
 
   LOADERLIBPREFIX =
       CDEBUGFLAGS = -O
-        CCOPTIONS = -Xc
+        CCOPTIONS =
 
       ALLINCLUDES = $(INCLUDES) $(PROJECT_INCLUDES) $(STD_INCLUDES)
        ALLDEFINES = $(STD_DEFINES) $(PROJECT_DEFINES) $(DEFINES)
@@ -282,11 +282,11 @@
 
 DEFINES = \
 	-DHAS_SYSCONF=1 \
-	-DHAS_FLOCK=0 \
+	-DHAS_FLOCK=1 \
 	-DHAS_FCNTL=1 \
-	-DHAS_SYS_DIR_H=0 \
+	-DHAS_SYS_DIR_H=1 \
 	-DHAS_DIRENT_H=1 \
-	-DHAS_BCOPY=0
+	-DHAS_BCOPY=1
 
     LIBSRCS = ato.c dir.c fd.c lock.c mem.c $(STRSRCS)
     LIBOBJS = ato.o dir.o fd.o lock.o mem.o $(STROBJS)
@@ -474,7 +474,8 @@
 porttest:: porttest.sh
 	$(RM) $@
 	echo "#!"$(SHELL) > $@
-	$(MSUB) porttest.sh >> $@
+	$(CAT) porttest.sh >> $@
+#	$(MSUB) porttest.sh >> $@
 	$(CHMOD) a+x $@
 
 clean::
@@ -600,26 +601,24 @@
 
 # DO NOT DELETE
 
-ato.o: /usr/include/stdio.h /usr/include/sys/feature_tests.h
-ato.o: /usr/include/math.h /usr/include/floatingpoint.h
-ato.o: /usr/include/sys/ieeefp.h
-dir.o: /usr/include/stdio.h /usr/include/sys/feature_tests.h
-dir.o: /usr/include/sys/types.h /usr/include/sys/isa_defs.h
-dir.o: /usr/include/sys/machtypes.h /usr/include/sys/select.h
+ato.o: /usr/include/stdio.h
+ato.o: /usr/include/math.h
+dir.o: /usr/include/stdio.h
+dir.o: /usr/include/sys/types.h
+dir.o: /usr/include/sys/select.h
 dir.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/dirent.h
 dir.o: /usr/include/sys/dirent.h portlib.h
-fd.o: portlib.h /usr/include/unistd.h /usr/include/sys/feature_tests.h
-fd.o: /usr/include/sys/types.h /usr/include/sys/isa_defs.h
-fd.o: /usr/include/sys/machtypes.h /usr/include/sys/select.h
+fd.o: portlib.h /usr/include/unistd.h
+fd.o: /usr/include/sys/types.h
+fd.o: /usr/include/sys/select.h
 fd.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/unistd.h
-lock.o: /usr/include/stdio.h /usr/include/sys/feature_tests.h
+lock.o: /usr/include/stdio.h
 lock.o: /usr/include/fcntl.h /usr/include/sys/types.h
-lock.o: /usr/include/sys/isa_defs.h /usr/include/sys/machtypes.h
 lock.o: /usr/include/sys/select.h /usr/include/sys/time.h /usr/include/time.h
 lock.o: /usr/include/sys/fcntl.h portlib.h
-mem.o: portlib.h /usr/include/string.h /usr/include/sys/feature_tests.h
-atotest.o: /usr/include/stdio.h /usr/include/sys/feature_tests.h portlib.h
-dirtest.o: /usr/include/stdio.h /usr/include/sys/feature_tests.h portlib.h
-fdtest.o: /usr/include/stdio.h /usr/include/sys/feature_tests.h portlib.h
-locktest.o: /usr/include/stdio.h /usr/include/sys/feature_tests.h portlib.h
-memtest.o: /usr/include/stdio.h /usr/include/sys/feature_tests.h portlib.h
+mem.o: portlib.h /usr/include/string.h
+atotest.o: /usr/include/stdio.h portlib.h
+dirtest.o: /usr/include/stdio.h portlib.h
+fdtest.o: /usr/include/stdio.h portlib.h
+locktest.o: /usr/include/stdio.h portlib.h
+memtest.o: /usr/include/stdio.h portlib.h