diff --git a/general.ent b/general.ent index e3d4d929d7..e8c86adb9b 100644 --- a/general.ent +++ b/general.ent @@ -1,12 +1,12 @@ - + - + diff --git a/general/genlib/libffi.xml b/general/genlib/libffi.xml index 43c78c9a00..144975b11e 100644 --- a/general/genlib/libffi.xml +++ b/general/genlib/libffi.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -92,11 +92,13 @@ commands: -sed -e '/^includesdir/ s:$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:$(includedir):' \ +sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \ -i include/Makefile.in && -sed -e '/^includedir/ s:${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:@includedir@:' \ + +sed -e '/^includedir/ s/=.*$/=@includedir@/' \ -e 's/^Cflags: -I${includedir}/Cflags:/' \ -i libffi.pc.in && + ./configure --prefix=/usr --disable-static && make diff --git a/general/prog/tcl.xml b/general/prog/tcl.xml index 617b0b2c5a..4c3ded6ab3 100644 --- a/general/prog/tcl.xml +++ b/general/prog/tcl.xml @@ -6,10 +6,10 @@ - + - - + + @@ -132,24 +132,21 @@ cd unix && --mandir=/usr/share/man \ $([ $(uname -m) = x86_64 ] && echo --enable-64bit) && make && - + sed -e "s#$SRCDIR/unix#/usr/lib#" \ -e "s#$SRCDIR#/usr/include#" \ -i tclConfig.sh && -sed -e "s#$SRCDIR/unix/pkgs/tdbc1.0.1#/usr/lib/tdbc1.0.0#" \ - -e "s#$SRCDIR/pkgs/tdbc1.0.1/generic#/usr/include#" \ - -e "s#$SRCDIR/pkgs/tdbc1.0.1/library#/usr/lib/tcl8.6#" \ - -e "s#$SRCDIR/pkgs/tdbc1.0.1#/usr/include#" \ - -i pkgs/tdbc1.0.1/tdbcConfig.sh && +sed -e "s#$SRCDIR/unix/pkgs/tdbc1.0.2#/usr/lib/tdbc1.0.2#" \ + -e "s#$SRCDIR/pkgs/tdbc1.0.2/generic#/usr/include#" \ + -e "s#$SRCDIR/pkgs/tdbc1.0.2/library#/usr/lib/tcl8.6#" \ + -e "s#$SRCDIR/pkgs/tdbc1.0.2#/usr/include#" \ + -i pkgs/tdbc1.0.2/tdbcConfig.sh && -sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.1#/usr/lib/itcl4.0.0#" \ - -e "s#$SRCDIR/pkgs/itcl4.0.1/generic#/usr/include#" \ - -e "s#$SRCDIR/pkgs/itcl4.0.1#/usr/include#" \ - -i pkgs/itcl4.0.1/itclConfig.sh && +sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.2#/usr/lib/itcl4.0.2#" \ + -e "s#$SRCDIR/pkgs/itcl4.0.2/generic#/usr/include#" \ + -e "s#$SRCDIR/pkgs/itcl4.0.2#/usr/include#" \ + -i pkgs/itcl4.0.2/itclConfig.sh && unset SRCDIR diff --git a/general/prog/tk.xml b/general/prog/tk.xml index 048acf97e2..fd538c72ce 100644 --- a/general/prog/tk.xml +++ b/general/prog/tk.xml @@ -6,9 +6,9 @@ - + - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 1b8875aaf8..43aa464e79 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,20 @@ --> + + November 13th, 2014 + + + [bdubbs] - Update to {tcl,tk}-8.6.3. Fixes + #5812. + + + [bdubbs] - Update to libffi-3.2. Fixes + #5810. + + + + November 12th, 2014 diff --git a/packages.ent b/packages.ent index a687262b33..d29954bd09 100644 --- a/packages.ent +++ b/packages.ent @@ -111,7 +111,7 @@ - + @@ -274,8 +274,8 @@ - - + +