diff options
Diffstat (limited to 'dev-tcltk/tkXwin/files')
| -rw-r--r-- | dev-tcltk/tkXwin/files/1.0-Makefile.in.diff | 21 | ||||
| -rw-r--r-- | dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch | 93 |
2 files changed, 114 insertions, 0 deletions
diff --git a/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff b/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff new file mode 100644 index 000000000000..bd10890c719c --- /dev/null +++ b/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff @@ -0,0 +1,21 @@ +--- Makefile.in.orig 2003-02-01 22:03:34.000000000 -0500 ++++ Makefile.in 2003-02-01 22:04:39.000000000 -0500 +@@ -432,14 +432,14 @@ + + + install-exec-hook: +- $(mkinstalldirs) @PKG_TCL@ ++ $(mkinstalldirs) $(DESTDIR)@PKG_TCL@ + echo "package ifneeded tkXwin" \ + `echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \ +- "[list load $(DESTDIR)$(libdir)/libtkXwin.so]" \ +- > @PKG_TCL@/pkgIndex.tcl ++ "[list load $(libdir)/libtkXwin.so]" \ ++ > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl + sed -e 's%load .libs/libtkXwin.so%package require tkXwin%' \ + < test.tcl \ +- > @PKG_TCL@/test.tcl ++ > $(DESTDIR)@PKG_TCL@/test.tcl + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch b/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch new file mode 100644 index 000000000000..ac2f84b97f21 --- /dev/null +++ b/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch @@ -0,0 +1,93 @@ + configure | 43 +++---------------------------------------- + 1 file changed, 3 insertions(+), 40 deletions(-) + +diff --git a/configure b/configure +index d92a1bf..d8605a0 100755 +--- a/configure ++++ b/configure +@@ -823,7 +823,6 @@ fi + + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" +-CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 + echo "configure:829: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then +@@ -839,23 +838,6 @@ rm -f conftest* + + fi + +-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi +- + # Check whether --enable-static or --disable-static was given. + if test "${enable_static+set}" = set; then + enableval="$enable_static" +@@ -2078,7 +2060,6 @@ fi + + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" +-CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 + echo "configure:2084: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then +@@ -2094,24 +2075,6 @@ rm -f conftest* + + fi + +-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi +- +- + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: +@@ -3403,9 +3366,9 @@ fi + + + if test "${SHARED_BUILD}" = "1" ; then +- CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}' ++ CFLAGS+=' ${CFLAGS_WARNING} ${SHLIB_CFLAGS}' + else +- CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}' ++ CFLAGS+=' ${CFLAGS_WARNING}' + fi + + #-------------------------------------------------------------------- +@@ -3534,7 +3497,7 @@ fi + + + +-PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin ++PKG_TCL=${libdir}/tkXwin + + + |