Index: head/mail/mailagent/Makefile
===================================================================
--- head/mail/mailagent/Makefile	(revision 552947)
+++ head/mail/mailagent/Makefile	(revision 552948)
@@ -1,64 +1,67 @@
 # Created by: Masafumi NAKANE <max@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		mailagent
 PORTVERSION=		3.1.78
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		mail
 MASTER_SITES=		http://eron.info/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sophisticated automatic mail-processing tool
+
+LICENSE=	ART10
+LICENSE_FILES=	${WRKSRC}/Artistic
 
 USES=		perl5 tar:bzip2
 
 ORGFILE=	${PREFIX}/etc/mailagent.orgname
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-dres \
 			-Dperlpath='${PERL}' \
 			-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 ${PERL}`:${PATH} INSTALL_PREFIX=${STAGEDIR}
 INSTALL_TARGET=	install install.man
 
 SUB_LIST+=	ORGFILE="${ORGFILE}"
 SUB_FILES=	pkg-message
 PLIST_SUB+=	ORGFILE="${ORGFILE}"
 
 pre-extract:
 	@if [ `${SH} -c umask` != 0022 ]; then \
 	  ${ECHO} "Please set umask to 022 before running make,"; \
 	  ${ECHO} "or mailagent will not build successfully."; \
 	  ${FALSE}; fi
 
 post-patch:
 	@(cd ${WRKSRC}; \
 	  ${REINPLACE_CMD} -i '' -e 's|exec perl -S|exec ${PERL} -S|' \
 	    agent/edusers.SH agent/magent.sh agent/maildist.SH \
 	    agent/mailhelp.SH agent/maillist.SH agent/mailpatch.SH \
 	    agent/package.SH agent/test/TEST agent/test/atail \
 	    bin/perload misc/getcost/getcost misc/mime/unmime \
 	    misc/news/newsgate)
 
 TEST_CMD=	'(cd ${WRKSRC}/agent/test; ${SETENV} ${MAKE_ENV} ${MAKE})'
 do-test:
 	@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
 	cd ${WRKSRC}/misc && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/misc
 	${MV} ${STAGEDIR}${PREFIX}/lib/mailagent/examples ${STAGEDIR}${EXAMPLESDIR}/agent
 
 .include <bsd.port.mk>
Index: head/mail/mailagent/files/pkg-message.in
===================================================================
--- head/mail/mailagent/files/pkg-message.in	(revision 552947)
+++ head/mail/mailagent/files/pkg-message.in	(revision 552948)
@@ -1,20 +1,18 @@
 [
-{ type: install
+{ type: upgrade, maximum_version: 3.1.78_1,
   message: <<EOM
-** 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.
 EOM
 }
 ]
Index: head/mail/mailagent/pkg-plist
===================================================================
--- head/mail/mailagent/pkg-plist	(revision 552947)
+++ head/mail/mailagent/pkg-plist	(revision 552948)
@@ -1,77 +1,77 @@
 bin/mailpatch
 bin/mailhelp
 bin/maillist
 bin/maildist
 bin/package
 bin/edusers
 bin/mailagent
 lib/mailagent/filter
 lib/mailagent/agenthelp
 lib/mailagent/commands
 lib/mailagent/distribs
 lib/mailagent/filter.sh
 lib/mailagent/mailagent.cf
 lib/mailagent/proglist
 lib/mailagent/chkagent.sh
 lib/mailagent/setup.cf
 lib/mailagent/compressors
 lib/mailagent/help/addauth
 lib/mailagent/help/approve
 lib/mailagent/help/delpower
 lib/mailagent/help/end
 lib/mailagent/help/getauth
 lib/mailagent/help/help
 lib/mailagent/help/newpower
 lib/mailagent/help/passwd
 lib/mailagent/help/password
 lib/mailagent/help/power
 lib/mailagent/help/release
 lib/mailagent/help/remauth
 lib/mailagent/help/set
 lib/mailagent/help/setauth
 lib/mailagent/help/user
 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
+@postexec [ -f %%ORGFILE%% ] || touch %%ORGFILE%% || true
+@rmempty %%ORGFILE%%
 %%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
 %%EXAMPLESDIR%%/misc/fakesend/freplcomps
 %%EXAMPLESDIR%%/misc/fakesend/mh_profile
 %%EXAMPLESDIR%%/misc/getcost/README
 %%EXAMPLESDIR%%/misc/getcost/getcost
 %%EXAMPLESDIR%%/misc/getcost/rules
 %%EXAMPLESDIR%%/misc/getcost/spamconfig
 %%EXAMPLESDIR%%/misc/mime/README
 %%EXAMPLESDIR%%/misc/mime/rules
 %%EXAMPLESDIR%%/misc/mime/unmime
 %%EXAMPLESDIR%%/misc/news/README
 %%EXAMPLESDIR%%/misc/news/ml.map
 %%EXAMPLESDIR%%/misc/news/newsgate
 %%EXAMPLESDIR%%/misc/news/rules
 %%EXAMPLESDIR%%/misc/pbounce/README
 %%EXAMPLESDIR%%/misc/pbounce/mailagent.cf
 %%EXAMPLESDIR%%/misc/pbounce/newcmd.cf
 %%EXAMPLESDIR%%/misc/pbounce/patbounce.pl
 %%EXAMPLESDIR%%/misc/pbounce/rules
 %%EXAMPLESDIR%%/misc/shell/README
 %%EXAMPLESDIR%%/misc/shell/server.cf
 %%EXAMPLESDIR%%/misc/shell/shell
 %%EXAMPLESDIR%%/misc/unkit/README
 %%EXAMPLESDIR%%/misc/unkit/kitok.msg
 %%EXAMPLESDIR%%/misc/unkit/mailagent.cf
 %%EXAMPLESDIR%%/misc/unkit/newcmd.cf
 %%EXAMPLESDIR%%/misc/unkit/rules
 %%EXAMPLESDIR%%/misc/unkit/unkit.pl