[src/trunk]: src Don't install libsm. Instead, pull a couple of things over ...

[atatat <atatat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6dca4d45ee82
branches:  trunk
changeset: 552247:6dca4d45ee82
user:      atatat <atatat%NetBSD.org@localhost>
date:      Mon Sep 22 12:54:46 2003 +0000

description:
Don't install libsm.  Instead, pull a couple of things over into
libmilter.

diffstat:

 distrib/sets/lists/comp/lint.mi          |  3 +--
 distrib/sets/lists/comp/mi               |  3 +--
 distrib/sets/lists/comp/obsolete.mi      |  4 +++-
 gnu/usr.sbin/sendmail/libmilter/Makefile |  9 +++++----
 gnu/usr.sbin/sendmail/libsm/Makefile     |  4 +++-
 5 files changed, 13 insertions(+), 10 deletions(-)

diffs (103 lines):

diff -r 89693e22c4e3 -r 6dca4d45ee82 distrib/sets/lists/comp/lint.mi
--- a/distrib/sets/lists/comp/lint.mi   Mon Sep 22 12:17:24 2003 +0000
+++ b/distrib/sets/lists/comp/lint.mi   Mon Sep 22 12:54:46 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: lint.mi,v 1.14 2003/07/23 21:56:35 itojun Exp $
+# $NetBSD: lint.mi,v 1.15 2003/09/22 12:54:46 atatat Exp $
 ./usr/libdata/lint/llib-lbsdmalloc.ln  comp-c-lintlib
 ./usr/libdata/lint/llib-lbz2.ln                comp-c-lintlib
 ./usr/libdata/lint/llib-lc.ln          comp-c-lintlib
@@ -29,7 +29,6 @@
 ./usr/libdata/lint/llib-lrpcsvc.ln     comp-c-lintlib
 ./usr/libdata/lint/llib-lrt.ln         comp-c-lintlib
 ./usr/libdata/lint/llib-lskey.ln       comp-c-lintlib
-./usr/libdata/lint/llib-lsm.ln         comp-sendmail-lintlib
 ./usr/libdata/lint/llib-lssl.ln                comp-c-lintlib
 ./usr/libdata/lint/llib-lstdc.ln       comp-c-lintlib
 ./usr/libdata/lint/llib-ltermcap.ln    comp-c-lintlib
diff -r 89693e22c4e3 -r 6dca4d45ee82 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Mon Sep 22 12:17:24 2003 +0000
+++ b/distrib/sets/lists/comp/mi        Mon Sep 22 12:54:46 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.619 2003/09/21 19:35:42 jdolecek Exp $
+#      $NetBSD: mi,v 1.620 2003/09/22 12:54:46 atatat Exp $
 ./usr/bin/addr2line            comp-debug-bin
 ./usr/bin/ar                   comp-util-bin
 ./usr/bin/as                   comp-util-bin
@@ -1049,7 +1049,6 @@
 ./usr/lib/libskey_p.a          comp-c-proflib
 ./usr/lib/libsl.a              comp-krb5-lib
 ./usr/lib/libsl_p.a            comp-krb5-proflib
-./usr/lib/libsm.a              comp-sendmail-lib
 ./usr/lib/libss.a              comp-krb5-lib
 ./usr/lib/libss_p.a            comp-krb5-proflib
 ./usr/lib/libssl.a             comp-c-lib
diff -r 89693e22c4e3 -r 6dca4d45ee82 distrib/sets/lists/comp/obsolete.mi
--- a/distrib/sets/lists/comp/obsolete.mi       Mon Sep 22 12:17:24 2003 +0000
+++ b/distrib/sets/lists/comp/obsolete.mi       Mon Sep 22 12:54:46 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.96 2003/09/18 09:16:29 jdolecek Exp $
+# $NetBSD: obsolete.mi,v 1.97 2003/09/22 12:54:47 atatat Exp $
 ./usr/bin/genclass
 ./usr/bin/gettextize
 ./usr/include/bfd
@@ -598,6 +598,7 @@
 ./usr/lib/libntp.so
 ./usr/lib/libntp_p.a
 ./usr/lib/libntp_pic.a
+./usr/lib/libsm.a
 ./usr/lib/libtelnet.a
 ./usr/lib/libtelnet.so
 ./usr/lib/libtelnet_p.a
@@ -606,6 +607,7 @@
 ./usr/lib/libusb_p.a
 ./usr/lib/libusb_pic.a
 ./usr/libdata/lint/llib-lntp.ln
+./usr/libdata/lint/llib-lsm.ln
 ./usr/libdata/lint/llib-ltelnet.ln
 ./usr/libdata/lint/llib-lusb.ln
 ./usr/libexec/collect2
diff -r 89693e22c4e3 -r 6dca4d45ee82 gnu/usr.sbin/sendmail/libmilter/Makefile
--- a/gnu/usr.sbin/sendmail/libmilter/Makefile  Mon Sep 22 12:17:24 2003 +0000
+++ b/gnu/usr.sbin/sendmail/libmilter/Makefile  Mon Sep 22 12:54:46 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/07/10 13:07:27 atatat Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/22 12:54:49 atatat Exp $
 
 NOPIC=         # defined
 NOPROFILE=     # defined
@@ -6,14 +6,15 @@
 .include <bsd.own.mk>
 
 DIST=          ${NETBSDSRCDIR}/gnu/dist
-.PATH: ${DIST}/sendmail/libmilter ${DIST}/sendmail/include/libmilter
+.PATH: ${DIST}/sendmail/libmilter ${DIST}/sendmail/libsm \
+       ${DIST}/sendmail/include/libmilter
 
 LIB=           milter
 
-CPPFLAGS+=     -DNOT_SENDMAIL
+CPPFLAGS+=     -DNOT_SENDMAIL -Dsm_snprintf=snprintf
 
 SRCS=          comm.c engine.c handler.c listener.c main.c signal.c \
-               sm_gethost.c smfi.c
+               sm_gethost.c smfi.c errstring.c strl.c
 
 INCS=          mfapi.h mfdef.h
 INCSDIR=       /usr/include/libmilter
diff -r 89693e22c4e3 -r 6dca4d45ee82 gnu/usr.sbin/sendmail/libsm/Makefile
--- a/gnu/usr.sbin/sendmail/libsm/Makefile      Mon Sep 22 12:17:24 2003 +0000
+++ b/gnu/usr.sbin/sendmail/libsm/Makefile      Mon Sep 22 12:54:46 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/07/04 04:52:59 atatat Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/22 12:54:48 atatat Exp $
 
 NOSHARE=       # defined
 NOPIC=         # defined
@@ -26,4 +26,6 @@
                vfscanf.c vprintf.c vsnprintf.c vsprintf.c vsscanf.c \
                wbuf.c wsetup.c xtrap.c
 
+libinstall::
+
 .include <bsd.lib.mk>