[pkgsrc/trunk]: pkgsrc/mail/mush Correct installation directories and use BSD...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e80554d4b3cf
branches:  trunk
changeset: 494731:e80554d4b3cf
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun May 29 05:57:20 2005 +0000

description:
Correct installation directories and use BSD_INSTALL_* to set
permission correctly.

diffstat:

 mail/mush/distinfo         |   4 ++--
 mail/mush/patches/patch-ao |  34 +++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

diffs (67 lines):

diff -r ee68d9005543 -r e80554d4b3cf mail/mush/distinfo
--- a/mail/mush/distinfo        Sun May 29 05:45:58 2005 +0000
+++ b/mail/mush/distinfo        Sun May 29 05:57:20 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/05/29 05:45:58 minskim Exp $
+$NetBSD: distinfo,v 1.8 2005/05/29 05:57:20 minskim Exp $
 
 SHA1 (mush/mush-7.2.5.tar.Z) = 1b9b54b368b9a748401b1baeb3b3eba5a9ed2c03
 RMD160 (mush/mush-7.2.5.tar.Z) = 32e010f544f79cc1a0f899d722d465975d552a4e
@@ -38,4 +38,4 @@
 SHA1 (patch-al) = 4d0c9ff2a6a8c3c1d59a81b659ed3599881cc762
 SHA1 (patch-am) = 2af4636ebd0168d06711abff5f05ffbf0e1868a8
 SHA1 (patch-an) = a750c02339df8a161f3c3c8cf33aa6411f1aa2bd
-SHA1 (patch-ao) = f48b3cc63489fcbb61e21f1b44f4a755595faada
+SHA1 (patch-ao) = e5b28c4a761c1bc1bba195c5dc6ff332cad51f67
diff -r ee68d9005543 -r e80554d4b3cf mail/mush/patches/patch-ao
--- a/mail/mush/patches/patch-ao        Sun May 29 05:45:58 2005 +0000
+++ b/mail/mush/patches/patch-ao        Sun May 29 05:57:20 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.1 2005/05/29 05:45:58 minskim Exp $
+$NetBSD: patch-ao,v 1.2 2005/05/29 05:57:20 minskim Exp $
 
---- makefile.linux.orig        2005-05-29 00:37:30.610283960 -0500
+--- makefile.linux.orig        2005-05-29 00:51:20.300151928 -0500
 +++ makefile.linux
 @@ -30,9 +30,9 @@ DEBUG=-O6 
  # apparently has the ncurses library installed as -lcurses, whereas the latter
@@ -14,12 +14,36 @@
  LIBS= -lncurses -ltermcap
  #LIBS= -lcurses -ltermcap
  #LIBS= -lcurses
-@@ -50,7 +50,7 @@ $(OBJS2): $(HDRS1) $(HDRS2) $(HDRS3)
+@@ -50,24 +50,20 @@ $(OBJS2): $(HDRS1) $(HDRS2) $(HDRS3)
  loop.o: version.h
  
  #PREFIX= /usr/packages/mush
 -PREFIX= /usr
 +#PREFIX= /usr
  BINDIR= $(PREFIX)/bin
- LIBDIR= $(PREFIX)/lib
- MRCDIR= $(PREFIX)/lib
+-LIBDIR= $(PREFIX)/lib
+-MRCDIR= $(PREFIX)/lib
++LIBDIR= $(PREFIX)/share/misc
++MRCDIR= $(PREFIX)/share/misc
+ MANDIR= $(PREFIX)/man/man1
+ MANEXT= 1
+ 
+ install: mush
+       -mkdir $(PREFIX) $(PREFIX)/{bin,lib,man,man/man1}
+-      cp mush $(BINDIR)
+-      strip $(BINDIR)/mush
+-      chmod 0755 $(BINDIR)/mush
+-      cp mush.1 $(MANDIR)/mush.$(MANEXT)
+-      chmod 0644 $(MANDIR)/mush.$(MANEXT)
+-      cp cmd_help $(LIBDIR)
+-      chmod 0644 $(LIBDIR)/cmd_help
+-      cp Mushrc $(MRCDIR)/Mushrc
+-      chmod 0644 $(MRCDIR)/Mushrc
++      $(BSD_INSTALL_PROGRAM) mush $(BINDIR)
++      $(BSD_INSTALL_MAN) mush.1 $(MANDIR)/mush.$(MANEXT)
++      $(BSD_INSTALL_DATA_DIR) $(LIBDIR)
++      $(BSD_INSTALL_DATA) cmd_help $(LIBDIR)
++      $(BSD_INSTALL_DATA) Mushrc $(MRCDIR)/Mushrc
+ 
+ clean:
+       rm -f *.o *~ core TAGS tags a.out mush