summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2007-02-03 01:45:01 +0000
committermarkd <markd@pkgsrc.org>2007-02-03 01:45:01 +0000
commit67c71be27e6d969ba331a26b9b9c251d5c7b6050 (patch)
treed729c2718e9747d8b44050ea3b8c24d453719e2f /editors
parent33329469cf1a54900afd936e7d23ed134aea2df3 (diff)
downloadpkgsrc-67c71be27e6d969ba331a26b9b9c251d5c7b6050.tar.gz
Fix the Makefile patch to not muck with where the icons are installed.
Fix the PLIST again. Bump PKGREVISION.
Diffstat (limited to 'editors')
-rw-r--r--editors/vim-kde/Makefile4
-rw-r--r--editors/vim-kde/PLIST11
-rw-r--r--editors/vim-kde/distinfo4
-rw-r--r--editors/vim-kde/patches/patch-aa39
4 files changed, 24 insertions, 34 deletions
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index c346a3726eb..09889e9340e 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2007/02/02 15:45:56 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2007/02/03 01:45:01 markd Exp $
DISTNAME= kvim-${KVIM_VERSION}
PKGNAME= vim-kde-${KVIM_VERSION}
-PKGREVISION= 11
+PKGREVISION= 12
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 --git a/editors/vim-kde/PLIST b/editors/vim-kde/PLIST
index c55934820ff..d9115292bf1 100644
--- a/editors/vim-kde/PLIST
+++ b/editors/vim-kde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/02/02 15:45:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/02/03 01:45:01 markd Exp $
bin/eview
bin/evim
bin/ex
@@ -23,13 +23,12 @@ man/man1/vim.1
man/man1/vimdiff.1
man/man1/vimtutor.1
man/man1/xxd.1
+share/icons/hicolor/16x16/actions/hi16-action-make.png
+share/icons/hicolor/22x22/actions/hi22-action-make.png
+share/icons/hicolor/32x32/apps/kvim.png
+share/icons/hicolor/48x48/apps/kvim.png
share/kde/applnk/Editors/KVim.desktop
share/kde/apps/kvim/tips
-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/vim/vim62/bugreport.vim
share/kde/vim/vim62/colors/README.txt
share/kde/vim/vim62/colors/blue.vim
diff --git a/editors/vim-kde/distinfo b/editors/vim-kde/distinfo
index 0d5d2580ca0..c30f20f6f5f 100644
--- a/editors/vim-kde/distinfo
+++ b/editors/vim-kde/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/03/28 22:29:53 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/02/03 01:45:01 markd 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-aa) = 816395aba5a38f3d017e0f97ab8b7dd9c656c82d
SHA1 (patch-ab) = 91bb27ddf2846aa8bd719502314d11acd1a5bdcd
SHA1 (patch-ac) = 671b781d200a6fa7f2b19543ec1ac1a1cdedb244
diff --git a/editors/vim-kde/patches/patch-aa b/editors/vim-kde/patches/patch-aa
index ede694d9268..e8ba75248fd 100644
--- a/editors/vim-kde/patches/patch-aa
+++ b/editors/vim-kde/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2006/03/12 13:47:36 rillig Exp $
+$NetBSD: patch-aa,v 1.3 2007/02/03 01:45:01 markd Exp $
The paths to perl and awk need to be set explicitly, otherwise the ones
from the .tools directory are found. The rest of the patch adjusts the
directories to the pkgsrc directory hierarchy layout.
---- Makefile.orig 2003-06-14 19:38:45.000000000 +0200
-+++ Makefile 2006-03-12 13:50:56.000000000 +0100
+--- Makefile.orig 2003-06-15 05:38:45.000000000 +1200
++++ Makefile
@@ -1764,8 +1764,8 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
fi
-chmod $(FILEMOD) $(DEST_TOOLS)/*
@@ -22,30 +22,21 @@ directories to the pkgsrc directory hierarchy layout.
# own install procedure, mikmak
installkdeicons:
- mkdir -p $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/
-- mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/
-- mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/
-- mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/
-- mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/16x16/actions/
-- mkdir -p $(DESTDIR)$(KDE_DIR)/share/apps/kvim
--
-- cp ../runtime/KVim.desktop $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/ && chmod 644 $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/KVim.desktop
-- cp ../runtime/kvim32x32.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/kvim.png
-- cp ../runtime/kvim48x48.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/kvim.png
-- cp ../runtime/hi16-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/16x16/actions/hi16-action-make.png
-- cp ../runtime/hi22-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/hi22-action-make.png
-- cp ../runtime/kde-tips $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips && chmod 644 $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips
+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/kde/applnk/Editors/
-+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/32x32/apps/
-+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/48x48/apps/
-+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/22x22/actions/
-+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/16x16/actions/
+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/
+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/
+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/
+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/16x16/actions/
+- mkdir -p $(DESTDIR)$(KDE_DIR)/share/apps/kvim
+ mkdir -p $(DESTDIR)$(KDE_DIR)/share/kde/apps/kvim
-+
+
+- cp ../runtime/KVim.desktop $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/ && chmod 644 $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/KVim.desktop
+ cp ../runtime/KVim.desktop $(DESTDIR)$(KDE_DIR)/share/kde/applnk/Editors/ && chmod 644 $(DESTDIR)$(KDE_DIR)/share/kde/applnk/Editors/KVim.desktop
-+ cp ../runtime/kvim32x32.png $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/32x32/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/32x32/apps/kvim.png
-+ cp ../runtime/kvim48x48.png $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/48x48/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/48x48/apps/kvim.png
-+ cp ../runtime/hi16-action-make.png $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/16x16/actions/hi16-action-make.png
-+ cp ../runtime/hi22-action-make.png $(DESTDIR)$(KDE_DIR)/share/kde/icons/hicolor/22x22/actions/hi22-action-make.png
+ cp ../runtime/kvim32x32.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/kvim.png
+ cp ../runtime/kvim48x48.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/kvim.png
+ cp ../runtime/hi16-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/16x16/actions/hi16-action-make.png
+ cp ../runtime/hi22-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/hi22-action-make.png
+- cp ../runtime/kde-tips $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips && chmod 644 $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips
+ cp ../runtime/kde-tips $(DESTDIR)$(KDE_DIR)/share/kde/apps/kvim/tips && chmod 644 $(DESTDIR)$(KDE_DIR)/share/kde/apps/kvim/tips
ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps