* Strongly buildlinkify.

* Use qt2-designer-kde for a uic that understands KDE2 widgets.
* Remove build dependencies on autoconf/automake by providing patches to
  the generated files as well.  This allows our other automatic changes at
  pre-configure time in bsd.pkg.mk to succeed.

5 files changed, 133 insertions, 15 deletions

diff --git a/sysutils/koncd/Makefile b/sysutils/koncd/Makefile
index c3e745372b8..e374c9a2885 100644
--- a/sysutils/koncd/Makefile
+++ b/sysutils/koncd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/27 14:35:15 tron Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/13 21:26:58 jlam Exp $
 
 DISTNAME=	koncd-0.7.1
 CATEGORIES=	sysutils
@@ -8,13 +8,14 @@ MAINTAINER=	wulf@netbsd.org
 HOMEPAGE=	http://www.koncd.de/
 COMMENT=	Frontend to the fabulous cdrecord and mkisofs programs
 
-BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
-BUILD_DEPENDS+=	automake>=1.4:../../devel/automake
+BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
 DEPENDS+=	cdrecord>=1.9:../../sysutils/cdrecord
-DEPENDS+=	kdebase>=2.1:../../x11/kdebase2
 
-.include	"../../x11/kde2/Makefile.part2"
-
-GNU_CONFIGURE=	YES
+USE_BUILDLINK_ONLY=	YES
+AUTOMAKE_OVERRIDE=	YES
+GNU_CONFIGURE=		YES
 
+.include "../../x11/kde2/buildlink.mk"
+.include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/koncd/PLIST b/sysutils/koncd/PLIST
index 901c4a7877e..6694d73c531 100644
--- a/sysutils/koncd/PLIST
+++ b/sysutils/koncd/PLIST
@@ -1,11 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:22 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/11/13 21:26:58 jlam Exp $
 bin/koncd
-share/kde/applnk/Multimedia/koncd.desktop
-share/kde/icons/locolor/32x32/apps/koncd.png
-share/kde/icons/locolor/16x16/apps/koncd.png
-share/kde/icons/hicolor/32x32/apps/koncd.png
-share/kde/icons/hicolor/16x16/apps/koncd.png
-share/kde/locale/de/LC_MESSAGES/koncd.mo
 share/doc/kde/HTML/en/koncd/images/audiocd.jpg
 share/doc/kde/HTML/en/koncd/images/copycd.jpg
 share/doc/kde/HTML/en/koncd/images/imagetype.jpg
@@ -34,7 +28,16 @@ share/doc/kde/HTML/de/koncd/index.html
 share/doc/kde/HTML/de/koncd/kopiere_cd.htm
 share/doc/kde/HTML/de/koncd/tipps.htm
 share/doc/kde/HTML/de/koncd/werkzeuge.htm
+share/kde/applnk/Multimedia/koncd.desktop
+share/kde/icons/locolor/32x32/apps/koncd.png
+share/kde/icons/locolor/16x16/apps/koncd.png
+share/kde/icons/hicolor/32x32/apps/koncd.png
+share/kde/icons/hicolor/16x16/apps/koncd.png
+share/kde/locale/de/LC_MESSAGES/koncd.mo
+@unexec ${RMDIR} %D/share/kde/locale/de/LC_MESSAGES 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/locale/de 2>/dev/null || ${TRUE}
 @dirrm share/doc/kde/HTML/en/koncd/images
 @dirrm share/doc/kde/HTML/en/koncd
 @dirrm share/doc/kde/HTML/de/koncd/images
 @dirrm share/doc/kde/HTML/de/koncd
+@unexec ${RMDIR} %D/share/doc/kde/HTML/de 2>/dev/null || ${TRUE}
diff --git a/sysutils/koncd/distinfo b/sysutils/koncd/distinfo
index fe5cc87f70c..c35348cd766 100644
--- a/sysutils/koncd/distinfo
+++ b/sysutils/koncd/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2001/06/13 12:41:55 bouyer Exp $
+$NetBSD: distinfo,v 1.5 2001/11/13 21:26:58 jlam Exp $
 
 SHA1 (koncd-0.7.1.tar.gz) = db387b3cd83c3a50d96175ef2a5b5ed98eec05b2
 Size (koncd-0.7.1.tar.gz) = 1286825 bytes
 SHA1 (patch-aa) = 8e726fdf59fd22ab628791d2650b2749ababa910
 SHA1 (patch-ab) = d63c278ee45f49f64fcb4edb9bc133ce54cde5ec
 SHA1 (patch-ac) = a216dfc85f7e274263544f76c0e98f323dad0153
+SHA1 (patch-ad) = 9145a6bd0800431eb98ed025740d62c12ffd5611
+SHA1 (patch-ae) = f163837afe101c8115168eb106f653769b9fc7ec
diff --git a/sysutils/koncd/patches/patch-ad b/sysutils/koncd/patches/patch-ad
new file mode 100644
index 00000000000..2d32a1d4e65
--- /dev/null
+++ b/sysutils/koncd/patches/patch-ad
@@ -0,0 +1,99 @@
+$NetBSD: patch-ad,v 1.1 2001/11/13 21:26:58 jlam Exp $
+
+--- configure.orig	Sat Mar 31 08:57:25 2001
++++ configure
+@@ -6954,6 +6954,86 @@
+ #MIN_CONFIG
+ 
+ 
++ac_safe=`echo "util.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for util.h""... $ac_c" 1>&6
++echo "configure:6960: checking for util.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6965 "configure"
++#include "confdefs.h"
++#include <util.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:6970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  echo $ac_n "checking for getrawpartition in -lutil""... $ac_c" 1>&6
++echo "configure:6987: checking for getrawpartition in -lutil" >&5
++ac_lib_var=`echo util'_'getrawpartition | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lutil  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 6995 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char getrawpartition();
++
++int main() {
++getrawpartition()
++; return 0; }
++EOF
++if { (eval echo configure:7006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  
++    cat >> confdefs.h <<\EOF
++#define HAVE_GETRAWPARTITION 1
++EOF
++
++    LIBUTIL="-lutil"
++  
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
+ 
+ 
+ DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
+@@ -7259,6 +7339,7 @@
+ s%@LIB_KPARTS@%$LIB_KPARTS%g
+ s%@LIB_KWRITE@%$LIB_KWRITE%g
+ s%@LIB_KFM@%$LIB_KFM%g
++s%@LIBUTIL@%$LIBUTIL%g
+ s%@TOPSUBDIRS@%$TOPSUBDIRS%g
+ 
+ CEOF
diff --git a/sysutils/koncd/patches/patch-ae b/sysutils/koncd/patches/patch-ae
new file mode 100644
index 00000000000..b7f3964ed29
--- /dev/null
+++ b/sysutils/koncd/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/11/13 21:26:58 jlam Exp $
+
+--- koncd/Makefile.in.orig	Sun Apr  1 12:09:58 2001
++++ koncd/Makefile.in
+@@ -229,7 +229,7 @@
+ #>- METASOURCES = AUTO
+ 
+ # the library search path. 
+-koncd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++koncd_LDFLAGS = $(all_libraries) $(KDE_RPATH) @LIBUTIL@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =