diff options
author | tv <tv@pkgsrc.org> | 1998-07-18 23:14:27 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 1998-07-18 23:14:27 +0000 |
commit | 7bccc76110c31778d4352e05fd74511038e11b86 (patch) | |
tree | afeefb7a26c3264ad7a5ed8d2ea7ae063d258c9f /x11/gtk/patches | |
parent | cf80f4e4fd210256ff2fe620e47931297cef1f98 (diff) | |
download | pkgsrc-7bccc76110c31778d4352e05fd74511038e11b86.tar.gz |
- Adapt to use pkg version of libtool instead of its own private copy.
- Use INSTALL_{PROGRAM,DATA,SCRIPT} from the pkg system in the makefiles
instead of hacking around the INSTALL= breakage in configure.
- Change @dirrm share/aclocal to a "try to delete aclocal directory" via
@unexec rmdir || true - more than one pkg uses the aclocal dir.
Diffstat (limited to 'x11/gtk/patches')
-rw-r--r-- | x11/gtk/patches/patch-aa | 29 | ||||
-rw-r--r-- | x11/gtk/patches/patch-ab | 24 |
2 files changed, 35 insertions, 18 deletions
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa index ee02c02f98b..e6369c3f054 100644 --- a/x11/gtk/patches/patch-aa +++ b/x11/gtk/patches/patch-aa @@ -1,10 +1,19 @@ ---- glib/configure.orig Sat Jun 6 07:40:29 1998 -+++ glib/configure Sat Jun 6 07:39:57 1998 -@@ -574,6 +574,7 @@ - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 - echo "configure:577: checking for a BSD compatible install" >&5 -+INSTALL="" - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +--- configure.orig Tue Jun 2 01:31:51 1998 ++++ configure Sat Jul 18 10:44:53 1998 +@@ -1231,6 +1231,7 @@ + echo "$ac_t""no" 1>&6 + fi + ++if false; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + +@@ -1276,7 +1277,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +- ++fi + + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 + echo "configure:1283: checking whether to enable maintainer-specific portions of Makefiles" >&5 diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab index 32e08c37636..6fd5fd8dd9c 100644 --- a/x11/gtk/patches/patch-ab +++ b/x11/gtk/patches/patch-ab @@ -1,11 +1,19 @@ ---- configure.orig Sat Jun 6 20:45:12 1998 -+++ configure Sat Jun 6 20:45:37 1998 -@@ -638,7 +638,7 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +--- glib/configure.orig Tue Jun 2 01:31:43 1998 ++++ glib/configure Sat Jul 18 10:48:59 1998 +@@ -1208,6 +1208,7 @@ + echo "$ac_t""no" 1>&6 + fi ++if false; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +@@ -1253,7 +1254,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +- ++fi - echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 - echo "configure:645: checking whether build environment is sane" >&5 + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 + echo "configure:1260: checking whether to enable maintainer-specific portions of Makefiles" >&5 |