[pkgsrc/trunk]: pkgsrc/editors/vim-kde Since vim-kde is linked against qt-mt,...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/21fdfba1b45c
branches:  trunk
changeset: 510150:21fdfba1b45c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Mar 28 22:29:53 2006 +0000

description:
Since vim-kde is linked against qt-mt, also link against pthread.
Add the missing files to PLIST. Bump revision.

diffstat:

 editors/vim-kde/Makefile         |   4 ++--
 editors/vim-kde/PLIST            |   4 +++-
 editors/vim-kde/distinfo         |   4 +++-
 editors/vim-kde/patches/patch-ab |  25 +++++++++++++++++++++++++
 editors/vim-kde/patches/patch-ac |  25 +++++++++++++++++++++++++
 5 files changed, 58 insertions(+), 4 deletions(-)

diffs (106 lines):

diff -r 6425a1bd6acc -r 21fdfba1b45c editors/vim-kde/Makefile
--- a/editors/vim-kde/Makefile  Tue Mar 28 22:07:18 2006 +0000
+++ b/editors/vim-kde/Makefile  Tue Mar 28 22:29:53 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2006/03/12 17:05:08 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2006/03/28 22:29:53 joerg Exp $
 
 DISTNAME=      kvim-${KVIM_VERSION}
 PKGNAME=       vim-kde-${KVIM_VERSION}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    editors kde
 MASTER_SITES=  ftp://ftp.rutgers.edu/pub/kde/stable/apps/KDE3.x/utils/ \
                ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/utils/ \
diff -r 6425a1bd6acc -r 21fdfba1b45c editors/vim-kde/PLIST
--- a/editors/vim-kde/PLIST     Tue Mar 28 22:07:18 2006 +0000
+++ b/editors/vim-kde/PLIST     Tue Mar 28 22:29:53 2006 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/31 04:31:20 snj Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/28 22:29:53 joerg Exp $
 bin/eview
 bin/evim
 bin/ex
+bin/kview
 bin/kvim
 bin/kvimdiff
 bin/rkview
@@ -27,6 +28,7 @@
 share/kde/icons/hicolor/16x16/actions/hi16-action-make.png
 share/kde/icons/hicolor/22x22/actions/hi22-action-make.png
 share/kde/icons/hicolor/32x32/apps/kvim.png
+share/kde/icons/hicolor/48x48/apps/gvim.png
 share/kde/icons/hicolor/48x48/apps/kvim.png
 share/kde/icons/locolor/16x16/apps/gvim.png
 share/kde/icons/locolor/32x32/apps/gvim.png
diff -r 6425a1bd6acc -r 21fdfba1b45c editors/vim-kde/distinfo
--- a/editors/vim-kde/distinfo  Tue Mar 28 22:07:18 2006 +0000
+++ b/editors/vim-kde/distinfo  Tue Mar 28 22:29:53 2006 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/03/12 13:47:35 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/03/28 22:29:53 joerg Exp $
 
 SHA1 (kvim-6.2.14.tar.bz2) = df6b14439536c4b5c8f3ca38d1a17de5bc284dbe
 RMD160 (kvim-6.2.14.tar.bz2) = 330d3e94ff8627944f14ac271aba05acc18949f3
 Size (kvim-6.2.14.tar.bz2) = 5014326 bytes
 SHA1 (patch-aa) = 5dceb9c3d0c065cc9f37b808ff74b69f34fff2ce
+SHA1 (patch-ab) = 91bb27ddf2846aa8bd719502314d11acd1a5bdcd
+SHA1 (patch-ac) = 671b781d200a6fa7f2b19543ec1ac1a1cdedb244
diff -r 6425a1bd6acc -r 21fdfba1b45c editors/vim-kde/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/vim-kde/patches/patch-ab  Tue Mar 28 22:29:53 2006 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2006/03/28 22:29:53 joerg Exp $
+
+--- configure.orig     2003-06-14 17:38:46.000000000 +0000
++++ configure
+@@ -4002,16 +4002,16 @@ echo "configure:3990: checking for QT ve
+                                               if test "x$enable_rpath" = "xyes"; then
+                               if test $qt_major_version = 2; then
+                                       GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC \
+--Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS"
++-Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+                               else 
+                                       GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC \
+--Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS"
++-Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+                               fi
+                       else
+                               if test $qt_major_version = 2; then
+-                                      GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC"
++                                      GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+                               else 
+-                                      GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC"
++                                      GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+                               fi
+                       fi
+ 
diff -r 6425a1bd6acc -r 21fdfba1b45c editors/vim-kde/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/vim-kde/patches/patch-ac  Tue Mar 28 22:29:53 2006 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.1 2006/03/28 22:29:53 joerg Exp $
+
+--- auto/configure.orig        2006-03-28 18:22:41.000000000 +0000
++++ auto/configure
+@@ -4002,16 +4002,16 @@ echo "configure:3990: checking for QT ve
+                                               if test "x$enable_rpath" = "xyes"; then
+                               if test $qt_major_version = 2; then
+                                       GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC \
+--Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS"
++-Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+                               else 
+                                       GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC \
+--Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS"
++-Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+                               fi
+                       else
+                               if test $qt_major_version = 2; then
+-                                      GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC"
++                                      GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+                               else 
+-                                      GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC"
++                                      GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+                               fi
+                       fi
+