cleanup from Motonori Nakamura

SCCS-vsn: usr.sbin/sendmail/src/Makefiles/Makefile.LUNA 8.2
SCCS-vsn: usr.sbin/sendmail/src/Makefiles/Makefile.EWS-UX_V 8.2
SCCS-vsn: usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.6.x 8.2
SCCS-vsn: usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.4.x 8.2

diff --git a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.EWS-UX_V b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.EWS-UX_V
index c3515aa..e4fefb3 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.EWS-UX_V
+++ b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.EWS-UX_V
@@ -7,14 +7,15 @@
 #
 #  This has been tested on NEC EWS-UX/V 4.2
 #
 #
 #  This has been tested on NEC EWS-UX/V 4.2
 #

-#      @(#)Makefile.EWS-UX_V   8.1 (Berkeley) %G%
+#      @(#)Makefile.EWS-UX_V   8.2 (Berkeley) %G%

 #
 
 # use O=-O (usual) or O=-g (debugging)
 O=     -O
 
 # make sure that /bin/cc is used (do not use /usr/ucb/cc).
 #
 
 # use O=-O (usual) or O=-g (debugging)
 O=     -O
 
 # make sure that /bin/cc is used (do not use /usr/ucb/cc).

-CC=    /bin/cc
+#CC=   /bin/cc
+CC=    /usr/abiccs/bin/cc

 
 # define the database mechanism used for alias lookups:
 #      -DNDBM -- use new DBM
 
 # define the database mechanism used for alias lookups:
 #      -DNDBM -- use new DBM


@@ -26,7 +27,7 @@ CC=   /bin/cc
 DBMDEF=        -DNDBM -DNIS
 
 # environment definitions (e.g., -D_AIX3)
 DBMDEF=        -DNDBM -DNIS
 
 # environment definitions (e.g., -D_AIX3)

-ENVDEF= -KOlimit=900
+ENVDEF=        -Dnec_ews_svr4 -KOlimit=900

 
 # see also conf.h for additional compilation flags
 
 
 # see also conf.h for additional compilation flags
 


@@ -80,27 +81,34 @@ sendmail: ${BEFORE} ${OBJS}
        ${CC} -o sendmail ${OBJS} ${LIBDIRS} ${LIBS}
 
 sysexits.h:
        ${CC} -o sendmail ${OBJS} ${LIBDIRS} ${LIBS}
 
 sysexits.h:

-       ln -s /usr/ucbinclude/sysexits.h .
+       echo '#ifndef _LOCAL_SYSEXITS_H_' > sysexits.h;
+       echo '#define _LOCAL_SYSEXITS_H_' >> sysexits.h;
+       cat /usr/abiccs/ucbinclude/sysexits.h >> sysexits.h;
+       echo '#endif /* _LOCAL_SYSEXITS_H_ */' >> sysexits.h;
+#      ln -s /usr/abiccs/ucbinclude/sysexits.h .

 
 ndbm.h:
 
 ndbm.h:

-       ln -s /usr/ucbinclude/ndbm.h .
+       ln -s /usr/abiccs/ucbinclude/ndbm.h .

 
 ndbm.o:
 
 ndbm.o:

-       ar x /usr/ucblib/libucb.a ndbm.o
+       ar x /usr/abiccs/ucblib/libucb.a ndbm.o
+#      ar x /usr/ucblib/libucb.a ndbm.o

 
 

-NROFF= nroff -h
+#NROFF=        nroff -h
+NROFF= groff -Tascii
+MANDOC=        -mandoc

 
 aliases.0: aliases.5
 
 aliases.0: aliases.5

-       ${NROFF} -mandoc aliases.5 > aliases.0
+       ${NROFF} ${MANDOC} aliases.5 > aliases.0

 
 mailq.0: mailq.1
 
 mailq.0: mailq.1

-       ${NROFF} -mandoc mailq.1 > mailq.0
+       ${NROFF} ${MANDOC} mailq.1 > mailq.0

 
 newaliases.0: newaliases.1
 
 newaliases.0: newaliases.1

-       ${NROFF} -mandoc newaliases.1 > newaliases.0
+       ${NROFF} ${MANDOC} newaliases.1 > newaliases.0

 
 sendmail.0: sendmail.8
 
 sendmail.0: sendmail.8

-       ${NROFF} -mandoc sendmail.8 > sendmail.0
+       ${NROFF} ${MANDOC} sendmail.8 > sendmail.0

 
 install: install-sendmail install-docs
 
 
 install: install-sendmail install-docs
 

diff --git a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.LUNA b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.LUNA
index f9f4162..96b14c2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.LUNA
+++ b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.LUNA
@@ -5,7 +5,7 @@
 #  old make program (I recommend that you get and port the new make if you
 #  are going to be doing any signficant work on sendmail).
 #
 #  old make program (I recommend that you get and port the new make if you
 #  are going to be doing any signficant work on sendmail).
 #

-#      @(#)Makefile.LUNA       8.1 (Berkeley) %G%
+#      @(#)Makefile.LUNA       8.2 (Berkeley) %G%

 #
 
 # use O=-O (usual) or O=-g (debugging)
 #
 
 # use O=-O (usual) or O=-g (debugging)


@@ -50,7 +50,7 @@ HFDIR=        ${DESTDIR}/usr/lib
 OBJADD=
 
 # additional pseudo-sources needed
 OBJADD=
 
 # additional pseudo-sources needed

-BEFORE= dirent.h stddef.h stdlib.h unistd.h limits.h time.h
+BEFORE= dirent.h stddef.h stdlib.h unistd.h limits.h time.h sys/time.h

 
 ###################  end of user configuration flags  ######################
 
 
 ###################  end of user configuration flags  ######################
 


@@ -92,6 +92,13 @@ time.h:
        cat /usr/include/time.h >> time.h
        echo "#endif" >> time.h
 
        cat /usr/include/time.h >> time.h
        echo "#endif" >> time.h
 

+sys/time.h:
+       -mkdir sys
+       echo "#ifndef _LOCAL_SYS_TIME_H_" > sys/time.h
+       echo "#define _LOCAL_SYS_TIME_H_" >> sys/time.h
+       cat /usr/include/sys/time.h >> sys/time.h
+       echo "#endif" >> sys/time.h
+

 NROFF= nroff -h
 
 aliases.0: aliases.5
 NROFF= nroff -h
 
 aliases.0: aliases.5

diff --git a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.4.x b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.4.x
index d577610..23b83c3 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.4.x
+++ b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.4.x
@@ -5,7 +5,7 @@
 #  old make program (I recommend that you get and port the new make if you
 #  are going to be doing any signficant work on sendmail).
 #
 #  old make program (I recommend that you get and port the new make if you
 #  are going to be doing any signficant work on sendmail).
 #

-#      @(#)Makefile.NEWS-OS.4.x        8.1 (Berkeley) %G%
+#      @(#)Makefile.NEWS-OS.4.x        8.2 (Berkeley) %G%

 #
 
 # use O=-O (usual) or O=-g (debugging)
 #
 
 # use O=-O (usual) or O=-g (debugging)


@@ -71,19 +71,21 @@ all: ${ALL}
 sendmail: ${BEFORE} ${OBJS}
        ${CC} -o sendmail ${LDOPTS} ${OBJS} ${LIBDIRS} ${LIBS}
 
 sendmail: ${BEFORE} ${OBJS}
        ${CC} -o sendmail ${LDOPTS} ${OBJS} ${LIBDIRS} ${LIBS}
 

-NROFF= nroff -h
+#NROFF=        nroff -h
+NROFF= groff -Tascii
+MANDOC=        -mandoc

 
 aliases.0: aliases.5
 
 aliases.0: aliases.5

-       ${NROFF} -mandoc aliases.5 > aliases.0
+       ${NROFF} ${MANDOC} aliases.5 > aliases.0

 
 mailq.0: mailq.1
 
 mailq.0: mailq.1

-       ${NROFF} -mandoc mailq.1 > mailq.0
+       ${NROFF} ${MANDOC} mailq.1 > mailq.0

 
 newaliases.0: newaliases.1
 
 newaliases.0: newaliases.1

-       ${NROFF} -mandoc newaliases.1 > newaliases.0
+       ${NROFF} ${MANDOC} newaliases.1 > newaliases.0

 
 sendmail.0: sendmail.8
 
 sendmail.0: sendmail.8

-       ${NROFF} -mandoc sendmail.8 > sendmail.0
+       ${NROFF} ${MANDOC} sendmail.8 > sendmail.0

 
 INSTALL=install
 
 
 INSTALL=install
 

diff --git a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.6.x b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.6.x
index a7bde44..2378b6f 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.6.x
+++ b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.NEWS-OS.6.x
@@ -7,7 +7,7 @@
 #
 #  This has been tested on NEWS-OS 6.0.3
 #
 #
 #  This has been tested on NEWS-OS 6.0.3
 #

-#      @(#)Makefile.NEWS-OS.6.x        8.1 (Berkeley) %G%
+#      @(#)Makefile.NEWS-OS.6.x        8.2 (Berkeley) %G%

 #
 
 # use O=-O (usual) or O=-g (debugging)
 #
 
 # use O=-O (usual) or O=-g (debugging)


@@ -26,7 +26,9 @@ CC=   /bin/cc
 DBMDEF=        -DNDBM -DNIS
 
 # environment definitions (e.g., -D_AIX3)
 DBMDEF=        -DNDBM -DNIS
 
 # environment definitions (e.g., -D_AIX3)

-ENVDEF= -DSYSLOG_BUFSIZE=256   # if you have a problem on syslog buffer size
+# define SYSLOG_BUFSIZE=256 if you have a problem on syslog buffer size
+# define SPT_TYPE=SPT_NONE if you are using NEWS-OS 6.0.1
+ENVDEF= -DSYSLOG_BUFSIZE=256 # -DSPT_TYPE=SPT_NONE

 
 # see also conf.h for additional compilation flags
 
 
 # see also conf.h for additional compilation flags
 


@@ -85,7 +87,7 @@ sysexits.h:
 
 ndbm.o:
        if [ ! -f /usr/include/ndbm.h ]; then \
 
 ndbm.o:
        if [ ! -f /usr/include/ndbm.h ]; then \

-               ln -n /usr/ucbinclude/ndbm.h .; \
+               ln -s /usr/ucbinclude/ndbm.h .; \

        fi; \
        if [ -f /usr/lib/libndbm.a ]; then \
                ar x /usr/lib/libndbm.a ndbm.o; \
        fi; \
        if [ -f /usr/lib/libndbm.a ]; then \
                ar x /usr/lib/libndbm.a ndbm.o; \


@@ -93,20 +95,21 @@ ndbm.o:
                ar x /usr/ucblib/libucb.a ndbm.o; \
        fi; \
 
                ar x /usr/ucblib/libucb.a ndbm.o; \
        fi; \
 

-
-NROFF= nroff -h
+#NROFF=        nroff -h
+NROFF= groff -Tascii
+MANDOC=        -mandoc

 
 aliases.0: aliases.5
 
 aliases.0: aliases.5

-       ${NROFF} -mandoc aliases.5 > aliases.0
+       ${NROFF} ${MANDOC} aliases.5 > aliases.0

 
 mailq.0: mailq.1
 
 mailq.0: mailq.1

-       ${NROFF} -mandoc mailq.1 > mailq.0
+       ${NROFF} ${MANDOC} mailq.1 > mailq.0

 
 newaliases.0: newaliases.1
 
 newaliases.0: newaliases.1

-       ${NROFF} -mandoc newaliases.1 > newaliases.0
+       ${NROFF} ${MANDOC} newaliases.1 > newaliases.0

 
 sendmail.0: sendmail.8
 
 sendmail.0: sendmail.8

-       ${NROFF} -mandoc sendmail.8 > sendmail.0
+       ${NROFF} ${MANDOC} sendmail.8 > sendmail.0

 
 install: install-sendmail install-docs
 
 
 install: install-sendmail install-docs