- Update to 6.1.22

- Add Net::DNS as stated in changelog for 6.1.21

Also changed in plist:
 - @dirrm(try) to @dir to make portlint happy.
 - removed @owner for libexec/sympa/*: sympa doesn't need write privileges here (do it ?)
 - changed broken ${CHOWN} from Makefile to "@owner" in plist for %%DATADIR%%/{list_data,bounce,arc} (owned by sympa:sympa for real)

Pass maintainership to submitter (thanks a lot!)

PR:		ports/193522
Submitted by:	Geoffroy Desvernay

3 files changed, 94 insertions, 95 deletions

diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 4b6c86a1a993..a021566dc0c4 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	sympa
-PORTVERSION=	6.1.20
-PORTREVISION=	1
+PORTVERSION=	6.1.23
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old/
 
-MAINTAINER=	crees@FreeBSD.org
+MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Sympa is an electronic mailing list manager
 
 LICENSE=	GPLv2
@@ -35,7 +34,8 @@ RUN_DEPENDS+=	\
 	p5-HTML-StripScripts-Parser>=0:${PORTSDIR}/www/p5-HTML-StripScripts-Parser \
 	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree		\
 	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit	\
-	p5-MIME-Lite-HTML>=0:${PORTSDIR}/mail/p5-MIME-Lite-HTML
+	p5-MIME-Lite-HTML>=0:${PORTSDIR}/mail/p5-MIME-Lite-HTML	\
+	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 
 # Ignore alpha/beta versions
 PORTSCOUT=	limit:^[0-9]+(\.[0-9]+)*$$
@@ -132,6 +132,7 @@ post-patch:
 	    -e 's|^\( *execcgidir=\).*$$|\1${PREFIX}/libexec/${PORTNAME}|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|\(--target.*sympa.conf\)|\1.sample|'	\
+			  -e 's|data_structure.version|data_structure.version.sample|g' \
 			  -e 's|/bin/true$$|:|'				\
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's#\$$(DESTDIR)\$$(sampledir)#${STAGEDIR}\$$(sampledir)#g' \
@@ -141,14 +142,13 @@ pre-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install:
+	${ECHO_CMD} "@owner ${USERS}" >> ${TMPPLIST}
+	${ECHO_CMD} "@group ${GROUPS}" >> ${TMPPLIST}
 	for dir in $$(sort ${WRKSRC}/createddirs | ${SED} 's,^${STAGEDIR},,'); do \
 		${MKDIR} -m755 ${STAGEDIR}$$dir; \
-		${TOUCH} ${STAGEDIR}$$dir/.keep; \
-		${ECHO_CMD} "@exec ${CHOWN} ${USERS}:${GROUPS} $${dir#${PREFIX}/}" >> ${TMPPLIST}; \
-		${ECHO_CMD} "$${dir#${PREFIX}/}/.keep" >> ${TMPPLIST}; \
 	done; \
 	for dir in $$(sort -r ${WRKSRC}/createddirs); do \
-		${ECHO_CMD} "@unexec rmdir $${dir#${STAGEDIR}} || : 2>/dev/null" >> ${TMPPLIST}; \
+		${ECHO_CMD} "@unexec ${RMDIR} $${dir#${STAGEDIR}} || : 2>/dev/null" >> ${TMPPLIST}; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/etc_README ${STAGEDIR}/${ETCDIR}
 
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index 2404197422d3..a722baba823e 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sympa-6.1.20.tar.gz) = b0afe73166e9c3427944bd47bfb07143bfc4a749a468e060370c5fe8c0b75dc5
-SIZE (sympa-6.1.20.tar.gz) = 8267233
+SHA256 (sympa-6.1.23.tar.gz) = 3d15aa8816dafcc4017cc06e52def44d5461498a05e9ef7634498b0993234ae4
+SIZE (sympa-6.1.23.tar.gz) = 8133792
diff --git a/mail/sympa/pkg-plist b/mail/sympa/pkg-plist
index af3f7e59fc6b..c2153db4a4de 100644
--- a/mail/sympa/pkg-plist
+++ b/mail/sympa/pkg-plist
@@ -3,10 +3,9 @@
 etc/sympa.conf.sample
 @unexec cmp -s %D/etc/wwsympa.conf.sample %D/etc/wwsympa.conf && rm -f %D/etc/wwsympa.conf
 etc/wwsympa.conf.sample
-%%ETCDIR%%/data_structure.version
 %%ETCDIR%%/etc_README
-@owner sympa
 @group sympa
+@sample %%ETCDIR%%/data_structure.version.sample
 libexec/sympa/Archive.pm
 libexec/sympa/Auth.pm
 libexec/sympa/Bounce.pm
@@ -177,86 +176,86 @@ man/man8/sympa.8.gz
 %%DATADIR%%/icons/text.png
 %%DATADIR%%/icons/top.png
 %%DATADIR%%/icons/unknown.png
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/vi
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/oc
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb_NO
-%%NLS%%@dirrmtry share/locale/la/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/la
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/bg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bg
-@dirrm %%EXAMPLESDIR%%/web_tt2
-@dirrm %%EXAMPLESDIR%%/scenari
-@dirrm %%EXAMPLESDIR%%/sample/test/web_tt2
-@dirrm %%EXAMPLESDIR%%/sample/test
-@dirrm %%EXAMPLESDIR%%/sample
-@dirrm %%EXAMPLESDIR%%/mail_tt2
-@dirrm %%EXAMPLESDIR%%/list_task_models
-@dirrm %%EXAMPLESDIR%%/global_task_models
-@dirrm %%EXAMPLESDIR%%/families/sample-auto
-@dirrm %%EXAMPLESDIR%%/families
-@dirrm %%EXAMPLESDIR%%/create_list_templates/public_web_forum
-@dirrm %%EXAMPLESDIR%%/create_list_templates/private_working_group
-@dirrm %%EXAMPLESDIR%%/create_list_templates/news-letter
-@dirrm %%EXAMPLESDIR%%/create_list_templates/intranet_list
-@dirrm %%EXAMPLESDIR%%/create_list_templates/html-news-letter
-@dirrm %%EXAMPLESDIR%%/create_list_templates/hotline
-@dirrm %%EXAMPLESDIR%%/create_list_templates/discussion_list
-@dirrm %%EXAMPLESDIR%%/create_list_templates/confidential
-@dirrm %%EXAMPLESDIR%%/create_list_templates
-@dirrm %%EXAMPLESDIR%%
-@dirrm libexec/sympa/Sympa/Template
-@dirrm libexec/sympa/Sympa
-@dirrm libexec/sympa/Marc
-@dirrm libexec/sympa/HTML
-@dirrm libexec/sympa
-@dirrmtry %%DATADIR%%/icons
-@dirrmtry %%DATADIR%%
+%%NLS%%@dir share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dir share/locale/zh_TW
+%%NLS%%@dir share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dir share/locale/zh_CN
+%%NLS%%@dir share/locale/vi/LC_MESSAGES
+%%NLS%%@dir share/locale/vi
+%%NLS%%@dir share/locale/tr/LC_MESSAGES
+%%NLS%%@dir share/locale/tr
+%%NLS%%@dir share/locale/sv/LC_MESSAGES
+%%NLS%%@dir share/locale/sv
+%%NLS%%@dir share/locale/ru/LC_MESSAGES
+%%NLS%%@dir share/locale/ru
+%%NLS%%@dir share/locale/ro/LC_MESSAGES
+%%NLS%%@dir share/locale/ro
+%%NLS%%@dir share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dir share/locale/pt_BR
+%%NLS%%@dir share/locale/pt/LC_MESSAGES
+%%NLS%%@dir share/locale/pt
+%%NLS%%@dir share/locale/pl/LC_MESSAGES
+%%NLS%%@dir share/locale/pl
+%%NLS%%@dir share/locale/oc/LC_MESSAGES
+%%NLS%%@dir share/locale/oc
+%%NLS%%@dir share/locale/nl/LC_MESSAGES
+%%NLS%%@dir share/locale/nl
+%%NLS%%@dir share/locale/nb_NO/LC_MESSAGES
+%%NLS%%@dir share/locale/nb_NO
+%%NLS%%@dir share/locale/la/LC_MESSAGES
+%%NLS%%@dir share/locale/la
+%%NLS%%@dir share/locale/ko/LC_MESSAGES
+%%NLS%%@dir share/locale/ko
+%%NLS%%@dir share/locale/ja/LC_MESSAGES
+%%NLS%%@dir share/locale/ja
+%%NLS%%@dir share/locale/it/LC_MESSAGES
+%%NLS%%@dir share/locale/it
+%%NLS%%@dir share/locale/id/LC_MESSAGES
+%%NLS%%@dir share/locale/id
+%%NLS%%@dir share/locale/fr/LC_MESSAGES
+%%NLS%%@dir share/locale/fr
+%%NLS%%@dir share/locale/fi/LC_MESSAGES
+%%NLS%%@dir share/locale/fi
+%%NLS%%@dir share/locale/eu/LC_MESSAGES
+%%NLS%%@dir share/locale/eu
+%%NLS%%@dir share/locale/et/LC_MESSAGES
+%%NLS%%@dir share/locale/et
+%%NLS%%@dir share/locale/es/LC_MESSAGES
+%%NLS%%@dir share/locale/es
+%%NLS%%@dir share/locale/el/LC_MESSAGES
+%%NLS%%@dir share/locale/el
+%%NLS%%@dir share/locale/de/LC_MESSAGES
+%%NLS%%@dir share/locale/de
+%%NLS%%@dir share/locale/cs/LC_MESSAGES
+%%NLS%%@dir share/locale/cs
+%%NLS%%@dir share/locale/ca/LC_MESSAGES
+%%NLS%%@dir share/locale/ca
+%%NLS%%@dir share/locale/bg/LC_MESSAGES
+%%NLS%%@dir share/locale/bg
+@dir %%EXAMPLESDIR%%/web_tt2
+@dir %%EXAMPLESDIR%%/scenari
+@dir %%EXAMPLESDIR%%/sample/test/web_tt2
+@dir %%EXAMPLESDIR%%/sample/test
+@dir %%EXAMPLESDIR%%/sample
+@dir %%EXAMPLESDIR%%/mail_tt2
+@dir %%EXAMPLESDIR%%/list_task_models
+@dir %%EXAMPLESDIR%%/global_task_models
+@dir %%EXAMPLESDIR%%/families/sample-auto
+@dir %%EXAMPLESDIR%%/families
+@dir %%EXAMPLESDIR%%/create_list_templates/public_web_forum
+@dir %%EXAMPLESDIR%%/create_list_templates/private_working_group
+@dir %%EXAMPLESDIR%%/create_list_templates/news-letter
+@dir %%EXAMPLESDIR%%/create_list_templates/intranet_list
+@dir %%EXAMPLESDIR%%/create_list_templates/html-news-letter
+@dir %%EXAMPLESDIR%%/create_list_templates/hotline
+@dir %%EXAMPLESDIR%%/create_list_templates/discussion_list
+@dir %%EXAMPLESDIR%%/create_list_templates/confidential
+@dir %%EXAMPLESDIR%%/create_list_templates
+@dir %%EXAMPLESDIR%%
+@dir libexec/sympa/Sympa/Template
+@dir libexec/sympa/Sympa
+@dir libexec/sympa/Marc
+@dir libexec/sympa/HTML
+@dir libexec/sympa
+@dir %%DATADIR%%/icons
+@dir %%DATADIR%%