Date: Fri, 2 Oct 2020 19:18:40 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551226 - in head: . sysutils/modules sysutils/modules/files Message-ID: <202010021918.092JIe64055795@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: 0mp Date: Fri Oct 2 19:18:40 2020 New Revision: 551226 URL: https://svnweb.freebsd.org/changeset/ports/551226 Log: Update to 4.6 The most important changes are described in the MIGRATING document: - https://modules.readthedocs.io/en/v4.6.0/MIGRATING.html Release notes: - https://modules.readthedocs.io/en/v4.6.0/NEWS.html - https://timeline.noticeable.io/cbzeG7wTvAIqj21zbUmx/posts/modules-4-6-0-released PR: 249978 Submitted by: Matthieu Volat <mazhe@alkumuna.eu> Added: head/sysutils/modules/files/patch-doc__Makefile (contents, props changed) Deleted: head/sysutils/modules/files/patch-Makefile.in head/sysutils/modules/files/patch-cmdModule.c head/sysutils/modules/files/patch-configure head/sysutils/modules/files/patch-doc__Makefile.in head/sysutils/modules/files/patch-doc__module.1.in head/sysutils/modules/files/patch-doc__modulefile.5.in head/sysutils/modules/files/patch-etc__Makefile.in head/sysutils/modules/files/patch-init__Makefile.in Modified: head/UPDATING head/sysutils/modules/Makefile head/sysutils/modules/distinfo head/sysutils/modules/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Oct 2 19:09:52 2020 (r551225) +++ head/UPDATING Fri Oct 2 19:18:40 2020 (r551226) @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20201002: + AFFECTS: users of sysutils/modules + AUTHOR: 0mp@FreeBSD.org + + The upstream developers of the Modules port encourage users to consult + the MIGRATING document, which describes the major changes occurring between + versions of Modules. It provides an overview of the new features and changed + behaviors that will be encountered when upgrading: + + https://modules.readthedocs.io/en/v4.6.0/MIGRATING.html + 20200930: AFFECTS: users of sysutils/syslog-ng32[789] AUTHOR: cy@FreeBSD.org Modified: head/sysutils/modules/Makefile ============================================================================== --- head/sysutils/modules/Makefile Fri Oct 2 19:09:52 2020 (r551225) +++ head/sysutils/modules/Makefile Fri Oct 2 19:18:40 2020 (r551226) @@ -2,29 +2,33 @@ # $FreeBSD$ PORTNAME= modules -PORTVERSION= 3.2.10 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= sysutils tcl -MASTER_SITES= SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION} +MASTER_SITES= https://github.com/cea-hpc/modules/releases/download/v${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Dynamic modification of a user environment LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING.GPLv2 -USES= tcl -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-x \ - --with-version-path=${PREFIX}/Modules/versions \ - --mandir=${MANPREFIX}/man \ - --with-tcl-ver=${TCL_VER:S/.//} \ - --with-tcl-inc=${TCL_INCLUDEDIR} \ - --with-tcl-lib=${LOCALBASE}/lib \ - --with-tclx-ver=${TCL_VER:S/.//} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \ + bash:shells/bash +USES= gmake python:env shebangfix tar:bzip2 tcl +GNU_CONFIGURE= yes +GNU_CONFIGURE_PREFIX= ${PREFIX}/Modules +CONFIGURE_SHELL= ${LOCALBASE}/bin/bash +CONFIGURE_ARGS= --disable-compat-version \ + --enable-versioning \ + --with-python="${PYTHON_CMD}" + PLIST_SUB= MODULES_VERSION=${PORTVERSION} post-extract: - ${MV} ${WRKSRC}/doc/modulefile.4.in ${WRKSRC}/doc/modulefile.5.in + ${MV} ${WRKSRC}/doc/build/modulefile.4 ${WRKSRC}/doc/build/modulefile.5 + +post-install: + @${STRIP_CMD} ${STAGEDIR}${GNU_CONFIGURE_PREFIX}/${PORTVERSION}/lib/libtclenvmodules.so .include <bsd.port.mk> Modified: head/sysutils/modules/distinfo ============================================================================== --- head/sysutils/modules/distinfo Fri Oct 2 19:09:52 2020 (r551225) +++ head/sysutils/modules/distinfo Fri Oct 2 19:18:40 2020 (r551226) @@ -1,2 +1,3 @@ -SHA256 (modules-3.2.10.tar.gz) = fb05c82a83477805a1d97737a9f0ca0db23f69b7bce504f1609ba99477b03955 -SIZE (modules-3.2.10.tar.gz) = 419970 +TIMESTAMP = 1601457747 +SHA256 (modules-4.6.0.tar.bz2) = 616f994384adf4faf91df7d8b7ae2dab5bad20d642509c1a8e189e159968f911 +SIZE (modules-4.6.0.tar.bz2) = 1589367 Added: head/sysutils/modules/files/patch-doc__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/modules/files/patch-doc__Makefile Fri Oct 2 19:18:40 2020 (r551226) @@ -0,0 +1,66 @@ +--- doc/Makefile.orig 2020-09-30 09:23:59 UTC ++++ doc/Makefile +@@ -22,9 +22,9 @@ ifeq ($(builddoc),n) + $(error No 'sphinx-build' command defined, cannot build documentation) + endif + +-man: $(BUILD_DIR)/module.1 $(BUILD_DIR)/ml.1 $(BUILD_DIR)/modulefile.4 ++man: $(BUILD_DIR)/module.1 $(BUILD_DIR)/ml.1 $(BUILD_DIR)/modulefile.5 + ifeq ($(compatversion),y) +-man: $(COMPAT_MAN_DIR)/module.1 $(COMPAT_MAN_DIR)/modulefile.4 ++man: $(COMPAT_MAN_DIR)/module.1 $(COMPAT_MAN_DIR)/modulefile.5 + endif + + txt: $(BUILD_DIR)/diff_v3_v4.txt $(BUILD_DIR)/MIGRATING.txt \ +@@ -70,7 +70,7 @@ $(BUILD_DIR)/%.html: $(SOURCE_DIR)/%.rst $(SOURCE_DIR) + $(BUILD_DIR)/%.txt: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py + $(SPHINXBUILD) $(SPHINXOPTS) -b text "$(SOURCE_DIR)" "$(BUILD_DIR)" + +-$(BUILD_DIR)/%.4 $(BUILD_DIR)/%.1: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py ++$(BUILD_DIR)/%.5 $(BUILD_DIR)/%.1: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py + $(SPHINXBUILD) $(SPHINXOPTS) -t pathsubs -b man "$(SOURCE_DIR)" "$(BUILD_DIR)" + + $(BUILD_DIR)/module.1.in: $(SOURCE_DIR)/module.rst $(SOURCE_DIR)/version.py +@@ -82,11 +82,11 @@ $(BUILD_DIR)/module.1: $(BUILD_DIR)/module.1.in + $(translate-in-script) + + # compatibility version-related rules +-$(COMPAT_MAN_DIR)/module.1 $(COMPAT_MAN_DIR)/modulefile.4: ++$(COMPAT_MAN_DIR)/module.1 $(COMPAT_MAN_DIR)/modulefile.5: + $(MAKE) -C $(COMPAT_MAN_DIR) $(@F) + + install: man txt +- mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man4 ++ mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 + ifeq ($(docinstall),y) + mkdir -p $(DESTDIR)$(docdir) + cp $(BUILD_DIR)/diff_v3_v4.txt $(DESTDIR)$(docdir)/ +@@ -99,10 +99,10 @@ ifeq ($(docinstall),y) + endif + cp $(BUILD_DIR)/module.1 $(DESTDIR)$(mandir)/man1/ + cp $(BUILD_DIR)/ml.1 $(DESTDIR)$(mandir)/man1/ +- cp $(BUILD_DIR)/modulefile.4 $(DESTDIR)$(mandir)/man4/ ++ cp $(BUILD_DIR)/modulefile.5 $(DESTDIR)$(mandir)/man5/ + ifeq ($(compatversion),y) + cp $(COMPAT_MAN_DIR)/module.1 $(DESTDIR)$(mandir)/man1/module-compat.1 +- cp $(COMPAT_MAN_DIR)/modulefile.4 $(DESTDIR)$(mandir)/man4/modulefile-compat.4 ++ cp $(COMPAT_MAN_DIR)/modulefile.5 $(DESTDIR)$(mandir)/man5/modulefile-compat.5 + endif + + uninstall: +@@ -118,12 +118,12 @@ ifeq ($(docinstall),y) + endif + rm -f $(DESTDIR)$(mandir)/man1/module.1 + rm -f $(DESTDIR)$(mandir)/man1/ml.1 +- rm -f $(DESTDIR)$(mandir)/man4/modulefile.4 ++ rm -f $(DESTDIR)$(mandir)/man5/modulefile.5 + ifeq ($(compatversion),y) + rm -f $(DESTDIR)$(mandir)/man1/module-compat.1 +- rm -f $(DESTDIR)$(mandir)/man4/modulefile-compat.4 ++ rm -f $(DESTDIR)$(mandir)/man5/modulefile-compat.5 + endif +- rmdir $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man4 ++ rmdir $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 + rmdir $(DESTDIR)$(mandir) + + clean: Modified: head/sysutils/modules/pkg-plist ============================================================================== --- head/sysutils/modules/pkg-plist Fri Oct 2 19:09:52 2020 (r551225) +++ head/sysutils/modules/pkg-plist Fri Oct 2 19:18:40 2020 (r551226) @@ -1,24 +1,54 @@ -man/man1/module.1.gz -man/man5/modulefile.5.gz Modules/%%MODULES_VERSION%%/bin/add.modules +Modules/%%MODULES_VERSION%%/bin/createmodule.py +Modules/%%MODULES_VERSION%%/bin/envml Modules/%%MODULES_VERSION%%/bin/mkroot Modules/%%MODULES_VERSION%%/bin/modulecmd -Modules/%%MODULES_VERSION%%/init/.modulespath +Modules/%%MODULES_VERSION%%/etc/siteconfig.tcl Modules/%%MODULES_VERSION%%/init/bash Modules/%%MODULES_VERSION%%/init/bash_completion Modules/%%MODULES_VERSION%%/init/cmake Modules/%%MODULES_VERSION%%/init/csh +Modules/%%MODULES_VERSION%%/init/fish +Modules/%%MODULES_VERSION%%/init/fish_completion Modules/%%MODULES_VERSION%%/init/ksh +Modules/%%MODULES_VERSION%%/init/ksh-functions/ml +Modules/%%MODULES_VERSION%%/init/ksh-functions/module +Modules/%%MODULES_VERSION%%/init/lisp +Modules/%%MODULES_VERSION%%/init/modulerc Modules/%%MODULES_VERSION%%/init/perl.pm +Modules/%%MODULES_VERSION%%/init/profile.csh +Modules/%%MODULES_VERSION%%/init/profile.sh Modules/%%MODULES_VERSION%%/init/python.py +Modules/%%MODULES_VERSION%%/init/r.R Modules/%%MODULES_VERSION%%/init/ruby.rb Modules/%%MODULES_VERSION%%/init/sh +Modules/%%MODULES_VERSION%%/init/tcl Modules/%%MODULES_VERSION%%/init/tcsh +Modules/%%MODULES_VERSION%%/init/tcsh_completion Modules/%%MODULES_VERSION%%/init/zsh +Modules/%%MODULES_VERSION%%/init/zsh-functions/_module +Modules/%%MODULES_VERSION%%/lib/libtclenvmodules.so +Modules/%%MODULES_VERSION%%/libexec/modulecmd.tcl Modules/%%MODULES_VERSION%%/modulefiles/dot Modules/%%MODULES_VERSION%%/modulefiles/module-git Modules/%%MODULES_VERSION%%/modulefiles/module-info Modules/%%MODULES_VERSION%%/modulefiles/modules Modules/%%MODULES_VERSION%%/modulefiles/null Modules/%%MODULES_VERSION%%/modulefiles/use.own +Modules/%%MODULES_VERSION%%/share/doc/CONTRIBUTING.txt +Modules/%%MODULES_VERSION%%/share/doc/COPYING.GPLv2 +Modules/%%MODULES_VERSION%%/share/doc/ChangeLog +Modules/%%MODULES_VERSION%%/share/doc/INSTALL-win.txt +Modules/%%MODULES_VERSION%%/share/doc/INSTALL.txt +Modules/%%MODULES_VERSION%%/share/doc/MIGRATING.txt +Modules/%%MODULES_VERSION%%/share/doc/NEWS.txt +Modules/%%MODULES_VERSION%%/share/doc/README +Modules/%%MODULES_VERSION%%/share/doc/diff_v3_v4.txt +Modules/%%MODULES_VERSION%%/share/doc/example.txt +Modules/%%MODULES_VERSION%%/share/vim/vimfiles/ftdetect/modulefile.vim +Modules/%%MODULES_VERSION%%/share/vim/vimfiles/ftplugin/modulefile.vim +Modules/%%MODULES_VERSION%%/share/vim/vimfiles/syntax/modulefile.vim Modules/versions/%%MODULES_VERSION%% +man/man1/ml.1.gz +man/man1/module.1.gz +man/man5/modulefile.5.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010021918.092JIe64055795>