Attachment #146784 for bug #193308




# $FreeBSD$

PORTNAME=	modules
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

LICENSE=	GPLv2

LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84

BINDIR=		${PREFIX}/Modules

TCL_DVER?=	8.4
TCL_VER=	${TCL_DVER:S/.//}
HAS_CONFIGURE=	yes

CONFIGURE_ARGS=	--prefix=${LOCALBASE} \
		--without-x \
		--with-version-path=${LOCALBASE}/Modules/versions \
		--mandir=${MANPREFIX}/man \
		--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}

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

pre-install:
	${MKDIR} ${PREFIX}/Modules

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (modules-3.1.6.tar.gz) = a65dd5c66a42558ba77f7b6343ecaeebc00c8501408313a1c1cf7fcca2a61bcb	1	SHA256 (modules-3.2.10.tar.gz) = fb05c82a83477805a1d97737a9f0ca0db23f69b7bce504f1609ba99477b03955
2	SIZE (modules-3.1.6.tar.gz) = 420885	2	SIZE (modules-3.2.10.tar.gz) = 419970




--- 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




--- 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" ;;
++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




--- doc/Makefile.in.orig	2014-09-04 11:56:48.688942391 +0200
+++ doc/Makefile.in	2014-09-04 11:58:04.757936396 +0200
@@ -33,7 +33,7 @@
 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 @@
 	$(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__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_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 man1_MANS = module.1
-man4_MANS = modulefile.4
+man5_MANS = modulefile.5
 all: all-am
 
 .SUFFIXES:
@@ -235,7 +235,7 @@
 $(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)
@@ -269,10 +269,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: $(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 "$(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; \
@@ -283,24 +283,24 @@
 	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; \
+	@list='$(man5_MANS)'; test -n "$(man5dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | 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)
 tags: TAGS
 TAGS:
 
@@ -395,7 +395,7 @@
 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-am:
+MAKEDIRS=  $(man1dir) $(man5dir)
 
-install-man: install-man1 install-man4
+install-man: install-man1 install-man5
 
 install-pdf: install-pdf-am
 	$(INSTALL_DATA) module.1     $(man1dir)
-	$(INSTALL_DATA) modulefile.4 $(man4dir)
+	$(INSTALL_DATA) modulefile.5 $(man5dir)
 
@@ -494,7 +494,7 @@
 	@for i in $(MAKEDIRS) ; do \
@@ -63,6 +63,6 @@
 mostlyclean: clean
 
 uninstall-am: uninstall-man
-	rm -f module.1 modulefile.4
+	rm -f module.1 modulefile.5
 
-uninstall-man: uninstall-man1 uninstall-man4
+uninstall-man: uninstall-man1 uninstall-man5
 
 .MAKE: check-am install-am install-strip
 
@@ -504,11 +504,11 @@
 	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 \
-	uninstall-am uninstall-man uninstall-man1 uninstall-man4
+	uninstall-am uninstall-man uninstall-man1 uninstall-man5
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.




--- doc/module.1.in.orig	2014-09-04 09:36:20 UTC
+++ doc/module.1.in
@@ -120,7 +120,7 @@
 .LP
 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 @@
 .SH VERSION
 @VERSION@
 sub-command.
 .SH SEE ALSO
-.BR modulefile (4)
+.BR modulefile (5)

Lines 1-12 Link Here

(-)files/patch-doc__modulefile.5.in (-7 / +10 lines)
1	--- doc/modulefile.5.in.orig Fri Jan 4 05:59:16 2002	1	--- doc/modulefile.5.in.orig 2014-09-04 09:37:33 UTC
2	+++ doc/modulefile.5.in Sun Nov 14 16:19:28 2004	2	+++ doc/modulefile.5.in
3	@@ -1,4 +1,4 @@	3	@@ -1,6 +1,6 @@
4	-.TH MODULEFILE 4 "1 July 1994"	4	-.\" .TH MODULEFILE 4 "1 July 1994"
5	+.TH MODULEFILE 5 "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"
6	.nh	9	.nh
7	.SH NAME	10	.SH NAME
8	modulefile \- files containing Tcl code for The Modules package	11	modulefile \- files containing Tcl code for the Modules package
9	@@ -538,7 +538,7 @@	12	@@ -656,7 +656,7 @@
10	.RE	13	.RE
11	.RS	14	.RS
12	.I a syslog facility	15	.I a syslog facility




--- 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
 




--- 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; \




Modules/%%MODULES_VERSION%%/init/bash
Modules/%%MODULES_VERSION%%/init/csh
Modules/%%MODULES_VERSION%%/init/ksh
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-git
Modules/%%MODULES_VERSION%%/modulefiles/module-info
Modules/%%MODULES_VERSION%%/modulefiles/modules
Modules/%%MODULES_VERSION%%/modulefiles/null

Return to bug 193308

Lines 2-40 Link Here

(-)Makefile (-13 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= modules	4	PORTNAME= modules
5	PORTVERSION= 3.1.6	5	PORTVERSION= 3.2.10
6	CATEGORIES= sysutils tcl	6	CATEGORIES= sysutils tcl
7	MASTER_SITES= SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Dynamic modification of a user's environment	10	COMMENT= Dynamic modification of a user's environment
11		11
12	LIB_DEPENDS= libtcl${TCL_VER}.so:${PORTSDIR}/lang/tcl${TCL_VER}	12	LICENSE= GPLv2
13		13
14	PLIST_SUB= MODULES_VERSION=${PORTVERSION}	14	LIB_DEPENDS= libtcl84.so:${PORTSDIR}/lang/tcl84
15		15
16	BINDIR= ${PREFIX}/Modules
17
18	TCL_DVER?= 8.4	16	TCL_DVER?= 8.4
19	TCL_VER= ${TCL_DVER:S/.//}	17	TCL_VER= ${TCL_DVER:S/.//}
20	HAS_CONFIGURE= yes	18	HAS_CONFIGURE= yes
21		19
22	CONFIGURE_ARGS= --prefix=${PREFIX}/Modules/@VERSION@ \	20	CONFIGURE_ARGS= --prefix=${LOCALBASE} \
23	--without-x \	21	--without-x \
24	--with-version-path=${PREFIX}/Modules/versions \	22	--with-version-path=${LOCALBASE}/Modules/versions \
25	--mandir=${MANPREFIX}/man \	23	--mandir=${MANPREFIX}/man \
26	--with-tcl-version=${TCL_VER} \	24	--with-tcl-ver=${TCL_VER} \
27	--with-tcl-include=${LOCALBASE}/include/tcl${TCL_DVER} \	25	--with-tcl-inc=${LOCALBASE}/include/tcl${TCL_DVER} \
28	--with-tcl-libraries=${LOCALBASE}/lib/	26	--with-tcl-lib=${LOCALBASE}/lib \
		27	--with-tclx-ver=${TCL_VER}
29		28
30	MAN1= module.1	29	MAN1= module.1
31	MAN5= modulefile.5	30	MAN5= modulefile.5
32		31
33	NO_STAGE= yes	32	PLIST_SUB= MODULES_VERSION=${PORTVERSION}
		33
34	post-extract:	34	post-extract:
35	${MV} ${WRKSRC}/doc/modulefile.4.in ${WRKSRC}/doc/modulefile.5.in	35	${MV} ${WRKSRC}/doc/modulefile.4.in ${WRKSRC}/doc/modulefile.5.in
36		36
37	pre-install:	37	pre-install:
38	${MKDIR} ${PREFIX}/Modules	38	${MKDIR} ${PREFIX}/Modules
39		39
40	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-Makefile.in (+121 lines)
		1	--- Makefile.in.orig 2012-12-19 18:02:26.000000000 +0100
		2	+++ Makefile.in 2014-09-04 12:15:49.912860562 +0200
		3	@@ -74,7 +74,7 @@
		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 @@
		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 @@
		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 @@
		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 @@
		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 @@
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 @@
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 @@
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 @@
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-126 Link Here

(-)files/patch-configure (-126 / +62 lines)
1	--- configure.orig Mon Nov 5 22:50:41 2001	1	--- configure.orig 2012-12-19 18:02:25.000000000 +0100
2	+++ configure Sun Nov 14 16:18:02 2004	2	+++ configure 2014-09-04 12:13:33.328870000 +0200
3	@@ -4105,7 +4105,7 @@	3	@@ -1480,7 +1480,7 @@
4	trap 'rm -fr `echo "Makefile modules.lsm .spec doc/Makefile init/Makefile	4	specify a pattern for trace [[no]]
5	init/bash init/csh init/ksh init/perl init/python init/sh init/tcsh	5	--with-tcl=<dir> directory containing tcl configuration
6	init/zsh init/.modulespath	6	(tclConfig.sh) [[searches]]
7	- doc/module.1 doc/modulefile.4	7	- --with-tcl-ver=X.Y Tcl version to use [[search]]
8	+ doc/module.1 doc/modulefile.5	8	+ --with-tcl-ver=XY Tcl version to use [[search]]
9	etc/Makefile etc/add.modules etc/mkroot	9	--with-tcl-lib=<dir> directory containing tcl libraries (libtclX.Y)
10	etc/skel/.cshrc etc/skel/.login	10	[[none]]
11	etc/skel/.kshenv etc/skel/.profile	11	--with-tcl-inc=<dir> directory containing tcl include files
12	@@ -4234,7 +4234,7 @@	12	@@ -1518,7 +1518,7 @@
13	CONFIG_FILES=\${CONFIG_FILES-"Makefile modules.lsm .spec doc/Makefile init/Makefile	13	init/
14	init/bash init/csh init/ksh init/perl init/python init/sh init/tcsh	14	man/
15	init/zsh init/.modulespath	15	man1/
16	- doc/module.1 doc/modulefile.4	16	- man4/
17	+ doc/module.1 doc/modulefile.5	17	+ man5/
18	etc/Makefile etc/add.modules etc/mkroot	18	modulefiles/
19	etc/skel/.cshrc etc/skel/.login	19	PREFIX/Modules/
20	etc/skel/.kshenv etc/skel/.profile	20	modulefiles/
21	diff -urN sysutils/modules.orig/files/patch-configure sysutils/modules/files/patch-configure	21	@@ -7099,9 +7099,9 @@
22	--- sysutils/modules.orig/files/patch-configure Thu Jan 1 01:00:00 1970	22	em_cv_tclver=${with_tclver}
23	+++ sysutils/modules/files/patch-configure Sun Nov 14 16:18:24 2004	23	fi #}}
24	@@ -0,0 +1,20 @@	24
25	+--- configure.orig Mon Nov 5 22:50:41 2001	25	- tclver=`echo $em_cv_tclver \| sed -n -e '/[0-9]\.[0-9]/p'`
26	++++ configure Sun Nov 14 16:18:02 2004	26	+ tclver=`echo $em_cv_tclver \| sed -n -e '/[0-9][0-9]/p'`
27	+@@ -4105,7 +4105,7 @@	27	if test x"$tclver" = x ; then #{
28	+ trap 'rm -fr `echo "Makefile modules.lsm .spec doc/Makefile init/Makefile	28	- as_fn_error $? "Must specify version (X.Y) if using this option" "$LINENO" 5
29	+ init/bash init/csh init/ksh init/perl init/python init/sh init/tcsh	29	+ as_fn_error $? "Must specify version (XY) if using this option" "$LINENO" 5
30	+ init/zsh init/.modulespath	30	fi #}
31	+- doc/module.1 doc/modulefile.4	31	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${em_cv_tclver}" >&5
32	++ doc/module.1 doc/modulefile.5	32	$as_echo "${em_cv_tclver}" >&6; }
33	+ etc/Makefile etc/add.modules etc/mkroot	33	@@ -7375,9 +7375,9 @@
34	+ etc/skel/.cshrc etc/skel/.login	34	em_cv_tclxver=${with_tclxver}
35	+ etc/skel/.kshenv etc/skel/.profile	35	fi #}}
36	+@@ -4234,7 +4234,7 @@	36
37	+ CONFIG_FILES=\${CONFIG_FILES-"Makefile modules.lsm .spec doc/Makefile init/Makefile	37	- tclxver=`echo $em_cv_tclxver \| sed -n -e '/[0-9]\.[0-9]/p'`
38	+ init/bash init/csh init/ksh init/perl init/python init/sh init/tcsh	38	+ tclxver=`echo $em_cv_tclxver \| sed -n -e '/[0-9][0-9]/p'`
39	+ init/zsh init/.modulespath	39	if test x"$tclxver" = x ; then #{
40	+- doc/module.1 doc/modulefile.4	40	- as_fn_error $? "Must specify version (X.Y) if using this option" "$LINENO" 5
41	++ doc/module.1 doc/modulefile.5	41	+ as_fn_error $? "Must specify version (XY) if using this option" "$LINENO" 5
42	+ etc/Makefile etc/add.modules etc/mkroot	42	fi #}
43	+ etc/skel/.cshrc etc/skel/.login	43	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using ${em_cv_tclxver}" >&5
44	+ etc/skel/.kshenv etc/skel/.profile	44	$as_echo "using ${em_cv_tclxver}" >&6; }
45	diff -urN sysutils/modules.orig/files/patch-doc::Makefile.in sysutils/modules/files/patch-doc::Makefile.in	45	@@ -7657,7 +7657,7 @@
46	--- sysutils/modules.orig/files/patch-doc::Makefile.in Thu Jan 1 01:00:00 1970	46	EXTDIR="etc"
47	+++ sysutils/modules/files/patch-doc::Makefile.in Sun Nov 14 16:05:08 2004	47
48	@@ -0,0 +1,36 @@	48	fi
49	+--- ./doc/Makefile.in.orig Wed Jun 28 02:17:33 2000	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	++++ ./doc/Makefile.in Sun Nov 14 16:04:44 2004	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	+@@ -26,21 +26,21 @@	51	ac_config_commands="$ac_config_commands default"
52	+ # Directory in which to install man pages	52	cat >confcache <<\_ACEOF
53	+ mandir = @mandir@	53	# This file is a shell script that caches the results of configure
54	+ man1dir = $(mandir)/man1	54	@@ -8398,7 +8398,7 @@
55	+-man4dir = $(mandir)/man4	55	"init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;;
56	++man5dir = $(mandir)/man5	56	"init/.modulespath") CONFIG_FILES="$CONFIG_FILES init/.modulespath" ;;
57	+	57	"doc/module.1") CONFIG_FILES="$CONFIG_FILES doc/module.1" ;;
58	+ SHELL = /bin/sh	58	- "doc/modulefile.4") CONFIG_FILES="$CONFIG_FILES doc/modulefile.4" ;;
59	+	59	+ "doc/modulefile.5") CONFIG_FILES="$CONFIG_FILES doc/modulefile.5" ;;
60	+ #### End of system configuration section. ####	60	"etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
61	+	61	"etc/add.modules") CONFIG_FILES="$CONFIG_FILES etc/add.modules" ;;
62	+-MAN_FILES= module.1 modulefile.4	62	"etc/mkroot") CONFIG_FILES="$CONFIG_FILES etc/mkroot" ;;
63	++MAN_FILES= module.1 modulefile.5
64	+
65	+-MAKEDIRS= $(man1dir) $(man4dir)
66	++MAKEDIRS= $(man1dir) $(man5dir)
67	+
68	+ all:
69	+
70	+ install: all install-dirs
71	+ $(INSTALL_DATA) module.1 $(man1dir)
72	+- $(INSTALL_DATA) modulefile.4 $(man4dir)
73	++ $(INSTALL_DATA) modulefile.5 $(man5dir)
74	+
75	+ install-dirs:
76	+ @for i in $(MAKEDIRS) ; do \
77	+@@ -63,6 +63,6 @@
78	+ mostlyclean: clean
79	+
80	+ distclean: clean
81	+- rm -f module.1 modulefile.4
82	++ rm -f module.1 modulefile.5
83	+
84	+ realclean: distclean
85	diff -urN sysutils/modules.orig/files/patch-doc::module.1.in sysutils/modules/files/patch-doc::module.1.in
86	--- sysutils/modules.orig/files/patch-doc::module.1.in Thu Jan 1 01:00:00 1970
87	+++ sysutils/modules/files/patch-doc::module.1.in Sun Nov 14 17:18:21 2004
88	@@ -0,0 +1,17 @@
89	+--- doc/module.1.in.orig Sat Jun 9 11:48:47 2001
90	++++ doc/module.1.in Sun Nov 14 17:17:58 2004
91	+@@ -114,7 +114,7 @@
92	+ .LP
93	+ Upon invocation \fImodulecmd\fP sources rc files which contain global, user
94	+ and modulefile specific setups. These files are interpreted as modulefiles.
95	+-See \fBmodulefile(4)\fP for detailed information.
96	++See \fBmodulefile(5)\fP for detailed information.
97	+ .LP
98	+ Upon invocation of modulecmd module RC files are sourced in the following
99	+ order:
100	+@@ -466,4 +466,4 @@
101	+ .B module update
102	+ sub-command.
103	+ .SH SEE ALSO
104	+-.BR modulefile(4)
105	++.BR modulefile(5)
106	diff -urN sysutils/modules.orig/files/patch-doc::modulefile.5.in sysutils/modules/files/patch-doc::modulefile.5.in
107	--- sysutils/modules.orig/files/patch-doc::modulefile.5.in Thu Jan 1 01:00:00 1970
108	+++ sysutils/modules/files/patch-doc::modulefile.5.in Sun Nov 14 16:24:03 2004
109	@@ -0,0 +1,17 @@
110	+--- doc/modulefile.5.in.orig Fri Jan 4 05:59:16 2002
111	++++ doc/modulefile.5.in Sun Nov 14 16:19:28 2004
112	+@@ -1,4 +1,4 @@
113	+-.TH MODULEFILE 4 "1 July 1994"
114	++.TH MODULEFILE 5 "1 July 1994"
115	+ .nh
116	+ .SH NAME
117	+ modulefile \- files containing Tcl code for The Modules package
118	+@@ -538,7 +538,7 @@
119	+ .RE
120	+ .RS
121	+ .I a syslog facility
122	+-- directs logging to the syslog. See \fBsyslog.conf(4)\fP for detailed
123	++- directs logging to the syslog. See \fBsyslog.conf(5)\fP for detailed
124	+ description of the valid syslog facilities.
125	+ .RE
126	+ .RS

Lines 1-36 Link Here

(-)files/patch-doc__Makefile.in (-24 / +127 lines)
1	--- ./doc/Makefile.in.orig Wed Jun 28 02:17:33 2000	1	--- doc/Makefile.in.orig 2014-09-04 11:56:48.688942391 +0200
2	+++ ./doc/Makefile.in Sun Nov 14 16:04:44 2004	2	+++ doc/Makefile.in 2014-09-04 11:58:04.757936396 +0200
3	@@ -26,21 +26,21 @@	3	@@ -33,7 +33,7 @@
4	# Directory in which to install man pages	4	POST_UNINSTALL = :
5	mandir = @mandir@	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 @@
		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 @@
		22	$(am__cd) "$$dir" && rm -f $$files; }; \
		23	}
6	man1dir = $(mandir)/man1	24	man1dir = $(mandir)/man1
		25	-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man4dir)"
7	-man4dir = $(mandir)/man4	26	-man4dir = $(mandir)/man4
		27	+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
8	+man5dir = $(mandir)/man5	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 @@
		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
9		42
10	SHELL = /bin/sh	43	.SUFFIXES:
		44	@@ -235,7 +235,7 @@
		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	@@ -269,10 +269,10 @@
		54	} \| sed -e 's,./,,;h;s,.\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
		55	-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
		56	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
		57	-install-man4: $(man4_MANS)
		58	+install-man5: $(man5_MANS)
		59	@$(NORMAL_INSTALL)
		60	- test -z "$(man4dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man4dir)"
		61	- @list='$(man4_MANS)'; test -n "$(man4dir)" \|\| exit 0; \
		62	+ test -z "$(man5dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man5dir)"
		63	+ @list='$(man5_MANS)'; test -n "$(man5dir)" \|\| exit 0; \
		64	{ for i in $$list; do echo "$$i"; done; \
		65	} \| while read p; do \
		66	if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
		67	@@ -283,24 +283,24 @@
		68	sed 'N;N;s,\n, ,g' \| { \
		69	list=; while read file base inst; do \
		70	if test "$$base" = "$$inst"; then list="$$list $$file"; else \
		71	- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man4dir)/$$inst'"; \
		72	- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man4dir)/$$inst" \|\| exit $$?; \
		73	+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
		74	+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" \|\| exit $$?; \
		75	fi; \
		76	done; \
		77	for i in $$list; do echo "$$i"; done \| $(am__base_list) \| \
		78	while read files; do \
		79	test -z "$$files" \|\| { \
		80	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man4dir)'"; \
		81	- $(INSTALL_DATA) $$files "$(DESTDIR)$(man4dir)" \|\| exit $$?; }; \
		82	+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
		83	+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" \|\| exit $$?; }; \
		84	done; }
11		85
12	#### End of system configuration section. ####	86	-uninstall-man4:
		87	+uninstall-man5:
		88	@$(NORMAL_UNINSTALL)
		89	- @list='$(man4_MANS)'; test -n "$(man4dir)" \|\| exit 0; \
		90	+ @list='$(man5_MANS)'; test -n "$(man5dir)" \|\| exit 0; \
		91	files=`{ for i in $$list; do echo "$$i"; done; \
		92	} \| sed -e 's,./,,;h;s,.\.,,;s,^[^4][0-9a-z]*$$,4,;x' \
		93	-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
		94	- dir='$(DESTDIR)$(man4dir)'; $(am__uninstall_files_from_dir)
		95	+ dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
		96	tags: TAGS
		97	TAGS:
13		98
14	-MAN_FILES= module.1 modulefile.4	99	@@ -395,7 +395,7 @@
15	+MAN_FILES= module.1 modulefile.5	100	check: check-am
		101	all-am: Makefile $(MANS)
		102	installdirs:
		103	- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man4dir)"; do \
		104	+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
		105	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
		106	done
		107	install: install-am
		108	@@ -464,7 +464,7 @@
16		109
17	-MAKEDIRS= $(man1dir) $(man4dir)	110	install-info-am:
18	+MAKEDIRS= $(man1dir) $(man5dir)
19		111
20	all:	112	-install-man: install-man1 install-man4
		113	+install-man: install-man1 install-man5
21		114
22	install: all install-dirs	115	install-pdf: install-pdf-am
23	$(INSTALL_DATA) module.1 $(man1dir)
24	- $(INSTALL_DATA) modulefile.4 $(man4dir)
25	+ $(INSTALL_DATA) modulefile.5 $(man5dir)
26		116
27	install-dirs:	117	@@ -494,7 +494,7 @@
28	@for i in $(MAKEDIRS) ; do \
29	@@ -63,6 +63,6 @@
30	mostlyclean: clean
31		118
32	distclean: clean	119	uninstall-am: uninstall-man
33	- rm -f module.1 modulefile.4
34	+ rm -f module.1 modulefile.5
35		120
36	realclean: distclean	121	-uninstall-man: uninstall-man1 uninstall-man4
		122	+uninstall-man: uninstall-man1 uninstall-man5
		123
		124	.MAKE: check-am install-am install-strip
		125
		126	@@ -504,11 +504,11 @@
		127	install-data install-data-am install-dvi install-dvi-am \
		128	install-exec install-exec-am install-html install-html-am \
		129	install-info install-info-am install-man install-man1 \
		130	- install-man4 install-pdf install-pdf-am install-ps \
		131	+ install-man5 install-pdf install-pdf-am install-ps \
		132	install-ps-am install-strip installcheck installcheck-am \
		133	installdirs maintainer-clean maintainer-clean-generic \
		134	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
		135	- uninstall-am uninstall-man uninstall-man1 uninstall-man4
		136	+ uninstall-am uninstall-man uninstall-man1 uninstall-man5
		137
		138
		139	# Tell versions [3.59,3.63) of GNU make to not export all variables.

Lines 1-17 Link Here

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

Line 0 Link Here

(-)files/patch-etc__Makefile.in (+13 lines)
	1	--- etc/Makefile.in.orig 2014-09-04 14:00:45.808429028 +0200
	2	+++ etc/Makefile.in 2014-09-04 14:02:10.225903882 +0200
	3	@@ -403,8 +403,8 @@
	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

Line 0 Link Here

(-)files/patch-init__Makefile.in (+16 lines)
	1	--- init/Makefile.in.orig 2012-12-19 18:02:26.000000000 +0100
	2	+++ init/Makefile.in 2014-09-04 14:32:46.863296746 +0200
	3	@@ -437,9 +437,10 @@
	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; \

Lines 5-17 Link Here

(-)pkg-plist (-3 / +4 lines)
5	Modules/%%MODULES_VERSION%%/init/bash	5	Modules/%%MODULES_VERSION%%/init/bash
6	Modules/%%MODULES_VERSION%%/init/csh	6	Modules/%%MODULES_VERSION%%/init/csh
7	Modules/%%MODULES_VERSION%%/init/ksh	7	Modules/%%MODULES_VERSION%%/init/ksh
8	Modules/%%MODULES_VERSION%%/init/perl	8	Modules/%%MODULES_VERSION%%/init/perl.pm
9	Modules/%%MODULES_VERSION%%/init/python	9	Modules/%%MODULES_VERSION%%/init/python.py
		10	Modules/%%MODULES_VERSION%%/init/ruby.rb
10	Modules/%%MODULES_VERSION%%/init/sh	11	Modules/%%MODULES_VERSION%%/init/sh
11	Modules/%%MODULES_VERSION%%/init/tcsh	12	Modules/%%MODULES_VERSION%%/init/tcsh
12	Modules/%%MODULES_VERSION%%/init/zsh	13	Modules/%%MODULES_VERSION%%/init/zsh
13	Modules/%%MODULES_VERSION%%/modulefiles/dot	14	Modules/%%MODULES_VERSION%%/modulefiles/dot
14	Modules/%%MODULES_VERSION%%/modulefiles/module-cvs	15	Modules/%%MODULES_VERSION%%/modulefiles/module-git
15	Modules/%%MODULES_VERSION%%/modulefiles/module-info	16	Modules/%%MODULES_VERSION%%/modulefiles/module-info
16	Modules/%%MODULES_VERSION%%/modulefiles/modules	17	Modules/%%MODULES_VERSION%%/modulefiles/modules
17	Modules/%%MODULES_VERSION%%/modulefiles/null	18	Modules/%%MODULES_VERSION%%/modulefiles/null