Subject: updating postfix
To: None <perry@netbsd.org>
From: Jun-ichiro itojun Hagino <itojun@iijlab.net>
List: tech-userlevel
Date: 03/14/2001 01:02:27
the following diff (for gnu/usr.sbin/postfix) should compile
the latest postfix release (2001/2/28). use it after putting latest
postfix release (2001/2/28) into gnu/dist/postfix.
if perry is okay (perry is the maintainer of the postfix import)
i'd like to commit it into the tree. also I may want to enable IPv6
support, but maybe it is too much unofficial local changes?
itojun
Index: Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 2001/01/09 08:52:59 1.6
+++ Makefile 2001/03/13 15:49:14
@@ -8,10 +8,12 @@
.include <bsd.own.mk>
-SUBDIR= util global dns masterlib .WAIT postfix master sendmail error \
- pickup cleanup smtpd local trivial-rewrite qmgr smtp bounce pipe \
- showq postalias postcat postconf postdrop postkick postlock postlog \
- postmap postsuper man # postfix-script
+SUBDIR= util global dns masterlib .WAIT master postfix \
+ sendmail error pickup cleanup smtpd local \
+ lmtp trivial-rewrite qmgr smtp bounce pipe \
+ showq postalias postcat postconf postdrop \
+ postkick postlock postlog postmap postsuper \
+ spawn flush man # smtpstone proto html
.if ${MKSHARE} != "no" || \
make(clean) || make(cleandir) || make(distclean) || make(obj)
@@ -34,6 +36,5 @@
distribution:
cd ${.CURDIR}/postfix-etc; ${MAKE} install
-
.include <bsd.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/Makefile.inc,v
retrieving revision 1.3
diff -u -r1.3 Makefile.inc
--- Makefile.inc 2001/01/09 08:53:00 1.3
+++ Makefile.inc 2001/03/13 15:49:14
@@ -4,11 +4,11 @@
WARNS?= 0
IDIST= ${.CURDIR}/../../../dist/postfix
CPPFLAGS+= -DNETBSD1 -I${DIST} \
- -I${IDIST}/dns -I${IDIST}/global -I${IDIST}/master \
- -I${IDIST}/util
+ -I${IDIST}/src/dns -I${IDIST}/src/global -I${IDIST}/src/master \
+ -I${IDIST}/src/util
DOBJDIR!= cd $(.CURDIR)/../dns && ${PRINTOBJDIR}
LIBPDNS= ${DOBJDIR}/libdns.a
Index: bounce/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/bounce/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- bounce/Makefile 2000/04/30 21:21:53 1.1
+++ bounce/Makefile 2001/03/13 15:49:14
@@ -2,13 +2,13 @@
PROG= bounce
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
SRCS= bounce.c bounce_append_service.c bounce_notify_service.c \
- bounce_cleanup.c
+ bounce_cleanup.c bounce_notify_util.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
Index: cleanup/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/cleanup/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- cleanup/Makefile 2000/04/30 21:21:54 1.1
+++ cleanup/Makefile 2001/03/13 15:49:14
@@ -2,15 +2,15 @@
PROG= cleanup
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
SRCS= cleanup.c cleanup_out.c cleanup_envelope.c cleanup_message.c \
- cleanup_extracted.c cleanup_state.c cleanup_skip.c cleanup_rewrite.c \
+ cleanup_extracted.c cleanup_state.c cleanup_rewrite.c \
cleanup_map11.c cleanup_map1n.c cleanup_masquerade.c \
- cleanup_out_recipient.c
+ cleanup_out_recipient.c cleanup_init.c cleanup_api.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
Index: conf/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/conf/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- conf/Makefile 2000/05/31 17:02:55 1.3
+++ conf/Makefile 2001/03/13 15:49:14
@@ -8,14 +8,15 @@
# Not built yet: main.cf.default
FILES= LICENSE access aliases canonical main.cf master.cf \
- relocated sample-aliases.cf sample-canonical.cf \
- sample-debug.cf sample-filter.cf sample-ldap.cf \
- sample-local.cf \
+ pcre_table regexp_table relocated sample-aliases.cf \
+ sample-auth.cf sample-canonical.cf sample-compatibility.cf \
+ sample-debug.cf sample-filter.cf sample-flush.cf \
+ sample-ldap.cf sample-lmtp.cf sample-local.cf \
sample-misc.cf sample-pcre.cf sample-rate.cf \
- sample-regexp.cf sample-relocated.cf \
- sample-resource.cf sample-rewrite.cf \
- sample-smtp.cf sample-smtpd.cf sample-transport.cf \
- sample-virtual.cf transport virtual
+ sample-regexp.cf sample-relocated.cf sample-resource.cf \
+ sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
+ sample-transport.cf sample-virtual.cf transport \
+ virtual
SCRIPTS= postfix-script-sgid
SCRIPTSNAME= postfix-script
@@ -26,4 +27,3 @@
# postfix-script-nosgid: we don't use that version.
.include <bsd.prog.mk>
-
Index: dns/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/dns/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- dns/Makefile 2000/04/30 21:21:57 1.1
+++ dns/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
LIB= dns
-DIST= ${.CURDIR}/../../../dist/postfix/${LIB}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${LIB}
.PATH: ${DIST}
SRCS= dns_lookup.c dns_rr.c dns_strerror.c dns_strtype.c
Index: error/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/error/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- error/Makefile 2000/04/30 21:21:57 1.1
+++ error/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= error
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
@@ -12,4 +12,4 @@
NOMAN=1
-.include <bsd.prog.mk>
\ No newline at end of file
+.include <bsd.prog.mk>
Index: flush/Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null Tue Mar 13 16:34:42 2001
+++ Makefile Tue Mar 13 17:49:14 2001
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2000/04/30 21:22:07 perry Exp $
+
+PROG= flush
+
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
+.PATH: ${DIST}
+
+BINDIR= ${PFIX_SBINDIR}
+
+DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+
+NOMAN=1
+
+.include <bsd.prog.mk>
Index: global/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/global/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- global/Makefile 2000/12/09 17:35:05 1.2
+++ global/Makefile 2001/03/13 15:49:14
@@ -2,28 +2,29 @@
LIB= global
-DIST= ${.CURDIR}/../../../dist/postfix/${LIB}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${LIB}
.PATH: ${DIST}
SRCS= been_here.c bounce.c canon_addr.c cleanup_strerror.c clnt_stream.c \
debug_peer.c debug_process.c defer.c deliver_completed.c \
deliver_flock.c deliver_pass.c deliver_request.c domain_list.c \
dot_lockfile.c dot_lockfile_as.c ext_prop.c file_id.c \
- header_opts.c is_header.c mail_addr.c \
- mail_addr_crunch.c mail_addr_find.c mail_addr_map.c \
- mail_command_read.c mail_command_write.c mail_conf.c \
- mail_conf_bool.c mail_conf_int.c mail_conf_raw.c mail_conf_str.c \
- mail_connect.c mail_copy.c mail_date.c mail_error.c mail_flush.c \
- mail_open_ok.c mail_params.c mail_pathname.c mail_print.c \
- mail_queue.c mail_run.c mail_scan.c mail_scan_dir.c mail_stream.c \
- mail_task.c mail_trigger.c maps.c mark_corrupt.c mkmap_db.c \
- mkmap_dbm.c mkmap_open.c mynetworks.c mypwd.c namadr_list.c \
- off_cvt.c opened.c own_inet_addr.c peer_name.c pipe_command.c \
- post_mail.c quote_822_local.c rec_streamlf.c rec_type.c \
- recipient_list.c record.c remove.c resolve_clnt.c resolve_local.c \
- rewrite_clnt.c sent.c smtp_stream.c split_addr.c string_list.c \
- sys_exits.c timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \
- tok822_resolve.c tok822_rewrite.c tok822_tree.c abounce.c
+ header_opts.c is_header.c mail_addr.c mail_addr_crunch.c \
+ mail_addr_find.c mail_addr_map.c mail_command_read.c \
+ mail_command_write.c mail_conf.c mail_conf_bool.c mail_conf_int.c \
+ mail_conf_raw.c mail_conf_str.c mail_connect.c mail_copy.c \
+ mail_date.c mail_error.c mail_flush.c mail_open_ok.c mail_params.c \
+ mail_pathname.c mail_print.c mail_queue.c mail_run.c mail_scan.c \
+ mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c maps.c \
+ mark_corrupt.c mkmap_db.c mkmap_dbm.c mkmap_open.c mynetworks.c \
+ mypwd.c namadr_list.c off_cvt.c opened.c own_inet_addr.c \
+ peer_name.c pipe_command.c post_mail.c quote_821_local.c \
+ quote_822_local.c rec_streamlf.c rec_type.c recipient_list.c \
+ record.c remove.c resolve_clnt.c resolve_local.c rewrite_clnt.c \
+ sent.c smtp_stream.c split_addr.c string_list.c sys_exits.c \
+ timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \
+ tok822_resolve.c tok822_rewrite.c tok822_tree.c xtext.c bounce_log.c \
+ flush_clnt.c mail_conf_time.c mbox_conf.c mbox_open.c abounce.c
MKLINT= no
MKPIC= no
Index: lmtp/Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null Tue Mar 13 16:34:42 2001
+++ Makefile Tue Mar 13 17:49:14 2001
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2000/04/30 21:22:07 perry Exp $
+
+PROG= lmtp
+
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
+.PATH: ${DIST}
+
+BINDIR= ${PFIX_SBINDIR}
+
+SRCS= lmtp.c lmtp_connect.c lmtp_proto.c lmtp_chat.c lmtp_session.c \
+ lmtp_addr.c lmtp_trouble.c lmtp_state.c lmtp_sasl_glue.c \
+ lmtp_sasl_proto.c
+
+DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
+
+NOMAN=1
+
+.include <bsd.prog.mk>
Index: local/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/local/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- local/Makefile 2000/04/30 21:21:59 1.1
+++ local/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= local
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
Index: man/man1/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/man/man1/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- man/man1/Makefile 2000/04/30 21:22:00 1.1
+++ man/man1/Makefile 2001/03/13 15:49:14
@@ -3,9 +3,10 @@
DIST= ${.CURDIR}/../../../../dist/postfix/man/man1
.PATH: ${DIST}
-MAN= postcat.1 postfix.1 postlog.1 \
- postconf.1 postkick.1 postmap.1 \
- postalias.1 postdrop.1 postlock.1 postsuper.1
+MAN= postalias.1 postcat.1 postconf.1 postfix.1 \
+ postkick.1 postlock.1 postlog.1 postdrop.1 \
+ postmap.1 \
+ postsuper.1
# XXX notyet:
# mailq.1 sendmail.1 newaliases.1
Index: man/man5/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/man/man5/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- man/man5/Makefile 2000/04/30 21:22:01 1.1
+++ man/man5/Makefile 2001/03/13 15:49:14
@@ -3,7 +3,8 @@
DIST= ${.CURDIR}/../../../../dist/postfix/man/man5
.PATH: ${DIST}
-MAN= access.5 canonical.5 relocated.5 transport.5 virtual.5
+MAN= access.5 canonical.5 relocated.5 \
+ transport.5 virtual.5 pcre_table.5 regexp_table.5
# XXX notyet:
# aliases.5
Index: man/man8/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/man/man8/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- man/man8/Makefile 2000/04/30 21:22:02 1.1
+++ man/man8/Makefile 2001/03/13 15:49:14
@@ -3,10 +3,11 @@
DIST= ${.CURDIR}/../../../../dist/postfix/man/man8
.PATH: ${DIST}
-MAN= bounce.8 cleanup.8 error.8 local.8 master.8 pickup.8 pipe.8 \
- qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+MAN= bounce.8 cleanup.8 error.8 local.8 \
+ lmtp.8 master.8 pickup.8 pipe.8 qmgr.8 \
+ showq.8 smtp.8 smtpd.8 trivial-rewrite.8 \
+ spawn.8 flush.8 # nqmgr.8 virtual.8
MLINKS= bounce.8 defer.8
.include <bsd.man.mk>
-
Index: master/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/master/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- master/Makefile 2000/04/30 21:22:02 1.1
+++ master/Makefile 2001/03/13 15:49:14
@@ -2,14 +2,15 @@
PROG= master
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
SRCS= master.c master_conf.c master_ent.c master_sig.c master_avail.c \
- master_spawn.c master_service.c master_status.c master_listen.c \
- master_vars.c master_wakeup.c
+ master_spawn.c master_service.c master_status.o master_listen.c \
+ master_proto.c single_server.c multi_server.c master_vars.c \
+ master_wakeup.c
DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
Index: masterlib/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/masterlib/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- masterlib/Makefile 2000/04/30 21:22:03 1.1
+++ masterlib/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
LIB= master
-DIST= ${.CURDIR}/../../../dist/postfix/${LIB}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${LIB}
.PATH: ${DIST}
SRCS= single_server.c multi_server.c trigger_server.c master_proto.c
Index: pickup/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/pickup/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- pickup/Makefile 2000/04/30 21:22:04 1.1
+++ pickup/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= pickup
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
Index: pipe/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/pipe/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- pipe/Makefile 2000/04/30 21:22:04 1.1
+++ pipe/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= pipe
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
Index: postalias/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postalias/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postalias/Makefile 2000/04/30 21:22:05 1.1
+++ postalias/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postalias
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postcat/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postcat/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postcat/Makefile 2000/04/30 21:22:06 1.1
+++ postcat/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postcat
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postconf/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postconf/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- postconf/Makefile 2000/05/12 18:05:44 1.3
+++ postconf/Makefile 2001/03/13 15:49:14
@@ -8,7 +8,7 @@
PROG= postconf
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postdrop/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postdrop/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- postdrop/Makefile 2000/05/01 00:12:26 1.2
+++ postdrop/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postdrop
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postfix/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postfix/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postfix/Makefile 2000/04/30 21:22:07 1.1
+++ postfix/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postfix
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postkick/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postkick/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postkick/Makefile 2000/04/30 21:22:11 1.1
+++ postkick/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postkick
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postlock/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postlock/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postlock/Makefile 2000/04/30 21:22:12 1.1
+++ postlock/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postlock
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postlog/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postlog/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postlog/Makefile 2000/04/30 21:22:12 1.1
+++ postlog/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postlog
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postmap/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postmap/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postmap/Makefile 2000/04/30 21:22:13 1.1
+++ postmap/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postmap
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: postsuper/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/postsuper/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postsuper/Makefile 2000/04/30 21:22:14 1.1
+++ postsuper/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= postsuper
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_SBINDIR}
Index: qmgr/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/qmgr/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- qmgr/Makefile 2000/04/30 21:22:15 1.1
+++ qmgr/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= qmgr
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
Index: sendmail/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/sendmail/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sendmail/Makefile 2000/04/30 21:22:15 1.1
+++ sendmail/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= sendmail
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
Index: showq/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/showq/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- showq/Makefile 2000/04/30 21:22:16 1.1
+++ showq/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= showq
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
Index: smtp/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/smtp/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- smtp/Makefile 2000/04/30 21:22:17 1.1
+++ smtp/Makefile 2001/03/13 15:49:14
@@ -2,13 +2,14 @@
PROG= smtp
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
-SRCS= smtp.c quote_821_local.c smtp_connect.c smtp_proto.c smtp_chat.c \
- smtp_session.c smtp_addr.c smtp_trouble.c smtp_unalias.c smtp_state.c
+SRCS= smtp.c smtp_connect.c smtp_proto.c smtp_chat.c smtp_session.c \
+ smtp_addr.c smtp_trouble.c smtp_unalias.c smtp_state.c \
+ smtp_sasl_proto.c smtp_sasl_glue.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
Index: smtpd/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/smtpd/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- smtpd/Makefile 2000/04/30 21:22:18 1.1
+++ smtpd/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= smtpd
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
Index: spawn/Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null Tue Mar 13 16:34:42 2001
+++ Makefile Tue Mar 13 17:49:14 2001
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2000/04/30 21:22:07 perry Exp $
+
+PROG= spawn
+
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
+.PATH: ${DIST}
+
+BINDIR= ${PFIX_SBINDIR}
+
+DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+
+NOMAN=1
+
+.include <bsd.prog.mk>
Index: trivial-rewrite/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/trivial-rewrite/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- trivial-rewrite/Makefile 2000/04/30 21:22:18 1.1
+++ trivial-rewrite/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
PROG= trivial-rewrite
-DIST= ${.CURDIR}/../../../dist/postfix/${PROG}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${PROG}
.PATH: ${DIST}
BINDIR= ${PFIX_LIBEXECDIR}
Index: util/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.sbin/postfix/util/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- util/Makefile 2000/04/30 21:22:19 1.1
+++ util/Makefile 2001/03/13 15:49:14
@@ -2,7 +2,7 @@
LIB= util
-DIST= ${.CURDIR}/../../../dist/postfix/${LIB}
+DIST= ${.CURDIR}/../../../dist/postfix/src/${LIB}
.PATH: ${DIST}
SRCS= argv.c argv_split.c attr.c basename.c binhash.c chroot_uid.c \
@@ -26,7 +26,10 @@
vstream.c vstream_popen.c vstring.c vstring_vstream.c writable.c \
write_buf.c write_wait.c dict_unix.c dict_pcre.c stream_listen.c \
stream_connect.c stream_trigger.c dict_regexp.c mac_expand.c \
- clean_env.c watchdog.c spawn_command.c sane_rename.c sane_link.c
+ clean_env.c watchdog.c spawn_command.c duplex_pipe.c sane_rename.c \
+ sane_link.c unescape.c timed_read.c timed_write.c dict_tcp.c \
+ hex_quote.c dict_alloc.c rand_sleep.c sane_time.c dict_debug.c \
+ sane_socketpair.c
MKLINT= no
MKPIC= no