pkgsrc-WIP-changes archive

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

Rename vmailmgr bindings: py- and php-vmailmgr.



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

Modified Files:
	vmailmgr-docs/Makefile
	vmailmgr/Makefile
	vmailmgr/Makefile.common
	vmailmgr/TODO.md
Added Files:
	php-vmailmgr/DESCR
	php-vmailmgr/Makefile
	php-vmailmgr/PLIST
	py-vmailmgr/DESCR
	py-vmailmgr/Makefile
	py-vmailmgr/PLIST
Removed Files:
	vmailmgr-php/DESCR
	vmailmgr-php/Makefile
	vmailmgr-php/PLIST
	vmailmgr-python/DESCR
	vmailmgr-python/Makefile
	vmailmgr-python/PLIST

Log Message:
Rename vmailmgr bindings: py- and php-vmailmgr.

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

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

diffstat:
 php-vmailmgr/DESCR       |  3 +++
 php-vmailmgr/Makefile    | 19 +++++++++++++++++++
 php-vmailmgr/PLIST       |  3 +++
 py-vmailmgr/DESCR        |  1 +
 py-vmailmgr/Makefile     | 23 +++++++++++++++++++++++
 py-vmailmgr/PLIST        | 22 ++++++++++++++++++++++
 vmailmgr-docs/Makefile   |  2 +-
 vmailmgr-php/DESCR       |  3 ---
 vmailmgr-php/Makefile    | 19 -------------------
 vmailmgr-php/PLIST       |  3 ---
 vmailmgr-python/DESCR    |  1 -
 vmailmgr-python/Makefile | 23 -----------------------
 vmailmgr-python/PLIST    | 22 ----------------------
 vmailmgr/Makefile        |  5 ++---
 vmailmgr/Makefile.common |  4 ++--
 vmailmgr/TODO.md         | 10 +++++++++-
 16 files changed, 85 insertions(+), 78 deletions(-)

diffs:
diff --git a/php-vmailmgr/DESCR b/php-vmailmgr/DESCR
new file mode 100644
index 0000000000..9c1440979f
--- /dev/null
+++ b/php-vmailmgr/DESCR
@@ -0,0 +1,3 @@
+This is the VMailMgr PHP library providing tools to setup a virtual
+domain, add and delete individual virtual users and aliases, and to
+change passwords.
diff --git a/php-vmailmgr/Makefile b/php-vmailmgr/Makefile
new file mode 100644
index 0000000000..a39b335524
--- /dev/null
+++ b/php-vmailmgr/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD$
+
+.include "../../wip/vmailmgr/Makefile.common"
+
+PKGNAME=		php-vmailmgr-${VERSION}
+
+DEPENDS+=		php-[0-9]*:${PHPPKGSRCDIR}
+
+CONFIGURE_ARGS+=	--enable-php
+
+BUILD_DIRS=		php
+INSTALL_DIRS=		php
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/${INSTALL_DIRS}/vmail.features \
+		${DESTDIR}${PREFIX}/share/vmailmgr/php/README
+
+.include "../../lang/php/phpversion.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/php-vmailmgr/PLIST b/php-vmailmgr/PLIST
new file mode 100644
index 0000000000..9dc82908ff
--- /dev/null
+++ b/php-vmailmgr/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+share/vmailmgr/php/README
+share/vmailmgr/php/vmail.inc
diff --git a/py-vmailmgr/DESCR b/py-vmailmgr/DESCR
new file mode 100644
index 0000000000..5ed7457375
--- /dev/null
+++ b/py-vmailmgr/DESCR
@@ -0,0 +1 @@
+These are the VMailMgr Python bindings.
diff --git a/py-vmailmgr/Makefile b/py-vmailmgr/Makefile
new file mode 100644
index 0000000000..7eb9154af1
--- /dev/null
+++ b/py-vmailmgr/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD$
+
+.include "../../wip/vmailmgr/Makefile.common"
+
+PKGNAME=		py-vmailmgr-${VERSION}
+
+CONFIGURE_ARGS+=	--enable-python
+CONFIGURE_ENV+=		PYTHONBIN=${PYTHONBIN:Q}
+
+BUILD_DIRS=		python
+INSTALL_DIRS=		python
+
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB:Q}
+
+SUBST_CLASSES+=		pyversion
+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/py-vmailmgr/PLIST b/py-vmailmgr/PLIST
new file mode 100644
index 0000000000..71e8229f7c
--- /dev/null
+++ b/py-vmailmgr/PLIST
@@ -0,0 +1,22 @@
+@comment $NetBSD$
+${PYSITELIB}/vmailmgr/__init__.py
+${PYSITELIB}/vmailmgr/__init__.pyc
+${PYSITELIB}/vmailmgr/__init__.pyo
+${PYSITELIB}/vmailmgr/commands.py
+${PYSITELIB}/vmailmgr/commands.pyc
+${PYSITELIB}/vmailmgr/commands.pyo
+${PYSITELIB}/vmailmgr/config.py
+${PYSITELIB}/vmailmgr/config.pyc
+${PYSITELIB}/vmailmgr/config.pyo
+${PYSITELIB}/vmailmgr/constants.py
+${PYSITELIB}/vmailmgr/constants.pyc
+${PYSITELIB}/vmailmgr/constants.pyo
+${PYSITELIB}/vmailmgr/daemon.py
+${PYSITELIB}/vmailmgr/daemon.pyc
+${PYSITELIB}/vmailmgr/daemon.pyo
+${PYSITELIB}/vmailmgr/local.py
+${PYSITELIB}/vmailmgr/local.pyc
+${PYSITELIB}/vmailmgr/local.pyo
+${PYSITELIB}/vmailmgr/types.py
+${PYSITELIB}/vmailmgr/types.pyc
+${PYSITELIB}/vmailmgr/types.pyo
diff --git a/vmailmgr-docs/Makefile b/vmailmgr-docs/Makefile
index 2c1214bd4c..eeb6386446 100644
--- a/vmailmgr-docs/Makefile
+++ b/vmailmgr-docs/Makefile
@@ -10,7 +10,7 @@ BUILD_DIRS+=		. authenticate
 TOOL_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 TOOL_DEPENDS+=		tex-texinfo-[0-9]*:../../print/tex-texinfo
 
-AUTO_MKDIRS=		yes
+INSTALLATION_DIRS=	share/doc/vmailmgr
 
 do-install:
 	cd ${WRKSRC}; \
diff --git a/vmailmgr-php/DESCR b/vmailmgr-php/DESCR
deleted file mode 100644
index 9c1440979f..0000000000
--- a/vmailmgr-php/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the VMailMgr PHP library providing tools to setup a virtual
-domain, add and delete individual virtual users and aliases, and to
-change passwords.
diff --git a/vmailmgr-php/Makefile b/vmailmgr-php/Makefile
deleted file mode 100644
index 40a7dacf36..0000000000
--- a/vmailmgr-php/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-.include "../../wip/vmailmgr/Makefile.common"
-
-PKGNAME=		vmailmgr-php-${VERSION}
-
-CONFIGURE_ARGS+=	--enable-php
-
-BUILD_DIRS=		php
-INSTALL_DIRS=		php
-
-DEPENDS+=		php-[0-9]*:${PHPPKGSRCDIR}
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/${INSTALL_DIRS}/vmail.features \
-		${DESTDIR}${PREFIX}/share/vmailmgr/php/README
-
-.include "../../lang/php/phpversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr-php/PLIST b/vmailmgr-php/PLIST
deleted file mode 100644
index 9dc82908ff..0000000000
--- a/vmailmgr-php/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-share/vmailmgr/php/README
-share/vmailmgr/php/vmail.inc
diff --git a/vmailmgr-python/DESCR b/vmailmgr-python/DESCR
deleted file mode 100644
index 5ed7457375..0000000000
--- a/vmailmgr-python/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-These are the VMailMgr Python bindings.
diff --git a/vmailmgr-python/Makefile b/vmailmgr-python/Makefile
deleted file mode 100644
index f2523624c8..0000000000
--- a/vmailmgr-python/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD$
-
-.include "../../wip/vmailmgr/Makefile.common"
-
-PKGNAME=		vmailmgr-${PYPKGPREFIX}-${VERSION}
-
-CONFIGURE_ARGS+=	--enable-python
-CONFIGURE_ENV+=		PYTHONBIN=${PYTHONBIN:Q}
-
-BUILD_DIRS=		python
-INSTALL_DIRS=		python
-
-PLIST_SUBST+=		PYSITELIB=${PYSITELIB:Q}
-
-SUBST_CLASSES+=		pyversion
-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-python/PLIST b/vmailmgr-python/PLIST
deleted file mode 100644
index 71e8229f7c..0000000000
--- a/vmailmgr-python/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD$
-${PYSITELIB}/vmailmgr/__init__.py
-${PYSITELIB}/vmailmgr/__init__.pyc
-${PYSITELIB}/vmailmgr/__init__.pyo
-${PYSITELIB}/vmailmgr/commands.py
-${PYSITELIB}/vmailmgr/commands.pyc
-${PYSITELIB}/vmailmgr/commands.pyo
-${PYSITELIB}/vmailmgr/config.py
-${PYSITELIB}/vmailmgr/config.pyc
-${PYSITELIB}/vmailmgr/config.pyo
-${PYSITELIB}/vmailmgr/constants.py
-${PYSITELIB}/vmailmgr/constants.pyc
-${PYSITELIB}/vmailmgr/constants.pyo
-${PYSITELIB}/vmailmgr/daemon.py
-${PYSITELIB}/vmailmgr/daemon.pyc
-${PYSITELIB}/vmailmgr/daemon.pyo
-${PYSITELIB}/vmailmgr/local.py
-${PYSITELIB}/vmailmgr/local.pyc
-${PYSITELIB}/vmailmgr/local.pyo
-${PYSITELIB}/vmailmgr/types.py
-${PYSITELIB}/vmailmgr/types.pyc
-${PYSITELIB}/vmailmgr/types.pyo
diff --git a/vmailmgr/Makefile b/vmailmgr/Makefile
index b49ceeab3a..ef3bc5a649 100644
--- a/vmailmgr/Makefile
+++ b/vmailmgr/Makefile
@@ -13,10 +13,9 @@ 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-${PYPKGPREFIX}>=${VERSION}:../../wip/vmailmgr-python
+DEPENDS+=	php-vmailmgr>=${VERSION}:../../wip/php-vmailmgr
+DEPENDS+=	py-vmailmgr>=${VERSION}:../../wip/py-vmailmgr
 
 META_PACKAGE=	yes
 
-.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr/Makefile.common b/vmailmgr/Makefile.common
index f97a3b53a9..2050b92755 100644
--- a/vmailmgr/Makefile.common
+++ b/vmailmgr/Makefile.common
@@ -1,11 +1,11 @@
 # $NetBSD$
 #
+# used by wip/php-vmailmgr/Makefile
+# used by wip/py-vmailmgr/Makefile
 # used by wip/vmailmgr-base/Makefile
 # used by wip/vmailmgr-cgi/Makefile
 # used by wip/vmailmgr-courier-imap/Makefile
 # used by wip/vmailmgr-docs/Makefile
-# used by wip/vmailmgr-php/Makefile
-# used by wip/vmailmgr-python/Makefile
 
 .include "../../wip/vmailmgr/version.mk"
 
diff --git a/vmailmgr/TODO.md b/vmailmgr/TODO.md
index fbe276e858..93aff3cc94 100644
--- a/vmailmgr/TODO.md
+++ b/vmailmgr/TODO.md
@@ -2,4 +2,12 @@
 
 - Give each package its own DESCR and COMMENT
 - Add separate package for daemon?
-- [FreeBSD's vmailmgr port just before deletion](https://github.com/freebsd/freebsd-ports/tree/635ccfbf59522ddd44cd9283b321e2d9b3bc9876/mail/vmailmgr)
+
+## Python
+
+- `.pyc` and `.pyo`:
+    - 2.x generates both?
+    - 3.x generates neither?
+- loading and calling these installed modules
+    - Works with 2.x
+    - Can it also work with 3.x?


Home | Main Index | Thread Index | Old Index