From owner-freebsd-ports Wed Jul 19 11:20:25 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 5BA7E37BFBF for ; Wed, 19 Jul 2000 11:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id LAA72821; Wed, 19 Jul 2000 11:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from ns.rim.or.jp (ns.rim.or.jp [202.247.128.2]) by hub.freebsd.org (Postfix) with ESMTP id 1E78E37B778 for ; Wed, 19 Jul 2000 11:19:32 -0700 (PDT) (envelope-from hige@higesoft.rim.or.jp) Received: from rayearth.rim.or.jp (uucp@rayearth.rim.or.jp [202.247.130.242]) by ns.rim.or.jp (8.9.3/3.6W-RIMNET-98-06-09) with ESMTP id DAA98012 for ; Thu, 20 Jul 2000 03:19:30 +0900 (JST) Received: (from uucp@localhost) by rayearth.rim.or.jp (8.8.8/3.5Wpl2-uucp1/RIMNET) with UUCP id DAA01185 for FreeBSD-gnats-submit@freebsd.org; Thu, 20 Jul 2000 03:19:29 +0900 (JST) Received: (from hige@localhost) by higesoft.rim.or.jp (8.9.3/3.7W) id DAA27626; Thu, 20 Jul 2000 03:18:04 +0900 (JST) Message-Id: <200007191818.DAA27626@higesoft.rim.or.jp> Date: Thu, 20 Jul 2000 03:18:04 +0900 (JST) From: hige@higesoft.rim.or.jp Reply-To: hige@higesoft.rim.or.jp To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/20041: Update port: japanese/kebook-i18n Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20041 >Category: ports >Synopsis: Update port: japanese/kebook-i18n >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 19 11:20:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: SUZUKI Mitsuhiro >Release: FreeBSD 4.1-RC i386 >Organization: None >Environment: >Description: Correct a patch of configure script to build successfully. >How-To-Repeat: >Fix: diff -urN kebook-i18n.old/patches/patch-aa kebook-i18n/patches/patch-aa --- kebook-i18n.old/patches/patch-aa Thu Jul 20 02:58:57 2000 +++ kebook-i18n/patches/patch-aa Thu Jul 20 03:00:22 2000 @@ -1,221 +1,133 @@ -*** configure.orig Thu May 25 22:44:47 2000 ---- configure Thu May 25 22:46:39 2000 -*************** -*** 2858,2865 **** - 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 $lt_target \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - - # Reload cache, that may have been modified by ltconfig ---- 2858,2865 ---- - 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} /usr/local/share/libtool/ltconfig --no-reexec \ -! $libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - - # Reload cache, that may have been modified by ltconfig -*************** -*** 2873,2879 **** - - - # This can be used to rebuild libtool when needed -! LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' ---- 2873,2879 ---- - - - # This can be used to rebuild libtool when needed -! LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -*************** -*** 4676,4689 **** - - - -! LIBQT="-lqt" - if test $kde_qtver = 2; then - - - LIBQT="$LIBQT $LIBPNG" - fi -! echo $ac_n "checking for Qt""... $ac_c" 1>&6 -! echo "configure:4687: checking for Qt" >&5 - - LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET" - ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO ---- 4676,4689 ---- - - - -! LIBQT="-lqti18n" - if test $kde_qtver = 2; then - - - LIBQT="$LIBQT $LIBPNG" - fi -! echo $ac_n "checking for Qt-i18n""... $ac_c" 1>&6 -! echo "configure:4687: checking for Qt-i18n" >&5 - - LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET" - ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO -*************** -*** 4895,4901 **** - - CXXFLAGS="$CXXFLAGS -I$qt_includes" - LDFLAGS="$X_LDFLAGS" -! LIBS="-lqt -lXext -lX11 $LIBSOCKET" - LD_LIBRARY_PATH= - export LD_LIBRARY_PATH - LIBRARY_PATH= ---- 4895,4901 ---- - - CXXFLAGS="$CXXFLAGS -I$qt_includes" - LDFLAGS="$X_LDFLAGS" -! LIBS="-lqti18n -lXext -lX11 $LIBSOCKET" - LD_LIBRARY_PATH= - export LD_LIBRARY_PATH - LIBRARY_PATH= -*************** -*** 5086,5092 **** - - - -! LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)' - - - ---- 5086,5092 ---- - - - -! LIB_QT='-lqti18n $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)' - - - -*************** -*** 5184,5190 **** - kde_libdir=NO - for i in $kde_libdirs; - do -! for j in libkdecore.la; - do - if test -r "$i/$j"; then - kde_libdir=$i ---- 5184,5190 ---- - kde_libdir=NO - for i in $kde_libdirs; - do -! for j in libkdecore.a; - do - if test -r "$i/$j"; then - kde_libdir=$i -*************** -*** 5195,5201 **** - - ac_kde_libraries="$kde_libdir" - -! if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.la"; then - { echo "configure: error: - in the prefix, you've chosen, are no KDE libraries installed. This will fail. - So, check this please and use another prefix!" 1>&2; exit 1; } ---- 5195,5201 ---- - - ac_kde_libraries="$kde_libdir" - -! if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.a"; then - { echo "configure: error: - in the prefix, you've chosen, are no KDE libraries installed. This will fail. - So, check this please and use another prefix!" 1>&2; exit 1; } -*************** -*** 5571,5579 **** - - LIB_SMB='-lsmb' - -! LIB_KFILE='-lkfile' - -! LIB_KAB='-lkab' - - LIB_MEDIATOOL='-lmediatool' - ---- 5571,5579 ---- - - LIB_SMB='-lsmb' - -! LIB_KFILE='-lkfilei18n' - -! LIB_KAB='-lkabi18n' - - LIB_MEDIATOOL='-lmediatool' - -*************** -*** 5590,5598 **** - - LIB_KFM='-lkfm $(LIB_KDECORE)' - -! LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)' - -! LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)' - - LIB_MEDIATOOL='-lmediatool $(LIB_KDECORE)' - ---- 5590,5598 ---- - - LIB_KFM='-lkfm $(LIB_KDECORE)' - -! LIB_KFILE='-lkfilei18n $(LIB_KFM) $(LIB_KDEUI)' - -! LIB_KAB='-lkabi18n $(LIB_KIMGIO) $(LIB_KDECORE)' - - LIB_MEDIATOOL='-lmediatool $(LIB_KDECORE)' - -*************** -*** 5616,5624 **** - - LIB_SMB='-lsmb' - -! LIB_KFILE='-lkfile' - -! LIB_KAB='-lkab' - - LIB_MEDIATOOL='-lmediatool' - ---- 5616,5624 ---- - - LIB_SMB='-lsmb' - -! LIB_KFILE='-lkfilei18n' - -! LIB_KAB='-lkabi18n' - - LIB_MEDIATOOL='-lmediatool' - -*************** -*** 5635,5643 **** - - LIB_KFM='-lkfm $(LIB_KDECORE)' - -! LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)' - -! LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)' - - LIB_MEDIATOOL='-lmediatool $(LIB_KDECORE)' - ---- 5635,5643 ---- - - LIB_KFM='-lkfm $(LIB_KDECORE)' - -! LIB_KFILE='-lkfilei18n $(LIB_KFM) $(LIB_KDEUI)' - -! LIB_KAB='-lkabi18n $(LIB_KIMGIO) $(LIB_KDECORE)' - - LIB_MEDIATOOL='-lmediatool $(LIB_KDECORE)' - +--- configure.orig Thu Jun 22 05:29:10 2000 ++++ configure Thu Jul 20 02:38:57 2000 +@@ -2858,8 +2858,8 @@ + 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 $lt_target \ ++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ ++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + + # Reload cache, that may have been modified by ltconfig +@@ -2873,7 +2873,7 @@ + + + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh" + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -4676,14 +4676,14 @@ + + + +-LIBQT="-lqt" ++LIBQT="-lqti18n" + if test $kde_qtver = 2; then + + + LIBQT="$LIBQT $LIBPNG" + fi +-echo $ac_n "checking for Qt""... $ac_c" 1>&6 +-echo "configure:4687: checking for Qt" >&5 ++echo $ac_n "checking for Qt-i18n""... $ac_c" 1>&6 ++echo "configure:4687: checking for Qt-i18n" >&5 + + LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET" + ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO +@@ -4758,7 +4758,7 @@ + test=NONE + qt_libdir=NONE + for dir in $qt_libdirs; do +- try="ls -1 $dir/libqt.*" ++ try="ls -1 $dir/libqti18n.*" + if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi + done + +@@ -4895,7 +4895,7 @@ + + CXXFLAGS="$CXXFLAGS -I$qt_includes" + LDFLAGS="$X_LDFLAGS" +-LIBS="-lqt -lXext -lX11 $LIBSOCKET" ++LIBS="-lqti18n -lXext -lX11 $LIBSOCKET" + LD_LIBRARY_PATH= + export LD_LIBRARY_PATH + LIBRARY_PATH= +@@ -5086,7 +5086,7 @@ + + + +-LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)' ++LIB_QT='-lqti18n $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)' + + + +@@ -5184,7 +5184,7 @@ + kde_libdir=NO + for i in $kde_libdirs; + do +- for j in libkdecore.la; ++ for j in libkdecore.a; + do + if test -r "$i/$j"; then + kde_libdir=$i +@@ -5195,7 +5195,7 @@ + + ac_kde_libraries="$kde_libdir" + +-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.la"; then ++if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.a"; then + { echo "configure: error: + in the prefix, you've chosen, are no KDE libraries installed. This will fail. + So, check this please and use another prefix!" 1>&2; exit 1; } +@@ -5571,9 +5571,9 @@ + + LIB_SMB='-lsmb' + +- LIB_KFILE='-lkfile' ++ LIB_KFILE='-lkfilei18n' + +- LIB_KAB='-lkab' ++ LIB_KAB='-lkabi18n' + + LIB_MEDIATOOL='-lmediatool' + +@@ -5590,9 +5590,9 @@ + + LIB_KFM='-lkfm $(LIB_KDECORE)' + +- LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)' ++ LIB_KFILE='-lkfilei18n $(LIB_KFM) $(LIB_KDEUI)' + +- LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)' ++ LIB_KAB='-lkabi18n $(LIB_KIMGIO) $(LIB_KDECORE)' + + LIB_MEDIATOOL='-lmediatool $(LIB_KDECORE)' + +@@ -5616,9 +5616,9 @@ + + LIB_SMB='-lsmb' + +- LIB_KFILE='-lkfile' ++ LIB_KFILE='-lkfilei18n' + +- LIB_KAB='-lkab' ++ LIB_KAB='-lkabi18n' + + LIB_MEDIATOOL='-lmediatool' + +@@ -5635,9 +5635,9 @@ + + LIB_KFM='-lkfm $(LIB_KDECORE)' + +- LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)' ++ LIB_KFILE='-lkfilei18n $(LIB_KFM) $(LIB_KDEUI)' + +- LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)' ++ LIB_KAB='-lkabi18n $(LIB_KIMGIO) $(LIB_KDECORE)' + + LIB_MEDIATOOL='-lmediatool $(LIB_KDECORE)' + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message