Attachment 173447 Details for Bug 211690 – Regenerate patch files, switch to USES, patch to build w/ tcl 8.6

[patch] Regenerate patch files, switch to USES, patch to build w/ tcl 8.6

modules_uses_tcl86.diff (text/plain), 8.49 KB, created by Matthieu Volat on 2016-08-09 10:00:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Volat

Created: 2016-08-09 10:00:13 UTC

Size: 8.49 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 419903)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	modules
> PORTVERSION=	3.2.10
>+PORTREVISION=	1
> CATEGORIES=	sysutils tcl
> MASTER_SITES=	SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}
> 
>@@ -11,20 +12,16 @@
> 
> 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}
> 
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 419903)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- 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)" \
>@@ -9,7 +9,7 @@
>  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
>@@ -18,7 +18,7 @@
>  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
>@@ -27,7 +27,7 @@
>  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)
>@@ -41,7 +41,7 @@
>  	{ 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 \
>@@ -75,7 +75,7 @@
>  
>  # 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:
>@@ -84,7 +84,7 @@
>  	  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:
>  
>@@ -93,7 +93,7 @@
>  
>  install-pdf: install-pdf-recursive
>  
>-@@ -1603,7 +1603,7 @@
>+@@ -1603,7 +1603,7 @@ ps-am:
>  
>  uninstall-am: uninstall-binPROGRAMS uninstall-man
>  
>@@ -102,7 +102,7 @@
>  
>  .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 \
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 419903)
>+++ files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- 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=<dir>        directory containing tcl configuration
>                            (tclConfig.sh) [[searches]]
>@@ -9,7 +9,7 @@
>    --with-tcl-lib=<dir>    directory containing tcl libraries (libtclX.Y)
>                            [[none]]
>    --with-tcl-inc=<dir>    directory containing tcl include files
>-@@ -1518,7 +1518,7 @@
>+@@ -1518,7 +1518,7 @@ PREFIX/Modules/($MODULES_VERSION/ if mod
>  	init/
>  	man/
>  		man1/
>@@ -18,7 +18,7 @@
>  	modulefiles/
>  PREFIX/Modules/
>  	modulefiles/
>-@@ -7099,9 +7099,9 @@
>+@@ -7099,9 +7099,9 @@ else
>  		em_cv_tclver=${with_tclver}
>  	    fi #}}
>  
>@@ -30,7 +30,7 @@
>  	    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 #}}
>  
>@@ -42,7 +42,7 @@
>  	    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
>@@ -51,7 +51,7 @@
>  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" ;;
>Index: files/patch-doc__module.1.in
>===================================================================
>--- files/patch-doc__module.1.in	(revision 419903)
>+++ files/patch-doc__module.1.in	(working copy)
>@@ -1,6 +1,6 @@
>---- 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
>@@ -9,7 +9,7 @@
>  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
>Index: files/patch-doc__modulefile.5.in
>===================================================================
>--- files/patch-doc__modulefile.5.in	(revision 419903)
>+++ files/patch-doc__modulefile.5.in	(working copy)
>@@ -1,4 +1,4 @@
>---- 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"
>@@ -9,7 +9,7 @@
>  .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
>Index: files/patch-etc__Makefile.in
>===================================================================
>--- files/patch-etc__Makefile.in	(revision 419903)
>+++ files/patch-etc__Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 \
>Index: files/patch-init__Makefile.in
>===================================================================
>--- files/patch-init__Makefile.in	(revision 419903)
>+++ files/patch-init__Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- 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.)

Actions: View | Diff

Attachments on bug 211690: 173447 | 173873