pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/sysutils

Module Name:    pkgsrc
Committed By:   mef
Date:           Sun Sep  6 02:38:57 UTC 2020

Modified Files:
        pkgsrc/sysutils/wbm-cyrus-imapd: Makefile
        pkgsrc/sysutils/wbm-virtual-server: Makefile
        pkgsrc/sysutils/webmin: Makefile distinfo version.mk wbm.mk
Removed Files:
        pkgsrc/sysutils/wbm-apache: distinfo
        pkgsrc/sysutils/wbm-at: distinfo
        pkgsrc/sysutils/wbm-bandwidth: distinfo
        pkgsrc/sysutils/wbm-bind8: distinfo
        pkgsrc/sysutils/wbm-change-user: distinfo
        pkgsrc/sysutils/wbm-cluster-copy: distinfo
        pkgsrc/sysutils/wbm-cluster-cron: distinfo
        pkgsrc/sysutils/wbm-cluster-passwd: distinfo
        pkgsrc/sysutils/wbm-cluster-shell: distinfo
        pkgsrc/sysutils/wbm-cluster-useradmin: distinfo
        pkgsrc/sysutils/wbm-cluster-webmin: distinfo
        pkgsrc/sysutils/wbm-custom: distinfo
        pkgsrc/sysutils/wbm-cyrus-imapd: distinfo
        pkgsrc/sysutils/wbm-dhcpd: distinfo
        pkgsrc/sysutils/wbm-dovecot: distinfo
        pkgsrc/sysutils/wbm-fetchmail: distinfo
        pkgsrc/sysutils/wbm-htaccess-htpasswd: distinfo
        pkgsrc/sysutils/wbm-inetd: distinfo
        pkgsrc/sysutils/wbm-ipfilter: distinfo
        pkgsrc/sysutils/wbm-ldap-useradmin: distinfo
        pkgsrc/sysutils/wbm-lpadmin: distinfo
        pkgsrc/sysutils/wbm-mailboxes: distinfo
        pkgsrc/sysutils/wbm-mount: distinfo
        pkgsrc/sysutils/wbm-mysql: distinfo
        pkgsrc/sysutils/wbm-net: distinfo
        pkgsrc/sysutils/wbm-openslp: distinfo
        pkgsrc/sysutils/wbm-postfix: distinfo
        pkgsrc/sysutils/wbm-postgresql: distinfo
        pkgsrc/sysutils/wbm-qmailadmin: distinfo
        pkgsrc/sysutils/wbm-quota: distinfo
        pkgsrc/sysutils/wbm-sendmail: distinfo
        pkgsrc/sysutils/wbm-shell: distinfo
        pkgsrc/sysutils/wbm-sshd: distinfo
        pkgsrc/sysutils/wbm-status: distinfo
        pkgsrc/sysutils/wbm-syslog: distinfo
        pkgsrc/sysutils/wbm-telnet: distinfo
        pkgsrc/sysutils/wbm-time: distinfo
        pkgsrc/sysutils/wbm-tunnel: distinfo
        pkgsrc/sysutils/wbm-useradmin: distinfo
        pkgsrc/sysutils/wbm-virtual-server: distinfo

Log Message:
(sysutils/webmin,wbm-*) updated 1.953 to 1.955

(pkgsrc changes)
 - Utilize common DISTINFO_FILE
 - patches converted to SUBST. Make portable to version update
 - (two distinfo files will be recovered again after this commit, sorry)
 - PKGPATH variable does not hold the value yet in Makefile (right ?)

(upstream changes)
Version 1.955 (22nd August 2020)
More bugfixes, and an update to the theme.

Version 1.954 (2nd August 2020)
Minor bugfixes to 1.953


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r0 pkgsrc/sysutils/wbm-apache/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-at/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-bandwidth/distinfo
cvs rdiff -u -r1.12 -r0 pkgsrc/sysutils/wbm-bind8/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-change-user/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-cluster-copy/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-cluster-cron/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-cluster-passwd/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-cluster-shell/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-cluster-useradmin/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-cluster-webmin/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-custom/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/wbm-cyrus-imapd/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/sysutils/wbm-cyrus-imapd/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-dhcpd/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-dovecot/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-fetchmail/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-htaccess-htpasswd/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-inetd/distinfo
cvs rdiff -u -r1.12 -r0 pkgsrc/sysutils/wbm-ipfilter/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-ldap-useradmin/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-lpadmin/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-mailboxes/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-mount/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-mysql/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-net/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-openslp/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-postfix/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-postgresql/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-qmailadmin/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-quota/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-sendmail/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-shell/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-sshd/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-status/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-syslog/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-telnet/distinfo
cvs rdiff -u -r1.13 -r0 pkgsrc/sysutils/wbm-time/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-tunnel/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/sysutils/wbm-useradmin/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/wbm-virtual-server/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/wbm-virtual-server/distinfo
cvs rdiff -u -r1.54 -r1.55 pkgsrc/sysutils/webmin/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/webmin/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/webmin/version.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/webmin/wbm.mk

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


Modified files:

Index: pkgsrc/sysutils/wbm-cyrus-imapd/Makefile
diff -u pkgsrc/sysutils/wbm-cyrus-imapd/Makefile:1.14 pkgsrc/sysutils/wbm-cyrus-imapd/Makefile:1.15
--- pkgsrc/sysutils/wbm-cyrus-imapd/Makefile:1.14       Mon Apr 27 15:16:47 2020
+++ pkgsrc/sysutils/wbm-cyrus-imapd/Makefile    Sun Sep  6 02:38:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/04/27 15:16:47 mef Exp $
+# $NetBSD: Makefile,v 1.15 2020/09/06 02:38:54 mef Exp $
 
 DISTNAME=      cyrus-imapd-mod-1.6.2
 WBM_NAME=      cyrus-imapd
@@ -13,6 +13,10 @@ DEPENDS+=    p5-Tree-Simple-[0-9]*:../../de
 HOMEPAGE=      http://www.tecchio.net/webmin/cyrus/
 COMMENT=       Webmin module for administering Cyrus IMAP
 
+#DISTINFO_FILE=        ${PKGPATH}/distinfo
+# above does not work
+DISTINFO_FILE= ../../sysutils/wbm-cyrus-imapd/distinfo
+
 WBM_STD_MODULE=        NO
 
 .include "../../sysutils/webmin/wbm.mk"

Index: pkgsrc/sysutils/wbm-virtual-server/Makefile
diff -u pkgsrc/sysutils/wbm-virtual-server/Makefile:1.9 pkgsrc/sysutils/wbm-virtual-server/Makefile:1.10
--- pkgsrc/sysutils/wbm-virtual-server/Makefile:1.9     Mon Nov  4 21:28:58 2019
+++ pkgsrc/sysutils/wbm-virtual-server/Makefile Sun Sep  6 02:38:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/11/04 21:28:58 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/09/06 02:38:57 mef Exp $
 
 PKGNAME=       wbm-${WBM_NAME}-${WBM_MOD_REV}
 DISTNAME=      ${WBM_NAME}-${WBM_MOD_REV}.gpl
@@ -9,6 +9,8 @@ WBM_STD_MODULE=         no
 WBM_MOD_REV=           5.05
 WBM_DEPEND_MODULES=    net quota useradmin sendmail apache mysql
 
+DISTINFO_FILE= ../../sysutils/wbm-virtual-server/distinfo
+
 COMMENT=       Webmin module to allow users to control their own virtual servers
 
 #post-install:

Index: pkgsrc/sysutils/webmin/Makefile
diff -u pkgsrc/sysutils/webmin/Makefile:1.54 pkgsrc/sysutils/webmin/Makefile:1.55
--- pkgsrc/sysutils/webmin/Makefile:1.54        Mon Aug 31 18:11:37 2020
+++ pkgsrc/sysutils/webmin/Makefile     Sun Sep  6 02:38:53 2020
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.54 2020/08/31 18:11:37 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2020/09/06 02:38:53 mef Exp $
 
-PKGREVISION= 1
 .include "version.mk"
 
 DISTNAME=      webmin-${WBM_VERSION}
@@ -32,6 +31,19 @@ FILES_SUBST+=                WEBMIN_VARDIR=${WEBMIN_VA
 MESSAGE_SUBST+=                WEBMIN_DIR=${WEBMIN_DIR:Q}
 BUILD_DEFS+=           VARBASE
 
+# patching always fails due to version is written closed the patching line,
+SUBST_CLASSES+=         os
+SUBST_STAGE.os=         pre-configure
+SUBST_FILES.os=         man/module.info init/module.info
+SUBST_MESSAGE.os=       Add DragonFly
+SUBST_SED.os=           -e 's/macos netbsd/macos netbsd dragonfly/'
+
+SUBST_CLASSES+=         dragonfly
+SUBST_STAGE.os=         pre-configure
+SUBST_FILES.os=         cron/module.info
+SUBST_MESSAGE.os=       Add DragonFly
+SUBST_SED.os=           -e 's/macos openbsd/macos openbsd dragonfly/'
+
 WEBMIN_MINIMAL_MODULES=        acl cron init inittab man proc servers webmin webminlog
 
 PKG_SYSCONFSUBDIR=     webmin

Index: pkgsrc/sysutils/webmin/distinfo
diff -u pkgsrc/sysutils/webmin/distinfo:1.26 pkgsrc/sysutils/webmin/distinfo:1.27
--- pkgsrc/sysutils/webmin/distinfo:1.26        Wed Jul 29 10:28:27 2020
+++ pkgsrc/sysutils/webmin/distinfo     Sun Sep  6 02:38:53 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2020/07/29 10:28:27 mef Exp $
+$NetBSD: distinfo,v 1.27 2020/09/06 02:38:53 mef Exp $
 
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
+SHA1 (webmin-1.955.tar.gz) = db4ed7590eb23ad8608110816c9f18b6d46874c2
+RMD160 (webmin-1.955.tar.gz) = 20fb35b0d1af39982085b3c32e2649f95d5b0579
+SHA512 (webmin-1.955.tar.gz) = f287ff2cb39b9d1fcb2d22ea10dae1571583d250d64ccdd83ce57215055c8370bbbb32f57f504bfa82c4d2dab8693914c888f7ad7c9cc3a911c14b1e87a1982c
+Size (webmin-1.955.tar.gz) = 46859996 bytes
 SHA1 (patch-aa) = 74a647da70fcd5afc9fa878554bc1288ec5ba979
 SHA1 (patch-ab) = 890f57542f17e891ae80bf5f3b0158c71baaa479
 SHA1 (patch-ac) = 327ecd47b4926eb3b9c6dc5f986d5f6232364030

Index: pkgsrc/sysutils/webmin/version.mk
diff -u pkgsrc/sysutils/webmin/version.mk:1.9 pkgsrc/sysutils/webmin/version.mk:1.10
--- pkgsrc/sysutils/webmin/version.mk:1.9       Wed Jul 29 10:28:27 2020
+++ pkgsrc/sysutils/webmin/version.mk   Sun Sep  6 02:38:53 2020
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.9 2020/07/29 10:28:27 mef Exp $
+# $NetBSD: version.mk,v 1.10 2020/09/06 02:38:53 mef Exp $
 
-WBM_VERSION=   1.953
+WBM_VERSION=   1.955

Index: pkgsrc/sysutils/webmin/wbm.mk
diff -u pkgsrc/sysutils/webmin/wbm.mk:1.16 pkgsrc/sysutils/webmin/wbm.mk:1.17
--- pkgsrc/sysutils/webmin/wbm.mk:1.16  Mon Jun  1 23:07:27 2020
+++ pkgsrc/sysutils/webmin/wbm.mk       Sun Sep  6 02:38:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: wbm.mk,v 1.16 2020/06/01 23:07:27 mef Exp $
+# $NetBSD: wbm.mk,v 1.17 2020/09/06 02:38:53 mef Exp $
 #
 # Makefile fragment for Webmin modules
 #
@@ -44,6 +44,8 @@ HOMEPAGE?=    http://www.webmin.com/standar
 USE_TOOLS+=    perl:run perl
 DEPENDS+=      webmin>=${WBM_VERSION}:../../sysutils/webmin
 
+DISTINFO_FILE?=        ../../sysutils/webmin/distinfo
+
 .for m in ${WBM_DEPEND_MODULES}
 DEPENDS+=      wbm-${m}>=${WBM_VERSION}:../../sysutils/wbm-${m}
 .endfor
Home | Main Index | Thread Index | Old Index