pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang List the info files directly in the PLIST, and ho...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/26d00e64da1d
branches:  trunk
changeset: 510847:26d00e64da1d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Apr 05 06:27:41 2006 +0000

description:
List the info files directly in the PLIST, and honor PKGINFODIR and
PKGMANDIR.

diffstat:

 lang/a60/Makefile                  |  16 +++++++++++-----
 lang/a60/PLIST                     |   4 +++-
 lang/chicken/Makefile              |   4 ++--
 lang/chicken/PLIST                 |   3 ++-
 lang/cim/Makefile                  |   4 ++--
 lang/cim/PLIST                     |   3 ++-
 lang/classpath/Makefile            |   4 ++--
 lang/classpath/PLIST               |   4 +++-
 lang/elisp-manual/Makefile         |   4 ++--
 lang/elisp-manual/PLIST            |   3 ++-
 lang/elisp-manual/distinfo         |   3 +--
 lang/elisp-manual/patches/patch-aa |  13 -------------
 lang/ja-gawk/Makefile              |   4 ++--
 lang/ja-gawk/PLIST                 |   3 ++-
 lang/japhar/Makefile               |   4 ++--
 lang/japhar/PLIST                  |   3 ++-
 lang/ksi/Makefile                  |   4 ++--
 lang/ksi/PLIST                     |   5 ++++-
 lang/mercury/Makefile              |  23 +++++++++++++----------
 lang/mercury/PLIST                 |   8 +++++++-
 lang/sablevm-classpath/Makefile    |   4 ++--
 lang/sablevm-classpath/PLIST       |   4 +++-
 lang/sather/Makefile               |  21 ++++++++++++---------
 lang/sather/PLIST                  |   5 ++++-
 lang/scm/Makefile                  |   5 ++---
 lang/scm/PLIST                     |   5 ++++-
 lang/smalltalk/Makefile            |   5 ++---
 lang/smalltalk/PLIST               |   5 ++++-
 28 files changed, 99 insertions(+), 74 deletions(-)

diffs (truncated from 545 to 300 lines):

diff -r de8732769723 -r 26d00e64da1d lang/a60/Makefile
--- a/lang/a60/Makefile Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/a60/Makefile Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=      a60-0.20a
 CATEGORIES=    lang
@@ -11,16 +11,22 @@
 
 CPPFLAGS+=     -Dunix
 
-INFO_FILES=    RRA60.info a60.info
+INFO_FILES=    # PLIST
 
-INSTALLATION_DIRS=     bin info man/man1
+INSTALLATION_DIRS=     bin ${PKGINFODIR} ${PKGMANDIR}/man1
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/a60 ${PREFIX}/bin/
        ${INSTALL_DATA_DIR} ${PREFIX}/share/a60/
        ${INSTALL_DATA} ${WRKSRC}/a60-mkc.inc ${PREFIX}/share/a60/
-       cd ${WRKSRC} && ${INSTALL_DATA} a60.info RRA60.info ${PREFIX}/info
-       ${INSTALL_MAN} ${WRKSRC}/a60.man ${PREFIX}/man/man1/a60.1
+       cd ${WRKSRC}; for f in                                          \
+               RRA60.info RRA60.info-[0-9]*                            \
+               a60.info a60.info-[0-9]*;                               \
+       do                                                              \
+               ${TEST} ! -f "$$f" ||                                   \
+               ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};          \
+       done
+       ${INSTALL_MAN} ${WRKSRC}/a60.man ${PREFIX}/${PKGMANDIR}/man1/a60.1
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/a60/
        cd ${WRKSRC}/examples && ${INSTALL_DATA} *.a60 README           \
                ${PREFIX}/share/examples/a60/
diff -r de8732769723 -r 26d00e64da1d lang/a60/PLIST
--- a/lang/a60/PLIST    Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/a60/PLIST    Wed Apr 05 06:27:41 2006 +0000
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/21 18:27:06 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/05 06:27:41 jlam Exp $
 bin/a60
+info/RRA60.info
+info/a60.info
 man/man1/a60.1
 share/a60/a60-mkc.inc
 share/doc/a60/a60.ps
diff -r de8732769723 -r 26d00e64da1d lang/chicken/Makefile
--- a/lang/chicken/Makefile     Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/chicken/Makefile     Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:29:53 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/05 06:27:41 jlam Exp $
 #
 
 DISTNAME=      chicken-2.2
@@ -14,7 +14,7 @@
 USE_TOOLS+=    gmake
 USE_LIBTOOL=   yes
 
-INFO_FILES=    chicken.info
+INFO_FILES=    # PLIST
 MAKE_FLAGS+=   MAKEINFO=${TRUE:Q}
 
 # Avoid an ICE in gcc2 on sparc64
diff -r de8732769723 -r 26d00e64da1d lang/chicken/PLIST
--- a/lang/chicken/PLIST        Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/chicken/PLIST        Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/11/16 22:36:40 rillig Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/04/05 06:27:41 jlam Exp $
 bin/chicken
 bin/chicken-config
 bin/chicken-profile
@@ -10,6 +10,7 @@
 include/c_defaults.h
 include/chicken-config.h
 include/chicken.h
+info/chicken.info
 lib/libchicken.la
 lib/libuchicken.la
 man/man1/chicken-config.1
diff -r de8732769723 -r 26d00e64da1d lang/cim/Makefile
--- a/lang/cim/Makefile Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/cim/Makefile Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/04/04 16:53:59 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=              cim-3.30
 PKGREVISION=           1
@@ -13,6 +13,6 @@
 CONFIGURE_ENV+=                libtool_path=${PKG_LIBTOOL:Q}
 USE_TOOLS+=            perl:run
 USE_LIBTOOL=           YES
-INFO_FILES=            cim.info
+INFO_FILES=            # PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff -r de8732769723 -r 26d00e64da1d lang/cim/PLIST
--- a/lang/cim/PLIST    Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/cim/PLIST    Wed Apr 05 06:27:41 2006 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/05 06:27:41 jlam Exp $
 bin/cim
 bin/cim2latex
 bin/cim2ps
 bin/cimindent
 include/cim.h
+info/cim.info
 lib/libcim-atr.a
 lib/libcim.la
 man/man1/cim.1
diff -r de8732769723 -r 26d00e64da1d lang/classpath/Makefile
--- a/lang/classpath/Makefile   Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/classpath/Makefile   Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/05 06:27:41 jlam Exp $
 
 .include "Makefile.common"
 
@@ -6,7 +6,7 @@
 
 BUILD_DEPENDS+=                zip>=2.3:../../archivers/zip
 
-INFO_FILES=            hacking.info vmintegration.info
+INFO_FILES=            # PLIST
 
 CONFIGURE_ARGS+=       --disable-gtk-peer
 
diff -r de8732769723 -r 26d00e64da1d lang/classpath/PLIST
--- a/lang/classpath/PLIST      Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/classpath/PLIST      Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/27 18:17:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/05 06:27:41 jlam Exp $
+info/hacking.info
+info/vmintegration.info
 lib/awt/font.properties
 lib/classpath/libjavaio.la
 lib/classpath/libjavalang.la
diff -r de8732769723 -r 26d00e64da1d lang/elisp-manual/Makefile
--- a/lang/elisp-manual/Makefile        Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/elisp-manual/Makefile        Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/03 15:15:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=      elisp-manual-21-2.8
 CATEGORIES=    lang
@@ -9,7 +9,7 @@
 COMMENT=       The Emacs Lisp Reference Manual for GNU Emacs Version 20.3
 
 GNU_CONFIGURE= YES
-INFO_FILES=    elisp
+INFO_FILES=    # PLIST
 
 BUILD_TARGET=  elisp
 
diff -r de8732769723 -r 26d00e64da1d lang/elisp-manual/PLIST
--- a/lang/elisp-manual/PLIST   Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/elisp-manual/PLIST   Wed Apr 05 06:27:41 2006 +0000
@@ -1,1 +1,2 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/22 14:43:44 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/05 06:27:41 jlam Exp $
+info/elisp
diff -r de8732769723 -r 26d00e64da1d lang/elisp-manual/distinfo
--- a/lang/elisp-manual/distinfo        Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/elisp-manual/distinfo        Wed Apr 05 06:27:41 2006 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:06 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/04/05 06:27:41 jlam Exp $
 
 SHA1 (elisp-manual-21-2.8.tar.gz) = 252fd99132f6b7c553a8737d9ba0a8b82636641c
 RMD160 (elisp-manual-21-2.8.tar.gz) = a0d9aa30c032e3e227cc931e6da711ade194f7d0
 Size (elisp-manual-21-2.8.tar.gz) = 2455995 bytes
-SHA1 (patch-aa) = 04f2e87d932fe78bf22a136fca1b685c36b98d0e
diff -r de8732769723 -r 26d00e64da1d lang/elisp-manual/patches/patch-aa
--- a/lang/elisp-manual/patches/patch-aa        Wed Apr 05 06:25:52 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/06/19 22:18:05 seb Exp $
-
---- Makefile.in.orig   2002-01-18 10:34:49.000000000 +0000
-+++ Makefile.in
-@@ -12,8 +12,6 @@ srcdir = @srcdir@
- TEX=tex
- MAKE=make
- SHELL=/bin/sh
--INSTALL_INFO = install-info
--MAKEINFO=makeinfo
- 
- # Where the TeX macros are kept:
- texmacrodir = /usr/local/lib/tex/macros
diff -r de8732769723 -r 26d00e64da1d lang/ja-gawk/Makefile
--- a/lang/ja-gawk/Makefile     Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/ja-gawk/Makefile     Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/11 13:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=      gawk-3.0.6
 PKGNAME=       ja-gawk-3.0.6
@@ -15,7 +15,7 @@
 
 CONFLICTS=     gawk-[0-9]*
 
-INFO_FILES=    gawk.info
+INFO_FILES=    # PLIST
 
 GNU_CONFIGURE= yes
 
diff -r de8732769723 -r 26d00e64da1d lang/ja-gawk/PLIST
--- a/lang/ja-gawk/PLIST        Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/ja-gawk/PLIST        Wed Apr 05 06:27:41 2006 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/02 12:01:52 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/05 06:27:41 jlam Exp $
 bin/jgawk
 bin/jigawk
+info/gawk.info
 libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/jgawk.1
diff -r de8732769723 -r 26d00e64da1d lang/japhar/Makefile
--- a/lang/japhar/Makefile      Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/japhar/Makefile      Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/05 06:27:41 jlam Exp $
 #
 
 DISTNAME=              japhar-0.08
@@ -18,7 +18,7 @@
 USE_LANGUAGES=         c c++
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig
 
-INFO_FILES=    japhar.info
+INFO_FILES=    # PLIST
 
 # The japhar tar archive uses ././@LongLink GNU tar hacks
 EXTRACT_USING=         nbtar
diff -r de8732769723 -r 26d00e64da1d lang/japhar/PLIST
--- a/lang/japhar/PLIST Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/japhar/PLIST Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/05 06:27:41 jlam Exp $
+info/japhar.info
 lib/libarch.la
 lib/libffi.la
 lib/libjni.la
diff -r de8732769723 -r 26d00e64da1d lang/ksi/Makefile
--- a/lang/ksi/Makefile Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/ksi/Makefile Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/04 17:45:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=              ksi-3.4.1
 PKGREVISION=           4
@@ -12,7 +12,7 @@
 CPPFLAGS+=             -Dunix
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            makeinfo
-INFO_FILES=            ksi-lang.info ksi-lib.info ksi.info
+INFO_FILES=            # PLIST
 MAKE_ENV+=             GC_PREFIX=${BUILDLINK_PREFIX.boehm-gc:Q}
 USE_GNU_READLINE=      # uses rl_event_hook() interface
 USE_LIBTOOL=           yes
diff -r de8732769723 -r 26d00e64da1d lang/ksi/PLIST
--- a/lang/ksi/PLIST    Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/ksi/PLIST    Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/05 06:27:41 jlam Exp $
 bin/ksi
 bin/ksi-compile
 bin/ksi-config
@@ -13,6 +13,9 @@
 include/ksi/ksi_ver.h
 include/ksi/ksi_vtab.h
 include/ksi/ksi_z.h
+info/ksi-lang.info
+info/ksi-lib.info
+info/ksi.info
 lib/ksi/libksi.la
 lib/ksi/libregexp.la
 lib/ksi/libzip.la
diff -r de8732769723 -r 26d00e64da1d lang/mercury/Makefile
--- a/lang/mercury/Makefile     Wed Apr 05 06:25:52 2006 +0000
+++ b/lang/mercury/Makefile     Wed Apr 05 06:27:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=              mercury-compiler-0.11.0



Home | Main Index | Thread Index | Old Index