From sgk@kolobov.com  Tue May 27 15:07:21 2003
Return-Path: <sgk@kolobov.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BDCC237B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 May 2003 15:07:21 -0700 (PDT)
Received: from outpost.globcon.net (outpost.globcon.net [62.141.88.161])
	by mx1.FreeBSD.org (Postfix) with SMTP id CD1D443F85
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 May 2003 15:07:19 -0700 (PDT)
	(envelope-from sgk@kolobov.com)
Received: (qmail 64579 invoked from network); 27 May 2003 22:07:17 -0000
Received: from h166.lukarcos.com (HELO kolobov.com) (62.141.88.166)
  by outpost.globcon.net with SMTP; 27 May 2003 22:07:17 -0000
Received: (qmail 8402 invoked by uid 911); 27 May 2003 22:06:47 -0000
Message-Id: <20030527220647.8401.qmail@kolobov.com>
Date: 27 May 2003 22:06:47 -0000
From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mwm@mired.org
Subject: [PATCH] Update mail/tmda to 0.78
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         52737
>Category:       ports
>Synopsis:       [PATCH] Update mail/tmda to 0.78
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 27 15:10:13 PDT 2003
>Closed-Date:    Mon Jun 02 07:05:09 PDT 2003
>Last-Modified:  Mon Jun 02 07:05:09 PDT 2003
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.1-BETA i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.1-BETA FreeBSD 5.1-BETA #0: Mon May 26 00:30:25 MSD 2003
>Description:
- Update to 0.78
- Add all official mirrors
- Remove pkg-req script: use PYTHON_REL for checking Pyhton version
- Use dynamically generated pkg-message instead of several ECHO_MSG in Makefile
  so users installing from package would also see this information
- Install example config and contrib bits into EXAMPLESDIR
- Only documentation now goes to DOCSDIR
- Do not install yet another copy of GPL
- Use DATADIR/DOCSDIR/EXAMPLESDIR macros in pkg-plist

Add file:
- pkg-message

Remove file:
- pkg-req

Port maintainer - mwm@mired.org - has been copied.
>How-To-Repeat:
>Fix:

--- tmda-0.78.patch begins here ---
? pkg-message
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/tmda/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile	2003/04/27 02:04:21	1.36
+++ Makefile	2003/05/27 22:02:05
@@ -6,9 +6,13 @@
 #
 
 PORTNAME=	tmda
-PORTVERSION=	0.76
+PORTVERSION=	0.78
 CATEGORIES=	mail python
-MASTER_SITES=	http://tmda.net/releases/%SUBDIR%/
+MASTER_SITES=	http://www.tmda.net/releases/%SUBDIR%/ \
+		http://www.us.tmda.net/releases/%SUBDIR%/ \
+		http://tmda.mirrors.summersault.com/releases/%SUBDIR%/ \
+		http://mirrors.standblue.net/tmda.net/releases/%SUBDIR%/ \
+		http://www.au.tmda.net/releases/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
 EXTRACT_SUFX=	.tgz
 
@@ -17,37 +21,40 @@
 
 USE_PYTHON=	yes
 
-do-build:
-	(cd ${WRKSRC}; ${PYTHON_CMD} ./compileall)
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+DOCS=		CODENAMES CRYPTO THANKS UPGRADE htdocs/*.html
+CONTRIB=	collectaddys def2html printcdb printdbm \
+		sendit.sh tmda.el vadduser-tmda
 
-pre-install:
-	@${SH} ${PKGREQ} INSTALL
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 210
+BROKEN=		"TMDA requries Python 2.1 or greater"
+.endif
 
+do-build:
+	cd ${WRKSRC} && ${PYTHON_CMD} ./compileall
+
 do-install:
-	${MKDIR} ${PYTHON_SITELIBDIR}/TMDA/pythonlib/email
-	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PYTHON_SITELIBDIR}/TMDA
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/TMDA/pythonlib/email
+	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PYTHONPREFIX_SITELIBDIR}/TMDA
 	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/pythonlib/email/*.py* \
-		${PYTHON_SITELIBDIR}/TMDA/pythonlib/email
-	${MKDIR} ${DATADIR}
+		${PYTHONPREFIX_SITELIBDIR}/TMDA/pythonlib/email
+	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tmda-* ${PREFIX}/bin
-
-post-install:
+	@${MKDIR} ${EXAMPLESDIR}/contrib
+	cd ${WRKSRC}/contrib && \
+		${INSTALL_DATA} sample.config ${EXAMPLESDIR} && \
+		${INSTALL_DATA} ${CONTRIB} ${EXAMPLESDIR}/contrib
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/contrib ${DOCSDIR}/htdocs
-.for f in CODENAMES COPYING CRYPTO ChangeLog INSTALL README THANKS UPGRADE
-	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
-.endfor
-.for f in ChangeLog collectaddys printcdb sample.config sendit.sh tmda.spec \
-		def2html printdbm tmda.el vadduser-tmda
-	@${INSTALL_DATA} ${WRKSRC}/contrib/$f ${DOCSDIR}/contrib
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${DOCSDIR}/htdocs
-	@${ECHO_MSG}
-	@${ECHO_MSG} See ${DOCSDIR}/INSTALL for configuration instructions
-	@${ECHO_MSG} See ${DOCSDIR}/UPGRADE if upgrading from a previous release
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@${ECHO_MSG} All related programs have been installed in ${PREFIX}/bin
-	@${ECHO_MSG}
+	@${SED} -e 's!PREFIX!${PREFIX}!; s!DOCSDIR!${DOCSDIR}!;' \
+	       -e 's!EXAMPLESDIR!${EXAMPLESDIR}!' ${.CURDIR}/pkg-message \
+	       > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/tmda/distinfo,v
retrieving revision 1.32
diff -u -r1.32 distinfo
--- distinfo	2003/04/27 02:04:21	1.32
+++ distinfo	2003/05/27 22:02:05
@@ -1 +1 @@
-MD5 (tmda-0.76.tgz) = 71531e95ad56994e03072bc3a1ca91e9
+MD5 (tmda-0.78.tgz) = a3abd8f0afd22d84940a1919c3ae59f8
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/tmda/pkg-plist,v
retrieving revision 1.28
diff -u -r1.28 pkg-plist
--- pkg-plist	2003/04/27 02:04:21	1.28
+++ pkg-plist	2003/05/27 22:02:06
@@ -53,6 +53,8 @@
 %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/base64MIME.pyc
 %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/quopriMIME.py
 %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/quopriMIME.pyc
+@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email
+@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib
 %%PYTHON_SITELIBDIR%%/TMDA/Address.py
 %%PYTHON_SITELIBDIR%%/TMDA/Address.pyc
 %%PYTHON_SITELIBDIR%%/TMDA/Auth.py
@@ -85,56 +87,48 @@
 %%PYTHON_SITELIBDIR%%/TMDA/Version.pyc
 %%PYTHON_SITELIBDIR%%/TMDA/__init__.py
 %%PYTHON_SITELIBDIR%%/TMDA/__init__.pyc
-%%PORTDOCS%%share/doc/tmda/CODENAMES
-%%PORTDOCS%%share/doc/tmda/COPYING
-%%PORTDOCS%%share/doc/tmda/CRYPTO
-%%PORTDOCS%%share/doc/tmda/ChangeLog
-%%PORTDOCS%%share/doc/tmda/INSTALL
-%%PORTDOCS%%share/doc/tmda/README
-%%PORTDOCS%%share/doc/tmda/THANKS
-%%PORTDOCS%%share/doc/tmda/UPGRADE
-%%PORTDOCS%%share/doc/tmda/contrib/ChangeLog
-%%PORTDOCS%%share/doc/tmda/contrib/collectaddys
-%%PORTDOCS%%share/doc/tmda/contrib/printcdb
-%%PORTDOCS%%share/doc/tmda/contrib/printdbm
-%%PORTDOCS%%share/doc/tmda/contrib/sample.config
-%%PORTDOCS%%share/doc/tmda/contrib/sendit.sh
-%%PORTDOCS%%share/doc/tmda/contrib/tmda.el
-%%PORTDOCS%%share/doc/tmda/contrib/tmda.spec
-%%PORTDOCS%%share/doc/tmda/contrib/def2html
-%%PORTDOCS%%share/doc/tmda/contrib/vadduser-tmda
-%%PORTDOCS%%share/doc/tmda/htdocs/bugs.html
-%%PORTDOCS%%share/doc/tmda/htdocs/config-client.html
-%%PORTDOCS%%share/doc/tmda/htdocs/config-filter.html
-%%PORTDOCS%%share/doc/tmda/htdocs/config-pre.html
-%%PORTDOCS%%share/doc/tmda/htdocs/config-server.html
-%%PORTDOCS%%share/doc/tmda/htdocs/config-vars.html
-%%PORTDOCS%%share/doc/tmda/htdocs/config.html
-%%PORTDOCS%%share/doc/tmda/htdocs/download.html
-%%PORTDOCS%%share/doc/tmda/htdocs/features.html
-%%PORTDOCS%%share/doc/tmda/htdocs/filter-sources.html
-%%PORTDOCS%%share/doc/tmda/htdocs/history.html
-%%PORTDOCS%%share/doc/tmda/htdocs/howto-template.html
-%%PORTDOCS%%share/doc/tmda/htdocs/howtos.html
-%%PORTDOCS%%share/doc/tmda/htdocs/index.html
-%%PORTDOCS%%share/doc/tmda/htdocs/install.html
-%%PORTDOCS%%share/doc/tmda/htdocs/inuse.html
-%%PORTDOCS%%share/doc/tmda/htdocs/mirrors.html
-%%PORTDOCS%%share/doc/tmda/htdocs/press.html
-%%PORTDOCS%%share/doc/tmda/htdocs/requirements.html
-%%PORTDOCS%%share/doc/tmda/htdocs/resources.html
-%%PORTDOCS%%share/doc/tmda/htdocs/results.html
-%%PORTDOCS%%share/doc/tmda/htdocs/support-commercial.html
-%%PORTDOCS%%share/doc/tmda/htdocs/tmda-ofmipd.html
-%%PORTDOCS%%share/doc/tmda/htdocs/tmda-vdomains.html
-%%PORTDOCS%%share/doc/tmda/htdocs/trouble.html
-share/tmda/bounce.txt
-share/tmda/confirm_accept.txt
-share/tmda/confirm_request.txt
-@dirrm share/tmda
-%%PORTDOCS%%@dirrm share/doc/tmda/contrib
-%%PORTDOCS%%@dirrm share/doc/tmda/htdocs
-%%PORTDOCS%%@dirrm share/doc/tmda
-@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email
-@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA
+%%PORTDOCS%%%%DOCSDIR%%/CODENAMES
+%%PORTDOCS%%%%DOCSDIR%%/CRYPTO
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+%%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/config-client.html
+%%PORTDOCS%%%%DOCSDIR%%/config-filter.html
+%%PORTDOCS%%%%DOCSDIR%%/config-pre.html
+%%PORTDOCS%%%%DOCSDIR%%/config-server.html
+%%PORTDOCS%%%%DOCSDIR%%/config-vars.html
+%%PORTDOCS%%%%DOCSDIR%%/config.html
+%%PORTDOCS%%%%DOCSDIR%%/download.html
+%%PORTDOCS%%%%DOCSDIR%%/features.html
+%%PORTDOCS%%%%DOCSDIR%%/filter-sources.html
+%%PORTDOCS%%%%DOCSDIR%%/history.html
+%%PORTDOCS%%%%DOCSDIR%%/howto-template.html
+%%PORTDOCS%%%%DOCSDIR%%/howtos.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/inuse.html
+%%PORTDOCS%%%%DOCSDIR%%/mirrors.html
+%%PORTDOCS%%%%DOCSDIR%%/press.html
+%%PORTDOCS%%%%DOCSDIR%%/requirements.html
+%%PORTDOCS%%%%DOCSDIR%%/resources.html
+%%PORTDOCS%%%%DOCSDIR%%/results.html
+%%PORTDOCS%%%%DOCSDIR%%/support-commercial.html
+%%PORTDOCS%%%%DOCSDIR%%/tmda-ofmipd.html
+%%PORTDOCS%%%%DOCSDIR%%/tmda-vdomains.html
+%%PORTDOCS%%%%DOCSDIR%%/trouble.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/contrib/collectaddys
+%%EXAMPLESDIR%%/contrib/def2html
+%%EXAMPLESDIR%%/contrib/printcdb
+%%EXAMPLESDIR%%/contrib/printdbm
+%%EXAMPLESDIR%%/contrib/sendit.sh
+%%EXAMPLESDIR%%/contrib/tmda.el
+%%EXAMPLESDIR%%/contrib/vadduser-tmda
+@dirrm %%EXAMPLESDIR%%/contrib
+%%EXAMPLESDIR%%/sample.config
+@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/bounce.txt
+%%DATADIR%%/confirm_accept.txt
+%%DATADIR%%/confirm_request.txt
+@dirrm %%DATADIR%%
--- tmda-0.78.patch ends here ---

>Release-Note:
>Audit-Trail:

From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/52737: [PATCH] Update mail/tmda to 0.78
Date: Wed, 28 May 2003 15:17:03 +0400

 Adding the port maintainer's approval to the audit trail:
 
 > From: Mike Meyer <mwm@mired.org>
 > Date: Tue, 27 May 2003 20:56:36 -0500
 > To: Sergei Kolobov <sergei@kolobov.com>
 > Cc: FreeBSD-gnats-submit@freebsd.org
 > Subject: Re: [PATCH] Update mail/tmda to 0.78
 > Message-ID: <16084.5972.657437.478424@guru.mired.org>
 > References: <20030527220647.8401.qmail@kolobov.com>
 > 
 > In <20030527220647.8401.qmail@kolobov.com>, Sergei Kolobov <sergei@kolobov.com> typed:
 > > 
 > > >Submitter-Id:	current-users
 > > >Originator:	Sergei Kolobov
 > > >Organization:	
 > > >Confidential:	no 
 > > >Synopsis:	[PATCH] Update mail/tmda to 0.78
 > > >Severity:	non-critical 
 > > >Priority:	low
 > > >Category:	ports 
 > > >Class:		update 
 > > >Release:	FreeBSD 5.1-BETA i386
 > > >Environment:
 > > System: FreeBSD elf.chetwood.ru 5.1-BETA FreeBSD 5.1-BETA #0: Mon May 26 00:30:25 MSD 2003
 > > >Description:
 > > - Update to 0.78
 > > - Add all official mirrors
 > > - Remove pkg-req script: use PYTHON_REL for checking Pyhton version
 > > - Use dynamically generated pkg-message instead of several ECHO_MSG in Makefile
 > >   so users installing from package would also see this information
 > > - Install example config and contrib bits into EXAMPLESDIR
 > > - Only documentation now goes to DOCSDIR
 > > - Do not install yet another copy of GPL
 > > - Use DATADIR/DOCSDIR/EXAMPLESDIR macros in pkg-plist
 > > 
 > > Add file:
 > > - pkg-message
 > > 
 > > Remove file:
 > > - pkg-req
 > > 
 > > Port maintainer - mwm@mired.org - has been copied.
 > 
 > Port maintainer thinks these are all good changes, and appreciates the
 > work done here. Someone please commit these things.
 > 
 > 	<mike
 > -- 
 > Mike Meyer <mwm@mired.org>		http://www.mired.org/consulting.html
 > Independent Network/Unix/Perforce consultant, email for more information.

From: Ceri Davies <ceri@FreeBSD.org>
To: FreeBSD Gnats Submit <freebsd-gnats-submit@FreeBSD.org>
Cc:  
Subject: Re: ports/52737: [PATCH] Update mail/tmda to 0.78
Date: Wed, 28 May 2003 23:25:51 +0100

 Adding to audit trail, from misfiled PR ports/52742:
 
 Date: Tue, 27 May 2003 20:56:36 -0500
 From: Mike Meyer <mwm-dated-1054518997.9bc73d@mired.org>
 Message-Id: <16084.5972.657437.478424@guru.mired.org>
 References: <20030527220647.8401.qmail@kolobov.com>
 
  In <20030527220647.8401.qmail@kolobov.com>, Sergei Kolobov <sergei@kolobov.com> typed:
 
  > Port maintainer - mwm@mired.org - has been copied.
  
  Port maintainer thinks these are all good changes, and appreciates the
  work done here. Someone please commit these things.
  
  	<mike
  -- 
  Mike Meyer <mwm@mired.org>		http://www.mired.org/consulting.html
  Independent Network/Unix/Perforce consultant, email for more information.
 

From: Christian Weisgerber <naddy@mips.inka.de>
To: sergei@kolobov.com
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/52737: [PATCH] Update mail/tmda to 0.78
Date: Sun, 1 Jun 2003 23:14:45 +0200 (CEST)

 In article <20030527220647.8401.qmail@kolobov.com> you write:
 
 > >Number:         52737
 > >Category:       ports
 > >Synopsis:       [PATCH] Update mail/tmda to 0.78
 
 I can't find the new pkg-message file in there.
 
 -- 
 Christian "naddy" Weisgerber                          naddy@mips.inka.de

From: Sergei Kolobov <sergei@kolobov.com>
To: Christian Weisgerber <naddy@mips.inka.de>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/52737: [PATCH] Update mail/tmda to 0.78
Date: Mon, 2 Jun 2003 11:52:42 +0400

 On 2003-06-01 at 23:14 +0200, Christian Weisgerber wrote:
 > In article <20030527220647.8401.qmail@kolobov.com> you write:
 > 
 > > >Number:         52737
 > > >Category:       ports
 > > >Synopsis:       [PATCH] Update mail/tmda to 0.78
 > 
 > I can't find the new pkg-message file in there.
 
 Oops. Here it is:
 
 ===[cut here]===
 
 	All TMDA programs have been installed in PREFIX/bin.
 	Documentation is located in DOCSDIR.
 	See DOCSDIR/UPGRADE if upgrading from a previous release.
 	Sample config file: EXAMPLESDIR/sample.config
 
 ===[cut here]===
 
 Sergei
State-Changed-From-To: open->closed 
State-Changed-By: naddy 
State-Changed-When: Mon Jun 2 07:04:55 PDT 2003 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52737 
>Unformatted:
