Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Sep 2014 09:46:59 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367502 - in head/sysutils/modules: . files
Message-ID:  <201409070946.s879kx3l078932@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sun Sep  7 09:46:58 2014
New Revision: 367502
URL: http://svnweb.freebsd.org/changeset/ports/367502
QAT: https://qat.redports.org/buildarchive/r367502/

Log:
  sysutils/modules: Upgrade version 3.1.6 => 3.2.10 and support stage
  
  PR:		193308
  Submitted by:	Matthieu Volat
  Stage fixes:	marino

Added:
  head/sysutils/modules/files/patch-Makefile.in   (contents, props changed)
  head/sysutils/modules/files/patch-etc__Makefile.in   (contents, props changed)
  head/sysutils/modules/files/patch-init__Makefile.in   (contents, props changed)
Modified:
  head/sysutils/modules/Makefile
  head/sysutils/modules/distinfo
  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/pkg-plist

Modified: head/sysutils/modules/Makefile
==============================================================================
--- head/sysutils/modules/Makefile	Sun Sep  7 09:29:03 2014	(r367501)
+++ head/sysutils/modules/Makefile	Sun Sep  7 09:46:58 2014	(r367502)
@@ -2,39 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	modules
-PORTVERSION=	3.1.6
+PORTVERSION=	3.2.10
 CATEGORIES=	sysutils tcl
 MASTER_SITES=	SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Dynamic modification of a user's environment
+COMMENT=	Dynamic modification of a user environment
 
-LIB_DEPENDS=	libtcl${TCL_VER}.so:${PORTSDIR}/lang/tcl${TCL_VER}
+LICENSE=	GPLv2
 
-PLIST_SUB=	MODULES_VERSION=${PORTVERSION}
-
-BINDIR=		${PREFIX}/Modules
+LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84
 
 TCL_DVER?=	8.4
 TCL_VER=	${TCL_DVER:S/.//}
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--prefix=${PREFIX}/Modules/@VERSION@ \
+CONFIGURE_ARGS=	--prefix=${LOCALBASE} \
 		--without-x \
-		--with-version-path=${PREFIX}/Modules/versions \
+		--with-version-path=${LOCALBASE}/Modules/versions \
 		--mandir=${MANPREFIX}/man \
-		--with-tcl-version=${TCL_VER} \
-		--with-tcl-include=${LOCALBASE}/include/tcl${TCL_DVER} \
-		--with-tcl-libraries=${LOCALBASE}/lib/
+		--with-tcl-ver=${TCL_VER} \
+		--with-tcl-inc=${LOCALBASE}/include/tcl${TCL_DVER} \
+		--with-tcl-lib=${LOCALBASE}/lib \
+		--with-tclx-ver=${TCL_VER}
 
-MAN1=		module.1
-MAN5=		modulefile.5
+PLIST_SUB=	MODULES_VERSION=${PORTVERSION}
 
-NO_STAGE=	yes
 post-extract:
-		${MV} ${WRKSRC}/doc/modulefile.4.in ${WRKSRC}/doc/modulefile.5.in
-
-pre-install:
-		${MKDIR} ${PREFIX}/Modules
+	${MV} ${WRKSRC}/doc/modulefile.4.in ${WRKSRC}/doc/modulefile.5.in
 
 .include <bsd.port.mk>

Modified: head/sysutils/modules/distinfo
==============================================================================
--- head/sysutils/modules/distinfo	Sun Sep  7 09:29:03 2014	(r367501)
+++ head/sysutils/modules/distinfo	Sun Sep  7 09:46:58 2014	(r367502)
@@ -1,2 +1,2 @@
-SHA256 (modules-3.1.6.tar.gz) = a65dd5c66a42558ba77f7b6343ecaeebc00c8501408313a1c1cf7fcca2a61bcb
-SIZE (modules-3.1.6.tar.gz) = 420885
+SHA256 (modules-3.2.10.tar.gz) = fb05c82a83477805a1d97737a9f0ca0db23f69b7bce504f1609ba99477b03955
+SIZE (modules-3.2.10.tar.gz) = 419970

Added: head/sysutils/modules/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/modules/files/patch-Makefile.in	Sun Sep  7 09:46:58 2014	(r367502)
@@ -0,0 +1,121 @@
+--- Makefile.in.orig	2012-12-19 18:02:26.000000000 +0100
++++ Makefile.in	2014-09-04 12:15:49.912860562 +0200
+@@ -74,7 +74,7 @@
+ 	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__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_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 @@
+ 	} | 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 @@
+ 	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 @@
+ 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-am:
+ 
+-install-man: install-man1 install-man4
++install-man: install-man1 install-man5
+ 
+ install-pdf: install-pdf-recursive
+ 
+@@ -1603,7 +1603,7 @@
+ 
+ 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 @@
+ 	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

Modified: head/sysutils/modules/files/patch-configure
==============================================================================
--- head/sysutils/modules/files/patch-configure	Sun Sep  7 09:29:03 2014	(r367501)
+++ head/sysutils/modules/files/patch-configure	Sun Sep  7 09:46:58 2014	(r367502)
@@ -1,126 +1,62 @@
---- configure.orig	Mon Nov  5 22:50:41 2001
-+++ configure	Sun Nov 14 16:18:02 2004
-@@ -4105,7 +4105,7 @@
- trap 'rm -fr `echo "Makefile modules.lsm .spec doc/Makefile init/Makefile
- 	init/bash init/csh init/ksh init/perl init/python init/sh init/tcsh
- 	init/zsh init/.modulespath
--	doc/module.1 doc/modulefile.4
-+	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 
-@@ -4234,7 +4234,7 @@
- CONFIG_FILES=\${CONFIG_FILES-"Makefile modules.lsm .spec doc/Makefile init/Makefile
- 	init/bash init/csh init/ksh init/perl init/python init/sh init/tcsh
- 	init/zsh init/.modulespath
--	doc/module.1 doc/modulefile.4
-+	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 
-diff -urN sysutils/modules.orig/files/patch-configure sysutils/modules/files/patch-configure
---- sysutils/modules.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
-+++ sysutils/modules/files/patch-configure	Sun Nov 14 16:18:24 2004
-@@ -0,0 +1,20 @@
-+--- configure.orig	Mon Nov  5 22:50:41 2001
-++++ configure	Sun Nov 14 16:18:02 2004
-+@@ -4105,7 +4105,7 @@
-+ trap 'rm -fr `echo "Makefile modules.lsm .spec doc/Makefile init/Makefile
-+ 	init/bash init/csh init/ksh init/perl init/python init/sh init/tcsh
-+ 	init/zsh init/.modulespath
-+-	doc/module.1 doc/modulefile.4
-++	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 
-+@@ -4234,7 +4234,7 @@
-+ CONFIG_FILES=\${CONFIG_FILES-"Makefile modules.lsm .spec doc/Makefile init/Makefile
-+ 	init/bash init/csh init/ksh init/perl init/python init/sh init/tcsh
-+ 	init/zsh init/.modulespath
-+-	doc/module.1 doc/modulefile.4
-++	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 
-diff -urN sysutils/modules.orig/files/patch-doc::Makefile.in sysutils/modules/files/patch-doc::Makefile.in
---- sysutils/modules.orig/files/patch-doc::Makefile.in	Thu Jan  1 01:00:00 1970
-+++ sysutils/modules/files/patch-doc::Makefile.in	Sun Nov 14 16:05:08 2004
-@@ -0,0 +1,36 @@
-+--- ./doc/Makefile.in.orig	Wed Jun 28 02:17:33 2000
-++++ ./doc/Makefile.in	Sun Nov 14 16:04:44 2004
-+@@ -26,21 +26,21 @@
-+ # Directory in which to install man pages
-+ mandir = @mandir@
-+ man1dir = $(mandir)/man1
-+-man4dir = $(mandir)/man4
-++man5dir = $(mandir)/man5
-+ 
-+ SHELL = /bin/sh
-+ 
-+ #### End of system configuration section. ####
-+ 
-+-MAN_FILES= module.1 modulefile.4
-++MAN_FILES= module.1 modulefile.5
-+ 
-+-MAKEDIRS=  $(man1dir) $(man4dir)
-++MAKEDIRS=  $(man1dir) $(man5dir)
-+ 
-+ all:
-+ 
-+ install: all install-dirs
-+ 	$(INSTALL_DATA) module.1     $(man1dir)
-+-	$(INSTALL_DATA) modulefile.4 $(man4dir)
-++	$(INSTALL_DATA) modulefile.5 $(man5dir)
-+ 
-+ install-dirs:
-+ 	@for i in $(MAKEDIRS) ; do \
-+@@ -63,6 +63,6 @@
-+ mostlyclean: clean
-+ 
-+ distclean:	clean
-+-	rm -f module.1 modulefile.4
-++	rm -f module.1 modulefile.5
-+ 
-+ realclean:	distclean
-diff -urN sysutils/modules.orig/files/patch-doc::module.1.in sysutils/modules/files/patch-doc::module.1.in
---- sysutils/modules.orig/files/patch-doc::module.1.in	Thu Jan  1 01:00:00 1970
-+++ sysutils/modules/files/patch-doc::module.1.in	Sun Nov 14 17:18:21 2004
-@@ -0,0 +1,17 @@
-+--- doc/module.1.in.orig	Sat Jun  9 11:48:47 2001
-++++ doc/module.1.in	Sun Nov 14 17:17:58 2004
-+@@ -114,7 +114,7 @@
-+ .LP
-+ Upon invocation \fImodulecmd\fP sources rc files which contain global, user
-+ and modulefile specific setups. These files are interpreted as modulefiles.
-+-See \fBmodulefile(4)\fP for detailed information.
-++See \fBmodulefile(5)\fP for detailed information.
-+ .LP
-+ Upon invocation of modulecmd module RC files are sourced in the following
-+ order:
-+@@ -466,4 +466,4 @@
-+ .B module update
-+ sub-command.
-+ .SH SEE ALSO
-+-.BR modulefile(4)
-++.BR modulefile(5)
-diff -urN sysutils/modules.orig/files/patch-doc::modulefile.5.in sysutils/modules/files/patch-doc::modulefile.5.in
---- sysutils/modules.orig/files/patch-doc::modulefile.5.in	Thu Jan  1 01:00:00 1970
-+++ sysutils/modules/files/patch-doc::modulefile.5.in	Sun Nov 14 16:24:03 2004
-@@ -0,0 +1,17 @@
-+--- doc/modulefile.5.in.orig	Fri Jan  4 05:59:16 2002
-++++ doc/modulefile.5.in	Sun Nov 14 16:19:28 2004
-+@@ -1,4 +1,4 @@
-+-.TH MODULEFILE 4 "1 July 1994"
-++.TH MODULEFILE 5 "1 July 1994"
-+ .nh
-+ .SH NAME
-+ modulefile \- files containing Tcl code for The Modules package
-+@@ -538,7 +538,7 @@
-+ .RE
-+ .RS
-+ .I a syslog facility
-+-- directs logging to the syslog. See \fBsyslog.conf(4)\fP for detailed
-++- directs logging to the syslog. See \fBsyslog.conf(5)\fP for detailed
-+ description of the valid syslog facilities.
-+ .RE
-+ .RS
+--- configure.orig	2012-12-19 18:02:25.000000000 +0100
++++ configure	2014-09-04 12:13:33.328870000 +0200
+@@ -1480,7 +1480,7 @@
+                           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 @@
+ 	init/
+ 	man/
+ 		man1/
+-		man4/
++		man5/
+ 	modulefiles/
+ PREFIX/Modules/
+ 	modulefiles/
+@@ -7099,9 +7099,9 @@
+ 		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 @@
+ 		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 @@
+ 	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 @@
+     "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" ;;

Modified: head/sysutils/modules/files/patch-doc__Makefile.in
==============================================================================
--- head/sysutils/modules/files/patch-doc__Makefile.in	Sun Sep  7 09:29:03 2014	(r367501)
+++ head/sysutils/modules/files/patch-doc__Makefile.in	Sun Sep  7 09:46:58 2014	(r367502)
@@ -1,36 +1,126 @@
---- ./doc/Makefile.in.orig	Wed Jun 28 02:17:33 2000
-+++ ./doc/Makefile.in	Sun Nov 14 16:04:44 2004
-@@ -26,21 +26,21 @@
- # Directory in which to install man pages
- mandir = @mandir@
+--- 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
- 
- SHELL = /bin/sh
- 
- #### End of system configuration section. ####
- 
--MAN_FILES= module.1 modulefile.4
-+MAN_FILES= module.1 modulefile.5
- 
--MAKEDIRS=  $(man1dir) $(man4dir)
-+MAKEDIRS=  $(man1dir) $(man5dir)
- 
- all:
- 
- install: all install-dirs
- 	$(INSTALL_DATA) module.1     $(man1dir)
--	$(INSTALL_DATA) modulefile.4 $(man4dir)
-+	$(INSTALL_DATA) modulefile.5 $(man5dir)
- 
- install-dirs:
- 	@for i in $(MAKEDIRS) ; do \
-@@ -63,6 +63,6 @@
- mostlyclean: clean
- 
- distclean:	clean
--	rm -f module.1 modulefile.4
-+	rm -f module.1 modulefile.5
- 
- realclean:	distclean
+ 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 \

Modified: head/sysutils/modules/files/patch-doc__module.1.in
==============================================================================
--- head/sysutils/modules/files/patch-doc__module.1.in	Sun Sep  7 09:29:03 2014	(r367501)
+++ head/sysutils/modules/files/patch-doc__module.1.in	Sun Sep  7 09:46:58 2014	(r367502)
@@ -1,17 +1,17 @@
---- doc/module.1.in.orig	Sat Jun  9 11:48:47 2001
-+++ doc/module.1.in	Sun Nov 14 17:17:58 2004
-@@ -114,7 +114,7 @@
- .LP
+--- doc/module.1.in.orig	2014-09-04 09:36:20 UTC
++++ doc/module.1.in
+@@ -120,7 +120,7 @@
  Upon invocation \fImodulecmd\fP sources rc files which contain global, user
  and modulefile specific setups. These files are interpreted as modulefiles.
--See \fBmodulefile(4)\fP for detailed information.
-+See \fBmodulefile(5)\fP for detailed information.
+ See
+-.BR modulefile (4)
++.BR modulefile (5)
+ for detailed information.
  .LP
  Upon invocation of modulecmd module RC files are sourced in the following
- order:
-@@ -466,4 +466,4 @@
- .B module update
- sub-command.
+@@ -498,4 +498,4 @@
+ .SH VERSION
+ @VERSION@
  .SH SEE ALSO
--.BR modulefile(4)
-+.BR modulefile(5)
+-.BR modulefile (4)
++.BR modulefile (5)

Modified: head/sysutils/modules/files/patch-doc__modulefile.5.in
==============================================================================
--- head/sysutils/modules/files/patch-doc__modulefile.5.in	Sun Sep  7 09:29:03 2014	(r367501)
+++ head/sysutils/modules/files/patch-doc__modulefile.5.in	Sun Sep  7 09:46:58 2014	(r367502)
@@ -1,12 +1,15 @@
---- doc/modulefile.5.in.orig	Fri Jan  4 05:59:16 2002
-+++ doc/modulefile.5.in	Sun Nov 14 16:19:28 2004
-@@ -1,4 +1,4 @@
--.TH MODULEFILE 4 "1 July 1994"
-+.TH MODULEFILE 5 "1 July 1994"
+--- doc/modulefile.5.in.orig	2014-09-04 09:37:33 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
-@@ -538,7 +538,7 @@
+ modulefile \- files containing Tcl code for the Modules package
+@@ -656,7 +656,7 @@
  .RE
  .RS
  .I a syslog facility

Added: head/sysutils/modules/files/patch-etc__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/modules/files/patch-etc__Makefile.in	Sun Sep  7 09:46:58 2014	(r367502)
@@ -0,0 +1,13 @@
+--- etc/Makefile.in.orig	2014-09-04 14:00:45.808429028 +0200
++++ etc/Makefile.in	2014-09-04 14:02:10.225903882 +0200
+@@ -403,8 +403,8 @@
+ 	@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
+ 

Added: head/sysutils/modules/files/patch-init__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/modules/files/patch-init__Makefile.in	Sun Sep  7 09:46:58 2014	(r367502)
@@ -0,0 +1,16 @@
+--- init/Makefile.in.orig	2012-12-19 18:02:26.000000000 +0100
++++ init/Makefile.in	2014-09-04 14:32:46.863296746 +0200
+@@ -437,9 +437,10 @@
+ # 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; \

Modified: head/sysutils/modules/pkg-plist
==============================================================================
--- head/sysutils/modules/pkg-plist	Sun Sep  7 09:29:03 2014	(r367501)
+++ head/sysutils/modules/pkg-plist	Sun Sep  7 09:46:58 2014	(r367502)
@@ -1,17 +1,22 @@
+man/man1/module.1.gz
+man/man5/modulefile.5.gz
 Modules/%%MODULES_VERSION%%/bin/add.modules
 Modules/%%MODULES_VERSION%%/bin/mkroot
 Modules/%%MODULES_VERSION%%/bin/modulecmd
 Modules/%%MODULES_VERSION%%/init/.modulespath
 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/ksh
-Modules/%%MODULES_VERSION%%/init/perl
-Modules/%%MODULES_VERSION%%/init/python
+Modules/%%MODULES_VERSION%%/init/perl.pm
+Modules/%%MODULES_VERSION%%/init/python.py
+Modules/%%MODULES_VERSION%%/init/ruby.rb
 Modules/%%MODULES_VERSION%%/init/sh
 Modules/%%MODULES_VERSION%%/init/tcsh
 Modules/%%MODULES_VERSION%%/init/zsh
 Modules/%%MODULES_VERSION%%/modulefiles/dot
-Modules/%%MODULES_VERSION%%/modulefiles/module-cvs
+Modules/%%MODULES_VERSION%%/modulefiles/module-git
 Modules/%%MODULES_VERSION%%/modulefiles/module-info
 Modules/%%MODULES_VERSION%%/modulefiles/modules
 Modules/%%MODULES_VERSION%%/modulefiles/null



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409070946.s879kx3l078932>