Return to BSD News archive
Path: sserve!manuel!munnari.oz.au!uunet!ogicse!psgrain!hippo!csir.co.za!paul
From: paul@csir.co.za (Paul Nash)
Newsgroups: comp.unix.bsd
Subject: [386bsd] patches for Smail 3.1.26
Keywords: smail patches 386bsd
Message-ID: <paul.717153639@tantrum.csir.co.za>
Date: 22 Sep 92 09:20:39 GMT
Article-I.D.: tantrum.paul.717153639
Sender: usenet@nuustak.csir.co.za (Jim the Netnews Poster)
Organization: Infotek, CSIR
Lines: 491
I have hacked up some patches for smail 3.1.26 to run under 386bsd. The
most significant change is to the configuration script, which breaks
under 386bsd's excuse for a /bin/sh. Any extra make options must be
specified with a leading '-', as "make -${MAKEOPTS}" dies if it resolves
to "make -"; this led me to remove the leading '-'.
These patches are not especially beautiful, but they work for me. Your
mileage may vary, and you may bush all over the place if you look at them
too closely.
paul
*** ./util/Makefile Mon Sep 21 11:41:02 1992
--- ../smail/./util/Makefile Wed Sep 9 14:09:48 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
*** ./src/Makefile Mon Sep 21 11:40:40 1992
--- ../smail/./src/Makefile Wed Sep 9 14:13:23 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKVERSION=${ROOT}/conf/lib/mkversion.sh
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKVERSION=${ROOT}/conf/lib/mkversion.sh
*** ./pd/uuwho/Makefile Mon Sep 21 11:40:31 1992
--- ../smail/./pd/uuwho/Makefile Wed Sep 9 14:08:38 1992
***************
*** 9,15 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
--- 9,15 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
*** ./pd/strlib/Makefile Mon Sep 21 11:40:30 1992
--- ../smail/./pd/strlib/Makefile Wed Sep 9 14:09:05 1992
***************
*** 9,15 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
--- 9,15 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
*** ./pd/pathalias/Makefile Mon Sep 21 11:40:27 1992
--- ../smail/./pd/pathalias/Makefile Wed Sep 9 14:08:20 1992
***************
*** 11,17 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
--- 11,17 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
***************
*** 90,99 ****
echo ${SHELL} ${INSTM} $$s_flag -m 0555 $$UTIL_BIN_DIR ${TARGETS}; \
${SHELL} ${INSTM} $$s_flag -m 0555 $$UTIL_BIN_DIR ${TARGETS}
! parse.c: parse.y $(HDRS)
$(YACC) $(YFLAGS) parse.y
- mv y.tab.c parse.c
makedb: makedb.o ${DEFS_SH} ${COMPAT_LIB}
. ./${DEFS_SH}; $$CC ${CFLAGS} $$LDFLAGS makedb.o ${GETOPT} \
-o makedb $$LIBS ${COMPAT_LIB}
--- 90,101 ----
echo ${SHELL} ${INSTM} $$s_flag -m 0555 $$UTIL_BIN_DIR ${TARGETS}; \
${SHELL} ${INSTM} $$s_flag -m 0555 $$UTIL_BIN_DIR ${TARGETS}
! y.tab.c: parse.y $(HDRS)
$(YACC) $(YFLAGS) parse.y
+ parse.c: y.tab.c $(HDRS)
+ cp y.tab.c parse.c
+
makedb: makedb.o ${DEFS_SH} ${COMPAT_LIB}
. ./${DEFS_SH}; $$CC ${CFLAGS} $$LDFLAGS makedb.o ${GETOPT} \
-o makedb $$LIBS ${COMPAT_LIB}
*** ./pd/getopt/Makefile Mon Sep 21 11:40:26 1992
--- ../smail/./pd/getopt/Makefile Wed Sep 9 14:07:41 1992
***************
*** 9,15 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
--- 9,15 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
*** ./pd/binmail/Makefile Mon Sep 21 11:40:26 1992
--- ../smail/./pd/binmail/Makefile Mon Sep 7 12:53:05 1992
***************
*** 14,20 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
--- 14,20 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
*** ./pd/Makefile Mon Sep 21 11:40:26 1992
--- ../smail/./pd/Makefile Mon Sep 7 12:51:47 1992
***************
*** 10,16 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
# IMPORTANT NOTE: Due to potential problems with installing binmail,
--- 10,16 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
# IMPORTANT NOTE: Due to potential problems with installing binmail,
*** ./conf/os/Makefile Mon Sep 21 11:40:08 1992
--- ../smail/./conf/os/Makefile Mon Sep 7 12:52:36 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
ROOT=../..
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
ROOT=../..
*** ./conf/lib/Makefile Mon Sep 21 11:40:07 1992
--- ../smail/./conf/lib/Makefile Mon Sep 7 12:52:29 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
ROOT=../..
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
ROOT=../..
*** ./conf/driver/Makefile Mon Sep 21 11:40:06 1992
--- ../smail/./conf/driver/Makefile Mon Sep 7 12:52:23 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
ROOT=../..
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
ROOT=../..
*** ./conf/arch/Makefile Mon Sep 21 11:40:06 1992
--- ../smail/./conf/arch/Makefile Mon Sep 7 12:52:16 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
ROOT=../..
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
ROOT=../..
*** ./conf/Makefile Mon Sep 21 11:40:05 1992
--- ../smail/./conf/Makefile Mon Sep 7 12:51:21 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
ROOT=..
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
ROOT=..
*** ./compat/Makefile Mon Sep 21 11:40:05 1992
--- ../smail/./compat/Makefile Wed Sep 9 14:07:19 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
***************
*** 107,109 ****
--- 107,111 ----
-${GET} Makefile
# DO NOT REMOVE THIS LINE, OR "make depend" WILL NOT WORK
+ # Miscellaneous dependencies
+ defs.sh: ${ROOT}/conf/os/bsd4.3
*** ./Makefile Mon Sep 21 11:40:04 1992
--- ../smail/./Makefile Wed Sep 9 14:07:01 1992
***************
*** 13,19 ****
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} -${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
--- 13,19 ----
AR=ar
LINT=lint
CLEAN=sccs clean
! MK=${MAKE} ${MAKEFLAGS}
SRC_PREFIX=
MKDEPEND=${ROOT}/conf/lib/mkdepend.sh
MKDEFS=${ROOT}/conf/lib/mkdefs.sh
*** ./conf/os/bsd4.2 Mon Sep 21 11:40:08 1992
--- ../smail/./conf/os/bsd4.2 Mon Sep 7 14:13:37 1992
***************
*** 34,40 ****
SECURE_PATH=/usr/ucb:/bin:/usr/bin
# OSLIBS - name any object libraries containing routines we will need
! OSLIBS=-ldbm
# DRIVER_CONFIGURATION - configuration file describing smail drivers
DRIVER_CONFIGURATION=bsd-network
--- 34,40 ----
SECURE_PATH=/usr/ucb:/bin:/usr/bin
# OSLIBS - name any object libraries containing routines we will need
! #OSLIBS=-ldbm
# DRIVER_CONFIGURATION - configuration file describing smail drivers
DRIVER_CONFIGURATION=bsd-network
***************
*** 53,59 ****
ZCAT=zcat
# HAVE - what features should be used with this operating system
! HAVE=RENAME:MKDIR:BSD_NETWORKING:SYSEXITS:DBM:BSTRING:GETHOSTNAME
HAVE=$HAVE:HASH_BANG:DUP2:READDIR
# UUCP_SYSTEM_FILE - path to UUCP file containing remote systems
--- 53,60 ----
ZCAT=zcat
# HAVE - what features should be used with this operating system
! #HAVE=RENAME:MKDIR:BSD_NETWORKING:SYSEXITS:DBM:BSTRING:GETHOSTNAME
! HAVE=RENAME:MKDIR:BSD_NETWORKING:SYSEXITS:BSTRING:GETHOSTNAME
HAVE=$HAVE:HASH_BANG:DUP2:READDIR
# UUCP_SYSTEM_FILE - path to UUCP file containing remote systems
*** ./conf/os/bsd4.3 Mon Sep 21 11:40:08 1992
--- ../smail/./conf/os/bsd4.3 Wed Sep 9 14:06:44 1992
***************
*** 18,24 ****
FLOCK_MAILBOX=yes
# MAILBOX_DIR - in which directory are user mailbox files
! MAILBOX_DIR=/usr/spool/mail
# CONSOLE - name of the console device file
CONSOLE=/dev/console
--- 18,24 ----
FLOCK_MAILBOX=yes
# MAILBOX_DIR - in which directory are user mailbox files
! MAILBOX_DIR=/var/mail
# CONSOLE - name of the console device file
CONSOLE=/dev/console
***************
*** 31,43 ****
"
# SECURE_PATH - directories containing system-supplied user programs
! SECURE_PATH=/usr/ucb:/bin:/usr/bin
# OSLIBS - name any object libraries containing routines we will need
! OSLIBS=-ldbm
# DRIVER_CONFIGURATION - configuration file describing smail drivers
! DRIVER_CONFIGURATION=bsd-network
# RANLIB - how do we organize an existing object archive library
RANLIB=ranlib
--- 31,43 ----
"
# SECURE_PATH - directories containing system-supplied user programs
! SECURE_PATH=/bin:/usr/bin:/usr/local/bin
# OSLIBS - name any object libraries containing routines we will need
! #OSLIBS=-ldbm
# DRIVER_CONFIGURATION - configuration file describing smail drivers
! DRIVER_CONFIGURATION=arpa-network
# RANLIB - how do we organize an existing object archive library
RANLIB=ranlib
***************
*** 46,52 ****
CHOWN=/etc/chown
# HAVE - what features should be used with this operating system
! HAVE=RENAME:MKDIR:BSD_NETWORKING:SYSEXITS:DBM:NDBM:BSTRING:SYS5STRLIB
HAVE=$HAVE:GETOPT:GETHOSTNAME:HASH_BANG:DUP2:READDIR
# UUCP_SYSTEM_FILE - path to UUCP file containing remote systems
--- 46,53 ----
CHOWN=/etc/chown
# HAVE - what features should be used with this operating system
! #HAVE=RENAME:MKDIR:BSD_NETWORKING:SYSEXITS:DBM:NDBM:BSTRING:SYS5STRLIB
! HAVE=RENAME:MKDIR:BSD_NETWORKING:SYSEXITS:BSTRING:SYS5STRLIB:VFPRINTF
HAVE=$HAVE:GETOPT:GETHOSTNAME:HASH_BANG:DUP2:READDIR
# UUCP_SYSTEM_FILE - path to UUCP file containing remote systems
*** ./conf/lib/mkdefs.sh Mon Sep 21 11:40:07 1992
--- ../smail/./conf/lib/mkdefs.sh Mon Sep 7 13:04:10 1992
***************
*** 430,443 ****
EOF
# Write out the simple variables
! eval "cat <<EOF
! `for v in $VARS $LISTS $NLISTS; do echo \"\$v='\\\$\$v'\"; done`
! EOF
! "
# write out the positive boolean list variables
(IFS="$sep"; for i in $HAVE; do echo HAVE_$i=yes; done)
! (IFS="$sep"; for i in $OSNAMES; do echo $i=yes; done)
# clear the negative boolean list variables
(IFS="$sep"; for i in $NO_HAVE; do echo HAVE_$i=; done)
--- 430,444 ----
EOF
# Write out the simple variables
! #eval "cat <<EOF
! #`for v in $VARS $LISTS $NLISTS; do echo \"\$v='\\\$\$v'\"; done`
! #EOF
! #"
! for v in $VARS $LISTS $NLISTS; do eval echo $v=\\\'\$$v\\\'; done
# write out the positive boolean list variables
(IFS="$sep"; for i in $HAVE; do echo HAVE_$i=yes; done)
! (IFS="$sep"; for i in $OSNAMES; do if [ "$i" != "" ]; then echo $i=yes; fi; done)
# clear the negative boolean list variables
(IFS="$sep"; for i in $NO_HAVE; do echo HAVE_$i=; done)
***************
*** 557,563 ****
# write out the positibe boolean list variables
(IFS="$sep"; for i in $HAVE; do echo "#define HAVE_$i"; done)
! (IFS="$sep"; for i in $OSNAMES; do echo "#define $i"; done)
# clear the negative boolean list variables
(IFS="$sep"; for i in $NO_HAVE; do echo "#undef HAVE_$i"; done)
--- 558,565 ----
# write out the positibe boolean list variables
(IFS="$sep"; for i in $HAVE; do echo "#define HAVE_$i"; done)
! #(IFS="$sep"; for i in $OSNAMES; do echo "#define $i"; done)
! (IFS="$sep"; for i in $OSNAMES; do if [ "$i" != "" ]; then echo "#define $i"; fi; done)
# clear the negative boolean list variables
(IFS="$sep"; for i in $NO_HAVE; do echo "#undef HAVE_$i"; done)
--
---=---=---=---=---=---=---=---=---=---=---=---=---=---=---=---=---
Paul Nash (voice) +27-12-8413050
Network Services, CSIR Infotek (fax) +27-12-8414109
"OS/2 will remain the operating system of the future"