diff options
author | rillig <rillig> | 2006-03-12 13:47:35 +0000 |
---|---|---|
committer | rillig <rillig> | 2006-03-12 13:47:35 +0000 |
commit | 7cf2f6f5aa42c16491a11d330301ed0f084028a4 (patch) | |
tree | 6ec6c7b4f3ac69a9e016886acd1050e859f54231 | |
parent | 19468887f87e7727581589e03f36f8319d3dd803 (diff) | |
download | pkgsrc-7cf2f6f5aa42c16491a11d330301ed0f084028a4.tar.gz |
Removed the references to the working directory. Removed the BROKEN_IN.
Fixed pkglint warnings. Bumped PKGREVISION.
-rw-r--r-- | editors/vim-kde/Makefile | 10 | ||||
-rw-r--r-- | editors/vim-kde/distinfo | 4 | ||||
-rw-r--r-- | editors/vim-kde/patches/patch-aa | 21 |
3 files changed, 25 insertions, 10 deletions
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile index fb6257cf746..7a21b532f89 100644 --- a/editors/vim-kde/Makefile +++ b/editors/vim-kde/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2006/03/04 21:29:33 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2006/03/12 13:47:35 rillig Exp $ DISTNAME= kvim-${KVIM_VERSION} PKGNAME= vim-kde-${KVIM_VERSION} -PKGREVISION= 5 +PKGREVISION= 6 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/ \ @@ -13,16 +13,16 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.freehackers.org/kvim COMMENT= Vim editor (vi clone) with X11 KDE3 GUI -BROKEN_IN= pkgsrc-2005Q4 - KVIM_VERSION= 6.2.14 CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* CONFLICTS+= vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]* -CONFLICTS+= pkg_alternatives-[0-9]* WRKSRC= ${WRKDIR}/kvim-${KVIM_VERSION}/src USE_DIRS+= xdg-1.1 +USE_TOOLS+= awk:run perl:run +MAKE_ENV+= AWK=${AWK:Q} +MAKE_ENV+= PERL5=${PERL5:Q} GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gui=kde diff --git a/editors/vim-kde/distinfo b/editors/vim-kde/distinfo index b1b683ad7fb..c720d0f9037 100644 --- a/editors/vim-kde/distinfo +++ b/editors/vim-kde/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/05/25 11:55:27 wiz Exp $ +$NetBSD: distinfo,v 1.4 2006/03/12 13:47:35 rillig 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) = ddf558e980ac8aaf4004e61cd4a231b380fb6557 +SHA1 (patch-aa) = 5dceb9c3d0c065cc9f37b808ff74b69f34fff2ce diff --git a/editors/vim-kde/patches/patch-aa b/editors/vim-kde/patches/patch-aa index 08faa6d3c77..ede694d9268 100644 --- a/editors/vim-kde/patches/patch-aa +++ b/editors/vim-kde/patches/patch-aa @@ -1,7 +1,22 @@ -$NetBSD: patch-aa,v 1.1 2004/04/02 03:34:54 snj Exp $ +$NetBSD: patch-aa,v 1.2 2006/03/12 13:47:36 rillig Exp $ ---- Makefile.orig 2003-06-14 10:38:45.000000000 -0700 -+++ Makefile 2004-03-30 18:41:49.000000000 -0800 +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 +@@ -1764,8 +1764,8 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ + fi + -chmod $(FILEMOD) $(DEST_TOOLS)/* + # replace the path in some tools +- perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl +- awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ ++ perlpath='$(PERL5)' && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl ++ awkpath='$(AWK)' && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ + awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ + awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi + -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` @@ -1789,19 +1789,19 @@ install-languages: languages $(DEST_LANG # doesn't.<=looks strange to install icons to user's directory ;), i add my # own install procedure, mikmak |