pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vmailmgr-python: limit to 2.7 for now.



Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz-web-git%schmonz.com@localhost>
Pushed By:	schmonz
Date:		Fri Feb 23 20:13:54 2024 -0500
Changeset:	c8ed7ebb48733d739149234872936a9d296746ec

Modified Files:
	vmailmgr-python/Makefile
	vmailmgr/Makefile
	vmailmgr/Makefile.common

Log Message:
vmailmgr-python: limit to 2.7 for now.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c8ed7ebb48733d739149234872936a9d296746ec

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vmailmgr-python/Makefile | 4 +++-
 vmailmgr/Makefile        | 7 ++++++-
 vmailmgr/Makefile.common | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diffs:
diff --git a/vmailmgr-python/Makefile b/vmailmgr-python/Makefile
index 80b1e87d09..f2523624c8 100644
--- a/vmailmgr-python/Makefile
+++ b/vmailmgr-python/Makefile
@@ -2,7 +2,7 @@
 
 .include "../../wip/vmailmgr/Makefile.common"
 
-PKGNAME=		vmailmgr-python-${VERSION}
+PKGNAME=		vmailmgr-${PYPKGPREFIX}-${VERSION}
 
 CONFIGURE_ARGS+=	--enable-python
 CONFIGURE_ENV+=		PYTHONBIN=${PYTHONBIN:Q}
@@ -17,5 +17,7 @@ SUBST_STAGE.pyversion=	pre-configure
 SUBST_FILES.pyversion=	configure.ac python/Makefile.am
 SUBST_VARS.pyversion=	PYTHONBIN
 
+PYTHON_VERSIONS_ACCEPTED=	27
+
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr/Makefile b/vmailmgr/Makefile
index a2ab73e2af..b49ceeab3a 100644
--- a/vmailmgr/Makefile
+++ b/vmailmgr/Makefile
@@ -5,13 +5,18 @@
 PKGNAME=	vmailmgr-${VERSION}
 CATEGORIES=	mail
 
+MAINTAINER=	schmonz%NetBSD.org@localhost
+HOMEPAGE=	https://untroubled.org/vmailmgr/
+COMMENT=	Virtual domain manager for qmail
+
 DEPENDS+=	vmailmgr-base>=${VERSION}:../../wip/vmailmgr-base
 DEPENDS+=	vmailmgr-cgi>=${VERSION}:../../wip/vmailmgr-cgi
 DEPENDS+=	vmailmgr-courier-imap>=${VERSION}:../../wip/vmailmgr-courier-imap
 DEPENDS+=	vmailmgr-docs>=${VERSION}:../../wip/vmailmgr-docs
 DEPENDS+=	vmailmgr-php>=${VERSION}:../../wip/vmailmgr-php
-DEPENDS+=	vmailmgr-python>=${VERSION}:../../wip/vmailmgr-python
+DEPENDS+=	vmailmgr-${PYPKGPREFIX}>=${VERSION}:../../wip/vmailmgr-python
 
 META_PACKAGE=	yes
 
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr/Makefile.common b/vmailmgr/Makefile.common
index 4eebbe2c2b..f97a3b53a9 100644
--- a/vmailmgr/Makefile.common
+++ b/vmailmgr/Makefile.common
@@ -16,7 +16,7 @@ GITHUB_TAG=		526d53c1d0e604ec29ada61b79485ceeb8b978cd
 
 MAINTAINER=		schmonz%NetBSD.org@localhost
 HOMEPAGE=		https://untroubled.org/vmailmgr/
-COMMENT=		Manage multiple mail domains on a single qmail host
+COMMENT=		Virtual domain manager for qmail
 LICENSE=		gnu-gpl-v2
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
@@ -46,7 +46,7 @@ SUBST_SED.prefix=	-e 's|/usr/bin|${PREFIX}/bin|g'
 SUBST_CLASSES+=		unused
 SUBST_STAGE.unused=	pre-configure
 SUBST_FILES.unused=	lib/courier-authlib/*.c lib/courier-authlib/*.h
-SUBST_SED.unused=	-e 's|\(.*rcsid\[\]=.*;\)$$|// \1|g'
+SUBST_SED.unused=	-e 's|\(.*rcsid\[]=.*;\)$$|// \1|g'
 
 SUBST_CLASSES+=		sysconf
 SUBST_STAGE.sysconf=	pre-configure


Home | Main Index | Thread Index | Old Index