diff options
| author | joerg <joerg@pkgsrc.org> | 2007-07-16 09:57:56 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-07-16 09:57:56 +0000 |
| commit | 9df3e415c940db3ab1d88843301650dadc00e8a0 (patch) | |
| tree | 98128d399e27358d0baa57ea5ec6719f97132a3a /pkgtools/pkg_install/files/view | |
| parent | 289ba6870437f96d2af26836f97afc4a86c84a71 (diff) | |
| download | pkgsrc-9df3e415c940db3ab1d88843301650dadc00e8a0.tar.gz | |
Merge remaining small changes from NetBSD, most of all the pkgsrc.7 man
page. Fix build on !NetBSD. Rebuild man pages with nroff -mandoc on
NetBSD current for consistency. Make it DESTDIR safe. Remove the note
that src/usr.sbin/pkg_install is the authoritive version, it won't be
any longer.
Diffstat (limited to 'pkgtools/pkg_install/files/view')
| -rw-r--r-- | pkgtools/pkg_install/files/view/Makefile.in | 20 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/view/linkfarm.cat1 | 4 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/view/pkg_view.cat1 | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/pkgtools/pkg_install/files/view/Makefile.in b/pkgtools/pkg_install/files/view/Makefile.in index b62d1935688..ec40c8a067f 100644 --- a/pkgtools/pkg_install/files/view/Makefile.in +++ b/pkgtools/pkg_install/files/view/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.4 2004/08/21 06:33:40 jlam Exp $ +# $NetBSD: Makefile.in,v 1.5 2007/07/16 09:57:59 joerg Exp $ prefix= @prefix@ exec_prefix= @exec_prefix@ @@ -19,16 +19,16 @@ clean: @true # do nothing install: - $(INSTALL) -m 755 -d $(sbindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(cat1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) @for script in $(SCRIPTS); do \ - echo "$(INSTALL) $$script.sh $(sbindir)/$$script"; \ - $(INSTALL) $$script.sh $(sbindir)/$$script; \ + echo "$(INSTALL) $$script.sh ${DESTDIR}$(sbindir)/$$script"; \ + $(INSTALL) $$script.sh ${DESTDIR}$(sbindir)/$$script; \ done @for script in $(SCRIPTS); do \ - echo "$(INSTALL) -m 444 $$script.1 $(man1dir)/$$script.1"; \ - $(INSTALL) -m 444 $$script.1 $(man1dir)/$$script.1; \ - echo "$(INSTALL) -m 444 $$script.cat1 $(cat1dir)/$$script.0"; \ - $(INSTALL) -m 444 $$script.cat1 $(cat1dir)/$$script.0; \ + echo "$(INSTALL) -m 444 $$script.1 ${DESTDIR}$(man1dir)/$$script.1"; \ + $(INSTALL) -m 444 $$script.1 ${DESTDIR}$(man1dir)/$$script.1; \ + echo "$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0"; \ + $(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0; \ done diff --git a/pkgtools/pkg_install/files/view/linkfarm.cat1 b/pkgtools/pkg_install/files/view/linkfarm.cat1 index 77897246e1f..75f06c09df7 100644 --- a/pkgtools/pkg_install/files/view/linkfarm.cat1 +++ b/pkgtools/pkg_install/files/view/linkfarm.cat1 @@ -1,7 +1,7 @@ LINKFARM(1) NetBSD General Commands Manual LINKFARM(1) NNAAMMEE - lliinnkkffaarrmm - manage symbolic links to package files + lliinnkkffaarrmm -- manage symbolic links to package files SSYYNNOOPPSSIISS lliinnkkffaarrmm [--ccDDnnRRVVvv] [--dd _s_t_o_w_d_i_r] [--ss _s_u_b_d_i_r] [--tt _t_a_r_g_e_t] _p_a_c_k_a_g_e @@ -64,4 +64,4 @@ SSEEEE AALLSSOO AAUUTTHHOORRSS The lliinnkkffaarrmm utility was written by Alistair G. Crooks <agc@NetBSD.org>. -NetBSD 2.0 September 2, 2003 NetBSD 2.0 +NetBSD 4.0 September 2, 2003 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/view/pkg_view.cat1 b/pkgtools/pkg_install/files/view/pkg_view.cat1 index 2a036988de1..aeb1ab0545a 100644 --- a/pkgtools/pkg_install/files/view/pkg_view.cat1 +++ b/pkgtools/pkg_install/files/view/pkg_view.cat1 @@ -141,4 +141,4 @@ SSEEEE AALLSSOO AAUUTTHHOORRSS The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@NetBSD.org>. -NetBSD 3.0 September 8, 2003 NetBSD 3.0 +NetBSD 4.0 September 8, 2003 NetBSD 4.0 |