Date: Sun, 10 Nov 2002 01:43:52 +0300 (MSK) From: "."@babolo.ru To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org Subject: Re: ports/45152: [PATCH] nullmailer's mailq and sendmail clash with system ones Message-ID: <200211092243.gA9MhqLN028683@aaz.links.ru> In-Reply-To: <200211090110.gA91A1QU052924@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> http://www.freebsd.org/cgi/query-pr.cgi?pr=45152 > >Category: ports > >Responsible: freebsd-ports > >Synopsis: [PATCH] nullmailer's mailq and sendmail clash with system ones > >Arrival-Date: Fri Nov 08 17:10:01 PST 2002 Sorry, I was too quick. Corrected patch: --- pkg-message 4 Mar 2001 13:13:42 -0000 +++ pkg-message 9 Nov 2002 00:20:44 -0000 @@ -4,6 +4,11 @@ as an example and edit your own %%PREFIX%%/etc/nullmailer/remotes +Please refefine mailq and sendmail in your /etc/mail/mailer.conf: + +sendmail %%PREFIX%%/libexec/nullmailer/sendmail +mailq %%PREFIX%%/libexec/nullmailer/mailq + Also man nullmailer-send(8) for more details ================================================================== --- pkg-plist 10 Mar 2001 03:24:54 -0000 +++ pkg-plist 9 Nov 2002 00:18:05 -0000 @@ -1,10 +1,10 @@ libexec/nullmailer/smtp libexec/nullmailer/qmqp -bin/mailq +libexec/nullmailer/mailq +libexec/nullmailer/sendmail bin/nullmailer-inject sbin/nullmailer-queue sbin/nullmailer-send -sbin/sendmail etc/nullmailer/remotes.sample etc/rc.d/nullmail.sh @exec mkdir -p %%LOCALSTATEDIR%%/var/nullmailer/queue --- Makefile 24 Aug 2002 16:30:51 -0000 +++ Makefile 9 Nov 2002 06:41:14 -0000 @@ -8,7 +8,7 @@ PORTNAME= nullmailer # PORTVERSION= 1.00RC5 PORTVERSION= 1.00r5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ # MASTER_SITE_SUBDIR= ${PORTVERSION} --- files/patch-src-Makefile Thu Jan 1 03:00:00 1970 +++ files/patch-src-Makefile Sat Nov 9 09:40:44 2002 @@ -0,0 +1,66 @@ +--- src/Makefile.in Sat Dec 30 07:22:57 2000 ++++ src/Makefile.in Sat Nov 9 09:34:23 2002 +@@ -68,9 +68,11 @@ + STRIP = @STRIP@ + VERSION = @VERSION@ + +-bin_PROGRAMS = mailq nullmailer-inject ++libexecdir = @libexecdir@/nullmailer + +-sbin_PROGRAMS = nullmailer-queue nullmailer-send sendmail ++bin_PROGRAMS = nullmailer-inject ++libexec_PROGRAMS = mailq sendmail ++sbin_PROGRAMS = nullmailer-queue nullmailer-send + + + #noinst_PROGRAMS = address +@@ -95,7 +97,7 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +-PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) ++PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) $(libexec_PROGRAMS) + + + DEFS = @DEFS@ -I. -I$(srcdir) -I.. +@@ -192,6 +194,31 @@ + rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + ++mostlyclean-libexecPROGRAMS: ++ ++clean-libexecPROGRAMS: ++ -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) ++ ++distclean-libexecPROGRAMS: ++ ++maintainer-clean-libexecPROGRAMS: ++ ++install-libexecPROGRAMS: $(libexec_PROGRAMS) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(libexecdir) ++ @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ++ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ ++ else :; fi; \ ++ done ++ ++uninstall-libexecPROGRAMS: ++ @$(NORMAL_UNINSTALL) ++ list='$(libexec_PROGRAMS)'; for p in $$list; do \ ++ rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ ++ done ++ + .c.o: + $(COMPILE) -c $< + +@@ -308,7 +335,7 @@ + check: check-am + installcheck-am: + installcheck: installcheck-am +-install-exec-am: install-binPROGRAMS install-sbinPROGRAMS ++install-exec-am: install-binPROGRAMS install-sbinPROGRAMS install-libexecPROGRAMS + install-exec: install-exec-am + + install-data-am: --- files/patch-Makefile Thu Jan 1 03:00:00 1970 +++ files/patch-Makefile Sat Nov 9 10:28:04 2002 @@ -0,0 +1,22 @@ +--- Makefile.in Sat Dec 30 07:22:51 2000 ++++ Makefile.in Sat Nov 9 10:16:13 2002 +@@ -66,6 +66,8 @@ + STRIP = @STRIP@ + VERSION = @VERSION@ + ++libexecdir = @libexecdir@/nullmailer ++ + localstatedir = @localstatedir@/nullmailer + sysconfdir = @sysconfdir@/nullmailer + +@@ -368,8 +370,8 @@ + chown nullmail $(DESTDIR)$(localstatedir)/* + chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue + chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue +- chown nullmail $(DESTDIR)$(bindir)/mailq +- chmod u+s $(DESTDIR)$(bindir)/mailq ++ chown nullmail $(DESTDIR)$(libexecdir)/mailq ++ chmod u+s $(DESTDIR)$(libexecdir)/mailq + + dist-hook: + sed -e s/@VERSION\@/@VERSION@/ \ -- @BABOLO http://links.ru/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211092243.gA9MhqLN028683>