pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc List info files directly in the PLIST and honor PKG{IN...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0764f396e4a6
branches:  trunk
changeset: 511004:0764f396e4a6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Apr 07 19:54:16 2006 +0000

description:
List info files directly in the PLIST and honor PKG{INFO,MAN}DIR.

diffstat:

 sysutils/cfengine2-doc/Makefile     |  16 +++++++++-------
 sysutils/cfengine2-doc/PLIST        |   5 ++++-
 sysutils/coreutils/Makefile         |   4 ++--
 sysutils/coreutils/PLIST            |   3 ++-
 sysutils/e2fsprogs/Makefile         |   4 ++--
 sysutils/e2fsprogs/PLIST.common     |   3 ++-
 sysutils/e2fsprogs/distinfo         |   3 +--
 sysutils/e2fsprogs/patches/patch-ad |  13 -------------
 sysutils/grub/Makefile              |   5 ++---
 sysutils/grub/PLIST                 |   4 +++-
 sysutils/mtools/Makefile            |   4 ++--
 sysutils/mtools/PLIST               |   3 ++-
 sysutils/pv/Makefile                |   5 ++---
 sysutils/pv/PLIST                   |   3 ++-
 sysutils/stow/Makefile              |   5 ++---
 sysutils/stow/PLIST                 |   3 ++-
 sysutils/vcdimager/Makefile         |   4 ++--
 sysutils/vcdimager/PLIST            |   3 ++-
 textproc/eblook/Makefile            |   4 ++--
 textproc/eblook/PLIST               |   3 ++-
 textproc/grep/Makefile              |   4 ++--
 textproc/grep/PLIST                 |   3 ++-
 textproc/groff/Makefile             |   4 ++--
 textproc/groff/PLIST                |   3 ++-
 textproc/gsed/Makefile              |   4 ++--
 textproc/gsed/PLIST                 |   3 ++-
 textproc/ja-grep/Makefile           |   5 ++---
 textproc/ja-grep/PLIST              |   3 ++-
 textproc/ja-sed/Makefile            |   5 ++---
 textproc/ja-sed/PLIST               |   3 ++-
 textproc/ndtpd/Makefile             |   4 ++--
 textproc/ndtpd/PLIST                |   4 +++-
 textproc/source-highlight/Makefile  |   4 ++--
 33 files changed, 74 insertions(+), 72 deletions(-)

diffs (truncated from 531 to 300 lines):

diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/cfengine2-doc/Makefile
--- a/sysutils/cfengine2-doc/Makefile   Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/cfengine2-doc/Makefile   Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/07 19:54:16 jlam Exp $
 #
 
 PKGNAME=       cfengine-doc-${CFENGINE_VERSION}
@@ -10,14 +10,16 @@
 
 NO_CONFIGURE=   yes
 NO_BUILD=       yes
-INFO_FILES=    cfengine-Reference.info cfengine-Tutorial.info
-INFO_FILES+=   cfengine-Anomalies.info
+INFO_FILES=    # PLIST
 
-INSTALLATION_DIRS=     info
+HTMLDIR=               ${PREFIX}/share/doc/html/cfengine
+INSTALLATION_DIRS=     ${PKGINFODIR} ${HTMLDIR}
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.info* ${PREFIX}/info
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/cfengine
-       ${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.html ${PREFIX}/share/doc/html/cfengine
+       cd ${WRKSRC}/doc; for f in *.info *.info-[0-9]*; do             \
+               ${TEST} ! -f "$$f" ||                                   \
+               ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};          \
+       done
+       ${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.html ${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/cfengine2-doc/PLIST
--- a/sysutils/cfengine2-doc/PLIST      Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/cfengine2-doc/PLIST      Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/23 22:50:59 ben Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/07 19:54:16 jlam Exp $
+info/cfengine-Anomalies.info
+info/cfengine-Reference.info
+info/cfengine-Tutorial.info
 share/doc/html/cfengine/cfengine-Anomalies.html
 share/doc/html/cfengine/cfengine-Reference.html
 share/doc/html/cfengine/cfengine-Tutorial.html
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile       Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/coreutils/Makefile       Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/12 12:37:30 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/07 19:54:16 jlam Exp $
 
 DISTNAME=      coreutils-5.2.1
 PKGREVISION=   2
@@ -20,7 +20,7 @@
 USE_TOOLS+=            perl
 USE_PKGLOCALEDIR=      YES
 
-INFO_FILES=    coreutils.info
+INFO_FILES=            # PLIST
 
 TEST_TARGET=           check
 
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/coreutils/PLIST
--- a/sysutils/coreutils/PLIST  Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/coreutils/PLIST  Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/03/21 14:44:08 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/07 19:54:16 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}[
 bin/${GNU_PROGRAM_PREFIX}basename
 bin/${GNU_PROGRAM_PREFIX}cat
@@ -89,6 +89,7 @@
 bin/${GNU_PROGRAM_PREFIX}who
 bin/${GNU_PROGRAM_PREFIX}whoami
 bin/${GNU_PROGRAM_PREFIX}yes
+info/coreutils.info
 man/man1/${GNU_PROGRAM_PREFIX}basename.1
 man/man1/${GNU_PROGRAM_PREFIX}cat.1
 man/man1/${GNU_PROGRAM_PREFIX}chgrp.1
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/e2fsprogs/Makefile
--- a/sysutils/e2fsprogs/Makefile       Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/e2fsprogs/Makefile       Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/07 19:54:16 jlam Exp $
 #
 
 DISTNAME=      e2fsprogs-1.32
@@ -14,7 +14,7 @@
 
 GNU_CONFIGURE= yes
 USE_TOOLS+=    makeinfo
-INFO_FILES=    libext2fs.info
+INFO_FILES=    # PLIST.common
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/e2fsprogs/PLIST.common
--- a/sysutils/e2fsprogs/PLIST.common   Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/e2fsprogs/PLIST.common   Fri Apr 07 19:54:16 2006 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST.common,v 1.3 2004/03/10 01:13:58 seb Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2006/04/07 19:54:16 jlam Exp $
 bin/chattr
 bin/lsattr
 bin/uuidgen
+info/libext2fs.info
 man/man1/chattr.1
 man/man1/lsattr.1
 man/man1/uuidgen.1
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/e2fsprogs/distinfo
--- a/sysutils/e2fsprogs/distinfo       Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/e2fsprogs/distinfo       Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/01/13 18:14:54 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/04/07 19:54:16 jlam Exp $
 
 SHA1 (e2fsprogs-1.32.tar.gz) = 409bbdbc48b5f8ec5006e283962d8432d971d51f
 RMD160 (e2fsprogs-1.32.tar.gz) = eeaaee7dd9eb202a9f2abccdf1f3acb65c0f216d
@@ -6,7 +6,6 @@
 SHA1 (patch-aa) = 61561b5c12345aceee3d8b46249b805a3f97822b
 SHA1 (patch-ab) = 932d19e15eed6589e124de60c35712b32e86eb83
 SHA1 (patch-ac) = 171e7e887f62831ebf8c48c6aa84cd3804f02067
-SHA1 (patch-ad) = 6aff39f1ca9ff0c43333168a190e16c4d7d98e2b
 SHA1 (patch-ae) = 85d394a64681882006854beee6826d4c6a6cd442
 SHA1 (patch-af) = dcdd61ea70b6eb322733249c9fb38d764243d6c4
 SHA1 (patch-ag) = 4afd200cd9a8a9afa429b15438e480d975312190
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/e2fsprogs/patches/patch-ad
--- a/sysutils/e2fsprogs/patches/patch-ad       Fri Apr 07 19:48:35 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/08/05 14:24:58 seb Exp $
-
---- doc/Makefile.in.orig       2002-02-24 21:03:58.000000000 +0000
-+++ doc/Makefile.in
-@@ -13,7 +13,7 @@ INSTALL = @INSTALL@
- 
- DVI=texi2dvi
- DVIPS=dvips -o "$@"
--INFO=makeinfo
-+INFO=$(MAKEINFO) --no-split
- HTML=texi2html
- 
- all:: libext2fs.info libext2fs.dvi
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/grub/Makefile
--- a/sysutils/grub/Makefile    Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/grub/Makefile    Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/04 21:30:41 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=      grub-0.97
@@ -14,8 +14,7 @@
 
 GNU_CONFIGURE=         YES
 USE_TOOLS+=            gmake
-
-INFO_FILES=            grub.info multiboot.info
+INFO_FILES=            # PLIST
 
 BUILDLINK_TRANSFORM+=  rename:-fno-builtin:-ffreestanding
 
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/grub/PLIST
--- a/sysutils/grub/PLIST       Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/grub/PLIST       Fri Apr 07 19:54:16 2006 +0000
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2005/02/19 10:23:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/04/07 19:54:17 jlam Exp $
 bin/mbchk
+info/grub.info
+info/multiboot.info
 man/man1/mbchk.1
 man/man8/grub-install.8
 man/man8/grub-md5-crypt.8
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/mtools/Makefile
--- a/sysutils/mtools/Makefile  Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/mtools/Makefile  Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/04/07 19:54:17 jlam Exp $
 
 DISTNAME=      mtools-3.9.10
 PKGREVISION=   1
@@ -14,7 +14,7 @@
 
 GNU_CONFIGURE=         YES
 USE_TOOLS+=            gmake makeinfo
-INFO_FILES=            mtools.info
+INFO_FILES=            # PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/mtools/PLIST
--- a/sysutils/mtools/PLIST     Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/mtools/PLIST     Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/04/04 08:56:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/07 19:54:17 jlam Exp $
 bin/amuFormat.sh
 ${NOFLOPPYD}bin/floppyd
 ${NOFLOPPYD}bin/floppyd_installtest
@@ -33,6 +33,7 @@
 bin/mzip
 bin/tgz
 bin/uz
+info/mtools.info
 ${NOFLOPPYD}man/man1/floppyd.1
 ${NOFLOPPYD}man/man1/floppyd_installtest.1
 man/man1/mattrib.1
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/pv/Makefile
--- a/sysutils/pv/Makefile      Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/pv/Makefile      Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:42 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=              pv-0.8.6
@@ -16,8 +16,7 @@
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake
 USE_PKGLOCALEDIR=      yes
-
-INFO_FILES=            pv.info
+INFO_FILES=            # PLIST
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pv
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/pv/PLIST
--- a/sysutils/pv/PLIST Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/pv/PLIST Fri Apr 07 19:54:16 2006 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2004/10/27 22:45:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/07 19:54:17 jlam Exp $
 bin/pv
+info/pv.info
 man/man1/pv.1
 share/doc/pv/COPYING
 share/doc/pv/NEWS
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/stow/Makefile
--- a/sysutils/stow/Makefile    Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/stow/Makefile    Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=      stow-1.3.3
@@ -13,7 +13,6 @@
 
 GNU_CONFIGURE= YES
 USE_TOOLS+=    perl:run
-
-INFO_FILES=    stow.info
+INFO_FILES=    # PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/stow/PLIST
--- a/sysutils/stow/PLIST       Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/stow/PLIST       Fri Apr 07 19:54:16 2006 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/10 01:30:35 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/07 19:54:17 jlam Exp $
 bin/stow
+info/stow.info
 man/man8/stow.8
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/vcdimager/Makefile
--- a/sysutils/vcdimager/Makefile       Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/vcdimager/Makefile       Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=      vcdimager-0.6.2
@@ -14,7 +14,7 @@
 
 USE_TOOLS+=    gmake
 GNU_CONFIGURE= YES
-INFO_FILES=    vcdimager.info
+INFO_FILES=    # PLIST
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
diff -r 9688e4b1caa7 -r 0764f396e4a6 sysutils/vcdimager/PLIST
--- a/sysutils/vcdimager/PLIST  Fri Apr 07 19:48:35 2006 +0000
+++ b/sysutils/vcdimager/PLIST  Fri Apr 07 19:54:16 2006 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/10 01:32:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/07 19:54:17 jlam Exp $
 bin/vcdimager
 bin/vcdrip
+info/vcdimager.info
 man/man1/vcdimager.1
 man/man1/vcdrip.1
diff -r 9688e4b1caa7 -r 0764f396e4a6 textproc/eblook/Makefile
--- a/textproc/eblook/Makefile  Fri Apr 07 19:48:35 2006 +0000
+++ b/textproc/eblook/Makefile  Fri Apr 07 19:54:16 2006 +0000
@@ -1,4 +1,4 @@



Home | Main Index | Thread Index | Old Index