From 8aee8c252185d08fef73e4f4127ae1534a639987 Mon Sep 17 00:00:00 2001 From: camield Date: Wed, 21 Jun 2000 06:00:57 +0000 Subject: [PATCH] - resolve package conflict with daemontools (setlock from daemontools is now preferred and installed as a dependency) - add RCS id to PLIST --- mail/serialmail/Makefile | 9 ++++++++- mail/serialmail/pkg/PLIST | 4 +--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile index 7c72e550985..27af5b799fa 100644 --- a/mail/serialmail/Makefile +++ b/mail/serialmail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2000/06/16 23:06:08 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2000/06/21 06:00:57 camield Exp $ DISTNAME= serialmail-0.75 HOMEPAGE= http://cr.yp.to/serialmail.html @@ -26,6 +26,7 @@ ALL_TARGET= default INSTALL_TARGET= setup check RUN_DEPENDS= tcpclient::net/ucspi-tcp +RUN_DEPENDS+= setlock::sysutils/daemontools RUN_DEPENDS+= ${QMAILDIR}/bin/qmail-local::mail/qmail pre-build: @@ -34,6 +35,12 @@ pre-build: @echo ${QMAILDIR} > ${WRKSRC}/conf-qmail pre-install: + # Rebuild custom installer with fake prefix @echo ${PREFIX} > ${WRKSRC}/conf-home +post-install: + # We prefer the setlock from daemontools, this is + # done to resolve a package install conflict. + @rm ${WRKSRC}/setlock + .include diff --git a/mail/serialmail/pkg/PLIST b/mail/serialmail/pkg/PLIST index 9db6d5b1fa1..44a06add0c4 100644 --- a/mail/serialmail/pkg/PLIST +++ b/mail/serialmail/pkg/PLIST @@ -1,21 +1,19 @@ +@comment $OpenBSD: PLIST,v 1.2 2000/06/21 06:00:58 camield Exp $ bin/maildirqmtp bin/maildirserial bin/maildirsmtp bin/serialqmtp bin/serialsmtp -bin/setlock man/cat1/maildirqmtp.0 man/cat1/maildirserial.0 man/cat1/maildirsmtp.0 man/cat1/serialqmtp.0 man/cat1/serialsmtp.0 -man/cat1/setlock.0 man/man1/maildirqmtp.1 man/man1/maildirserial.1 man/man1/maildirsmtp.1 man/man1/serialqmtp.1 man/man1/serialsmtp.1 -man/man1/setlock.1 share/doc/serialmail/AUTOTURN share/doc/serialmail/FROMISP share/doc/serialmail/TOISP