View | Details | Raw Unified | Return to bug 211690 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-8 / +5 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	modules
4
PORTNAME=	modules
5
PORTVERSION=	3.2.10
5
PORTVERSION=	3.2.10
6
PORTREVISION=	1
6
CATEGORIES=	sysutils tcl
7
CATEGORIES=	sysutils tcl
7
MASTER_SITES=	SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}
8
9
Lines 11-30 Link Here
11
12
12
LICENSE=	GPLv2
13
LICENSE=	GPLv2
13
14
14
LIB_DEPENDS=	libtcl84.so:lang/tcl84
15
USES=		tcl
15
16
TCL_DVER?=	8.4
17
TCL_VER=	${TCL_DVER:S/.//}
18
HAS_CONFIGURE=	yes
16
HAS_CONFIGURE=	yes
19
20
CONFIGURE_ARGS=	--prefix=${LOCALBASE} \
17
CONFIGURE_ARGS=	--prefix=${LOCALBASE} \
21
		--without-x \
18
		--without-x \
22
		--with-version-path=${LOCALBASE}/Modules/versions \
19
		--with-version-path=${LOCALBASE}/Modules/versions \
23
		--mandir=${MANPREFIX}/man \
20
		--mandir=${MANPREFIX}/man \
24
		--with-tcl-ver=${TCL_VER} \
21
		--with-tcl-ver=${TCL_VER:S/.//} \
25
		--with-tcl-inc=${LOCALBASE}/include/tcl${TCL_DVER} \
22
		--with-tcl-inc=${TCL_INCLUDEDIR} \
26
		--with-tcl-lib=${LOCALBASE}/lib \
23
		--with-tcl-lib=${LOCALBASE}/lib \
27
		--with-tclx-ver=${TCL_VER}
24
		--with-tclx-ver=${TCL_VER:S/.//}
28
25
29
PLIST_SUB=	MODULES_VERSION=${PORTVERSION}
26
PLIST_SUB=	MODULES_VERSION=${PORTVERSION}
30
27
(-)files/patch-Makefile.in (-11 / +11 lines)
Lines 1-6 Link Here
1
--- Makefile.in.orig	2012-12-19 18:02:26.000000000 +0100
1
--- Makefile.in.orig	2012-12-19 17:02:26 UTC
2
+++ Makefile.in	2014-09-04 12:15:49.912860562 +0200
2
+++ Makefile.in
3
@@ -74,7 +74,7 @@
3
@@ -74,7 +74,7 @@ CONFIG_CLEAN_FILES = modules.lsm .spec e
4
 	ext/common/.profile
4
 	ext/common/.profile
5
 CONFIG_CLEAN_VPATH_FILES =
5
 CONFIG_CLEAN_VPATH_FILES =
6
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
6
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
Lines 9-15 Link Here
9
 PROGRAMS = $(bin_PROGRAMS)
9
 PROGRAMS = $(bin_PROGRAMS)
10
 am_modulecmd_OBJECTS = modulecmd-ModuleCmd_Avail.$(OBJEXT) \
10
 am_modulecmd_OBJECTS = modulecmd-ModuleCmd_Avail.$(OBJEXT) \
11
 	modulecmd-ModuleCmd_Clear.$(OBJEXT) \
11
 	modulecmd-ModuleCmd_Clear.$(OBJEXT) \
12
@@ -150,7 +150,7 @@
12
@@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \
13
          $(am__cd) "$$dir" && rm -f $$files; }; \
13
          $(am__cd) "$$dir" && rm -f $$files; }; \
14
   }
14
   }
15
 man1dir = $(mandir)/man1
15
 man1dir = $(mandir)/man1
Lines 18-24 Link Here
18
 NROFF = nroff
18
 NROFF = nroff
19
 MANS = $(man_MANS)
19
 MANS = $(man_MANS)
20
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
20
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
21
@@ -320,7 +320,7 @@
21
@@ -320,7 +320,7 @@ top_build_prefix = @top_build_prefix@
22
 top_builddir = @top_builddir@
22
 top_builddir = @top_builddir@
23
 top_srcdir = @top_srcdir@
23
 top_srcdir = @top_srcdir@
24
 ACLOCAL_AMFLAGS = -I config
24
 ACLOCAL_AMFLAGS = -I config
Lines 27-33 Link Here
27
 SUBDIRS = . init modulefiles @EXTDIR@ doc
27
 SUBDIRS = . init modulefiles @EXTDIR@ doc
28
 DIST_SUBDIRS = . init modulefiles etc ext doc
28
 DIST_SUBDIRS = . init modulefiles etc ext doc
29
 SOURCES_H = modules_def.h getopt.h config.h
29
 SOURCES_H = modules_def.h getopt.h config.h
30
@@ -1087,10 +1087,10 @@
30
@@ -1087,10 +1087,10 @@ uninstall-man1:
31
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
31
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
32
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
32
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
33
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
33
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
Lines 41-47 Link Here
41
 	{ for i in $$list; do echo "$$i"; done; \
41
 	{ for i in $$list; do echo "$$i"; done; \
42
 	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
42
 	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
43
 	  sed -n '/\.4[a-z]*$$/p'; \
43
 	  sed -n '/\.4[a-z]*$$/p'; \
44
@@ -1103,26 +1103,26 @@
44
@@ -1103,26 +1103,26 @@ install-man4: $(man_MANS)
45
 	sed 'N;N;s,\n, ,g' | { \
45
 	sed 'N;N;s,\n, ,g' | { \
46
 	list=; while read file base inst; do \
46
 	list=; while read file base inst; do \
47
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
47
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
Lines 75-81 Link Here
75
 
75
 
76
 # This directory's subdirectories are mostly independent; you can cd
76
 # This directory's subdirectories are mostly independent; you can cd
77
 # into them and run `make' without going through this Makefile.
77
 # into them and run `make' without going through this Makefile.
78
@@ -1498,7 +1498,7 @@
78
@@ -1498,7 +1498,7 @@ check: check-recursive
79
 all-am: Makefile $(PROGRAMS) $(MANS) config.h
79
 all-am: Makefile $(PROGRAMS) $(MANS) config.h
80
 installdirs: installdirs-recursive
80
 installdirs: installdirs-recursive
81
 installdirs-am:
81
 installdirs-am:
Lines 84-90 Link Here
84
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
84
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
85
 	done
85
 	done
86
 install: install-recursive
86
 install: install-recursive
87
@@ -1570,7 +1570,7 @@
87
@@ -1570,7 +1570,7 @@ install-info: install-info-recursive
88
 
88
 
89
 install-info-am:
89
 install-info-am:
90
 
90
 
Lines 93-99 Link Here
93
 
93
 
94
 install-pdf: install-pdf-recursive
94
 install-pdf: install-pdf-recursive
95
 
95
 
96
@@ -1603,7 +1603,7 @@
96
@@ -1603,7 +1603,7 @@ ps-am:
97
 
97
 
98
 uninstall-am: uninstall-binPROGRAMS uninstall-man
98
 uninstall-am: uninstall-binPROGRAMS uninstall-man
99
 
99
 
Lines 102-108 Link Here
102
 
102
 
103
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
103
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
104
 	ctags-recursive install-am install-strip tags-recursive
104
 	ctags-recursive install-am install-strip tags-recursive
105
@@ -1619,14 +1619,14 @@
105
@@ -1619,14 +1619,14 @@ uninstall-man: uninstall-man1 uninstall-
106
 	info-am install install-am install-binPROGRAMS install-data \
106
 	info-am install install-am install-binPROGRAMS install-data \
107
 	install-data-am install-dvi install-dvi-am install-exec \
107
 	install-data-am install-dvi install-dvi-am install-exec \
108
 	install-exec-am install-html install-html-am install-info \
108
 	install-exec-am install-html install-html-am install-info \
(-)files/patch-cmdModule.c (+21 lines)
Line 0 Link Here
1
--- cmdModule.c.orig	2016-08-09 09:37:36 UTC
2
+++ cmdModule.c
3
@@ -640,8 +640,16 @@ int	 Execute_TclFile(	Tcl_Interp	*interp
4
             case TCL_OK:	gotPartial = 0;
5
 			        continue;	/** while **/
6
 	    
7
-            case TCL_ERROR:	interp->errorLine = ((linenum-1)-gotPartial) +
8
-				    interp->errorLine;
9
+            case TCL_ERROR:	
10
+#if (TCL_MAJOR_VERSION > 8) \
11
+	|| (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 6)
12
+					Tcl_SetErrorLine(
13
+							interp,
14
+							((linenum-1)-gotPartial) + Tcl_GetErrorLine(interp));
15
+#else
16
+					interp->errorLine = 
17
+						((linenum-1)-gotPartial) + interp->errorLine;
18
+#endif
19
 	    			/* FALLTHROUGH */
20
 
21
             case TCL_LEVEL0_RETURN:
(-)files/patch-configure (-8 / +8 lines)
Lines 1-6 Link Here
1
--- configure.orig	2012-12-19 18:02:25.000000000 +0100
1
--- configure.orig	2012-12-19 17:02:25 UTC
2
+++ configure	2014-09-04 12:13:33.328870000 +0200
2
+++ configure
3
@@ -1480,7 +1480,7 @@
3
@@ -1480,7 +1480,7 @@ Optional Packages:
4
                           specify a pattern for trace [[no]]
4
                           specify a pattern for trace [[no]]
5
   --with-tcl=<dir>        directory containing tcl configuration
5
   --with-tcl=<dir>        directory containing tcl configuration
6
                           (tclConfig.sh) [[searches]]
6
                           (tclConfig.sh) [[searches]]
Lines 9-15 Link Here
9
   --with-tcl-lib=<dir>    directory containing tcl libraries (libtclX.Y)
9
   --with-tcl-lib=<dir>    directory containing tcl libraries (libtclX.Y)
10
                           [[none]]
10
                           [[none]]
11
   --with-tcl-inc=<dir>    directory containing tcl include files
11
   --with-tcl-inc=<dir>    directory containing tcl include files
12
@@ -1518,7 +1518,7 @@
12
@@ -1518,7 +1518,7 @@ PREFIX/Modules/($MODULES_VERSION/ if mod
13
 	init/
13
 	init/
14
 	man/
14
 	man/
15
 		man1/
15
 		man1/
Lines 18-24 Link Here
18
 	modulefiles/
18
 	modulefiles/
19
 PREFIX/Modules/
19
 PREFIX/Modules/
20
 	modulefiles/
20
 	modulefiles/
21
@@ -7099,9 +7099,9 @@
21
@@ -7099,9 +7099,9 @@ else
22
 		em_cv_tclver=${with_tclver}
22
 		em_cv_tclver=${with_tclver}
23
 	    fi #}}
23
 	    fi #}}
24
 
24
 
Lines 30-36 Link Here
30
 	    fi #}
30
 	    fi #}
31
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${em_cv_tclver}" >&5
31
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${em_cv_tclver}" >&5
32
 $as_echo "${em_cv_tclver}" >&6; }
32
 $as_echo "${em_cv_tclver}" >&6; }
33
@@ -7375,9 +7375,9 @@
33
@@ -7375,9 +7375,9 @@ else
34
 		em_cv_tclxver=${with_tclxver}
34
 		em_cv_tclxver=${with_tclxver}
35
 	    fi #}}
35
 	    fi #}}
36
 
36
 
Lines 42-48 Link Here
42
 	    fi #}
42
 	    fi #}
43
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ${em_cv_tclxver}" >&5
43
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ${em_cv_tclxver}" >&5
44
 $as_echo "using ${em_cv_tclxver}" >&6; }
44
 $as_echo "using ${em_cv_tclxver}" >&6; }
45
@@ -7657,7 +7657,7 @@
45
@@ -7657,7 +7657,7 @@ else
46
 	EXTDIR="etc"
46
 	EXTDIR="etc"
47
 
47
 
48
 fi
48
 fi
Lines 51-57 Link Here
51
 ac_config_commands="$ac_config_commands default"
51
 ac_config_commands="$ac_config_commands default"
52
 cat >confcache <<\_ACEOF
52
 cat >confcache <<\_ACEOF
53
 # This file is a shell script that caches the results of configure
53
 # This file is a shell script that caches the results of configure
54
@@ -8398,7 +8398,7 @@
54
@@ -8398,7 +8398,7 @@ do
55
     "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;;
55
     "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;;
56
     "init/.modulespath") CONFIG_FILES="$CONFIG_FILES init/.modulespath" ;;
56
     "init/.modulespath") CONFIG_FILES="$CONFIG_FILES init/.modulespath" ;;
57
     "doc/module.1") CONFIG_FILES="$CONFIG_FILES doc/module.1" ;;
57
     "doc/module.1") CONFIG_FILES="$CONFIG_FILES doc/module.1" ;;
(-)files/patch-doc__module.1.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- doc/module.1.in.orig	2014-09-04 09:36:20 UTC
1
--- doc/module.1.in.orig	2012-11-08 22:45:02 UTC
2
+++ doc/module.1.in
2
+++ doc/module.1.in
3
@@ -120,7 +120,7 @@
3
@@ -120,7 +120,7 @@ command is defined with:
4
 Upon invocation \fImodulecmd\fP sources rc files which contain global, user
4
 Upon invocation \fImodulecmd\fP sources rc files which contain global, user
5
 and modulefile specific setups. These files are interpreted as modulefiles.
5
 and modulefile specific setups. These files are interpreted as modulefiles.
6
 See
6
 See
Lines 9-15 Link Here
9
 for detailed information.
9
 for detailed information.
10
 .LP
10
 .LP
11
 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
12
@@ -498,4 +498,4 @@
12
@@ -498,4 +498,4 @@ If this defines a valid filename, it ser
13
 .SH VERSION
13
 .SH VERSION
14
 @VERSION@
14
 @VERSION@
15
 .SH SEE ALSO
15
 .SH SEE ALSO
(-)files/patch-doc__modulefile.5.in (-2 / +2 lines)
Lines 1-4 Link Here
1
--- doc/modulefile.5.in.orig	2014-09-04 09:37:33 UTC
1
--- doc/modulefile.5.in.orig	2012-12-06 22:51:08 UTC
2
+++ doc/modulefile.5.in
2
+++ doc/modulefile.5.in
3
@@ -1,6 +1,6 @@
3
@@ -1,6 +1,6 @@
4
-.\" .TH MODULEFILE 4 "1 July 1994"
4
-.\" .TH MODULEFILE 4 "1 July 1994"
Lines 9-15 Link Here
9
 .nh
9
 .nh
10
 .SH NAME
10
 .SH NAME
11
 modulefile \- files containing Tcl code for the Modules package
11
 modulefile \- files containing Tcl code for the Modules package
12
@@ -656,7 +656,7 @@
12
@@ -656,7 +656,7 @@ to your shell.
13
 .RE
13
 .RE
14
 .RS
14
 .RS
15
 .I a syslog facility
15
 .I a syslog facility
(-)files/patch-etc__Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- etc/Makefile.in.orig	2014-09-04 14:00:45.808429028 +0200
1
--- etc/Makefile.in.orig	2012-12-19 17:02:26 UTC
2
+++ etc/Makefile.in	2014-09-04 14:02:10.225903882 +0200
2
+++ etc/Makefile.in
3
@@ -403,8 +403,8 @@
3
@@ -403,8 +403,8 @@ install-data-local : $(EXTRA_scripts)
4
 	@list='$(EXTRA_scripts)'; for p in $$list; do \
4
 	@list='$(EXTRA_scripts)'; for p in $$list; do \
5
 	  if test -f $$p \
5
 	  if test -f $$p \
6
 	  ; then \
6
 	  ; then \
(-)files/patch-init__Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- init/Makefile.in.orig	2012-12-19 18:02:26.000000000 +0100
1
--- init/Makefile.in.orig	2012-12-19 17:02:26 UTC
2
+++ init/Makefile.in	2014-09-04 14:32:46.863296746 +0200
2
+++ init/Makefile.in
3
@@ -437,9 +437,10 @@
3
@@ -437,9 +437,10 @@ uninstall-inits :
4
 # We need to filter the *.in files to produce the init scripts
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.
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.)
6
 # (We can not rely on configure to give us correct values.)

Return to bug 211690