Rename vmailmgr bindings: py- and php-vmailmgr.

NetBSD · Feb 24, 2024 · a7105cc · a7105cc
1 parent 0f942c2
commit a7105cc
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 11 deletions.
diff --git a/vmailmgr-php/DESCR → php-vmailmgr/DESCR b/vmailmgr-php/DESCR → php-vmailmgr/DESCR
diff --git a/vmailmgr-php/Makefile → php-vmailmgr/Makefile b/vmailmgr-php/Makefile → php-vmailmgr/Makefile
@@ -2,15 +2,15 @@
 
 .include "../../wip/vmailmgr/Makefile.common"
 
-PKGNAME=		vmailmgr-php-${VERSION}
+PKGNAME=		php-vmailmgr-${VERSION}
+
+DEPENDS+=		php-[0-9]*:${PHPPKGSRCDIR}
 
 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

diff --git a/vmailmgr-php/PLIST → php-vmailmgr/PLIST b/vmailmgr-php/PLIST → php-vmailmgr/PLIST
diff --git a/vmailmgr-python/DESCR → py-vmailmgr/DESCR b/vmailmgr-python/DESCR → py-vmailmgr/DESCR
diff --git a/vmailmgr-python/Makefile → py-vmailmgr/Makefile b/vmailmgr-python/Makefile → py-vmailmgr/Makefile
@@ -2,7 +2,7 @@
 
 .include "../../wip/vmailmgr/Makefile.common"
 
-PKGNAME=		vmailmgr-${PYPKGPREFIX}-${VERSION}
+PKGNAME=		py-vmailmgr-${VERSION}
 
 CONFIGURE_ARGS+=	--enable-python
 CONFIGURE_ENV+=		PYTHONBIN=${PYTHONBIN:Q}

diff --git a/vmailmgr-python/PLIST → py-vmailmgr/PLIST b/vmailmgr-python/PLIST → py-vmailmgr/PLIST
diff --git 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/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
@@ -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
@@ -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?