From 6a78b6f973963ccf4e1bf75977e661a226d9929a Mon Sep 17 00:00:00 2001
From: bernd <bernd@openbsd.org>
Date: Mon, 13 Mar 2006 18:31:21 +0000
Subject: [PATCH] Use python module instead of hardcoded python version.

ok alek@ (some time ago)
---
 mail/mailman/Makefile  |  11 ++-
 mail/mailman/pkg/PLIST |   8 +--
 mail/tmda/Makefile     |  20 ++----
 mail/tmda/pkg/PLIST    | 160 ++++++++++++++++++++---------------------
 4 files changed, 95 insertions(+), 104 deletions(-)

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 09b2e091bb3..08c581220bd 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2006/01/21 15:03:32 jakob Exp $
+# $OpenBSD: Makefile,v 1.38 2006/03/13 18:35:45 bernd Exp $
 
 COMMENT=	"mailing list manager with web interface"
 
 DISTNAME=	mailman-2.1.7
-PKGNAME=	${DISTNAME}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	mail www
 
 HOMEPAGE=	http://www.gnu.org/software/mailman/
@@ -20,10 +20,7 @@ WANTLIB=		c
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mailman/}
 EXTRACT_SUFX=		.tgz
 
-PYTHON_VER=		2.3
-SUBST_VARS=		PYTHON_VER
-BUILD_DEPENDS=		${RUN_DEPENDS}
-RUN_DEPENDS=		:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
+MODULES=		lang/python
 
 NO_REGRESS=		Yes
 
@@ -39,7 +36,7 @@ CONFIGURE_STYLE=	simple
 # to exist, otherwise there will be problems running mailman
 CONFIGURE_ARGS+=	--prefix='${MMHOME}' \
 			--with-mailhost=localhost.my.domain \
-			--with-python=${LOCALBASE}/bin/python${PYTHON_VER} \
+			--with-python=${MODPY_BIN} \
 			--with-urlhost=localhost.my.domain \
 			--with-var-prefix='${MMSPOOL}' \
 			--without-permcheck \
diff --git a/mail/mailman/pkg/PLIST b/mail/mailman/pkg/PLIST
index f56bed699c8..56b9d1c6fcf 100644
--- a/mail/mailman/pkg/PLIST
+++ b/mail/mailman/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2006/01/21 15:03:32 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.14 2006/03/13 18:35:45 bernd Exp $
 @newgroup _mailman:504
 @newuser _mailman:504:_mailman:daemon:Mailing List Manager:${PREFIX}/lib/mailman:/sbin/nologin
 @mode 775
@@ -792,10 +792,10 @@ lib/mailman/pythonlib/korean/unijohab.py
 lib/mailman/pythonlib/korean/unijohab.pyc
 @mode 775
 lib/mailman/pythonlib/lib/
-lib/mailman/pythonlib/lib/python${PYTHON_VER}/
-lib/mailman/pythonlib/lib/python${PYTHON_VER}/site-packages/
+lib/mailman/pythonlib/lib/python${MODPY_VERSION}/
+lib/mailman/pythonlib/lib/python${MODPY_VERSION}/site-packages/
 @mode
-lib/mailman/pythonlib/lib/python${PYTHON_VER}/site-packages/japanese.pth
+lib/mailman/pythonlib/lib/python${MODPY_VERSION}/site-packages/japanese.pth
 @mode 775
 lib/mailman/scripts/
 @mode
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 09b873bb1a5..8b28069bf93 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2005/05/19 00:02:28 alek Exp $
+# $OpenBSD: Makefile,v 1.30 2006/03/13 18:31:21 bernd Exp $
 
 COMMENT=		"reduce the amount of SPAM/UCE (junk-mail)"
 
-VERSION=		1.0.3
-DISTNAME=		tmda-${VERSION}
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		tmda-1.0.3
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		mail
 
 HOMEPAGE=		http://tmda.net/
@@ -19,13 +18,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		http://tmda.net/releases/stable/
 EXTRACT_SUFX=		.tgz
 
-PYTHON_VER=     	2.3
+MODULES=		lang/python
 
-RUN_DEPENDS=		:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
-BUILD_DEPENDS=		${RUN_DEPENDS}
-
-PYTHON_LIBDIR=		lib/python${PYTHON_VER}/site-packages
-SUBST_VARS=		PYTHON_VER
 NO_REGRESS=		Yes
 
 CONTRIB_FILES=		collectaddys printcdb sample.config sendit.sh \
@@ -36,10 +30,10 @@ do-build:
 
 do-install:
 	@perl -pi -e 's:htdocs:${TRUEPREFIX}/share/doc/tmda:' ${WRKSRC}/INSTALL
-	${INSTALL_DATA_DIR} ${PREFIX}/${PYTHON_LIBDIR}/TMDA/pythonlib/email
-	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PREFIX}/${PYTHON_LIBDIR}/TMDA
+	${INSTALL_DATA_DIR} ${DESTDIR}${MODPY_SITEPKG}/TMDA/pythonlib/email
+	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${DESTDIR}${MODPY_SITEPKG}/TMDA
 	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/pythonlib/email/*.py* \
-		${PREFIX}/${PYTHON_LIBDIR}/TMDA/pythonlib/email
+		${DESTDIR}${MODPY_SITEPKG}/TMDA/pythonlib/email
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tmda
 	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${PREFIX}/share/tmda
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tmda-* ${PREFIX}/bin
diff --git a/mail/tmda/pkg/PLIST b/mail/tmda/pkg/PLIST
index de99e0a0593..633940c932e 100644
--- a/mail/tmda/pkg/PLIST
+++ b/mail/tmda/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2004/09/15 09:09:45 espie Exp $
+@comment $OpenBSD: PLIST,v 1.17 2006/03/13 18:31:21 bernd Exp $
 bin/tmda-address
 bin/tmda-check-address
 bin/tmda-filter
@@ -8,85 +8,85 @@ bin/tmda-ofmipd
 bin/tmda-pending
 bin/tmda-rfilter
 bin/tmda-sendmail
-lib/python${PYTHON_VER}/site-packages/TMDA/
-lib/python${PYTHON_VER}/site-packages/TMDA/Address.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Address.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/Auth.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Auth.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/AutoResponse.py
-lib/python${PYTHON_VER}/site-packages/TMDA/AutoResponse.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/Cookie.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Cookie.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/Defaults.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Defaults.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/Deliver.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Deliver.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/Errors.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Errors.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/FilterParser.py
-lib/python${PYTHON_VER}/site-packages/TMDA/FilterParser.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/HMAC.py
-lib/python${PYTHON_VER}/site-packages/TMDA/HMAC.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/MTA.py
-lib/python${PYTHON_VER}/site-packages/TMDA/MTA.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/MessageLogger.py
-lib/python${PYTHON_VER}/site-packages/TMDA/MessageLogger.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/Pending.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Pending.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/SMTP.py
-lib/python${PYTHON_VER}/site-packages/TMDA/SMTP.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/Util.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Util.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/Version.py
-lib/python${PYTHON_VER}/site-packages/TMDA/Version.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/__init__.py
-lib/python${PYTHON_VER}/site-packages/TMDA/__init__.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Charset.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Charset.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Encoders.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Encoders.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Errors.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Errors.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Generator.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Generator.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Header.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Header.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Iterators.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Iterators.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEAudio.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEAudio.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEBase.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEBase.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEImage.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEImage.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEMessage.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEMessage.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEMultipart.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEMultipart.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMENonMultipart.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMENonMultipart.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEText.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/MIMEText.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Message.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Message.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Parser.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Parser.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Utils.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/Utils.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/__init__.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/__init__.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/_compat21.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/_compat21.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/_compat22.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/_compat22.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/_parseaddr.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/_parseaddr.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/base64MIME.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/base64MIME.pyc
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/quopriMIME.py
-lib/python${PYTHON_VER}/site-packages/TMDA/pythonlib/email/quopriMIME.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/
+lib/python${MODPY_VERSION}/site-packages/TMDA/Address.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Address.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/Auth.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Auth.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/AutoResponse.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/AutoResponse.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/Cookie.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Cookie.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/Defaults.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Defaults.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/Deliver.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Deliver.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/Errors.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Errors.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/FilterParser.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/FilterParser.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/HMAC.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/HMAC.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/MTA.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/MTA.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/MessageLogger.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/MessageLogger.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/Pending.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Pending.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/SMTP.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/SMTP.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/Util.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Util.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/Version.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/Version.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/__init__.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Charset.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Charset.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Encoders.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Encoders.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Errors.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Errors.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Generator.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Generator.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Header.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Header.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Iterators.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Iterators.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEAudio.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEAudio.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEBase.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEBase.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEImage.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEImage.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEMessage.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEMessage.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEMultipart.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEMultipart.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMENonMultipart.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMENonMultipart.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEText.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/MIMEText.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Message.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Message.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Parser.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Parser.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Utils.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/Utils.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/__init__.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/_compat21.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/_compat21.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/_compat22.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/_compat22.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/_parseaddr.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/_parseaddr.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/base64MIME.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/base64MIME.pyc
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/quopriMIME.py
+lib/python${MODPY_VERSION}/site-packages/TMDA/pythonlib/email/quopriMIME.pyc
 share/doc/tmda/
 share/doc/tmda/CRYPTO
 share/doc/tmda/INSTALL