From owner-freebsd-ports Wed Aug 21 15: 0:21 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EEE037B400 for ; Wed, 21 Aug 2002 15:00:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AB0843E91 for ; Wed, 21 Aug 2002 15:00:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7LM03JU078890 for ; Wed, 21 Aug 2002 15:00:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7LM03vo078889; Wed, 21 Aug 2002 15:00:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61D1E37B401 for ; Wed, 21 Aug 2002 14:55:57 -0700 (PDT) Received: from outpost.lukarcos.com (outpost.lukarcos.com [195.239.240.132]) by mx1.FreeBSD.org (Postfix) with SMTP id F0D1843E6A for ; Wed, 21 Aug 2002 14:55:55 -0700 (PDT) (envelope-from sgk@outpost.globcon.net) Received: (qmail 98242 invoked by uid 911); 21 Aug 2002 21:55:58 -0000 Message-Id: <20020821215558.98241.qmail@outpost.globcon.net> Date: 21 Aug 2002 21:55:58 -0000 From: Sergei Kolobov To: FreeBSD-gnats-submit@FreeBSD.org Cc: mwm@mired.org X-Send-Pr-Version: 3.113 Subject: ports/41863: [PATCH] Update mail/tmda port to 0.61 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41863 >Category: ports >Synopsis: [PATCH] Update mail/tmda port to 0.61 >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 21 15:00:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Sergei Kolobov >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD outpost.globcon.net 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Aug 1 02:44:26 MSD 2002 sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST i386 >Description: - Update to tmda 0.61 - Use MASTER_SITE_SUBDIR to reference to old releases - Use DATADIR and DOCSDIR to simplify Makefile - Use PYTHON_SITELIBDIR in pkg-plist - Sort pkg-plist >How-To-Repeat: Patch included. >Fix: --- tmda-0.61-patch begins here --- diff -ruN tmda.orig/Makefile tmda/Makefile --- tmda.orig/Makefile Thu Aug 22 01:29:54 2002 +++ tmda/Makefile Thu Aug 22 01:37:29 2002 @@ -6,10 +6,10 @@ # PORTNAME= tmda -PORTVERSION= 0.59 +PORTVERSION= 0.61 CATEGORIES= mail python -MASTER_SITES= http://tmda.net/releases/ \ - http://tmda.net/releases/old/ +MASTER_SITES= http://tmda.net/releases/%SUBDIR%/ +MASTER_SITE_SUBDIR= . old EXTRACT_SUFX= .tgz MAINTAINER= mwm@mired.org @@ -25,23 +25,21 @@ do-install: ${MKDIR} ${PYTHON_SITELIBDIR}/TMDA ${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PYTHON_SITELIBDIR}/TMDA - ${MKDIR} ${PREFIX}/share/tmda - ${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${PREFIX}/share/tmda + ${MKDIR} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/bin/tmda-* ${PREFIX}/bin post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/tmda - ${MKDIR} ${PREFIX}/share/doc/tmda/contrib - ${MKDIR} ${PREFIX}/share/doc/tmda/htdocs + ${MKDIR} ${DOCSDIR} ${DOCSDIR}/contrib ${DOCSDIR}/htdocs .for f in COPYING CRYPTO ChangeLog INSTALL README THANKS UPGRADE - @${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/tmda + @${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR} .endfor - @${INSTALL_DATA} ${WRKSRC}/contrib/* ${PREFIX}/share/doc/tmda/contrib - @${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${PREFIX}/share/doc/tmda/htdocs + @${INSTALL_DATA} ${WRKSRC}/contrib/* ${DOCSDIR}/contrib + @${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${DOCSDIR}/htdocs @${ECHO_MSG} - @${ECHO_MSG} See ${PREFIX}/share/doc/tmda/INSTALL for configuration instructions - @${ECHO_MSG} See ${PREFIX}/share/doc/tmda/UPGRADE if upgrading from a previous release + @${ECHO_MSG} See ${DOCSDIR}/INSTALL for configuration instructions + @${ECHO_MSG} See ${DOCSDIR}/UPGRADE if upgrading from a previous release .endif @${ECHO_MSG} All related programs have been installed in ${PREFIX}/bin @${ECHO_MSG} diff -ruN tmda.orig/distinfo tmda/distinfo --- tmda.orig/distinfo Thu Aug 22 01:29:54 2002 +++ tmda/distinfo Thu Aug 22 01:32:23 2002 @@ -1 +1 @@ -MD5 (tmda-0.59.tgz) = 680da61ae93badaf60dde34f6ff095ee +MD5 (tmda-0.61.tgz) = 37fc7f4f8fd9a70a0470704d874eaee9 diff -ruN tmda.orig/pkg-plist tmda/pkg-plist --- tmda.orig/pkg-plist Thu Aug 22 01:29:54 2002 +++ tmda/pkg-plist Thu Aug 22 01:43:26 2002 @@ -7,28 +7,30 @@ bin/tmda-pending bin/tmda-rfilter bin/tmda-sendmail -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Cookie.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Cookie.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Defaults.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Defaults.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Deliver.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Deliver.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Errors.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Errors.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/FilterParser.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/FilterParser.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/HMAC.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/HMAC.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/MTA.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/MTA.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/SMTP.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/SMTP.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Util.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Util.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Version.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/Version.pyc -lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.py -lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.pyc +%%PYTHON_SITELIBDIR%%/TMDA/Cookie.py +%%PYTHON_SITELIBDIR%%/TMDA/Cookie.pyc +%%PYTHON_SITELIBDIR%%/TMDA/Defaults.py +%%PYTHON_SITELIBDIR%%/TMDA/Defaults.pyc +%%PYTHON_SITELIBDIR%%/TMDA/Deliver.py +%%PYTHON_SITELIBDIR%%/TMDA/Deliver.pyc +%%PYTHON_SITELIBDIR%%/TMDA/Errors.py +%%PYTHON_SITELIBDIR%%/TMDA/Errors.pyc +%%PYTHON_SITELIBDIR%%/TMDA/FilterParser.py +%%PYTHON_SITELIBDIR%%/TMDA/FilterParser.pyc +%%PYTHON_SITELIBDIR%%/TMDA/HMAC.py +%%PYTHON_SITELIBDIR%%/TMDA/HMAC.pyc +%%PYTHON_SITELIBDIR%%/TMDA/MTA.py +%%PYTHON_SITELIBDIR%%/TMDA/MTA.pyc +%%PYTHON_SITELIBDIR%%/TMDA/MessageLogger.py +%%PYTHON_SITELIBDIR%%/TMDA/MessageLogger.pyc +%%PYTHON_SITELIBDIR%%/TMDA/SMTP.py +%%PYTHON_SITELIBDIR%%/TMDA/SMTP.pyc +%%PYTHON_SITELIBDIR%%/TMDA/Util.py +%%PYTHON_SITELIBDIR%%/TMDA/Util.pyc +%%PYTHON_SITELIBDIR%%/TMDA/Version.py +%%PYTHON_SITELIBDIR%%/TMDA/Version.pyc +%%PYTHON_SITELIBDIR%%/TMDA/__init__.py +%%PYTHON_SITELIBDIR%%/TMDA/__init__.pyc %%PORTDOCS%%share/doc/tmda/COPYING %%PORTDOCS%%share/doc/tmda/CRYPTO %%PORTDOCS%%share/doc/tmda/ChangeLog @@ -51,11 +53,13 @@ %%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/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/press.html %%PORTDOCS%%share/doc/tmda/htdocs/requirements.html %%PORTDOCS%%share/doc/tmda/htdocs/resources.html %%PORTDOCS%%share/doc/tmda/htdocs/results.html @@ -68,4 +72,4 @@ %%PORTDOCS%%@dirrm share/doc/tmda/contrib %%PORTDOCS%%@dirrm share/doc/tmda/htdocs %%PORTDOCS%%@dirrm share/doc/tmda -@dirrm lib/%%PYTHON_VERSION%%/site-packages/TMDA +@dirrm %%PYTHON_SITELIBDIR%%/TMDA --- tmda-0.61-patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message