Some cleanup.

4 files changed, 5 insertions, 74 deletions

diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index a163709d0a3..131eba3faff 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/07/08 07:13:37 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2007/07/08 08:13:43 wiz Exp $
 #
 
 DISTNAME=	libkdcraw-0.1.1
@@ -22,6 +22,7 @@ PKGCONFIG_OVERRIDE+=	libkdcraw/libkdcraw.pc.in
 
 BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.3
 .include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.lcms+=		lcms>=1.14
 .include "../../graphics/lcms/buildlink3.mk"
diff --git a/graphics/libkdcraw/PLIST b/graphics/libkdcraw/PLIST
index c2676eb4921..dd4defff046 100644
--- a/graphics/libkdcraw/PLIST
+++ b/graphics/libkdcraw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/08 07:13:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/07/08 08:13:43 wiz Exp $
 include/libkdcraw/dcrawbinary.h
 include/libkdcraw/dcrawinfocontainer.h
 include/libkdcraw/dcrawsettingswidget.h
@@ -14,4 +14,5 @@ share/icons/hicolor/128x128/apps/kdcraw.png
 share/icons/hicolor/32x32/apps/kdcraw.png
 share/icons/hicolor/48x48/apps/kdcraw.png
 share/icons/hicolor/64x64/apps/kdcraw.png
+@dirrm lib/libkdcraw1
 @dirrm include/libkdcraw
diff --git a/graphics/libkdcraw/distinfo b/graphics/libkdcraw/distinfo
index a02ba3904b8..7ec3b321272 100644
--- a/graphics/libkdcraw/distinfo
+++ b/graphics/libkdcraw/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/07/08 07:13:37 wiz Exp $
+$NetBSD: distinfo,v 1.2 2007/07/08 08:13:44 wiz Exp $
 
 SHA1 (libkdcraw-0.1.1.tar.bz2) = 6414d29fe865ad04650e25157d059481b421f1b6
 RMD160 (libkdcraw-0.1.1.tar.bz2) = 53883e3cdb833a7568c4db2b1cd670285e03cd92
 Size (libkdcraw-0.1.1.tar.bz2) = 548111 bytes
-SHA1 (patch-aa) = f2b8e62d5b931c16646c3d0e4fd0d3b716a68130
diff --git a/graphics/libkdcraw/patches/patch-aa b/graphics/libkdcraw/patches/patch-aa
deleted file mode 100644
index acd654a3e99..00000000000
--- a/graphics/libkdcraw/patches/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/07/08 07:13:37 wiz Exp $
-
---- configure.orig	2007-07-08 06:51:18.000000000 +0000
-+++ configure
-@@ -29911,14 +29911,14 @@ fi
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
--echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
--if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for libjpeg" >&5
-+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_jpeg_+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -29962,12 +29962,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
--  eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
-+  eval "ac_cv_lib_jpeg_=-ljpeg"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	eval "ac_cv_lib_jpeg_6b=no"
-+	eval "ac_cv_lib_jpeg_=no"
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-@@ -29978,10 +29978,10 @@ CFLAGS="$ac_save_CFLAGS"
- fi
- 
- 
--if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
--  LIBJPEG="$ac_cv_lib_jpeg_6b"
--  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
--echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_`\" = no"; then
-+  LIBJPEG="$ac_cv_lib_jpeg_"
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_" >&6; }
- else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -30102,14 +30102,14 @@ else
- There is an installation error in jpeg support. You seem to have only one
- of either the headers _or_ the libraries installed. You may need to either
- provide correct --with-extra-... options, or the development package of
--libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+libjpeg. You can get a source package of libjpeg from http://www.ijg.org/
- Disabling JPEG support.
- " >&5
- echo "$as_me: WARNING:
- There is an installation error in jpeg support. You seem to have only one
- of either the headers _or_ the libraries installed. You may need to either
- provide correct --with-extra-... options, or the development package of
--libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+libjpeg. You can get a source package of libjpeg from http://www.ijg.org/
- Disabling JPEG support.
- " >&2;}
-   else