Index: head/sysutils/modules/Makefile =================================================================== --- head/sysutils/modules/Makefile (revision 420491) +++ head/sysutils/modules/Makefile (revision 420492) @@ -1,34 +1,31 @@ # Created by: Hokan # $FreeBSD$ PORTNAME= modules PORTVERSION= 3.2.10 +PORTREVISION= 1 CATEGORIES= sysutils tcl MASTER_SITES= SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Dynamic modification of a user environment LICENSE= GPLv2 -LIB_DEPENDS= libtcl84.so:lang/tcl84 - -TCL_DVER?= 8.4 -TCL_VER= ${TCL_DVER:S/.//} +USES= tcl 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-ver=${TCL_VER:S/.//} \ + --with-tcl-inc=${TCL_INCLUDEDIR} \ --with-tcl-lib=${LOCALBASE}/lib \ - --with-tclx-ver=${TCL_VER} + --with-tclx-ver=${TCL_VER:S/.//} PLIST_SUB= MODULES_VERSION=${PORTVERSION} post-extract: ${MV} ${WRKSRC}/doc/modulefile.4.in ${WRKSRC}/doc/modulefile.5.in .include Index: head/sysutils/modules/files/patch-Makefile.in =================================================================== --- head/sysutils/modules/files/patch-Makefile.in (revision 420491) +++ head/sysutils/modules/files/patch-Makefile.in (revision 420492) @@ -1,121 +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 @@ +--- 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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 Property changes on: head/sysutils/modules/files/patch-Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/modules/files/patch-cmdModule.c =================================================================== --- head/sysutils/modules/files/patch-cmdModule.c (nonexistent) +++ head/sysutils/modules/files/patch-cmdModule.c (revision 420492) @@ -0,0 +1,21 @@ +--- 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: Property changes on: head/sysutils/modules/files/patch-cmdModule.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/modules/files/patch-configure =================================================================== --- head/sysutils/modules/files/patch-configure (revision 420491) +++ head/sysutils/modules/files/patch-configure (revision 420492) @@ -1,62 +1,62 @@ ---- configure.orig 2012-12-19 18:02:25.000000000 +0100 -+++ configure 2014-09-04 12:13:33.328870000 +0200 -@@ -1480,7 +1480,7 @@ +--- configure.orig 2012-12-19 17:02:25 UTC ++++ configure +@@ -1480,7 +1480,7 @@ Optional Packages: specify a pattern for trace [[no]] --with-tcl= 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= directory containing tcl libraries (libtclX.Y) [[none]] --with-tcl-inc= directory containing tcl include files -@@ -1518,7 +1518,7 @@ +@@ -1518,7 +1518,7 @@ PREFIX/Modules/($MODULES_VERSION/ if mod init/ man/ man1/ - man4/ + man5/ modulefiles/ PREFIX/Modules/ modulefiles/ -@@ -7099,9 +7099,9 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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" ;; Index: head/sysutils/modules/files/patch-doc__module.1.in =================================================================== --- head/sysutils/modules/files/patch-doc__module.1.in (revision 420491) +++ head/sysutils/modules/files/patch-doc__module.1.in (revision 420492) @@ -1,17 +1,17 @@ ---- doc/module.1.in.orig 2014-09-04 09:36:20 UTC +--- doc/module.1.in.orig 2012-11-08 22:45:02 UTC +++ doc/module.1.in -@@ -120,7 +120,7 @@ +@@ -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 @@ +@@ -498,4 +498,4 @@ If this defines a valid filename, it ser .SH VERSION @VERSION@ .SH SEE ALSO -.BR modulefile (4) +.BR modulefile (5) Index: head/sysutils/modules/files/patch-doc__modulefile.5.in =================================================================== --- head/sysutils/modules/files/patch-doc__modulefile.5.in (revision 420491) +++ head/sysutils/modules/files/patch-doc__modulefile.5.in (revision 420492) @@ -1,20 +1,20 @@ ---- doc/modulefile.5.in.orig 2014-09-04 09:37:33 UTC +--- 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 @@ +@@ -656,7 +656,7 @@ to your shell. .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 Index: head/sysutils/modules/files/patch-etc__Makefile.in =================================================================== --- head/sysutils/modules/files/patch-etc__Makefile.in (revision 420491) +++ head/sysutils/modules/files/patch-etc__Makefile.in (revision 420492) @@ -1,13 +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 @@ +--- 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 Property changes on: head/sysutils/modules/files/patch-etc__Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/modules/files/patch-init__Makefile.in =================================================================== --- head/sysutils/modules/files/patch-init__Makefile.in (revision 420491) +++ head/sysutils/modules/files/patch-init__Makefile.in (revision 420492) @@ -1,16 +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 @@ +--- 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; \ Property changes on: head/sysutils/modules/files/patch-init__Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property