summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1998-06-04 11:57:51 +0000
committeragc <agc@pkgsrc.org>1998-06-04 11:57:51 +0000
commit8228fec82af642fed69f6cac06e6243be2050e76 (patch)
tree27842a53f3d8ee7f18c61377d021fd86a37ea223
parent91d5889f0c0cc99d67aedc2effd0eb98909e6e96 (diff)
downloadpkgsrc-8228fec82af642fed69f6cac06e6243be2050e76.tar.gz
Put xvile's perl files in ${PREFIX}/share/xvile/perl, to avoid conflict
with the Perl files which vile installs. Minor cleanup in Makefile.
-rw-r--r--editors/xvile/Makefile12
-rw-r--r--editors/xvile/patches/patch-aa11
-rw-r--r--editors/xvile/pkg/PLIST22
3 files changed, 28 insertions, 17 deletions
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 39379a0ed1e..0a8e2572d7c 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/06/03 12:57:12 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/06/04 11:57:51 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
#
@@ -21,8 +21,8 @@ MAN1= xvile.1
.include "../../mk/bsd.prefs.mk"
pre-configure:
- @echo "To use xvile with menus, set the variable USE_MENUS"
- @echo "in the environment or in /etc/mk.conf"
+ @${ECHO} "To use xvile with menus, set the variable USE_MENUS"
+ @${ECHO} "in the environment or in /etc/mk.conf"
.if defined(USE_MENUS)
SCREEN_TYPE= Xaw
@@ -31,10 +31,10 @@ SCREEN_TYPE= x11
.endif
post-install:
- @echo "You might want to copy the *.rc files from the source tree before"
- @echo "doing \`make clean'."
+ @${ECHO} "You might want to copy the *.rc files from the source tree before"
+ @${ECHO} "doing \`make clean'."
.if defined(USE_MENUS)
- @echo "And also take a look at README.MENU !"
+ @${ECHO} "And also take a look at README.MENU !"
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/patches/patch-aa b/editors/xvile/patches/patch-aa
new file mode 100644
index 00000000000..690cdb2f8bf
--- /dev/null
+++ b/editors/xvile/patches/patch-aa
@@ -0,0 +1,11 @@
+--- makefile.in 1998/06/04 11:42:13 1.1
++++ makefile.in 1998/06/04 11:42:25
+@@ -58,7 +58,7 @@
+
+ manext = 1
+ bindir = @bindir@
+-datadir = @datadir@/vile
++datadir = @datadir@/xvile
+ perldir = $(datadir)/perl
+ mandir = @mandir@/man$(manext)
+
diff --git a/editors/xvile/pkg/PLIST b/editors/xvile/pkg/PLIST
index d31353b9c51..b540d34ff7c 100644
--- a/editors/xvile/pkg/PLIST
+++ b/editors/xvile/pkg/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 1998/06/02 16:16:16 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/06/04 11:57:51 agc Exp $
bin/xvile
bin/vile-c-filt
bin/vile-crypt
bin/vile-manfilt
bin/vile-pas-filt
man/man1/xvile.1.gz
-share/vile/perl/glob2re.pl
-share/vile/perl/hgrep.pl
-share/vile/perl/manfilt.pl
-share/vile/perl/search.pl
-share/vile/perl/shell.pl
-share/vile/perl/tailf.pl
-share/vile/perl/visit.pl
-share/vile/vile.hlp
-@dirrm share/vile/perl
-@dirrm share/vile
+share/xvile/perl/glob2re.pl
+share/xvile/perl/hgrep.pl
+share/xvile/perl/manfilt.pl
+share/xvile/perl/search.pl
+share/xvile/perl/shell.pl
+share/xvile/perl/tailf.pl
+share/xvile/perl/visit.pl
+share/xvile/vile.hlp
+@dirrm share/xvile/perl
+@dirrm share/xvile