Attachment #218397 for bug #249978




# $FreeBSD$

PORTNAME=	modules
PORTVERSION=	4.2.2
PORTREVISION=	1
CATEGORIES=	sysutils tcl
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

USES=		gmake tar:bzip2 tcl
GNU_CONFIGURE=	yes
GNU_CONFIGURE_PREFIX=${PREFIX}/Modules
CONFIGURE_ARGS=	--disable-compat-version \
		--enable-versioning
		--with-tcl-ver=${TCL_VER:S/.//} \
		--with-tcl-inc=${TCL_INCLUDEDIR} \
		--with-tcl-lib=${LOCALBASE}/lib \
		--with-tclx-ver=${TCL_VER:S/.//}

PLIST_SUB=	MODULES_VERSION=${PORTVERSION}

post-extract:
	${MV} ${WRKSRC}/doc/build/modulefile.4 ${WRKSRC}/doc/build/modulefile.5

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (modules-3.2.10.tar.gz) = fb05c82a83477805a1d97737a9f0ca0db23f69b7bce504f1609ba99477b03955	1	TIMESTAMP = 1601361178
2	SIZE (modules-3.2.10.tar.gz) = 419970	2	SHA256 (modules-4.2.2.tar.bz2) = 10bbbc1c25d8afc47dde5fca195b729a34c841d0f2ca85700d9b365c8338a8bb
		3	SIZE (modules-4.2.2.tar.bz2) = 1280349




--- Makefile.in.orig	2012-12-19 17:02:26 UTC
+++ Makefile.in
@@ -74,7 +74,7 @@ CONFIG_CLEAN_FILES = modules.lsm .spec e
 	ext/common/.profile
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(man4dir)"
+	"$(DESTDIR)$(man5dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_modulecmd_OBJECTS = modulecmd-ModuleCmd_Avail.$(OBJEXT) \
 	modulecmd-ModuleCmd_Clear.$(OBJEXT) \
@@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 man1dir = $(mandir)/man1
-man4dir = $(mandir)/man4
+man5dir = $(mandir)/man5
 NROFF = nroff
 MANS = $(man_MANS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -320,7 +320,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I config
-man_MANS = doc/module.1 doc/modulefile.4
+man_MANS = doc/module.1 doc/modulefile.5
 SUBDIRS = . init modulefiles @EXTDIR@ doc
 DIST_SUBDIRS = . init modulefiles etc ext doc
 SOURCES_H = modules_def.h getopt.h config.h
@@ -1087,10 +1087,10 @@ uninstall-man1:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man4: $(man_MANS)
+install-man5: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man4dir)" || $(MKDIR_P) "$(DESTDIR)$(man4dir)"
-	@list=''; test -n "$(man4dir)" || exit 0; \
+	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
+	@list=''; test -n "$(man5dir)" || exit 0; \
 	{ for i in $$list; do echo "$$i"; done; \
 	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.4[a-z]*$$/p'; \
@@ -1103,26 +1103,26 @@ install-man4: $(man_MANS)
 	sed 'N;N;s,\n, ,g' | { \
 	list=; while read file base inst; do \
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man4dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man4dir)/$$inst" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
 	  fi; \
 	done; \
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man4dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man4dir)" || exit $$?; }; \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
 	done; }
 
-uninstall-man4:
+uninstall-man5:
 	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man4dir)" || exit 0; \
+	@list=''; test -n "$(man5dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.4[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^4][0-9a-z]*$$,4,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man4dir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -1498,7 +1498,7 @@ check: check-recursive
 all-am: Makefile $(PROGRAMS) $(MANS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man4dir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -1570,7 +1570,7 @@ install-info: install-info-recursive
 
 install-info-am:
 
-install-man: install-man1 install-man4
+install-man: install-man1 install-man5
 
 install-pdf: install-pdf-recursive
 
@@ -1603,7 +1603,7 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-man
 
-uninstall-man: uninstall-man1 uninstall-man4
+uninstall-man: uninstall-man1 uninstall-man5
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
 	ctags-recursive install-am install-strip tags-recursive
@@ -1619,14 +1619,14 @@ uninstall-man: uninstall-man1 uninstall-
 	info-am install install-am install-binPROGRAMS install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-man4 \
+	install-info-am install-man install-man1 install-man5 \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
 	ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-man uninstall-man1 \
-	uninstall-man4
+	uninstall-man5
 
 
 test: check-local




--- cmdModule.c.orig	2016-08-09 09:37:36 UTC
+++ cmdModule.c
@@ -640,8 +640,16 @@ int	 Execute_TclFile(	Tcl_Interp	*interp
             case TCL_OK:	gotPartial = 0;
 			        continue;	/** while **/
 	    
-            case TCL_ERROR:	interp->errorLine = ((linenum-1)-gotPartial) +
-				    interp->errorLine;
+            case TCL_ERROR:	
+#if (TCL_MAJOR_VERSION > 8) \
+	|| (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 6)
+					Tcl_SetErrorLine(
+							interp,
+							((linenum-1)-gotPartial) + Tcl_GetErrorLine(interp));
+#else
+					interp->errorLine = 
+						((linenum-1)-gotPartial) + interp->errorLine;
+#endif
 	    			/* FALLTHROUGH */
 
             case TCL_LEVEL0_RETURN:




--- configure.orig	2012-12-19 17:02:25 UTC
+++ configure
@@ -1480,7 +1480,7 @@ Optional Packages:
                           specify a pattern for trace [[no]]
   --with-tcl=<dir>        directory containing tcl configuration
                           (tclConfig.sh) [[searches]]
-  --with-tcl-ver=X.Y      Tcl version to use [[search]]
+  --with-tcl-ver=XY       Tcl version to use [[search]]
   --with-tcl-lib=<dir>    directory containing tcl libraries (libtclX.Y)
                           [[none]]
   --with-tcl-inc=<dir>    directory containing tcl include files
@@ -1518,7 +1518,7 @@ PREFIX/Modules/($MODULES_VERSION/ if mod
 	init/
 	man/
 		man1/
-		man4/
+		man5/
 	modulefiles/
 PREFIX/Modules/
 	modulefiles/
@@ -7099,9 +7099,9 @@ else
 		em_cv_tclver=${with_tclver}
 	    fi #}}
 
-	    tclver=`echo $em_cv_tclver | sed -n -e '/[0-9]\.[0-9]/p'`
+	    tclver=`echo $em_cv_tclver | sed -n -e '/[0-9][0-9]/p'`
 	    if test x"$tclver" = x ; then #{
-		as_fn_error $? "Must specify version (X.Y) if using this option" "$LINENO" 5
+		as_fn_error $? "Must specify version (XY) if using this option" "$LINENO" 5
 	    fi #}
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${em_cv_tclver}" >&5
 $as_echo "${em_cv_tclver}" >&6; }
@@ -7375,9 +7375,9 @@ else
 		em_cv_tclxver=${with_tclxver}
 	    fi #}}
 
-	    tclxver=`echo $em_cv_tclxver | sed -n -e '/[0-9]\.[0-9]/p'`
+	    tclxver=`echo $em_cv_tclxver | sed -n -e '/[0-9][0-9]/p'`
 	    if test x"$tclxver" = x ; then #{
-		as_fn_error $? "Must specify version (X.Y) if using this option" "$LINENO" 5
+		as_fn_error $? "Must specify version (XY) if using this option" "$LINENO" 5
 	    fi #}
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ${em_cv_tclxver}" >&5
 $as_echo "using ${em_cv_tclxver}" >&6; }
@@ -7657,7 +7657,7 @@ else
 	EXTDIR="etc"
 
 fi
-ac_config_files="$ac_config_files Makefile modules.lsm .spec doc/Makefile init/Makefile init/.modulespath doc/module.1 doc/modulefile.4 etc/Makefile etc/add.modules etc/mkroot etc/skel/.cshrc etc/skel/.login etc/skel/.kshenv etc/skel/.profile etc/global/csh.cshrc etc/global/csh.login etc/global/csh.modules etc/global/bashrc etc/global/profile etc/global/profile.modules ext/Makefile ext/add.ext ext/mkroot ext/common/.cshrc ext/common/.login ext/common/.kshenv ext/common/.profile modulefiles/Makefile modulefiles/modules modulefiles/module-git modulefiles/module-info modulefiles/null modulefiles/use.own modulefiles/dot modulefiles/version"
+ac_config_files="$ac_config_files Makefile modules.lsm .spec doc/Makefile init/Makefile init/.modulespath doc/module.1 doc/modulefile.5 etc/Makefile etc/add.modules etc/mkroot etc/skel/.cshrc etc/skel/.login etc/skel/.kshenv etc/skel/.profile etc/global/csh.cshrc etc/global/csh.login etc/global/csh.modules etc/global/bashrc etc/global/profile etc/global/profile.modules ext/Makefile ext/add.ext ext/mkroot ext/common/.cshrc ext/common/.login ext/common/.kshenv ext/common/.profile modulefiles/Makefile modulefiles/modules modulefiles/module-git modulefiles/module-info modulefiles/null modulefiles/use.own modulefiles/dot modulefiles/version"
 ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8398,7 +8398,7 @@ do
     "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;;
     "init/.modulespath") CONFIG_FILES="$CONFIG_FILES init/.modulespath" ;;
     "doc/module.1") CONFIG_FILES="$CONFIG_FILES doc/module.1" ;;
-    "doc/modulefile.4") CONFIG_FILES="$CONFIG_FILES doc/modulefile.4" ;;
+    "doc/modulefile.5") CONFIG_FILES="$CONFIG_FILES doc/modulefile.5" ;;
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
     "etc/add.modules") CONFIG_FILES="$CONFIG_FILES etc/add.modules" ;;
     "etc/mkroot") CONFIG_FILES="$CONFIG_FILES etc/mkroot" ;;




--- doc/Makefile.orig	2019-02-17 07:21:57 UTC
+++ doc/Makefile
@@ -22,9 +22,9 @@ ifneq ($(builddoc),y)
   $(error No 'sphinx-build' command defined, cannot build documentation)
 endif
 
-man: $(BUILD_DIR)/module.1 $(BUILD_DIR)/modulefile.4
+man: $(BUILD_DIR)/module.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 \
@@ -66,7 +66,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: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py
+$(BUILD_DIR)/%.5: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py
 	$(SPHINXBUILD) $(SPHINXOPTS) -t pathsubs -b man "$(SOURCE_DIR)" "$(BUILD_DIR)"
 
 $(BUILD_DIR)/%.1.in: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py
@@ -78,11 +78,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)/
@@ -92,10 +92,10 @@ ifeq ($(docinstall),y)
 	cp example.txt $(DESTDIR)$(docdir)/
 endif
 	cp $(BUILD_DIR)/module.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:
@@ -108,12 +108,12 @@ ifeq ($(docinstall),y)
 	rmdir $(DESTDIR)$(docdir)
 endif
 	rm -f $(DESTDIR)$(mandir)/man1/module.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:




--- doc/Makefile.in.orig	2012-12-19 17:02:26 UTC
+++ doc/Makefile.in
@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = doc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/module.1.in $(srcdir)/modulefile.4.in
+	$(srcdir)/module.1.in $(srcdir)/modulefile.5.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/emtcl.m4 \
 	$(top_srcdir)/config/tcl.m4 $(top_srcdir)/acinclude.m4 \
@@ -42,7 +42,7 @@ am__configure_deps = $(am__aclocal_m4_de
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = module.1 modulefile.4
+CONFIG_CLEAN_FILES = module.1 modulefile.5
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -74,10 +74,10 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man4dir)"
-man4dir = $(mandir)/man4
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
+man5dir = $(mandir)/man5
 NROFF = nroff
-MANS = $(man1_MANS) $(man4_MANS)
+MANS = $(man1_MANS) $(man5_MANS)
 DEJATOOL = $(PACKAGE)
 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
 EXPECT = expect
@@ -199,7 +199,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 man1_MANS = module.1
-man4_MANS = modulefile.4
+man5_MANS = modulefile.5
 all: all-am
 
 .SUFFIXES:
@@ -235,11 +235,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 module.1: $(top_builddir)/config.status $(srcdir)/module.1.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-modulefile.4: $(top_builddir)/config.status $(srcdir)/modulefile.4.in
+modulefile.5: $(top_builddir)/config.status $(srcdir)/modulefile.5.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-man1: $(man1_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	test -z "$(DESTDIR)$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	{ for i in $$list; do echo "$$i"; done; \
 	} | while read p; do \
@@ -269,32 +269,32 @@ uninstall-man1:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man4: $(man4_MANS)
+install-man5: $(man5_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man4dir)" || $(MKDIR_P) "$(DESTDIR)$(man4dir)"
-	@list='$(man4_MANS)'; test -n "$(man4dir)" || exit 0; \
+	test -z "$(DESTDIR)$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
+	@list='$(man5_MANS)'; test -n "$(man5dir)" || exit 0; \
 	{ for i in $$list; do echo "$$i"; done; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
 	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^4][0-9a-z]*$$,4,;x' \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
 	sed 'N;N;s,\n, ,g' | { \
 	list=; while read file base inst; do \
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man4dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man4dir)/$$inst" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
 	  fi; \
 	done; \
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man4dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man4dir)" || exit $$?; }; \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
 	done; }
 
-uninstall-man4:
+uninstall-man5:
 	@$(NORMAL_UNINSTALL)
 	@list='$(man4_MANS)'; test -n "$(man4dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
@@ -395,7 +395,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(MANS)
 installdirs:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man4dir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -464,7 +464,7 @@ install-info: install-info-am
 
 install-info-am:
 
-install-man: install-man1 install-man4
+install-man: install-man1 install-man5
 
 install-pdf: install-pdf-am
 
@@ -504,7 +504,7 @@ uninstall-man: uninstall-man1 uninstall-
 	install-data install-data-am install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-man1 \
-	install-man4 install-pdf install-pdf-am install-ps \
+	install-man5 install-pdf install-pdf-am install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \




--- doc/module.1.in.orig	2012-11-08 22:45:02 UTC
+++ doc/module.1.in
@@ -120,7 +120,7 @@ command is defined with:
 Upon invocation \fImodulecmd\fP sources rc files which contain global, user
 and modulefile specific setups. These files are interpreted as modulefiles.
 See
-.BR modulefile (4)
+.BR modulefile (5)
 for detailed information.
 .LP
 Upon invocation of modulecmd module RC files are sourced in the following
@@ -498,4 +498,4 @@ If this defines a valid filename, it ser
 .SH VERSION
 @VERSION@
 .SH SEE ALSO
-.BR modulefile (4)
+.BR modulefile (5)




--- doc/modulefile.5.in.orig	2012-12-06 22:51:08 UTC
+++ doc/modulefile.5.in
@@ -1,6 +1,6 @@
-.\" .TH MODULEFILE 4 "1 July 1994"
+.\" .TH MODULEFILE 5 "1 July 1994"
 .\"  minor editorial edits grenker 20090711
-.TH MODULEFILE 4 "July 2009" "Modules version @VERSION@" "Modules configuration"
+.TH MODULEFILE 5 "July 2009" "Modules version @VERSION@" "Modules configuration"
 .nh
 .SH NAME
 modulefile \- files containing Tcl code for the Modules package
@@ -656,7 +656,7 @@ to your shell.
 .RE
 .RS
 .I a syslog facility




--- etc/Makefile.in.orig	2012-12-19 17:02:26 UTC
+++ etc/Makefile.in
@@ -403,8 +403,8 @@ install-data-local : $(EXTRA_scripts)
 	@list='$(EXTRA_scripts)'; for p in $$list; do \
 	  if test -f $$p \
 	  ; then \
-	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(prefix)/bin/$$p"; \
-	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(prefix)/bin/$$p; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_SCRIPT) $$p $(DESTDIR)$(prefix)/bin/$$p"; \
+	   $(INSTALL_PROGRAM_ENV) $(INSTALL_SCRIPT) $$p $(DESTDIR)$(prefix)/bin/$$p; \
 	  else :; fi; \
 	done
 




--- init/Makefile.in.orig	2012-12-19 17:02:26 UTC
+++ init/Makefile.in
@@ -437,9 +437,10 @@ uninstall-inits :
 # We need to filter the *.in files to produce the init scripts
 # since we don't know the value of '@prefix@' until Make time.
 # (We can not rely on configure to give us correct values.)
-% : %.in $(top_builddir)/config.status
-	sed -e "/@$(if $(subst 0,,$(WANTS_VERSIONING)),NOT,)VERSIONING\@/d; \
-	s,@$(if $(subst 0,,$(WANTS_VERSIONING)),,NOT)VERSIONING\@,,g; \
+.SUFFIXES: .in .NULL
+.in: $(top_builddir)/config.status
+	sed -e "/@VERSIONING\@/d; \
+	s,@NOTVERSIONING\@,,g; \
 	s,@prefix\@,${prefix},g; \
 	s,@bindir\@,${exec_prefix}/bin,g; \
 	s,@VERSION\@,@VERSION@,g; \

Lines 1-20 Link Here

(-)pkg-plist (-1 / +21 lines)
1	man/man1/module.1.gz	1	man/man1/module.1.gz
2	man/man5/modulefile.5.gz	2	man/man5/modulefile.5.gz
3	Modules/%%MODULES_VERSION%%/bin/add.modules	3	Modules/%%MODULES_VERSION%%/bin/add.modules
		4	Modules/%%MODULES_VERSION%%/bin/envml
4	Modules/%%MODULES_VERSION%%/bin/mkroot	5	Modules/%%MODULES_VERSION%%/bin/mkroot
5	Modules/%%MODULES_VERSION%%/bin/modulecmd	6	Modules/%%MODULES_VERSION%%/bin/modulecmd
6	Modules/%%MODULES_VERSION%%/init/.modulespath
7	Modules/%%MODULES_VERSION%%/init/bash	7	Modules/%%MODULES_VERSION%%/init/bash
8	Modules/%%MODULES_VERSION%%/init/bash_completion	8	Modules/%%MODULES_VERSION%%/init/bash_completion
9	Modules/%%MODULES_VERSION%%/init/cmake	9	Modules/%%MODULES_VERSION%%/init/cmake
10	Modules/%%MODULES_VERSION%%/init/csh	10	Modules/%%MODULES_VERSION%%/init/csh
		11	Modules/%%MODULES_VERSION%%/init/fish
		12	Modules/%%MODULES_VERSION%%/init/fish_completion
11	Modules/%%MODULES_VERSION%%/init/ksh	13	Modules/%%MODULES_VERSION%%/init/ksh
		14	Modules/%%MODULES_VERSION%%/init/ksh-functions/module
		15	Modules/%%MODULES_VERSION%%/init/lisp
		16	Modules/%%MODULES_VERSION%%/init/modulerc
12	Modules/%%MODULES_VERSION%%/init/perl.pm	17	Modules/%%MODULES_VERSION%%/init/perl.pm
		18	Modules/%%MODULES_VERSION%%/init/profile.csh
		19	Modules/%%MODULES_VERSION%%/init/profile.sh
13	Modules/%%MODULES_VERSION%%/init/python.py	20	Modules/%%MODULES_VERSION%%/init/python.py
		21	Modules/%%MODULES_VERSION%%/init/r.R
14	Modules/%%MODULES_VERSION%%/init/ruby.rb	22	Modules/%%MODULES_VERSION%%/init/ruby.rb
15	Modules/%%MODULES_VERSION%%/init/sh	23	Modules/%%MODULES_VERSION%%/init/sh
		24	Modules/%%MODULES_VERSION%%/init/tcl
16	Modules/%%MODULES_VERSION%%/init/tcsh	25	Modules/%%MODULES_VERSION%%/init/tcsh
		26	Modules/%%MODULES_VERSION%%/init/tcsh_completion
17	Modules/%%MODULES_VERSION%%/init/zsh	27	Modules/%%MODULES_VERSION%%/init/zsh
		28	Modules/%%MODULES_VERSION%%/init/zsh-functions/_module
		29	Modules/%%MODULES_VERSION%%/libexec/modulecmd.tcl
18	Modules/%%MODULES_VERSION%%/modulefiles/dot	30	Modules/%%MODULES_VERSION%%/modulefiles/dot
19	Modules/%%MODULES_VERSION%%/modulefiles/module-git	31	Modules/%%MODULES_VERSION%%/modulefiles/module-git
20	Modules/%%MODULES_VERSION%%/modulefiles/module-info	32	Modules/%%MODULES_VERSION%%/modulefiles/module-info
Lines 21-24 Link Here
21	Modules/%%MODULES_VERSION%%/modulefiles/modules	33	Modules/%%MODULES_VERSION%%/modulefiles/modules
22	Modules/%%MODULES_VERSION%%/modulefiles/null	34	Modules/%%MODULES_VERSION%%/modulefiles/null
23	Modules/%%MODULES_VERSION%%/modulefiles/use.own	35	Modules/%%MODULES_VERSION%%/modulefiles/use.own
		36	Modules/%%MODULES_VERSION%%/share/doc/COPYING.GPLv2
		37	Modules/%%MODULES_VERSION%%/share/doc/ChangeLog
		38	Modules/%%MODULES_VERSION%%/share/doc/INSTALL.txt
		39	Modules/%%MODULES_VERSION%%/share/doc/MIGRATING.txt
		40	Modules/%%MODULES_VERSION%%/share/doc/NEWS.txt
		41	Modules/%%MODULES_VERSION%%/share/doc/README
		42	Modules/%%MODULES_VERSION%%/share/doc/diff_v3_v4.txt
		43	Modules/%%MODULES_VERSION%%/share/doc/example.txt
24	Modules/versions/%%MODULES_VERSION%%	44	Modules/versions/%%MODULES_VERSION%%

Return to bug 249978

Lines 2-11 Link Here

(-)Makefile (-12 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= modules	4	PORTNAME= modules
5	PORTVERSION= 3.2.10	5	PORTVERSION= 4.2.2
6	PORTREVISION= 1
7	CATEGORIES= sysutils tcl	6	CATEGORIES= sysutils tcl
8	MASTER_SITES= SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}	7	MASTER_SITES= https://github.com/cea-hpc/modules/releases/download/v${PORTVERSION}/
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Dynamic modification of a user environment	10	COMMENT= Dynamic modification of a user environment
Lines 12-30 Link Here
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14		13
15	USES= tcl	14	USES= gmake tar:bzip2 tcl
16	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS= --without-x \	16	GNU_CONFIGURE_PREFIX=${PREFIX}/Modules
18	--with-version-path=${PREFIX}/Modules/versions \	17	CONFIGURE_ARGS= --disable-compat-version \
19	--mandir=${MANPREFIX}/man \	18	--enable-versioning
20	--with-tcl-ver=${TCL_VER:S/.//} \
21	--with-tcl-inc=${TCL_INCLUDEDIR} \
22	--with-tcl-lib=${LOCALBASE}/lib \
23	--with-tclx-ver=${TCL_VER:S/.//}
24		19
25	PLIST_SUB= MODULES_VERSION=${PORTVERSION}	20	PLIST_SUB= MODULES_VERSION=${PORTVERSION}
26		21
27	post-extract:	22	post-extract:
28	${MV} ${WRKSRC}/doc/modulefile.4.in ${WRKSRC}/doc/modulefile.5.in	23	${MV} ${WRKSRC}/doc/build/modulefile.4 ${WRKSRC}/doc/build/modulefile.5
29		24
30	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Lines 1-121 Link Here

(-)files/patch-Makefile.in (-121 lines)
1	--- Makefile.in.orig 2012-12-19 17:02:26 UTC
2	+++ Makefile.in
3	@@ -74,7 +74,7 @@ CONFIG_CLEAN_FILES = modules.lsm .spec e
4	ext/common/.profile
5	CONFIG_CLEAN_VPATH_FILES =
6	am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
7	- "$(DESTDIR)$(man4dir)"
8	+ "$(DESTDIR)$(man5dir)"
9	PROGRAMS = $(bin_PROGRAMS)
10	am_modulecmd_OBJECTS = modulecmd-ModuleCmd_Avail.$(OBJEXT) \
11	modulecmd-ModuleCmd_Clear.$(OBJEXT) \
12	@@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \
13	$(am__cd) "$$dir" && rm -f $$files; }; \
14	}
15	man1dir = $(mandir)/man1
16	-man4dir = $(mandir)/man4
17	+man5dir = $(mandir)/man5
18	NROFF = nroff
19	MANS = $(man_MANS)
20	RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
21	@@ -320,7 +320,7 @@ top_build_prefix = @top_build_prefix@
22	top_builddir = @top_builddir@
23	top_srcdir = @top_srcdir@
24	ACLOCAL_AMFLAGS = -I config
25	-man_MANS = doc/module.1 doc/modulefile.4
26	+man_MANS = doc/module.1 doc/modulefile.5
27	SUBDIRS = . init modulefiles @EXTDIR@ doc
28	DIST_SUBDIRS = . init modulefiles etc ext doc
29	SOURCES_H = modules_def.h getopt.h config.h
30	@@ -1087,10 +1087,10 @@ uninstall-man1:
31	} \| sed -e 's,./,,;h;s,.\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
32	-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
33	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
34	-install-man4: $(man_MANS)
35	+install-man5: $(man_MANS)
36	@$(NORMAL_INSTALL)
37	- test -z "$(man4dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man4dir)"
38	- @list=''; test -n "$(man4dir)" \|\| exit 0; \
39	+ test -z "$(man5dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man5dir)"
40	+ @list=''; test -n "$(man5dir)" \|\| exit 0; \
41	{ for i in $$list; do echo "$$i"; done; \
42	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done \| \
43	sed -n '/\.4[a-z]*$$/p'; \
44	@@ -1103,26 +1103,26 @@ install-man4: $(man_MANS)
45	sed 'N;N;s,\n, ,g' \| { \
46	list=; while read file base inst; do \
47	if test "$$base" = "$$inst"; then list="$$list $$file"; else \
48	- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man4dir)/$$inst'"; \
49	- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man4dir)/$$inst" \|\| exit $$?; \
50	+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
51	+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" \|\| exit $$?; \
52	fi; \
53	done; \
54	for i in $$list; do echo "$$i"; done \| $(am__base_list) \| \
55	while read files; do \
56	test -z "$$files" \|\| { \
57	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man4dir)'"; \
58	- $(INSTALL_DATA) $$files "$(DESTDIR)$(man4dir)" \|\| exit $$?; }; \
59	+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
60	+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" \|\| exit $$?; }; \
61	done; }
62
63	-uninstall-man4:
64	+uninstall-man5:
65	@$(NORMAL_UNINSTALL)
66	- @list=''; test -n "$(man4dir)" \|\| exit 0; \
67	+ @list=''; test -n "$(man5dir)" \|\| exit 0; \
68	files=`{ for i in $$list; do echo "$$i"; done; \
69	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done \| \
70	sed -n '/\.4[a-z]*$$/p'; \
71	} \| sed -e 's,./,,;h;s,.\.,,;s,^[^4][0-9a-z]*$$,4,;x' \
72	-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
73	- dir='$(DESTDIR)$(man4dir)'; $(am__uninstall_files_from_dir)
74	+ dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
75
76	# This directory's subdirectories are mostly independent; you can cd
77	# into them and run `make' without going through this Makefile.
78	@@ -1498,7 +1498,7 @@ check: check-recursive
79	all-am: Makefile $(PROGRAMS) $(MANS) config.h
80	installdirs: installdirs-recursive
81	installdirs-am:
82	- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man4dir)"; do \
83	+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
84	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
85	done
86	install: install-recursive
87	@@ -1570,7 +1570,7 @@ install-info: install-info-recursive
88
89	install-info-am:
90
91	-install-man: install-man1 install-man4
92	+install-man: install-man1 install-man5
93
94	install-pdf: install-pdf-recursive
95
96	@@ -1603,7 +1603,7 @@ ps-am:
97
98	uninstall-am: uninstall-binPROGRAMS uninstall-man
99
100	-uninstall-man: uninstall-man1 uninstall-man4
101	+uninstall-man: uninstall-man1 uninstall-man5
102
103	.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
104	ctags-recursive install-am install-strip tags-recursive
105	@@ -1619,14 +1619,14 @@ uninstall-man: uninstall-man1 uninstall-
106	info-am install install-am install-binPROGRAMS install-data \
107	install-data-am install-dvi install-dvi-am install-exec \
108	install-exec-am install-html install-html-am install-info \
109	- install-info-am install-man install-man1 install-man4 \
110	+ install-info-am install-man install-man1 install-man5 \
111	install-pdf install-pdf-am install-ps install-ps-am \
112	install-strip installcheck installcheck-am installdirs \
113	installdirs-am maintainer-clean maintainer-clean-generic \
114	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
115	ps ps-am tags tags-recursive uninstall uninstall-am \
116	uninstall-binPROGRAMS uninstall-man uninstall-man1 \
117	- uninstall-man4
118	+ uninstall-man5
119
120
121	test: check-local

Lines 1-21 Link Here

(-)files/patch-cmdModule.c (-21 lines)
1	--- cmdModule.c.orig 2016-08-09 09:37:36 UTC
2	+++ cmdModule.c
3	@@ -640,8 +640,16 @@ int Execute_TclFile( Tcl_Interp *interp
4	case TCL_OK: gotPartial = 0;
5	continue; / while /
6
7	- case TCL_ERROR: interp->errorLine = ((linenum-1)-gotPartial) +
8	- interp->errorLine;
9	+ case TCL_ERROR:
10	+#if (TCL_MAJOR_VERSION > 8) \
11	+ \|\| (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 6)
12	+ Tcl_SetErrorLine(
13	+ interp,
14	+ ((linenum-1)-gotPartial) + Tcl_GetErrorLine(interp));
15	+#else
16	+ interp->errorLine =
17	+ ((linenum-1)-gotPartial) + interp->errorLine;
18	+#endif
19	/* FALLTHROUGH */
20
21	case TCL_LEVEL0_RETURN:

Lines 1-62 Link Here

(-)files/patch-configure (-62 lines)
1	--- configure.orig 2012-12-19 17:02:25 UTC
2	+++ configure
3	@@ -1480,7 +1480,7 @@ Optional Packages:
4	specify a pattern for trace [[no]]
5	--with-tcl=<dir> directory containing tcl configuration
6	(tclConfig.sh) [[searches]]
7	- --with-tcl-ver=X.Y Tcl version to use [[search]]
8	+ --with-tcl-ver=XY Tcl version to use [[search]]
9	--with-tcl-lib=<dir> directory containing tcl libraries (libtclX.Y)
10	[[none]]
11	--with-tcl-inc=<dir> directory containing tcl include files
12	@@ -1518,7 +1518,7 @@ PREFIX/Modules/($MODULES_VERSION/ if mod
13	init/
14	man/
15	man1/
16	- man4/
17	+ man5/
18	modulefiles/
19	PREFIX/Modules/
20	modulefiles/
21	@@ -7099,9 +7099,9 @@ else
22	em_cv_tclver=${with_tclver}
23	fi #}}
24
25	- tclver=`echo $em_cv_tclver \| sed -n -e '/[0-9]\.[0-9]/p'`
26	+ tclver=`echo $em_cv_tclver \| sed -n -e '/[0-9][0-9]/p'`
27	if test x"$tclver" = x ; then #{
28	- as_fn_error $? "Must specify version (X.Y) if using this option" "$LINENO" 5
29	+ as_fn_error $? "Must specify version (XY) if using this option" "$LINENO" 5
30	fi #}
31	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${em_cv_tclver}" >&5
32	$as_echo "${em_cv_tclver}" >&6; }
33	@@ -7375,9 +7375,9 @@ else
34	em_cv_tclxver=${with_tclxver}
35	fi #}}
36
37	- tclxver=`echo $em_cv_tclxver \| sed -n -e '/[0-9]\.[0-9]/p'`
38	+ tclxver=`echo $em_cv_tclxver \| sed -n -e '/[0-9][0-9]/p'`
39	if test x"$tclxver" = x ; then #{
40	- as_fn_error $? "Must specify version (X.Y) if using this option" "$LINENO" 5
41	+ as_fn_error $? "Must specify version (XY) if using this option" "$LINENO" 5
42	fi #}
43	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using ${em_cv_tclxver}" >&5
44	$as_echo "using ${em_cv_tclxver}" >&6; }
45	@@ -7657,7 +7657,7 @@ else
46	EXTDIR="etc"
47
48	fi
49	-ac_config_files="$ac_config_files Makefile modules.lsm .spec doc/Makefile init/Makefile init/.modulespath doc/module.1 doc/modulefile.4 etc/Makefile etc/add.modules etc/mkroot etc/skel/.cshrc etc/skel/.login etc/skel/.kshenv etc/skel/.profile etc/global/csh.cshrc etc/global/csh.login etc/global/csh.modules etc/global/bashrc etc/global/profile etc/global/profile.modules ext/Makefile ext/add.ext ext/mkroot ext/common/.cshrc ext/common/.login ext/common/.kshenv ext/common/.profile modulefiles/Makefile modulefiles/modules modulefiles/module-git modulefiles/module-info modulefiles/null modulefiles/use.own modulefiles/dot modulefiles/version"
50	+ac_config_files="$ac_config_files Makefile modules.lsm .spec doc/Makefile init/Makefile init/.modulespath doc/module.1 doc/modulefile.5 etc/Makefile etc/add.modules etc/mkroot etc/skel/.cshrc etc/skel/.login etc/skel/.kshenv etc/skel/.profile etc/global/csh.cshrc etc/global/csh.login etc/global/csh.modules etc/global/bashrc etc/global/profile etc/global/profile.modules ext/Makefile ext/add.ext ext/mkroot ext/common/.cshrc ext/common/.login ext/common/.kshenv ext/common/.profile modulefiles/Makefile modulefiles/modules modulefiles/module-git modulefiles/module-info modulefiles/null modulefiles/use.own modulefiles/dot modulefiles/version"
51	ac_config_commands="$ac_config_commands default"
52	cat >confcache <<\_ACEOF
53	# This file is a shell script that caches the results of configure
54	@@ -8398,7 +8398,7 @@ do
55	"init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;;
56	"init/.modulespath") CONFIG_FILES="$CONFIG_FILES init/.modulespath" ;;
57	"doc/module.1") CONFIG_FILES="$CONFIG_FILES doc/module.1" ;;
58	- "doc/modulefile.4") CONFIG_FILES="$CONFIG_FILES doc/modulefile.4" ;;
59	+ "doc/modulefile.5") CONFIG_FILES="$CONFIG_FILES doc/modulefile.5" ;;
60	"etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
61	"etc/add.modules") CONFIG_FILES="$CONFIG_FILES etc/add.modules" ;;
62	"etc/mkroot") CONFIG_FILES="$CONFIG_FILES etc/mkroot" ;;

Line 0 Link Here

(-)files/patch-doc__Makefile (+66 lines)
		1	--- doc/Makefile.orig 2019-02-17 07:21:57 UTC
		2	+++ doc/Makefile
		3	@@ -22,9 +22,9 @@ ifneq ($(builddoc),y)
		4	$(error No 'sphinx-build' command defined, cannot build documentation)
		5	endif
		6
		7	-man: $(BUILD_DIR)/module.1 $(BUILD_DIR)/modulefile.4
		8	+man: $(BUILD_DIR)/module.1 $(BUILD_DIR)/modulefile.5
		9	ifeq ($(compatversion),y)
		10	-man: $(COMPAT_MAN_DIR)/module.1 $(COMPAT_MAN_DIR)/modulefile.4
		11	+man: $(COMPAT_MAN_DIR)/module.1 $(COMPAT_MAN_DIR)/modulefile.5
		12	endif
		13
		14	txt: $(BUILD_DIR)/diff_v3_v4.txt $(BUILD_DIR)/MIGRATING.txt \
		15	@@ -66,7 +66,7 @@ $(BUILD_DIR)/%.html: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)
		16	$(BUILD_DIR)/%.txt: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py
		17	$(SPHINXBUILD) $(SPHINXOPTS) -b text "$(SOURCE_DIR)" "$(BUILD_DIR)"
		18
		19	-$(BUILD_DIR)/%.4: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py
		20	+$(BUILD_DIR)/%.5: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py
		21	$(SPHINXBUILD) $(SPHINXOPTS) -t pathsubs -b man "$(SOURCE_DIR)" "$(BUILD_DIR)"
		22
		23	$(BUILD_DIR)/%.1.in: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py
		24	@@ -78,11 +78,11 @@ $(BUILD_DIR)/module.1: $(BUILD_DIR)/module.1.in
		25	$(translate-in-script)
		26
		27	# compatibility version-related rules
		28	-$(COMPAT_MAN_DIR)/module.1 $(COMPAT_MAN_DIR)/modulefile.4:
		29	+$(COMPAT_MAN_DIR)/module.1 $(COMPAT_MAN_DIR)/modulefile.5:
		30	$(MAKE) -C $(COMPAT_MAN_DIR) $(@F)
		31
		32	install: man txt
		33	- mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man4
		34	+ mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
		35	ifeq ($(docinstall),y)
		36	mkdir -p $(DESTDIR)$(docdir)
		37	cp $(BUILD_DIR)/diff_v3_v4.txt $(DESTDIR)$(docdir)/
		38	@@ -92,10 +92,10 @@ ifeq ($(docinstall),y)
		39	cp example.txt $(DESTDIR)$(docdir)/
		40	endif
		41	cp $(BUILD_DIR)/module.1 $(DESTDIR)$(mandir)/man1/
		42	- cp $(BUILD_DIR)/modulefile.4 $(DESTDIR)$(mandir)/man4/
		43	+ cp $(BUILD_DIR)/modulefile.5 $(DESTDIR)$(mandir)/man5/
		44	ifeq ($(compatversion),y)
		45	cp $(COMPAT_MAN_DIR)/module.1 $(DESTDIR)$(mandir)/man1/module-compat.1
		46	- cp $(COMPAT_MAN_DIR)/modulefile.4 $(DESTDIR)$(mandir)/man4/modulefile-compat.4
		47	+ cp $(COMPAT_MAN_DIR)/modulefile.5 $(DESTDIR)$(mandir)/man5/modulefile-compat.5
		48	endif
		49
		50	uninstall:
		51	@@ -108,12 +108,12 @@ ifeq ($(docinstall),y)
		52	rmdir $(DESTDIR)$(docdir)
		53	endif
		54	rm -f $(DESTDIR)$(mandir)/man1/module.1
		55	- rm -f $(DESTDIR)$(mandir)/man4/modulefile.4
		56	+ rm -f $(DESTDIR)$(mandir)/man5/modulefile.5
		57	ifeq ($(compatversion),y)
		58	rm -f $(DESTDIR)$(mandir)/man1/module-compat.1
		59	- rm -f $(DESTDIR)$(mandir)/man4/modulefile-compat.4
		60	+ rm -f $(DESTDIR)$(mandir)/man5/modulefile-compat.5
		61	endif
		62	- rmdir $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man4
		63	+ rmdir $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
		64	rmdir $(DESTDIR)$(mandir)
65
66	clean:

Lines 1-126 Link Here

(-)files/patch-doc__Makefile.in (-126 lines)
1	--- doc/Makefile.in.orig 2012-12-19 17:02:26 UTC
2	+++ doc/Makefile.in
3	@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
4	POST_UNINSTALL = :
5	subdir = doc
6	DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
7	- $(srcdir)/module.1.in $(srcdir)/modulefile.4.in
8	+ $(srcdir)/module.1.in $(srcdir)/modulefile.5.in
9	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
10	am__aclocal_m4_deps = $(top_srcdir)/config/emtcl.m4 \
11	$(top_srcdir)/config/tcl.m4 $(top_srcdir)/acinclude.m4 \
12	@@ -42,7 +42,7 @@ am__configure_deps = $(am__aclocal_m4_de
13	$(ACLOCAL_M4)
14	mkinstalldirs = $(install_sh) -d
15	CONFIG_HEADER = $(top_builddir)/config.h
16	-CONFIG_CLEAN_FILES = module.1 modulefile.4
17	+CONFIG_CLEAN_FILES = module.1 modulefile.5
18	CONFIG_CLEAN_VPATH_FILES =
19	SOURCES =
20	DIST_SOURCES =
21	@@ -74,10 +74,10 @@ am__uninstall_files_from_dir = { \
22	$(am__cd) "$$dir" && rm -f $$files; }; \
23	}
24	man1dir = $(mandir)/man1
25	-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man4dir)"
26	-man4dir = $(mandir)/man4
27	+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
28	+man5dir = $(mandir)/man5
29	NROFF = nroff
30	-MANS = $(man1_MANS) $(man4_MANS)
31	+MANS = $(man1_MANS) $(man5_MANS)
32	DEJATOOL = $(PACKAGE)
33	RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
34	EXPECT = expect
35	@@ -199,7 +199,7 @@ top_build_prefix = @top_build_prefix@
36	top_builddir = @top_builddir@
37	top_srcdir = @top_srcdir@
38	man1_MANS = module.1
39	-man4_MANS = modulefile.4
40	+man5_MANS = modulefile.5
41	all: all-am
42
43	.SUFFIXES:
44	@@ -235,11 +235,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
45	$(am__aclocal_m4_deps):
46	module.1: $(top_builddir)/config.status $(srcdir)/module.1.in
47	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
48	-modulefile.4: $(top_builddir)/config.status $(srcdir)/modulefile.4.in
49	+modulefile.5: $(top_builddir)/config.status $(srcdir)/modulefile.5.in
50	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
51	install-man1: $(man1_MANS)
52	@$(NORMAL_INSTALL)
53	- test -z "$(man1dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man1dir)"
54	+ test -z "$(DESTDIR)$(man1dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man1dir)"
55	@list='$(man1_MANS)'; test -n "$(man1dir)" \|\| exit 0; \
56	{ for i in $$list; do echo "$$i"; done; \
57	} \| while read p; do \
58	@@ -269,32 +269,32 @@ uninstall-man1:
59	} \| sed -e 's,./,,;h;s,.\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
60	-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
61	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
62	-install-man4: $(man4_MANS)
63	+install-man5: $(man5_MANS)
64	@$(NORMAL_INSTALL)
65	- test -z "$(man4dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man4dir)"
66	- @list='$(man4_MANS)'; test -n "$(man4dir)" \|\| exit 0; \
67	+ test -z "$(DESTDIR)$(man5dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man5dir)"
68	+ @list='$(man5_MANS)'; test -n "$(man5dir)" \|\| exit 0; \
69	{ for i in $$list; do echo "$$i"; done; \
70	} \| while read p; do \
71	if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
72	echo "$$d$$p"; echo "$$p"; \
73	done \| \
74	- sed -e 'n;s,./,,;p;h;s,.\.,,;s,^[^4][0-9a-z]*$$,4,;x' \
75	+ sed -e 'n;s,./,,;p;h;s,.\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
76	-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' \| \
77	sed 'N;N;s,\n, ,g' \| { \
78	list=; while read file base inst; do \
79	if test "$$base" = "$$inst"; then list="$$list $$file"; else \
80	- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man4dir)/$$inst'"; \
81	- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man4dir)/$$inst" \|\| exit $$?; \
82	+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
83	+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" \|\| exit $$?; \
84	fi; \
85	done; \
86	for i in $$list; do echo "$$i"; done \| $(am__base_list) \| \
87	while read files; do \
88	test -z "$$files" \|\| { \
89	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man4dir)'"; \
90	- $(INSTALL_DATA) $$files "$(DESTDIR)$(man4dir)" \|\| exit $$?; }; \
91	+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
92	+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" \|\| exit $$?; }; \
93	done; }
94
95	-uninstall-man4:
96	+uninstall-man5:
97	@$(NORMAL_UNINSTALL)
98	@list='$(man4_MANS)'; test -n "$(man4dir)" \|\| exit 0; \
99	files=`{ for i in $$list; do echo "$$i"; done; \
100	@@ -395,7 +395,7 @@ check-am: all-am
101	check: check-am
102	all-am: Makefile $(MANS)
103	installdirs:
104	- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man4dir)"; do \
105	+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
106	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
107	done
108	install: install-am
109	@@ -464,7 +464,7 @@ install-info: install-info-am
110
111	install-info-am:
112
113	-install-man: install-man1 install-man4
114	+install-man: install-man1 install-man5
115
116	install-pdf: install-pdf-am
117
118	@@ -504,7 +504,7 @@ uninstall-man: uninstall-man1 uninstall-
119	install-data install-data-am install-dvi install-dvi-am \
120	install-exec install-exec-am install-html install-html-am \
121	install-info install-info-am install-man install-man1 \
122	- install-man4 install-pdf install-pdf-am install-ps \
123	+ install-man5 install-pdf install-pdf-am install-ps \
124	install-ps-am install-strip installcheck installcheck-am \
125	installdirs maintainer-clean maintainer-clean-generic \
126	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \

Lines 1-17 Link Here

(-)files/patch-doc__module.1.in (-17 lines)
1	--- doc/module.1.in.orig 2012-11-08 22:45:02 UTC
2	+++ doc/module.1.in
3	@@ -120,7 +120,7 @@ command is defined with:
4	Upon invocation \fImodulecmd\fP sources rc files which contain global, user
5	and modulefile specific setups. These files are interpreted as modulefiles.
6	See
7	-.BR modulefile (4)
8	+.BR modulefile (5)
9	for detailed information.
10	.LP
11	Upon invocation of modulecmd module RC files are sourced in the following
12	@@ -498,4 +498,4 @@ If this defines a valid filename, it ser
13	.SH VERSION
14	@VERSION@
15	.SH SEE ALSO
16	-.BR modulefile (4)
17	+.BR modulefile (5)

Lines 1-20 Link Here

(-)files/patch-doc__modulefile.5.in (-15 lines)
1	--- doc/modulefile.5.in.orig 2012-12-06 22:51:08 UTC
2	+++ doc/modulefile.5.in
3	@@ -1,6 +1,6 @@
4	-.\" .TH MODULEFILE 4 "1 July 1994"
5	+.\" .TH MODULEFILE 5 "1 July 1994"
6	.\" minor editorial edits grenker 20090711
7	-.TH MODULEFILE 4 "July 2009" "Modules version @VERSION@" "Modules configuration"
8	+.TH MODULEFILE 5 "July 2009" "Modules version @VERSION@" "Modules configuration"
9	.nh
10	.SH NAME
11	modulefile \- files containing Tcl code for the Modules package
12	@@ -656,7 +656,7 @@ to your shell.
13	.RE
14	.RS
15	.I a syslog facility

Lines 1-13 Link Here

(-)files/patch-etc__Makefile.in (-13 lines)
1	--- etc/Makefile.in.orig 2012-12-19 17:02:26 UTC
2	+++ etc/Makefile.in
3	@@ -403,8 +403,8 @@ install-data-local : $(EXTRA_scripts)
4	@list='$(EXTRA_scripts)'; for p in $$list; do \
5	if test -f $$p \
6	; then \
7	- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(prefix)/bin/$$p"; \
8	- $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(prefix)/bin/$$p; \
9	+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_SCRIPT) $$p $(DESTDIR)$(prefix)/bin/$$p"; \
10	+ $(INSTALL_PROGRAM_ENV) $(INSTALL_SCRIPT) $$p $(DESTDIR)$(prefix)/bin/$$p; \
11	else :; fi; \
12	done
13

Lines 1-16 Link Here

(-)files/patch-init__Makefile.in (-16 lines)
1	--- init/Makefile.in.orig 2012-12-19 17:02:26 UTC
2	+++ init/Makefile.in
3	@@ -437,9 +437,10 @@ uninstall-inits :
4	# We need to filter the *.in files to produce the init scripts
5	# since we don't know the value of '@prefix@' until Make time.
6	# (We can not rely on configure to give us correct values.)
7	-% : %.in $(top_builddir)/config.status
8	- sed -e "/@$(if $(subst 0,,$(WANTS_VERSIONING)),NOT,)VERSIONING\@/d; \
9	- s,@$(if $(subst 0,,$(WANTS_VERSIONING)),,NOT)VERSIONING\@,,g; \
10	+.SUFFIXES: .in .NULL
11	+.in: $(top_builddir)/config.status
12	+ sed -e "/@VERSIONING\@/d; \
13	+ s,@NOTVERSIONING\@,,g; \
14	s,@prefix\@,${prefix},g; \
15	s,@bindir\@,${exec_prefix}/bin,g; \
16	s,@VERSION\@,@VERSION@,g; \