CVS commit: pkgsrc/mail/php-vmailmgr

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Feb  2 20:22:26 UTC 2025

Modified Files:
        pkgsrc/mail/php-vmailmgr: Makefile PLIST

Log Message:
php-vmailmgr: avoid multi-version self-conflicts, too.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/php-vmailmgr/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/php-vmailmgr/PLIST

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

Modified files:

Index: pkgsrc/mail/php-vmailmgr/Makefile
diff -u pkgsrc/mail/php-vmailmgr/Makefile:1.2 pkgsrc/mail/php-vmailmgr/Makefile:1.3
--- pkgsrc/mail/php-vmailmgr/Makefile:1.2       Sun Feb  2 11:37:30 2025
+++ pkgsrc/mail/php-vmailmgr/Makefile   Sun Feb  2 20:22:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2025/02/02 11:37:30 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/02/02 20:22:26 schmonz Exp $
 
 .include "../../mail/vmailmgr/Makefile.common"
 
@@ -10,6 +10,8 @@ HOMEPAGE=             https://untroubled.org/vmailm
 COMMENT=               Virtual domain manager for qmail (PHP bindings)
 LICENSE=               gnu-gpl-v2
 
+CONFLICTS+=            php-vmailmgr-[0-9]*
+
 DEPENDS+=              php-[0-9]*:${PHPPKGSRCDIR}
 
 CONFIGURE_ARGS+=       --enable-php
@@ -17,11 +19,11 @@ CONFIGURE_ARGS+=    --enable-php
 BUILD_DIRS=            php
 INSTALL_DIRS=          php
 
-CONFLICTS+=            php-vmailmgr-[0-9]*
-
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/${INSTALL_DIRS}/vmail.features \
                ${DESTDIR}${PREFIX}/share/vmailmgr/php/README
+       ${MV} ${DESTDIR}${PREFIX}/share/vmailmgr/php \
+               ${DESTDIR}${PREFIX}/share/vmailmgr/${PHP_PKG_PREFIX}
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/php-vmailmgr/PLIST
diff -u pkgsrc/mail/php-vmailmgr/PLIST:1.1 pkgsrc/mail/php-vmailmgr/PLIST:1.2
--- pkgsrc/mail/php-vmailmgr/PLIST:1.1  Sun Feb 25 12:09:20 2024
+++ pkgsrc/mail/php-vmailmgr/PLIST      Sun Feb  2 20:22:26 2025
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2024/02/25 12:09:20 schmonz Exp $
-share/vmailmgr/php/README
-share/vmailmgr/php/vmail.inc
+@comment $NetBSD: PLIST,v 1.2 2025/02/02 20:22:26 schmonz Exp $
+share/vmailmgr/${PHP_PKG_PREFIX}/README
+share/vmailmgr/${PHP_PKG_PREFIX}/vmail.inc