sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-12 23:31:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/modules: update to v5.3.1

Browse source 
Changelog: https://modules.readthedocs.io/en/latest/changes.html#modules-5

PR:		275080
This commit is contained in:
Laurent 2023-11-14 05:07:06 -05:00 • committed by Robert Clausecker
parent e3aeb5c7a9
commit f8a14bbc74
7 changed files with 88 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysutils/modules/Makefile
View file

@ -1,9 +1,9 @@
PORTNAME= modules
PORTVERSION= 4.6.0
DISTVERSION= 5.3.1
CATEGORIES= sysutils tcl
MASTER_SITES= https://github.com/cea-hpc/modules/releases/download/v${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= laurent.chardon@gmail.com
COMMENT= Dynamic modification of a user environment
WWW= https://modules.sourceforge.net/

6
sysutils/modules/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1601457747
SHA256 (modules-4.6.0.tar.bz2) = 616f994384adf4faf91df7d8b7ae2dab5bad20d642509c1a8e189e159968f911
SIZE (modules-4.6.0.tar.bz2) = 1589367
TIMESTAMP = 1699876784
SHA256 (modules-5.3.1.tar.bz2) = 171f7faebc1363c8738a6905b31074636dd81d303098002b1c25801ee5483d86
SIZE (modules-5.3.1.tar.bz2) = 1820274

11
sysutils/modules/files/patch-Makefile Normal file
View file

@ -0,0 +1,11 @@
--- Makefile.orig 2023-06-27 17:22:08 UTC
+++ Makefile
@@ -763,7 +763,7 @@ dist-tar: ChangeLog.gz contrib/rpm/environment-modules
lib/configure lib/config.h.in $(DIST_AUTORECONF_EXTRA) ChangeLog.gz \
doc/build/MIGRATING.txt doc/build/changes.txt doc/build/INSTALL.txt \
doc/build/INSTALL-win.txt doc/build/NEWS.txt doc/build/CONTRIBUTING.txt \
- doc/build/module.1.in doc/build/ml.1 doc/build/modulefile.4 \
+ doc/build/module.1.in doc/build/ml.1 doc/build/modulefile.5 \
contrib/rpm/environment-modules.spec
dist-gzip: dist-tar

53
sysutils/modules/files/patch-doc_Makefile Normal file
View file

@ -0,0 +1,53 @@
--- doc/Makefile.orig 2023-06-27 17:22:08 UTC
+++ doc/Makefile
@@ -37,7 +37,7 @@ ALL_RST := $(wildcard $(SOURCE_DIR)/*.rst $(SOURCE_DIR
$(SOURCE_DIR)/design/*.rst)
ALL_TXT := $(patsubst $(SOURCE_DIR)/%,$(BUILD_DIR)/%,$(patsubst %.rst,%.txt,$(ALL_RST)))
ALL_HTML := $(patsubst $(SOURCE_DIR)/%,$(BUILD_DIR)/%,$(patsubst %.rst,%.html,$(ALL_RST)))
-ALL_MAN := $(BUILD_DIR)/module.1 $(BUILD_DIR)/ml.1 $(BUILD_DIR)/modulefile.4
+ALL_MAN := $(BUILD_DIR)/module.1 $(BUILD_DIR)/ml.1 $(BUILD_DIR)/modulefile.5
all: man txt
@@ -97,10 +97,10 @@ $(BUILD_DIR)/%.txt: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/
$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/*.txt
$(SPHINXBUILD) $(SPHINXOPTS) -b text "$(SOURCE_DIR)" "$(BUILD_DIR)"
-$(BUILD_DIR)/module.1.in $(BUILD_DIR)/modulefile.4 $(BUILD_DIR)/ml.1: $(ALL_RST) $(SOURCE_DIR)/version.py
+$(BUILD_DIR)/module.1.in $(BUILD_DIR)/modulefile.5 $(BUILD_DIR)/ml.1: $(ALL_RST) $(SOURCE_DIR)/version.py
$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/ml.1
$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/module.1.in
- $(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/modulefile.4
+ $(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/modulefile.5
$(SPHINXBUILD) $(SPHINXOPTS) -t pathsubs -b man "$(SOURCE_DIR)" "$(BUILD_DIR)"
$(if $(findstring module.1.in,$@),mv $(BUILD_DIR)/module.1 $@)
endif
@@ -109,7 +109,7 @@ $(BUILD_DIR)/module.1: $(BUILD_DIR)/module.1.in
$(translate-in-script)
install: man txt
- $(INSTALL_DIR) '$(DESTDIR)$(mandir)/man1' '$(DESTDIR)$(mandir)/man4'
+ $(INSTALL_DIR) '$(DESTDIR)$(mandir)/man1' '$(DESTDIR)$(mandir)/man5'
ifeq ($(docinstall),y)
$(INSTALL_DIR) '$(DESTDIR)$(docdir)'
$(INSTALL_DATA) $(BUILD_DIR)/changes.txt '$(DESTDIR)$(docdir)/'
@@ -121,7 +121,7 @@ ifeq ($(docinstall),y)
endif
$(INSTALL_DATA) $(BUILD_DIR)/module.1 '$(DESTDIR)$(mandir)/man1/'
$(INSTALL_DATA) $(BUILD_DIR)/ml.1 '$(DESTDIR)$(mandir)/man1/'
- $(INSTALL_DATA) $(BUILD_DIR)/modulefile.4 '$(DESTDIR)$(mandir)/man4/'
+ $(INSTALL_DATA) $(BUILD_DIR)/modulefile.5 '$(DESTDIR)$(mandir)/man5/'
uninstall:
ifeq ($(docinstall),y)
@@ -135,8 +135,8 @@ 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'
- rmdir '$(DESTDIR)$(mandir)/man1' '$(DESTDIR)$(mandir)/man4'
+ rm -f '$(DESTDIR)$(mandir)/man5/modulefile.5'
+ rmdir '$(DESTDIR)$(mandir)/man1' '$(DESTDIR)$(mandir)/man5'
rmdir '$(DESTDIR)$(mandir)'
clean:

66
sysutils/modules/files/patch-doc__Makefile
View file

@ -1,66 +0,0 @@
--- 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:

11
sysutils/modules/files/patch-doc_build_modulefile.5 Normal file
View file

@ -0,0 +1,11 @@
--- doc/build/modulefile.5.orig 2023-06-27 17:25:15 UTC
+++ doc/build/modulefile.5
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-lev
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
-.TH "MODULEFILE" "4" "2023-06-27" "5.3.1" "Modules"
+.TH "MODULEFILE" "5" "2023-06-27" "5.3.1" "Modules"
.SH NAME
modulefile \- files containing Tcl code for the Modules package
.SH DESCRIPTION

13
sysutils/modules/pkg-plist
View file

@ -1,8 +1,8 @@
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%%/etc/initrc
Modules/%%MODULES_VERSION%%/etc/siteconfig.tcl
Modules/%%MODULES_VERSION%%/init/bash
Modules/%%MODULES_VERSION%%/init/bash_completion
@ -14,7 +14,6 @@ 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
@ -37,14 +36,18 @@ 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/ChangeLog.gz
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/doc/changes.txt
Modules/%%MODULES_VERSION%%/share/nagelfar/plugin_globalrc.tcl
Modules/%%MODULES_VERSION%%/share/nagelfar/plugin_modulefile.tcl
Modules/%%MODULES_VERSION%%/share/nagelfar/plugin_modulerc.tcl
Modules/%%MODULES_VERSION%%/share/nagelfar/syntaxdb_modulefile.tcl
Modules/%%MODULES_VERSION%%/share/nagelfar/syntaxdb_modulerc.tcl
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