Index: head/mail/bsmtp/Makefile =================================================================== --- head/mail/bsmtp/Makefile (revision 332606) +++ head/mail/bsmtp/Makefile (revision 332607) @@ -1,45 +1,66 @@ # $FreeBSD$ PORTNAME= bsmtp PORTVERSION= 1.02 PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= naddy MAINTAINER= naddy@FreeBSD.org COMMENT= Batch SMTP support for sendmail, incoming and outgoing +RUN_DEPENDS= ${LOCALBASE}/bin/uux:${PORTSDIR}/net/freebsd-uucp + CONFLICTS= smail-3.* USES= shebangfix perl5 WRKSRC= ${WRKDIR}/${PORTNAME} HAS_CONFIGURE= yes CONFIGURE_ARGS= --redo SHEBANG_FILES= configure -NO_STAGE= yes -.include - -RUN_DEPENDS= ${LOCALBASE}/bin/uux:${PORTSDIR}/net/freebsd-uucp -UUPREFIX= ${LOCALBASE} - post-patch: @${CP} ${WRKSRC}/bsmtp.m4.8.9.in ${WRKSRC}/bsmtp.m4.8.10.in @${CP} ${FILESDIR}/bsmtp.m4.8.11.in ${WRKSRC}/ .for v in 12 13 14 @${CP} ${FILESDIR}/bsmtp.m4.8.12.in ${WRKSRC}/bsmtp.m4.8.$v.in .endfor pre-configure: @${SED} <${FILESDIR}/config.sed >${WRKSRC}/config.sed \ - -e 's:%%CC%%:${CC}:' \ - -e 's:%%CFLAGS%%:${CFLAGS}:' \ - -e 's:%%PREFIX%%:${PREFIX}:' \ - -e 's:%%UUPREFIX%%:${UUPREFIX}:' + -e 's:%%CC%%:${CC}:' \ + -e 's:%%CFLAGS%%:${CFLAGS}:' \ + -e 's:%%PERL%%:${PERL}:' \ + -e 's:%%PREFIX%%:${PREFIX}:' \ + -e 's:%%LOCALBASE%%:${LOCALBASE}:' -post-install: - ${MKDIR} ${PREFIX}/share/doc/bsmtp - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bsmtp/ +privbin= ${STAGEDIR}${PREFIX}/libexec/bsmtp +pubbin= ${STAGEDIR}${PREFIX}/bin +mailerdir= ${STAGEDIR}${PREFIX}/share/sendmail -.include +do-install: + ${MKDIR} ${privbin} + ${MKDIR} ${mailerdir} + ${INSTALL_PROGRAM} ${WRKSRC}/batcher.new ${privbin}/batcher + ${INSTALL_PROGRAM} ${WRKSRC}/bsmtp ${privbin} + ${INSTALL_DATA} ${WRKSRC}/bsmtp.m4.8.14 ${mailerdir}/bsmtp.m4 + ${INSTALL_SCRIPT} ${WRKSRC}/rcsmtp ${pubbin} +.for i in cbsmtp crsmtp rgsmtp + ${LN} -s rcsmtp ${pubbin}/$i +.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/rsmtp.wrapper ${pubbin}/rsmtp + ${INSTALL_SCRIPT} ${WRKSRC}/rsmtp ${privbin} +.for i in bsmtp + ${LN} -s rsmtp ${pubbin}/$i +.endfor +.for i in c-cbsmtp c-rcsmtp g-rcsmtp g-rgsmtp n-rsmtp + ${INSTALL_SCRIPT} ${WRKSRC}/transmitter.$i ${privbin} +.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/_bqueue ${pubbin} + ${INSTALL_SCRIPT} ${WRKSRC}/bqueue ${pubbin} +# post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + +.include Index: head/mail/bsmtp/files/patch-Makefile.in =================================================================== --- head/mail/bsmtp/files/patch-Makefile.in (revision 332606) +++ head/mail/bsmtp/files/patch-Makefile.in (nonexistent) @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Thu Sep 5 15:38:26 2002 -+++ Makefile.in Thu Sep 5 15:38:51 2002 -@@ -103,7 +103,7 @@ - mkdir -p $(mailerdir) || mkdir $(mailerdir) || exit 0 ; \ - chown $(binusr) $(mailerdir) ; \ - chgrp $(bingrp) $(mailerdir) ; \ -- chmod 644 $(mailerdir) ; \ -+ chmod 755 $(mailerdir) ; \ - fi - $(install) -c -o $(binusr) -g $(bingrp) -m 555 $(batcher) \ - $(privbin)/batcher || ( cp $(batcher) /tmp/batcher && \ Property changes on: head/mail/bsmtp/files/patch-Makefile.in ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/mail/bsmtp/files/config.sed =================================================================== --- head/mail/bsmtp/files/config.sed (revision 332606) +++ head/mail/bsmtp/files/config.sed (revision 332607) @@ -1,28 +1,28 @@ # $FreeBSD$ s,@CC@,%%CC%%, s,@INSTALL@,/usr/bin/install, s,@SH@,/bin/sh, s,@GZIP@,/usr/bin/gzip, -s,@PERL@,/usr/bin/perl, +s,@PERL@,%%PERL%%, s,@COMPRESS@,/usr/bin/compress, -s,@UUX@,%%UUPREFIX%%/bin/uux, +s,@UUX@,%%LOCALBASE%%/bin/uux, s,@SENDMAIL@,/usr/sbin/sendmail, s,@CFLAGS@,%%CFLAGS%%, s,@PRIVBINDIR@,%%PREFIX%%/libexec/bsmtp, s,@PUBBINDIR@,%%PREFIX%%/bin, s,@MAILERDIR@,%%PREFIX%%/share/sendmail, s,@BINUSR@,root, s,@BINGRP@,wheel, s,@QUEUEDIR@,/var/spool/bsmtp, s,@DAEMONUSER@,uucp, s,@DAEMONGID@,66, s,@DAEMONUID@,66, s,@INPROTO@,BSMTP, s,@LOCALHOSTNAME@,`hostname`, s,@DOMAINSUFFIX@,none, -s,@SENDMAILVERS@,8.13, +s,@SENDMAILVERS@,8.14, s,@INSTALLMAILER@,true, -s,@MAILERVERSION@,8.13, +s,@MAILERVERSION@,8.14, s,@FLOCK@,true, s,@LOCKDEFINE@,-DUSE_FLOCK, s,@BATCHER@,batcher.new, Index: head/mail/bsmtp/files/patch-configure =================================================================== --- head/mail/bsmtp/files/patch-configure (revision 332606) +++ head/mail/bsmtp/files/patch-configure (revision 332607) @@ -1,34 +1,34 @@ $FreeBSD$ ---- configure.orig -+++ configure -@@ -41,6 +41,11 @@ +--- configure.orig 2013-11-01 19:55:42.000000000 +0100 ++++ configure 2013-11-01 19:55:42.000000000 +0100 +@@ -41,6 +41,11 @@ if ($#ARGV == 0) { "batcher", "batcher.c", "bsmtp.c", + "bsmtp.m4.8.14", + "bsmtp.m4.8.13", + "bsmtp.m4.8.12", + "bsmtp.m4.8.11", + "bsmtp.m4.8.10", "bsmtp.m4.8.9", "bsmtp.m4.8.8", "bsmtp.m4.8.7", -@@ -198,6 +203,16 @@ +@@ -198,6 +203,16 @@ if (! $redo) { $default[$i] = '8.8'; } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.9(\..*)?\s*$/) { $default[$i] = '8.9'; + } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.10(\..*)?\s*$/) { + $default[$i] = '8.10'; + } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.11(\..*)?\s*$/) { + $default[$i] = '8.11'; + } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.12(\..*)?\s*$/) { + $default[$i] = '8.12'; + } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.13(\..*)?\s*$/) { + $default[$i] = '8.13'; + } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.14(\..*)?\s*$/) { + $default[$i] = '8.14'; } else { $default[$i] = ''; # Will not be installed } Index: head/mail/bsmtp/files/patch-rsmtp.in =================================================================== --- head/mail/bsmtp/files/patch-rsmtp.in (revision 332606) +++ head/mail/bsmtp/files/patch-rsmtp.in (revision 332607) @@ -1,14 +1,14 @@ $FreeBSD$ ---- rsmtp.in.orig -+++ rsmtp.in -@@ -72,7 +72,7 @@ +--- rsmtp.in.orig 1999-05-16 11:24:09.000000000 +0200 ++++ rsmtp.in 2013-11-01 19:55:42.000000000 +0100 +@@ -72,7 +72,7 @@ while (<>) { print STDERR "Recipient: $r\n" if ($debug); push (@recipients, $r); } - $sendmail="$sendmailproto -f$mailfrom -p@INPROTO@:$fromhost"; + $sendmail="$sendmailproto -f$mailfrom -p@INPROTO@:$fromhost --"; while (defined $recipients[0]) { $sendmail .= " " . $recipients[0]; shift (@recipients); Index: head/mail/bsmtp/pkg-plist =================================================================== --- head/mail/bsmtp/pkg-plist (revision 332606) +++ head/mail/bsmtp/pkg-plist (revision 332607) @@ -1,24 +1,31 @@ @comment $FreeBSD$ +@owner uucp +@mode 4555 bin/_bqueue +@mode +@owner bin/bqueue bin/bsmtp bin/cbsmtp bin/crsmtp bin/rcsmtp bin/rgsmtp bin/rsmtp libexec/bsmtp/batcher +@mode 4555 libexec/bsmtp/bsmtp +@mode libexec/bsmtp/rsmtp libexec/bsmtp/transmitter.c-cbsmtp libexec/bsmtp/transmitter.c-rcsmtp libexec/bsmtp/transmitter.g-rcsmtp libexec/bsmtp/transmitter.g-rgsmtp libexec/bsmtp/transmitter.n-rsmtp -share/doc/bsmtp/README +%%DOCSDIR%%/README share/sendmail/bsmtp.m4 @dirrm libexec/bsmtp @dirrm share/doc/bsmtp @dirrm share/sendmail -@exec mkdir -pm 770 /var/spool/bsmtp; chown uucp:uucp /var/spool/bsmtp -@unexec rmdir /var/spool/bsmtp || true +@exec install -d -o uucp -g uucp -m 0770 /var/spool/bsmtp +@comment Do not use rmdir to avoid inappropriate pkg tools magic +@unexec rm -d /var/spool/bsmtp 2>/dev/null || true