diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2006-02-23 10:40:44 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2006-02-23 10:40:44 +0000 |
| commit | 8503536d3896846d823f7f76be54e0a99da8d8b6 (patch) | |
| tree | 1a89e4038216ead71b008f2a5091474964e1c341 /comms/kpsk | |
| parent | Unbreak: make it fetchable again (diff) | |
Conversion to a single libtool environment.
Approved by: portmgr (kris)
Notes
Notes:
svn path=/head/; revision=156749
Diffstat (limited to 'comms/kpsk')
| -rw-r--r-- | comms/kpsk/Makefile | 2 | ||||
| -rw-r--r-- | comms/kpsk/files/patch-aa | 41 |
2 files changed, 35 insertions, 8 deletions
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile index fda737e1b6f4..94afa9b08498 100644 --- a/comms/kpsk/Makefile +++ b/comms/kpsk/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_KDELIBS_VER=3 USE_REINPLACE= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-D_POSIX_C_SOURCE -I${LOCALBASE}/include" \ USER_LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-debug=full diff --git a/comms/kpsk/files/patch-aa b/comms/kpsk/files/patch-aa index 0ea71b84facc..5834ce3ffdae 100644 --- a/comms/kpsk/files/patch-aa +++ b/comms/kpsk/files/patch-aa @@ -1,11 +1,38 @@ ---- configure.orig Thu Oct 24 11:17:10 2002 -+++ configure Thu Oct 24 11:17:32 2002 -@@ -8703,7 +8703,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +--- configure.orig Wed Oct 9 00:32:30 2002 ++++ configure Sat Feb 18 22:49:57 2006 +@@ -3830,13 +3830,2 @@ + +-# Actually configure libtool. ac_aux_dir is where install-sh is found. +-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ +-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ +-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ +-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ +-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \ +-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +- + # Reload cache, that may have been modified by ltconfig +@@ -3864,16 +3853,2 @@ + LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh" +-lt_save_CC="$CC" +-lt_save_CFLAGS="$CFLAGS" +-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \ +-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ +-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ +-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ +-deplibs_check_method="$deplibs_check_method" \ +-file_magic_cmd="$file_magic_cmd" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \ +---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \ +-|| { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; } +-CC="$lt_save_CC" +-CFLAGS="$lt_save_CFLAGS" + +@@ -8705,3 +8680,3 @@ ac_save_LIBS="$LIBS" -LIBS="-ldb-4.0 $LIBS" +LIBS="-ldb-4.0 $USER_LDFLAGS $LIBS" cat > conftest.$ac_ext <<EOF - #line 8709 "configure" - #include "confdefs.h" |