Attachment 145772 Details for Bug 192642 – patch v4

[patch] patch v4

mailagent.diff (text/plain), 18.98 KB, created by Yoshiaki Kasahara on 2014-08-14 14:14:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yoshiaki Kasahara

Created: 2014-08-14 14:14:44 UTC

Size: 18.98 KB

patch

obsolete

>diff -ruN mailagent.bak/Makefile mailagent/Makefile
>--- mailagent.bak/Makefile	2014-06-21 01:38:03.000000000 +0900
>+++ mailagent/Makefile	2014-08-14 22:55:04.089510944 +0900
>@@ -3,19 +3,17 @@
> 
> PORTNAME=		mailagent
> PORTVERSION=		3.1.78
>+PORTREVISION=		1
> CATEGORIES=		mail
> MASTER_SITES=		http://eron.info/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Sophisticated automatic mail-processing tool
> 
>-DEPRECATED=	Unmaintained interactive port
>-EXPIRATION_DATE=2014-08-20
>-
> USES=		perl5 tar:bzip2
> 
>-NO_PACKAGE=	Correct FQDN needs to be hardcoded
>-IS_INTERACTIVE=		yes
>+ORGFILE=	${PREFIX}/etc/mailagent.orgname
>+
> HAS_CONFIGURE=		yes
> CONFIGURE_SCRIPT=	Configure
> CONFIGURE_ARGS=		-dres \
>@@ -23,12 +21,17 @@
> 			-Dccflags='${CFLAGS}' \
> 			-Dd_flockonly='define' \
> 			-Dutmp='/var/run/utmp' \
>+			-Dorgname='${ORGFILE}' \
> 			-Dprefix='${PREFIX}' \
> 			-Dmansrc='${STAGEDIR}${PREFIX}/man/man1'
> MAKE_JOBS_UNSAFE=	yes
> MAKE_ENV=	PATH=`dirname ${PERL5}`:${PATH} INSTALL_PREFIX=${STAGEDIR}
> INSTALL_TARGET=	install install.man
> 
>+SUB_LIST+=	ORGFILE="${ORGFILE}"
>+SUB_FILES=	pkg-message
>+PLIST_SUB+=	ORGFILE="${ORGFILE}"
>+
> .include <bsd.port.pre.mk>
> .if ${OSVERSION} > 900006
> EXTRA_PATCHES=	${PATCHDIR}/extra-patch-utmpx-agent_pl_utmp_utmp.pl \
>@@ -40,9 +43,6 @@
> 	  ${ECHO} "Please set umask to 022 before running make,"; \
> 	  ${ECHO} "or mailagent will not build successfully."; \
> 	  ${FALSE}; fi
>-	@if [ `id -u` = 0 ]; then \
>-	  ${ECHO} "Do not build mailagent as root or it won't pass the sanity tests."; \
>-	  ${FALSE}; fi
> 
> post-patch:
> 	@(cd ${WRKSRC}; \
>@@ -53,9 +53,18 @@
> 	    bin/perload misc/getcost/getcost misc/mime/unmime \
> 	    misc/news/newsgate)
> 
>+TEST_CMD=	'(cd ${WRKSRC}/agent/test; ${SETENV} ${MAKE_ENV} ${MAKE})'
>+post-build:
>+	@if [ `${ID} -u` = 0 ]; then \
>+	  ${CHOWN} -R nobody ${WRKSRC}/agent/test; \
>+	  su -m nobody -c ${TEST_CMD}; \
>+	else \
>+	  ${SH} -c ${TEST_CMD}; \
>+	fi
>+
> post-install:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/misc
>-	${CP} -pR ${WRKSRC}/misc/* ${STAGEDIR}${EXAMPLESDIR}/misc
>-	@${LN} -fs ${PREFIX}/lib/mailagent/examples ${STAGEDIR}${EXAMPLESDIR}/agent
>+	cd ${WRKSRC}/misc && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/misc
>+	${MV} ${STAGEDIR}${PREFIX}/lib/mailagent/examples ${STAGEDIR}${EXAMPLESDIR}/agent
> 
> .include <bsd.port.post.mk>
>diff -ruN mailagent.bak/files/extra-patch-utmpx-agent_pl_utmp_Makefile.SH mailagent/files/extra-patch-utmpx-agent_pl_utmp_Makefile.SH
>--- mailagent.bak/files/extra-patch-utmpx-agent_pl_utmp_Makefile.SH	2013-04-30 21:19:06.000000000 +0900
>+++ mailagent/files/extra-patch-utmpx-agent_pl_utmp_Makefile.SH	2014-08-14 01:59:36.000000000 +0900
>@@ -1,5 +1,5 @@
>---- ../mailagent-3.1.77/agent/pl/utmp/Makefile.SH	2006-08-24 22:24:12.354556000 +0900
>-+++ agent/pl/utmp/Makefile.SH	2012-01-19 17:37:50.697895588 +0900
>+--- ./agent/pl/utmp/Makefile.SH.orig	2006-08-24 22:24:12.000000000 +0900
>++++ ./agent/pl/utmp/Makefile.SH	2014-08-14 01:59:33.508704927 +0900
> @@ -107,7 +107,6 @@
>  	cp Makefile.new Makefile
>  	$(RM) Makefile.new
>diff -ruN mailagent.bak/files/extra-patch-utmpx-agent_pl_utmp_utmp.pl mailagent/files/extra-patch-utmpx-agent_pl_utmp_utmp.pl
>--- mailagent.bak/files/extra-patch-utmpx-agent_pl_utmp_utmp.pl	2013-04-30 21:19:06.000000000 +0900
>+++ mailagent/files/extra-patch-utmpx-agent_pl_utmp_utmp.pl	2014-08-14 01:59:36.000000000 +0900
>@@ -1,5 +1,5 @@
>---- /dev/null	2012-01-19 17:47:14.000000000 +0900
>-+++ agent/pl/utmp/utmp.pl	2012-01-19 17:53:06.536872534 +0900
>+--- ./agent/pl/utmp/utmp.pl.orig	2014-08-14 01:59:33.506704776 +0900
>++++ ./agent/pl/utmp/utmp.pl	2014-08-14 01:59:33.506704776 +0900
> @@ -0,0 +1,22 @@
> +#
> +# utmp file primitives
>diff -ruN mailagent.bak/files/patch-agent-Makefile.SH mailagent/files/patch-agent-Makefile.SH
>--- mailagent.bak/files/patch-agent-Makefile.SH	1970-01-01 09:00:00.000000000 +0900
>+++ mailagent/files/patch-agent-Makefile.SH	2014-08-14 01:59:36.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- ./agent/Makefile.SH.orig	2008-08-19 17:48:44.000000000 +0900
>++++ ./agent/Makefile.SH	2014-08-14 01:59:33.510702714 +0900
>+@@ -53,7 +53,7 @@
>+ ########################################################################
>+ # Automatically generated parameters -- do not edit
>+ 
>+-SUBDIRS = pl filter files man test examples
>++SUBDIRS = pl filter files man examples
>+ SCRIPTS =  \$(BIN)
>+ 
>+ !GROK!THIS!
>diff -ruN mailagent.bak/files/patch-agent-examples-Makefile mailagent/files/patch-agent-examples-Makefile
>--- mailagent.bak/files/patch-agent-examples-Makefile	2014-06-20 23:52:57.000000000 +0900
>+++ mailagent/files/patch-agent-examples-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,20 +0,0 @@
>---- agent/examples/Makefile.orig	2014-06-20 11:31:53.597110451 -0300
>-+++ agent/examples/Makefile	2014-06-20 11:32:15.393108703 -0300
>-@@ -54,7 +54,7 @@
>- install::
>- 	@for dir in $(PRIVLIB)/examples; do \
>- 	case '${MFLAGS}' in *[i]*) set +e;; esac; \
>--	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
>-+	(set -x; test -d $$dir || $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \
>- 	done
>- 
>- deinstall::
>-@@ -63,7 +63,7 @@
>- install:: $(FILES)
>- 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
>- 	for i in $(FILES); do \
>--	(set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)/examples); \
>-+	(set -x; $(INSTALL) -c -m 444 $$i $(INSTALL_PREFIX)$(PRIVLIB)/examples); \
>- 	done
>- 
>- deinstall::
>diff -ruN mailagent.bak/files/patch-agent-examples-Makefile.SH mailagent/files/patch-agent-examples-Makefile.SH
>--- mailagent.bak/files/patch-agent-examples-Makefile.SH	1970-01-01 09:00:00.000000000 +0900
>+++ mailagent/files/patch-agent-examples-Makefile.SH	2014-08-14 01:59:36.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- ./agent/examples/Makefile.SH.orig	2006-08-24 22:24:12.000000000 +0900
>++++ ./agent/examples/Makefile.SH	2014-08-14 01:59:33.512702931 +0900
>+@@ -84,7 +84,7 @@
>+ install::
>+ 	@for dir in $(PRIVLIB)/examples; do \
>+ 	case '${MFLAGS}' in *[i]*) set +e;; esac; \
>+-	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
>++	(set -x; test -d $(INSTALL_PREFIX)$$dir || $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \
>+ 	done
>+ 
>+ deinstall::
>+@@ -93,7 +93,7 @@
>+ install:: $(FILES)
>+ 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
>+ 	for i in $(FILES); do \
>+-	(set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)/examples); \
>++	(set -x; $(INSTALL) -c -m 444 $$i $(INSTALL_PREFIX)$(PRIVLIB)/examples); \
>+ 	done
>+ 
>+ deinstall::
>diff -ruN mailagent.bak/files/patch-agent-files-Makefile mailagent/files/patch-agent-files-Makefile
>--- mailagent.bak/files/patch-agent-files-Makefile	2014-06-20 23:52:57.000000000 +0900
>+++ mailagent/files/patch-agent-files-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,20 +0,0 @@
>---- agent/files/Makefile.orig	2014-06-20 11:29:40.559119965 -0300
>-+++ agent/files/Makefile	2014-06-20 11:30:00.539568981 -0300
>-@@ -58,7 +58,7 @@
>- install::
>- 	@for dir in $(PRIVLIB); do \
>- 	case '${MFLAGS}' in *[i]*) set +e;; esac; \
>--	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
>-+	(set -x; test -d $$dir || $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \
>- 	done
>- 
>- deinstall::
>-@@ -67,7 +67,7 @@
>- install:: $(FILES)
>- 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
>- 	for i in $(FILES); do \
>--	(set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)); \
>-+	(set -x; $(INSTALL) -c -m 444 $$i $(INSTALL_PREFIX)$(PRIVLIB)); \
>- 	done
>- 
>- deinstall::
>diff -ruN mailagent.bak/files/patch-agent-files-Makefile.SH mailagent/files/patch-agent-files-Makefile.SH
>--- mailagent.bak/files/patch-agent-files-Makefile.SH	1970-01-01 09:00:00.000000000 +0900
>+++ mailagent/files/patch-agent-files-Makefile.SH	2014-08-14 01:59:36.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- ./agent/files/Makefile.SH.orig	2006-08-24 22:24:12.000000000 +0900
>++++ ./agent/files/Makefile.SH	2014-08-14 01:59:33.532955007 +0900
>+@@ -87,7 +87,7 @@
>+ install::
>+ 	@for dir in $(PRIVLIB); do \
>+ 	case '${MFLAGS}' in *[i]*) set +e;; esac; \
>+-	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
>++	(set -x; test -d $(INSTALL_PREFIX)$$dir || $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \
>+ 	done
>+ 
>+ deinstall::
>+@@ -96,7 +96,7 @@
>+ install:: $(FILES)
>+ 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
>+ 	for i in $(FILES); do \
>+-	(set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)); \
>++	(set -x; $(INSTALL) -c -m 444 $$i $(INSTALL_PREFIX)$(PRIVLIB)); \
>+ 	done
>+ 
>+ deinstall::
>diff -ruN mailagent.bak/files/patch-agent-files-help-Makefile mailagent/files/patch-agent-files-help-Makefile
>--- mailagent.bak/files/patch-agent-files-help-Makefile	2014-06-20 23:52:57.000000000 +0900
>+++ mailagent/files/patch-agent-files-help-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,20 +0,0 @@
>---- agent/files/help/Makefile.orig	2014-06-20 11:30:51.718114891 -0300
>-+++ agent/files/help/Makefile	2014-06-20 11:31:10.122113536 -0300
>-@@ -99,7 +99,7 @@
>- install::
>- 	@for dir in $(PRIVLIB) $(PRIVLIB)/help; do \
>- 		case '${MFLAGS}' in *[i]*) set +e;; esac; \
>--		(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
>-+		(set -x; test -d $$dir || $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \
>- 	done
>- 
>- deinstall::
>-@@ -108,7 +108,7 @@
>- install:: $(FILES)
>- 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
>- 	for i in $(FILES); do \
>--		(set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)/help); \
>-+		(set -x; $(INSTALL) -c -m 444 $$i $(INSTALL_PREFIX)$(PRIVLIB)/help); \
>- 	done
>- 
>- deinstall::
>diff -ruN mailagent.bak/files/patch-agent-files-help-Makefile.SH mailagent/files/patch-agent-files-help-Makefile.SH
>--- mailagent.bak/files/patch-agent-files-help-Makefile.SH	1970-01-01 09:00:00.000000000 +0900
>+++ mailagent/files/patch-agent-files-help-Makefile.SH	2014-08-14 01:59:36.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- ./agent/files/help/Makefile.SH.orig	2006-08-24 22:24:12.000000000 +0900
>++++ ./agent/files/help/Makefile.SH	2014-08-14 01:59:33.534704805 +0900
>+@@ -129,7 +129,7 @@
>+ install::
>+ 	@for dir in $(PRIVLIB) $(PRIVLIB)/help; do \
>+ 		case '${MFLAGS}' in *[i]*) set +e;; esac; \
>+-		(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
>++		(set -x; test -d $(INSTALL_PREFIX)$$dir || $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \
>+ 	done
>+ 
>+ deinstall::
>+@@ -138,7 +138,7 @@
>+ install:: $(FILES)
>+ 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
>+ 	for i in $(FILES); do \
>+-		(set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)/help); \
>++		(set -x; $(INSTALL) -c -m 444 $$i $(INSTALL_PREFIX)$(PRIVLIB)/help); \
>+ 	done
>+ 
>+ deinstall::
>diff -ruN mailagent.bak/files/patch-agent-filter-Makefile mailagent/files/patch-agent-filter-Makefile
>--- mailagent.bak/files/patch-agent-filter-Makefile	2014-06-20 23:52:57.000000000 +0900
>+++ mailagent/files/patch-agent-filter-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,19 +0,0 @@
>---- agent/filter/Makefile.orig	2014-06-20 11:27:19.802128926 -0300
>-+++ agent/filter/Makefile	2014-06-20 11:29:16.092184615 -0300
>-@@ -124,14 +124,14 @@
>- install::
>- 	@for dir in $(PRIVLIB); do \
>- 	case '${MFLAGS}' in *[i]*) set +e;; esac; \
>--	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
>-+	(set -x; test -d $$dir || $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \
>- 	done
>- 
>- deinstall::
>- 	$(RM) -r $(PRIVLIB)
>- 
>- install:: filter
>--	$(INSTALL) -c -s -m 555  filter $(PRIVLIB)
>-+	$(INSTALL) -c -s -m 555  filter $(INSTALL_PREFIX)$(PRIVLIB)
>- 
>- deinstall::
>- 	$(RM) $(PRIVLIB)/filter
>diff -ruN mailagent.bak/files/patch-agent-filter-Makefile.SH mailagent/files/patch-agent-filter-Makefile.SH
>--- mailagent.bak/files/patch-agent-filter-Makefile.SH	1970-01-01 09:00:00.000000000 +0900
>+++ mailagent/files/patch-agent-filter-Makefile.SH	2014-08-14 01:59:36.000000000 +0900
>@@ -0,0 +1,19 @@
>+--- ./agent/filter/Makefile.SH.orig	2006-08-24 22:24:12.000000000 +0900
>++++ ./agent/filter/Makefile.SH	2014-08-14 01:59:33.536704870 +0900
>+@@ -154,14 +154,14 @@
>+ install::
>+ 	@for dir in $(PRIVLIB); do \
>+ 	case '${MFLAGS}' in *[i]*) set +e;; esac; \
>+-	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
>++	(set -x; test -d $(INSTALL_PREFIX)$$dir || $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \
>+ 	done
>+ 
>+ deinstall::
>+ 	$(RM) -r $(PRIVLIB)
>+ 
>+ install:: filter
>+-	$(INSTALL) -c -s -m 555  filter $(PRIVLIB)
>++	$(INSTALL) -c -s -m 555  filter $(INSTALL_PREFIX)$(PRIVLIB)
>+ 
>+ deinstall::
>+ 	$(RM) $(PRIVLIB)/filter
>diff -ruN mailagent.bak/files/patch-agent-filter-io.c mailagent/files/patch-agent-filter-io.c
>--- mailagent.bak/files/patch-agent-filter-io.c	2014-07-29 08:20:38.000000000 +0900
>+++ mailagent/files/patch-agent-filter-io.c	2014-08-14 01:59:36.000000000 +0900
>@@ -1,6 +1,6 @@
>---- agent/filter/io.c.orig	Wed Jul 29 02:41:11 1998
>-+++ agent/filter/io.c	Mon Aug 10 21:01:22 1998
>-@@ -120,6 +120,9 @@
>+--- ./agent/filter/io.c.orig	2008-08-19 17:44:07.000000000 +0900
>++++ ./agent/filter/io.c	2014-08-14 01:59:33.537704696 +0900
>+@@ -141,6 +141,9 @@
>  #ifdef I_SYS_IOCTL
>  #include <sys/ioctl.h>
>  #endif
>@@ -10,9 +10,9 @@
>  
>  /*
>   * The following should be defined in <sys/stat.h>.
>-@@ -713,7 +716,7 @@
>+@@ -739,7 +742,7 @@
>  	 */
>- 	
>+ 
>  	char **envp;			/* Environment pointer */
> -#ifdef UNION_WAIT
> +#if defined(UNION_WAIT) && (!defined(BSD) || BSD < 199306)
>diff -ruN mailagent.bak/files/patch-agent-filter-logfile.c mailagent/files/patch-agent-filter-logfile.c
>--- mailagent.bak/files/patch-agent-filter-logfile.c	2014-07-29 08:20:38.000000000 +0900
>+++ mailagent/files/patch-agent-filter-logfile.c	2014-08-14 01:59:36.000000000 +0900
>@@ -1,8 +1,8 @@
>---- agent/filter/logfile.c.orig Fri Mar 17 12:59:44 2006
>-+++ agent/filter/logfile.c      Fri Mar 17 13:02:25 2006
>-@@ -47,6 +47,12 @@
>- #include <stdio.h>
>- #include <sys/types.h>
>+--- ./agent/filter/logfile.c.orig	2008-08-19 17:44:07.000000000 +0900
>++++ ./agent/filter/logfile.c	2014-08-14 01:59:33.539704490 +0900
>+@@ -58,6 +58,12 @@
>+ #endif
>+ #endif	/* I_STDLIB */
>  
> +#ifdef I_STRING
> +#include <string.h>
>diff -ruN mailagent.bak/files/patch-agent-magent.sh mailagent/files/patch-agent-magent.sh
>--- mailagent.bak/files/patch-agent-magent.sh	1970-01-01 09:00:00.000000000 +0900
>+++ mailagent/files/patch-agent-magent.sh	2014-08-14 03:21:10.000000000 +0900
>@@ -0,0 +1,15 @@
>+--- ./agent/magent.sh.orig	2011-12-23 07:44:07.000000000 +0900
>++++ ./agent/magent.sh	2014-08-14 01:59:33.545705026 +0900
>+@@ -116,10 +116,10 @@
>+ \$phostname = '$phostname';
>+ 
>+ # Our domain name
>+-\$mydomain = '$mydomain';
>++\$mydomain = '';
>+ 
>+ # Hidden network (advertised host)
>+-\$hiddennet = '$hiddennet';
>++\$hiddennet = '';
>+ 
>+ # Directory where mail is spooled
>+ \$maildir = '$maildir';
>diff -ruN mailagent.bak/files/patch-agent-man-Makefile.SH mailagent/files/patch-agent-man-Makefile.SH
>--- mailagent.bak/files/patch-agent-man-Makefile.SH	2014-07-29 08:20:38.000000000 +0900
>+++ mailagent/files/patch-agent-man-Makefile.SH	2014-08-14 01:59:36.000000000 +0900
>@@ -1,5 +1,5 @@
>---- agent/man/Makefile.SH.orig	Sun Mar 18 03:31:22 2001
>-+++ agent/man/Makefile.SH	Tue Sep  3 07:51:50 2002
>+--- ./agent/man/Makefile.SH.orig	2006-08-24 22:24:12.000000000 +0900
>++++ ./agent/man/Makefile.SH	2014-08-14 01:59:33.542700970 +0900
> @@ -85,8 +85,7 @@
>  # Baseline for mailagent 3.0 netwide release.
>  #
>diff -ruN mailagent.bak/files/pkg-message.in mailagent/files/pkg-message.in
>--- mailagent.bak/files/pkg-message.in	1970-01-01 09:00:00.000000000 +0900
>+++ mailagent/files/pkg-message.in	2014-08-14 18:08:00.909697278 +0900
>@@ -0,0 +1,15 @@
>+** Upgrade note from a previous version to mailagent-3.1.78_1 or later **
>+
>+In order to make building of this port non-interactive, the build-time
>+manual configuration of FQDN and the organization name had been removed.
>+
>+Now you need to specify your domain's FQDN properly in ~/.mailagent file.
>+
>+Please run "mailagent -I" to make sure your ~/.mailagent is up-to-date,
>+and set "domain" and "hidenet" configuration options appropriately.
>+Please consult mailagent(1) for more details.
>+
>+This package is configured to read %%ORGFILE%%
>+file to retrieve the name of your organization.  An empty file had been
>+installed to suppress warning messages.  Please modify as necessary.
>+
>diff -ruN mailagent.bak/pkg-plist mailagent/pkg-plist
>--- mailagent.bak/pkg-plist	2014-06-20 23:35:23.000000000 +0900
>+++ mailagent/pkg-plist	2014-08-14 22:52:22.260524907 +0900
>@@ -30,19 +30,21 @@
> lib/mailagent/help/set
> lib/mailagent/help/setauth
> lib/mailagent/help/user
>-lib/mailagent/examples/README
>-lib/mailagent/examples/daemon
>-lib/mailagent/examples/mailfolders
>-lib/mailagent/examples/mchk
>-lib/mailagent/examples/mhinc
>-lib/mailagent/examples/nocmds
>-lib/mailagent/examples/profile
>-lib/mailagent/examples/rules
>-lib/mailagent/examples/vacation
> man/man1/edusers.1.gz
> man/man1/mailagent.1.gz
> man/man1/mailhelp.1.gz
> man/man1/package.1.gz
>+@exec [ -f %%ORGFILE%% ] || touch %%ORGFILE%% || true
>+@unexec [ -s %%ORGFILE%% ] || rm -f %%ORGFILE%% || true
>+%%EXAMPLESDIR%%/agent/README
>+%%EXAMPLESDIR%%/agent/daemon
>+%%EXAMPLESDIR%%/agent/mailfolders
>+%%EXAMPLESDIR%%/agent/mchk
>+%%EXAMPLESDIR%%/agent/mhinc
>+%%EXAMPLESDIR%%/agent/nocmds
>+%%EXAMPLESDIR%%/agent/profile
>+%%EXAMPLESDIR%%/agent/rules
>+%%EXAMPLESDIR%%/agent/vacation
> %%EXAMPLESDIR%%/misc/README
> %%EXAMPLESDIR%%/misc/fakesend/README
> %%EXAMPLESDIR%%/misc/fakesend/fakesend.pl
>@@ -50,17 +52,14 @@
> %%EXAMPLESDIR%%/misc/fakesend/mh_profile
> %%EXAMPLESDIR%%/misc/getcost/README
> %%EXAMPLESDIR%%/misc/getcost/getcost
>-%%EXAMPLESDIR%%/misc/getcost/getcost.bak
> %%EXAMPLESDIR%%/misc/getcost/rules
> %%EXAMPLESDIR%%/misc/getcost/spamconfig
> %%EXAMPLESDIR%%/misc/mime/README
> %%EXAMPLESDIR%%/misc/mime/rules
> %%EXAMPLESDIR%%/misc/mime/unmime
>-%%EXAMPLESDIR%%/misc/mime/unmime.bak
> %%EXAMPLESDIR%%/misc/news/README
> %%EXAMPLESDIR%%/misc/news/ml.map
> %%EXAMPLESDIR%%/misc/news/newsgate
>-%%EXAMPLESDIR%%/misc/news/newsgate.bak
> %%EXAMPLESDIR%%/misc/news/rules
> %%EXAMPLESDIR%%/misc/pbounce/README
> %%EXAMPLESDIR%%/misc/pbounce/mailagent.cf
>@@ -76,8 +75,7 @@
> %%EXAMPLESDIR%%/misc/unkit/newcmd.cf
> %%EXAMPLESDIR%%/misc/unkit/rules
> %%EXAMPLESDIR%%/misc/unkit/unkit.pl
>-@exec /bin/ln -sf %D/lib/mailagent/examples %D/%%EXAMPLESDIR%%/agent
>-@unexec /bin/rm -f %D/%%EXAMPLESDIR%%/agent
>+@dirrm %%EXAMPLESDIR%%/agent
> @dirrm %%EXAMPLESDIR%%/misc/unkit
> @dirrm %%EXAMPLESDIR%%/misc/shell
> @dirrm %%EXAMPLESDIR%%/misc/pbounce
>@@ -87,6 +85,5 @@
> @dirrm %%EXAMPLESDIR%%/misc/fakesend
> @dirrm %%EXAMPLESDIR%%/misc
> @dirrm %%EXAMPLESDIR%%
>-@dirrm lib/mailagent/examples
> @dirrm lib/mailagent/help
> @dirrm lib/mailagent
>diff -ruN mailagent.bak/scripts/pre-configure mailagent/scripts/pre-configure
>--- mailagent.bak/scripts/pre-configure	2014-01-24 09:14:07.000000000 +0900
>+++ mailagent/scripts/pre-configure	1970-01-01 09:00:00.000000000 +0900
>@@ -1,37 +0,0 @@
>-#!/bin/sh
>-# Pre-configure script for mailagent.
>-#   This script asks for information specific to the machine and writes
>-#   given values to work/mailagent-3.0/config.sh to set the default
>-#   values for COnfigure script so that Configure doesn't request any
>-#   input.
>-
>-while [ X$addr = X ]; do
>-    read -p "Enter your complete E-mail address> " addr
>-done
>-
>-while [ X$host = X ]; do
>-    read -p "Enter fully qualified name of this host (`hostname`)> " host
>-    if [ X$host = X ]; then
>-        host=`hostname`
>-    fi
>-done
>-
>-maildomain=`echo $addr | awk -F@ '{printf("%s", $2)}'`
>-if [ `echo $maildomain | tr A-Z a-z` = `echo $host | tr A-Z a-z` ]; then
>-    d_hidnet=undef
>-    hiddennet=''
>-else
>-    d_hidnet=define
>-    hiddennet=$maildomain
>-fi
>-
>-read -p "Enter the name of your organization> " orgname
>-
>-cat >${WRKSRC}/config.sh <<EOM
>-#!/bin/sh
>-cf_email='$addr'
>-d_flockonly='define'
>-d_hidnet='$d_hidnet'
>-hiddennet='$hiddennet'
>-orgname='$orgname'
>-EOM

Actions: View | Diff

Attachments on bug 192642: 145763 | 145765 | 145769 | 145772