diff options
| author | skrll <skrll@pkgsrc.org> | 2000-08-22 21:26:54 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2000-08-22 21:26:54 +0000 |
| commit | 3a2db696bd6531c6ec403b2feff0f042e9a02abf (patch) | |
| tree | 179f261b31697badbffcc8e493c451c4756ad8fb | |
| parent | 5054feb1ba1a90867695c3c3377e68f74b018624 (diff) | |
| download | pkgsrc-3a2db696bd6531c6ec403b2feff0f042e9a02abf.tar.gz | |
Use LTCONFIG_OVERRIDE and remove libtool part of patch.
| -rw-r--r-- | net/kdenetwork/Makefile | 3 | ||||
| -rw-r--r-- | net/kdenetwork/files/patch-sum | 4 | ||||
| -rw-r--r-- | net/kdenetwork/patches/patch-ac | 33 |
3 files changed, 8 insertions, 32 deletions
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index 56c06f63fba..5e8b559d451 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2000/08/16 00:20:22 hubertf Exp $ +# $NetBSD: Makefile,v 1.50 2000/08/22 21:26:54 skrll Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -21,6 +21,7 @@ NOT_FOR_PLATFORM= *-*-alpha # LP64/ELF problems USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/admin/ltconfig GNU_CONFIGURE= yes EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \ diff --git a/net/kdenetwork/files/patch-sum b/net/kdenetwork/files/patch-sum index 15084f91ea0..79c44085ebb 100644 --- a/net/kdenetwork/files/patch-sum +++ b/net/kdenetwork/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.4 1999/11/12 14:40:03 hubertf Exp $ +$NetBSD: patch-sum,v 1.5 2000/08/22 21:26:55 skrll Exp $ MD5 (patch-aa) = c44ffb7411ffd09f2119823077550393 MD5 (patch-ab) = 70e042b4393e38d0d0781ad5a222f552 -MD5 (patch-ac) = 19ffe37c0ce30d1e8795d1e1b84272f0 +MD5 (patch-ac) = 7559e1980d52277163c763fc49840257 diff --git a/net/kdenetwork/patches/patch-ac b/net/kdenetwork/patches/patch-ac index 04c98570fad..51532c10b49 100644 --- a/net/kdenetwork/patches/patch-ac +++ b/net/kdenetwork/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.6 1999/09/15 18:26:03 tron Exp $ +$NetBSD: patch-ac,v 1.7 2000/08/22 21:26:55 skrll Exp $ ---- configure.orig Sat Sep 11 17:38:35 1999 -+++ configure Wed Sep 15 17:04:37 1999 +--- configure.orig Sat Sep 11 16:38:35 1999 ++++ configure Sun Aug 20 10:54:07 2000 @@ -513,9 +513,9 @@ # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -14,23 +14,7 @@ $NetBSD: patch-ac,v 1.6 1999/09/15 18:26:03 tron Exp $ fi fi for ac_site_file in $CONFIG_SITE; do -@@ -2005,6 +2005,7 @@ - CC=$CXX - CFLAGS="$CXXFLAGS" - # Always use our own libtool. -+if false; then - LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' - - -@@ -2237,6 +2238,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. -@@ -4087,37 +4089,37 @@ +@@ -4087,37 +4087,37 @@ if test "$ac_use_path_checking" = "default"; then if test -z "$kde_htmldir"; then @@ -79,12 +63,3 @@ $NetBSD: patch-ac,v 1.6 1999/09/15 18:26:03 tron Exp $ fi if test -z "$kde_bindir"; then kde_bindir='\$(exec_prefix)/bin' -@@ -4210,7 +4212,7 @@ - - echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6 - echo "configure:4213: checking for KDE libraries installed" >&5 --ac_link='/bin/sh ./libtool --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' -+ac_link='${LIBTOOL} --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' - - if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - echo "$ac_t""yes" 1>&6 |