Modify the configure script (using code shamelessy pasted from kdevelop's

configure) to put kdbg's KDE resource files in the right place.

2 files changed, 231 insertions, 51 deletions

diff --git a/devel/kdbg/patches/patch-aa b/devel/kdbg/patches/patch-aa
new file mode 100644
index 00000000000..e5bc398c471
--- /dev/null
+++ b/devel/kdbg/patches/patch-aa
@@ -0,0 +1,180 @@
+$NetBSD: patch-aa,v 1.1 2000/02/02 13:47:43 scw Exp $
+
+--- configure.orig	Sun Nov 14 17:01:51 1999
++++ configure	Wed Feb  2 12:51:57 2000
+@@ -3818,7 +3818,8 @@
+     
+ 
+ 
+-
++# Use NetBSD package system libtool (start)
++if false; then
+ 
+ kde_save_cc=$CC
+ kde_save_cflags="$CFLAGS"
+@@ -3921,6 +3922,10 @@
+ CC=$kde_save_cc
+ CFLAGS="$kde_save_cflags"
+ 
++fi
++# Use NetBSD package system libtool (end)
++
++
+ echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+ echo "configure:3926: checking whether NLS is requested" >&5
+         # Check whether --enable-nls or --disable-nls was given.
+@@ -4254,7 +4259,7 @@
+   fi
+   
+ else
+-  ac_use_path_checking="default"
++  ac_use_path_checking=""
+   
+ fi
+ 
+@@ -4269,7 +4274,9 @@
+ if eval "test \"`echo '$''{'kde_cv_all_paths'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  
++
++if test "$ac_use_path_checking" = "default"; then
++
+   if test -z "$kde_htmldir"; then
+     kde_htmldir='\$(prefix)/share/doc/HTML'
+   fi
+@@ -4330,6 +4337,124 @@
+ 	kde_servicetypesdir=\"$kde_servicetypesdir\" \
+ 	kde_result=defaults"
+ 
++else
++
++echo "$ac_t""compiling" 1>&6
++
++
++    echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
++echo "configure:4346: checking for KDE headers installed" >&5
++    ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++
++cat > conftest.$ac_ext <<EOF
++#include <stdio.h>
++#include "confdefs.h"
++#include <kapp.h>
++
++int main() {
++    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
++    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
++    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
++    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
++    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
++    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
++    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
++    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
++    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
++    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
++    printf("kde_wallpaperdir=\\"%s\\"\n", 
++	KApplication::kde_wallpaperdir().data());
++    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
++    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
++    printf("kde_servicesdir=\\"%s\\"\n", "dummy");
++    printf("kde_servicetypesdir=\\"%s\\"\n", "dummy");
++    return 0;
++    }
++EOF
++
++ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
++if { (eval echo configure:4410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  echo "$ac_t""yes" 1>&6
++else
++  { echo "configure: error: your system is not able to compile a small KDE application!
++Check, if you installed the KDE header files correctly." 1>&2; exit 1; }
++fi
++
++
++KDE_TEST_RPATH=
++
++if test -n "$USE_RPATH"; then
++
++  if test -n "$kde_libraries"; then
++    KDE_TEST_RPATH="-rpath $kde_libraries"
++  fi
++
++  if test -n "$qt_libraries"; then
++    KDE_TEST_RPATH="$KDE_TEST_RPATH -rpath $qt_libraries"
++  fi
++
++  if test -n "$x_libraries"; then
++    KDE_TEST_RPATH="$KDE_TEST_RPATH -rpath $x_libraries"
++  fi
++
++  KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
++fi
++
++echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
++echo "configure:4438: 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'
++
++if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then 
++  echo "$ac_t""yes" 1>&6
++else
++  { echo "configure: error: your system fails at linking a small KDE application!
++Check, if your compiler is installed correctly and if you have used the
++same compiler to compile Qt and kdelibs as you did use now" 1>&2; exit 1; }
++fi
++
++if eval `KDEDIR= ./conftest 2>&5`; then
++  kde_result=done
++else
++  kde_result=problems
++fi
++
++KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
++kde_have_all_paths=yes
++ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++
++
++if test "$kde_have_all_paths" = "yes"; then
++kde_cv_all_paths="kde_have_all_paths=\"yes\" \
++	kde_htmldir=\"$kde_htmldir\" \
++	kde_appsdir=\"$kde_appsdir\" \
++	kde_icondir=\"$kde_icondir\" \
++	kde_sounddir=\"$kde_sounddir\" \
++	kde_datadir=\"$kde_datadir\" \
++	kde_locale=\"$kde_locale\" \
++	kde_cgidir=\"$kde_cgidir\" \
++	kde_confdir=\"$kde_confdir\" \
++	kde_mimedir=\"$kde_mimedir\" \
++	kde_toolbardir=\"$kde_toolbardir\" \
++	kde_wallpaperdir=\"$kde_wallpaperdir\" \
++	kde_bindir=\"$kde_bindir\" \
++	kde_partsdir=\"$kde_partsdir\" \
++	kde_servicesdir=\"$kde_servicesdir\" \
++	kde_servicetypesdir=\"$kde_servicetypesdir\" \
++	kde_result=$kde_result"
++fi
++rm -fr conftest*
++
++fi
+ 
+ fi
+ 
+@@ -4342,8 +4467,7 @@
+    test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
+    test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
+    test -z "$kde_wallpaperdir" || test -z "$kde_bindir" ||
+-   test -z "$kde_servicesdir" ||
+-   test -z "$kde_servicetypesdir" || test "$kde_have_all_paths" != "yes"; then
++   test "$kde_have_all_paths" != "yes"; then
+   kde_have_all_paths=no
+   { echo "configure: error: configure could not run a little KDE program to test the environment. 
+ Since it had compiled and linked before, it must be a strange problem on your system.
diff --git a/devel/kdbg/pkg/PLIST b/devel/kdbg/pkg/PLIST
index 33c96f5d04e..58ae5141e0e 100644
--- a/devel/kdbg/pkg/PLIST
+++ b/devel/kdbg/pkg/PLIST
@@ -1,52 +1,52 @@
-@comment $NetBSD: PLIST,v 1.3 1999/12/13 15:39:37 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/02/02 13:47:45 scw Exp $
 bin/kdbg
-share/doc/HTML/de/kdbg/index.html
-share/doc/HTML/de/kdbg/types.html
-@dirrm share/doc/HTML/de/kdbg
-share/doc/HTML/en/kdbg/index.html
-share/doc/HTML/en/kdbg/types.html
-@dirrm share/doc/HTML/en/kdbg
-share/doc/HTML/ru/kdbg/index.html
-share/doc/HTML/ru/kdbg/types.html
-@dirrm share/doc/HTML/ru/kdbg
-share/locale/cs/LC_MESSAGES/kdbg.mo
-share/locale/da/LC_MESSAGES/kdbg.mo
-share/locale/de/LC_MESSAGES/kdbg.mo
-share/locale/es/LC_MESSAGES/kdbg.mo
-share/locale/fr/LC_MESSAGES/kdbg.mo
-share/locale/hr/LC_MESSAGES/kdbg.mo
-share/locale/it/LC_MESSAGES/kdbg.mo
-share/locale/no/LC_MESSAGES/kdbg.mo
-share/locale/pl/LC_MESSAGES/kdbg.mo
-share/locale/pt/LC_MESSAGES/kdbg.mo
-share/locale/ro/LC_MESSAGES/kdbg.mo
-share/locale/ru/LC_MESSAGES/kdbg.mo
-share/locale/sk/LC_MESSAGES/kdbg.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kdbg.mo
-share/icons/kdbg.xpm
-share/icons/mini/mini-kdbg.xpm
-share/apps/kdbg/pics/brkpt.xpm
-share/apps/kdbg/pics/pgmfinish.xpm
-share/apps/kdbg/pics/pgmnext.xpm
-share/apps/kdbg/pics/pgmrun.xpm
-share/apps/kdbg/pics/pgmstep.xpm
-share/apps/kdbg/pics/execopen.xpm
-share/apps/kdbg/pics/search.xpm
-share/apps/kdbg/pics/brkena.xpm
-share/apps/kdbg/pics/brkdis.xpm
-share/apps/kdbg/pics/brktmp.xpm
-share/apps/kdbg/pics/brkcond.xpm
-share/apps/kdbg/pics/pcinner.xpm
-share/apps/kdbg/pics/pcup.xpm
-share/apps/kdbg/pics/pointer.xpm
-@dirrm share/apps/kdbg/pics
-share/apps/kdbg/types/qt.kdbgtt
-share/apps/kdbg/types/qt2.kdbgtt
-share/apps/kdbg/types/kdecore.kdbgtt
-share/apps/kdbg/types/kdecore3.kdbgtt
-share/apps/kdbg/types/glib.kdbgtt
-share/apps/kdbg/types/gtk+.kdbgtt
-share/apps/kdbg/types/X11.kdbgtt
-@dirrm share/apps/kdbg/types
-@dirrm share/apps/kdbg
-share/applnk/Development/kdbg.kdelnk
+share/doc/kde/HTML/de/kdbg/index.html
+share/doc/kde/HTML/de/kdbg/types.html
+@dirrm share/doc/kde/HTML/de/kdbg
+share/doc/kde/HTML/en/kdbg/index.html
+share/doc/kde/HTML/en/kdbg/types.html
+@dirrm share/doc/kde/HTML/en/kdbg
+share/doc/kde/HTML/ru/kdbg/index.html
+share/doc/kde/HTML/ru/kdbg/types.html
+@dirrm share/doc/kde/HTML/ru/kdbg
+share/kde/locale/cs/LC_MESSAGES/kdbg.mo
+share/kde/locale/da/LC_MESSAGES/kdbg.mo
+share/kde/locale/de/LC_MESSAGES/kdbg.mo
+share/kde/locale/es/LC_MESSAGES/kdbg.mo
+share/kde/locale/fr/LC_MESSAGES/kdbg.mo
+share/kde/locale/hr/LC_MESSAGES/kdbg.mo
+share/kde/locale/it/LC_MESSAGES/kdbg.mo
+share/kde/locale/no/LC_MESSAGES/kdbg.mo
+share/kde/locale/pl/LC_MESSAGES/kdbg.mo
+share/kde/locale/pt/LC_MESSAGES/kdbg.mo
+share/kde/locale/ro/LC_MESSAGES/kdbg.mo
+share/kde/locale/ru/LC_MESSAGES/kdbg.mo
+share/kde/locale/sk/LC_MESSAGES/kdbg.mo
+share/kde/locale/zh_CN.GB2312/LC_MESSAGES/kdbg.mo
+share/kde/icons/kdbg.xpm
+share/kde/icons/mini/mini-kdbg.xpm
+share/kde/apps/kdbg/pics/brkpt.xpm
+share/kde/apps/kdbg/pics/pgmfinish.xpm
+share/kde/apps/kdbg/pics/pgmnext.xpm
+share/kde/apps/kdbg/pics/pgmrun.xpm
+share/kde/apps/kdbg/pics/pgmstep.xpm
+share/kde/apps/kdbg/pics/execopen.xpm
+share/kde/apps/kdbg/pics/search.xpm
+share/kde/apps/kdbg/pics/brkena.xpm
+share/kde/apps/kdbg/pics/brkdis.xpm
+share/kde/apps/kdbg/pics/brktmp.xpm
+share/kde/apps/kdbg/pics/brkcond.xpm
+share/kde/apps/kdbg/pics/pcinner.xpm
+share/kde/apps/kdbg/pics/pcup.xpm
+share/kde/apps/kdbg/pics/pointer.xpm
+@dirrm share/kde/apps/kdbg/pics
+share/kde/apps/kdbg/types/qt.kdbgtt
+share/kde/apps/kdbg/types/qt2.kdbgtt
+share/kde/apps/kdbg/types/kdecore.kdbgtt
+share/kde/apps/kdbg/types/kdecore3.kdbgtt
+share/kde/apps/kdbg/types/glib.kdbgtt
+share/kde/apps/kdbg/types/gtk+.kdbgtt
+share/kde/apps/kdbg/types/X11.kdbgtt
+@dirrm share/kde/apps/kdbg/types
+@dirrm share/kde/apps/kdbg
+share/kde/applnk/Development/kdbg.kdelnk