[pkgsrc/trunk]: pkgsrc/sysutils/filelight Applied a patch from Mark Davies, w...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0768d21f6448
branches:  trunk
changeset: 519605:0768d21f6448
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Oct 06 18:15:10 2006 +0000

description:
Applied a patch from Mark Davies, which greatly simplifies the package
by including meta-pkgs/kde3/kde3.mk. PKGREVISION++.

diffstat:

 sysutils/filelight/Makefile         |  10 +++-------
 sysutils/filelight/PLIST            |   4 ++--
 sysutils/filelight/distinfo         |   3 +--
 sysutils/filelight/patches/patch-aa |  16 ----------------
 4 files changed, 6 insertions(+), 27 deletions(-)

diffs (77 lines):

diff -r 4f9c9fc39d62 -r 0768d21f6448 sysutils/filelight/Makefile
--- a/sysutils/filelight/Makefile       Fri Oct 06 18:12:48 2006 +0000
+++ b/sysutils/filelight/Makefile       Fri Oct 06 18:15:10 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/10/03 18:17:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/06 18:15:10 rillig Exp $
 #
 
 DISTNAME=      filelight-1.0
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  http://methylblue.com/filelight/packages/
 EXTRACT_SUFX=  .tar.bz2
@@ -11,18 +12,13 @@
 COMMENT=       Graphical filesystem usage monitor
 
 GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/kde
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 USE_TOOLS+=    perl
 
-BUILDLINK_TRANSFORM+=  l:jpeg6b:jpeg
-
 pre-build:
        cd ${WRKSRC}/src/part && env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} dialog.h
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4f9c9fc39d62 -r 0768d21f6448 sysutils/filelight/PLIST
--- a/sysutils/filelight/PLIST  Fri Oct 06 18:12:48 2006 +0000
+++ b/sysutils/filelight/PLIST  Fri Oct 06 18:15:10 2006 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/02 18:58:55 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/10/06 18:15:10 rillig Exp $
 bin/filelight
 lib/kde3/libfilelight.la
-share/kde/applications/kde/filelight.desktop
+share/applications/kde/filelight.desktop
 share/kde/apps/filelight/filelight_partui.rc
 share/kde/apps/filelight/filelightui.rc
 share/kde/config/filelightrc
diff -r 4f9c9fc39d62 -r 0768d21f6448 sysutils/filelight/distinfo
--- a/sysutils/filelight/distinfo       Fri Oct 06 18:12:48 2006 +0000
+++ b/sysutils/filelight/distinfo       Fri Oct 06 18:15:10 2006 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/02 18:58:55 rillig Exp $
+$NetBSD: distinfo,v 1.2 2006/10/06 18:15:10 rillig Exp $
 
 SHA1 (filelight-1.0.tar.bz2) = 2a4644c598dfcc408af0af65e655e2525494708d
 RMD160 (filelight-1.0.tar.bz2) = 67ce0deb03f14cc280f7471156c4f2a3135ebb5e
 Size (filelight-1.0.tar.bz2) = 530449 bytes
-SHA1 (patch-aa) = c0dfb098c33efc8a2bebfef8d24bd4cf145a7461
diff -r 4f9c9fc39d62 -r 0768d21f6448 sysutils/filelight/patches/patch-aa
--- a/sysutils/filelight/patches/patch-aa       Fri Oct 06 18:12:48 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/10/02 18:58:55 rillig Exp $
-
-Includedir contains ${prefix}, which does not get expanded unless "eval"
-is used.
-
---- configure.orig     2001-08-06 01:00:00.000000000 +0200
-+++ configure  2006-10-02 20:34:49.000000000 +0200
-@@ -32514,7 +32514,7 @@ fi
- 
- 
- 
--jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-+eval "jpeg_incdirs=\"$includedir /usr/include /usr/local/include $kde_extra_includes\""
- 
- jpeg_incdir=NO
- for i in $jpeg_incdirs;