diff options
Diffstat (limited to 'dev-tcltk/tkimg/files/tkimg-1.3-m4.patch')
| -rw-r--r-- | dev-tcltk/tkimg/files/tkimg-1.3-m4.patch | 311 |
1 files changed, 0 insertions, 311 deletions
diff --git a/dev-tcltk/tkimg/files/tkimg-1.3-m4.patch b/dev-tcltk/tkimg/files/tkimg-1.3-m4.patch deleted file mode 100644 index d1814b649..000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.3-m4.patch +++ /dev/null @@ -1,311 +0,0 @@ ---- Makefile.in -+++ Makefile.in -@@ -117,12 +117,14 @@ - here=`pwd` ; \ - cd $$sub ; \ - $(MAKE) install \ -+ DESTDIR="" INSTALL_ROOT="" \ -+ libdir=$$here/Img/exec_prefix/lib \ - exec_prefix=$$here/Img/exec_prefix \ - prefix=$$here/Img/prefix \ - pkglibdir=$$here/Img/exec_prefix/lib/Img \ - ; \ - cd $$here ; \ -- cat Img/exec_prefix/lib/Img/pkgIndex.tcl >> pkgIndex.tcl ; \ -+ cat Img/exec_prefix/lib/Img/pkgIndex.tcl >> pkgIndex.tcl || :; \ - done - mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl - ---- base/tclconfig/tcl.m4 -+++ base/tclconfig/tcl.m4 -@@ -759,7 +759,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -912,7 +912,7 @@ - - # AIX v<=4.1 has some different flags than 4.2+ - if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then -- LIBOBJS="$LIBOBJS tclLoadAix.o" -+ AC_LIBOBJ([tclLoadAix]) - DL_LIBS="-lld" - fi - -@@ -1143,7 +1143,7 @@ - # is kind of overkill but it works. - # Disable inlining only when one of the - # files in compat/*.c is being linked in. -- if test x"${LIBOBJS}" != x ; then -+ if test x"${LIB@&t@OBJS}" != x ; then - EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" - fi - -@@ -2026,7 +2026,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -2178,7 +2178,7 @@ - AC_MSG_RESULT([ok]) - else - AC_MSG_RESULT([buggy]) -- LIBOBJS="$LIBOBJS fixstrtod.o" -+ AC_LIBOBJ([fixstrtod]) - AC_DEFINE(strtod, fixstrtod) - fi - fi ---- base/tkimg.h -+++ base/tkimg.h -@@ -22,6 +22,7 @@ - #define __TKIMG_H__ - - #include <stdio.h> /* stdout, and other definitions */ -+#include <string.h> - #include "tk.h" - - /* ---- libjpeg/tcl/configure -+++ libjpeg/tcl/configure -@@ -5319,14 +5319,14 @@ - - case "$srcdir" in - .) # No --srcdir option. We are building in place. -- jpegdir=$srcdir/.. ;; -+ jpegdir=`pwd`/.. ;; - /*) # Absolute path. - jpegdir=$srcdir/.. ;; - *) # Relative path. - jpegdir=../$ac_dots$srcdir/.. ;; - esac - --mkdir libjpeg -+mkdir -p libjpeg - cd libjpeg - env CC="$JPEG_CC" CFLAGS="$JPEG_CFLAGS" $jpegdir/configure - cd .. ---- libjpeg/tcl/tclconfig/tcl.m4 -+++ libjpeg/tcl/tclconfig/tcl.m4 -@@ -759,7 +759,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -912,7 +912,7 @@ - - # AIX v<=4.1 has some different flags than 4.2+ - if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then -- LIBOBJS="$LIBOBJS tclLoadAix.o" -+ AC_LIBOBJ([tclLoadAix]) - DL_LIBS="-lld" - fi - -@@ -1143,7 +1143,7 @@ - # is kind of overkill but it works. - # Disable inlining only when one of the - # files in compat/*.c is being linked in. -- if test x"${LIBOBJS}" != x ; then -+ if test x"${LIB@&t@OBJS}" != x ; then - EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" - fi - -@@ -2026,7 +2026,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -2178,7 +2178,7 @@ - AC_MSG_RESULT([ok]) - else - AC_MSG_RESULT([buggy]) -- LIBOBJS="$LIBOBJS fixstrtod.o" -+ AC_LIBOBJ([fixstrtod]) - AC_DEFINE(strtod, fixstrtod) - fi - fi ---- libpng/tcl/tclconfig/tcl.m4 -+++ libpng/tcl/tclconfig/tcl.m4 -@@ -759,7 +759,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -912,7 +912,7 @@ - - # AIX v<=4.1 has some different flags than 4.2+ - if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then -- LIBOBJS="$LIBOBJS tclLoadAix.o" -+ AC_LIBOBJ([tclLoadAix]) - DL_LIBS="-lld" - fi - -@@ -1143,7 +1143,7 @@ - # is kind of overkill but it works. - # Disable inlining only when one of the - # files in compat/*.c is being linked in. -- if test x"${LIBOBJS}" != x ; then -+ if test x"${LIB@&t@OBJS}" != x ; then - EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" - fi - -@@ -2026,7 +2026,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -2178,7 +2178,7 @@ - AC_MSG_RESULT([ok]) - else - AC_MSG_RESULT([buggy]) -- LIBOBJS="$LIBOBJS fixstrtod.o" -+ AC_LIBOBJ([fixstrtod]) - AC_DEFINE(strtod, fixstrtod) - fi - fi ---- libtiff/tcl/tclconfig/tcl.m4 -+++ libtiff/tcl/tclconfig/tcl.m4 -@@ -759,7 +759,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -912,7 +912,7 @@ - - # AIX v<=4.1 has some different flags than 4.2+ - if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then -- LIBOBJS="$LIBOBJS tclLoadAix.o" -+ AC_LIBOBJ([tclLoadAix]) - DL_LIBS="-lld" - fi - -@@ -1143,7 +1143,7 @@ - # is kind of overkill but it works. - # Disable inlining only when one of the - # files in compat/*.c is being linked in. -- if test x"${LIBOBJS}" != x ; then -+ if test x"${LIB@&t@OBJS}" != x ; then - EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" - fi - -@@ -2026,7 +2026,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -2178,7 +2178,7 @@ - AC_MSG_RESULT([ok]) - else - AC_MSG_RESULT([buggy]) -- LIBOBJS="$LIBOBJS fixstrtod.o" -+ AC_LIBOBJ([fixstrtod]) - AC_DEFINE(strtod, fixstrtod) - fi - fi ---- libz/tcl/tclconfig/tcl.m4 -+++ libz/tcl/tclconfig/tcl.m4 -@@ -759,7 +759,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -912,7 +912,7 @@ - - # AIX v<=4.1 has some different flags than 4.2+ - if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then -- LIBOBJS="$LIBOBJS tclLoadAix.o" -+ AC_LIBOBJ([tclLoadAix]) - DL_LIBS="-lld" - fi - -@@ -1143,7 +1143,7 @@ - # is kind of overkill but it works. - # Disable inlining only when one of the - # files in compat/*.c is being linked in. -- if test x"${LIBOBJS}" != x ; then -+ if test x"${LIB@&t@OBJS}" != x ; then - EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" - fi - -@@ -2026,7 +2026,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -2178,7 +2178,7 @@ - AC_MSG_RESULT([ok]) - else - AC_MSG_RESULT([buggy]) -- LIBOBJS="$LIBOBJS fixstrtod.o" -+ AC_LIBOBJ([fixstrtod]) - AC_DEFINE(strtod, fixstrtod) - fi - fi ---- tclconfig/tcl.m4 -+++ tclconfig/tcl.m4 -@@ -759,7 +759,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -1143,7 +1143,7 @@ - # is kind of overkill but it works. - # Disable inlining only when one of the - # files in compat/*.c is being linked in. -- if test x"${LIBOBJS}" != x ; then -+ if test x"${LIB@&t@OBJS}" != x ; then - EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" - fi - -@@ -2026,7 +2026,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` |