pkgsrc-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff709a59100f
branches:  trunk
changeset: 510879:ff709a59100f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Apr 05 23:01:15 2006 +0000

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

diffstat:

 math/algae/Makefile             |  11 +++++++--
 math/algae/PLIST                |   3 +-
 math/algae/distinfo             |   4 +-
 math/algae/patches/patch-ae     |  43 +++-------------------------------------
 math/bc/Makefile                |   4 +-
 math/bc/PLIST                   |   4 ++-
 math/blitz++/Makefile           |   5 +--
 math/blitz++/PLIST              |   3 +-
 math/calc/Makefile              |  14 +++++++-----
 math/calc/PLIST                 |   3 +-
 math/eukleides/Makefile         |   9 ++++++-
 math/eukleides/PLIST            |   3 +-
 math/eukleides/distinfo         |   3 +-
 math/eukleides/patches/patch-aa |  18 -----------------
 math/mcsim/Makefile             |  15 +++++++------
 math/mcsim/PLIST                |   3 +-
 math/pspp/Makefile              |   9 +++----
 math/pspp/PLIST                 |   3 +-
 misc/git/Makefile               |   4 +-
 misc/git/PLIST                  |   3 +-
 misc/lookup/Makefile            |   5 +--
 misc/lookup/PLIST               |   4 ++-
 misc/screen/Makefile            |   4 +-
 misc/screen/PLIST               |   3 +-
 misc/screen/PLIST.SunOS         |   3 +-
 25 files changed, 76 insertions(+), 107 deletions(-)

diffs (truncated from 491 to 300 lines):

diff -r 318aa4e7fe52 -r ff709a59100f math/algae/Makefile
--- a/math/algae/Makefile       Wed Apr 05 22:54:59 2006 +0000
+++ b/math/algae/Makefile       Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:02 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/05 23:01:15 jlam Exp $
 
 DISTNAME=              algae-4.1.3
 PKGREVISION=           4
@@ -15,8 +15,13 @@
 USE_LANGUAGES=         fortran
 USE_TOOLS+=            ls tr
 USE_GNU_READLINE=      # uses history_truncate_file
-
-INFO_FILES=            algae.info
+INFO_FILES=            # PLIST
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS}                                   \
+                       mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1          \
+                       infodir=${PREFIX:Q}/${PKGINFODIR:Q}             \
+                       htmldir=${PREFIX:Q}/share/doc/html/algae        \
+                       sourcedir=${PREFIX:Q}/include                   \
+                       hdir=${PREFIX:Q}/include/algae
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 318aa4e7fe52 -r ff709a59100f math/algae/PLIST
--- a/math/algae/PLIST  Wed Apr 05 22:54:59 2006 +0000
+++ b/math/algae/PLIST  Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/06/17 12:47:55 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/05 23:01:15 jlam Exp $
 bin/${PKGNAME}
 bin/algae
 include/algae/abs.h
@@ -119,6 +119,7 @@
 include/algae/vector_st.h
 include/algae/version.h
 include/algae/zero.h
+info/algae.info
 lib/algae/${PKGVERSION}/algae.A
 man/man1/algae.1
 share/algae/${PKGVERSION}/tools/all.A
diff -r 318aa4e7fe52 -r ff709a59100f math/algae/distinfo
--- a/math/algae/distinfo       Wed Apr 05 22:54:59 2006 +0000
+++ b/math/algae/distinfo       Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/12/21 17:56:10 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/04/05 23:01:15 jlam Exp $
 
 SHA1 (algae-4.1.3.tar.gz) = 73da6e67e9b73389af97239deda4479096cb7eb0
 RMD160 (algae-4.1.3.tar.gz) = 79b127f3f8983c19f5a9984d14ce9cc2cc913031
@@ -7,5 +7,5 @@
 SHA1 (patch-ab) = 79866650010effa2a7179dc246c835a98b152c1c
 SHA1 (patch-ac) = 5f638e253bef7cb53b56d645d8ab9a2fe873e96f
 SHA1 (patch-ad) = f169de7ed2a8b0302f8bcd7110ca216526eaf1cb
-SHA1 (patch-ae) = 6c7e7d8f1aa9aa1ed3aac19742351c5f884fa227
+SHA1 (patch-ae) = 926e28580031c61fba5d8e47a690741766e94555
 SHA1 (patch-af) = c70e919a048992058fa1305d7a2ab3435f38a026
diff -r 318aa4e7fe52 -r ff709a59100f math/algae/patches/patch-ae
--- a/math/algae/patches/patch-ae       Wed Apr 05 22:54:59 2006 +0000
+++ b/math/algae/patches/patch-ae       Wed Apr 05 23:01:15 2006 +0000
@@ -1,43 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2003/07/24 16:28:56 jtb Exp $
+$NetBSD: patch-ae,v 1.4 2006/04/05 23:01:15 jlam Exp $
 
---- Makefile.in.orig   2003-02-28 23:07:03.000000000 +0000
-+++ Makefile.in        2003-07-24 17:14:18.000000000 +0100
-@@ -78,18 +78,18 @@
- libdir = $(prefix)/lib
- 
- # Directory in which to install the man page.
--mandir = $(datadir)/man/man$(manext)
-+mandir = $(prefix)/man/man$(manext)
- # The manpage extension
- manext = 1
- 
- # Directory in which to install the Info files.
--infodir = $(datadir)/info
-+infodir = $(prefix)/info
- 
- # Directory in which to install the algae tools.
- tooldir = $(datadir)/algae/$(VERSION_NUMBER)/tools
- 
- # Directory in which to install the algae html files.
--htmldir = $(datadir)/algae/$(VERSION_NUMBER)/html
-+htmldir = $(prefix)/share/doc/html/algae
- 
- # Directory and name of the startup file.  This is compiled into the
- # executable, so don't change either assignment if you have a binary
-@@ -99,10 +99,10 @@
- RC0 = $(rcdir)/algae.A
- 
- # Directory in which to install source code.
--sourcedir = $(prefix)/src
-+sourcedir = $(prefix)/include
- 
- # Directory in which to install the header files.
--hdir = $(sourcedir)/algae/$(VERSION_NUMBER)/include
-+hdir = $(sourcedir)/algae
- 
- # Directory containing site files: that is, files installed locally
- # which are not part of the standard Algae distribution.
-@@ -308,7 +308,7 @@
+--- Makefile.in.orig   2003-02-28 18:07:03.000000000 -0500
++++ Makefile.in
+@@ -308,7 +308,7 @@ install: algae.A installdirs
        cd tools; \
          $(MAKE) tooldir=$(tooldir) install
        cd doc; \
diff -r 318aa4e7fe52 -r ff709a59100f math/bc/Makefile
--- a/math/bc/Makefile  Wed Apr 05 22:54:59 2006 +0000
+++ b/math/bc/Makefile  Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/04/05 22:24:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/05 23:01:15 jlam Exp $
 
 DISTNAME=      bc-1.06
 PKGREVISION=   1
@@ -11,7 +11,7 @@
 
 USE_TOOLS+=    flex
 GNU_CONFIGURE= YES
-INFO_FILES=    bc.info dc.info
+INFO_FILES=    # PLIST
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff -r 318aa4e7fe52 -r ff709a59100f math/bc/PLIST
--- a/math/bc/PLIST     Wed Apr 05 22:54:59 2006 +0000
+++ b/math/bc/PLIST     Wed Apr 05 23:01:15 2006 +0000
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/07 21:57:21 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/05 23:01:15 jlam Exp $
 bin/bc
 bin/dc
+info/bc.info
+info/dc.info
 man/man1/bc.1
 man/man1/dc.1
diff -r 318aa4e7fe52 -r ff709a59100f math/blitz++/Makefile
--- a/math/blitz++/Makefile     Wed Apr 05 22:54:59 2006 +0000
+++ b/math/blitz++/Makefile     Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:02 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/05 23:01:15 jlam Exp $
 
 DISTNAME=      blitz-0.8
 PKGNAME=       blitz++-0.8
@@ -14,7 +14,6 @@
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-cxx=gcc
-
-INFO_FILES=            blitz.info
+INFO_FILES=            # PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff -r 318aa4e7fe52 -r ff709a59100f math/blitz++/PLIST
--- a/math/blitz++/PLIST        Wed Apr 05 22:54:59 2006 +0000
+++ b/math/blitz++/PLIST        Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/09/05 14:06:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/05 23:01:15 jlam Exp $
 include/blitz/applics.h
 include/blitz/array-impl.h
 include/blitz/array-old.h
@@ -160,6 +160,7 @@
 include/random/mt.h
 include/random/normal.h
 include/random/uniform.h
+info/blitz.info
 lib/libblitz.la
 lib/pkgconfig/blitz.pc
 share/doc/blitz-0.8/blitz.gif
diff -r 318aa4e7fe52 -r ff709a59100f math/calc/Makefile
--- a/math/calc/Makefile        Wed Apr 05 22:54:59 2006 +0000
+++ b/math/calc/Makefile        Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/05 23:01:15 jlam Exp $
 
 DISTNAME=      calc-2.02f
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -15,14 +15,16 @@
 MAKE_ENV+=     EMACS=${EMACS_FLAVOR:Q}
 
 USE_TOOLS+=    makeinfo
-INFO_FILES=    calc.info
+INFO_FILES=    # PLIST
 
-INSTALLATION_DIRS=     info
+INSTALLATION_DIRS=     ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/calc
 
 do-install:
-       ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/calc
        ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
-       ${WRKSRC}/calccard.tex ${EMACS_LISPPREFIX}/calc
-       ${INSTALL_DATA} ${WRKSRC}/calc.info* ${PREFIX}/info
+               ${WRKSRC}/calccard.tex ${EMACS_LISPPREFIX}/calc
+       cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do                 \
+               ${TEST} ! -f "$$f" ||                                   \
+               ${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};              \
+       done
 
 .include "../../mk/bsd.pkg.mk"
diff -r 318aa4e7fe52 -r ff709a59100f math/calc/PLIST
--- a/math/calc/PLIST   Wed Apr 05 22:54:59 2006 +0000
+++ b/math/calc/PLIST   Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/03/07 21:59:54 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/05 23:01:15 jlam Exp $
+${EMACS_INFOPREFIX}/calc.info
 ${EMACS_LISPPREFIX}/calc/calc-aent.el
 ${EMACS_LISPPREFIX}/calc/calc-aent.elc
 ${EMACS_LISPPREFIX}/calc/calc-alg-2.el
diff -r 318aa4e7fe52 -r ff709a59100f math/eukleides/Makefile
--- a/math/eukleides/Makefile   Wed Apr 05 22:54:59 2006 +0000
+++ b/math/eukleides/Makefile   Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/05 22:35:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/05 23:01:15 jlam Exp $
 
 DISTNAME=      eukleides.1.0.1
 PKGNAME=       eukleides-1.0.1
@@ -14,6 +14,11 @@
 
 BUILD_TARGET=  eukleides
 USE_TOOLS+=    bison gmake makeinfo
-INFO_FILES=    eukleides.info
+INFO_FILES=    # PLIST
+
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS}                                   \
+                       BIN=${PREFIX:Q}/bin/                            \
+                       INFO=${PREFIX:Q}/${PKGINFODIR:Q}/               \
+                       MAN=${PREFIX:Q}/${PKGMANDIR:Q}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff -r 318aa4e7fe52 -r ff709a59100f math/eukleides/PLIST
--- a/math/eukleides/PLIST      Wed Apr 05 22:54:59 2006 +0000
+++ b/math/eukleides/PLIST      Wed Apr 05 23:01:15 2006 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2004/12/31 12:36:44 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/05 23:01:15 jlam Exp $
 bin/euk2edit
 bin/euk2eps
 bin/eukleides
+info/eukleides.info
 man/man1/euk2edit.1
 man/man1/euk2eps.1
 man/man1/eukleides.1
diff -r 318aa4e7fe52 -r ff709a59100f math/eukleides/distinfo
--- a/math/eukleides/distinfo   Wed Apr 05 22:54:59 2006 +0000
+++ b/math/eukleides/distinfo   Wed Apr 05 23:01:15 2006 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 12:06:54 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/04/05 23:01:15 jlam Exp $
 
 SHA1 (eukleides.1.0.1.tar.gz) = 6ece226caec7bb452daa86b5bef08c00bd046c37
 RMD160 (eukleides.1.0.1.tar.gz) = 91c2092782a9cb969583ef35b0dc505a2b2559d6
 Size (eukleides.1.0.1.tar.gz) = 50635 bytes
-SHA1 (patch-aa) = 5bae9eb5d1411ffddf5ea0a438e412ff3d89aab6
diff -r 318aa4e7fe52 -r ff709a59100f math/eukleides/patches/patch-aa
--- a/math/eukleides/patches/patch-aa   Wed Apr 05 22:54:59 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/12/31 12:36:44 kristerw Exp $
-
---- Makefile.orig      2004-09-20 12:28:49.000000000 +0000
-+++ Makefile
-@@ -6,10 +6,9 @@ CFLAGS = -c -O2
- OBJECTS = lex.yy.o parser.tab.o main.o geometry.o drawing.o
- LEX = flex
- YACC = bison -d
--PREFIX = /usr/local/
--BIN = $(PREFIX)bin/
--MAN = $(PREFIX)man/man1/
--INFO = $(PREFIX)info/
-+BIN = $(PREFIX)/bin/
-+MAN = $(PREFIX)/man/man1/
-+INFO = $(PREFIX)/info/
- PAPER = --texinfo=@afourpaper
- DOC = eukleides.info eukleides.dvi eukleides.ps
- 
diff -r 318aa4e7fe52 -r ff709a59100f math/mcsim/Makefile
--- a/math/mcsim/Makefile       Wed Apr 05 22:54:59 2006 +0000
+++ b/math/mcsim/Makefile       Wed Apr 05 23:01:15 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/19 15:26:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/05 23:01:15 jlam Exp $
 
 DISTNAME=      mcsim-4.2.0
 CATEGORIES=    math
@@ -8,23 +8,24 @@
 COMMENT=       Monte Carlo Simulation software
 
 USE_TOOLS+=    makeinfo
-INFO_FILES=    mcsim
+INFO_FILES=    # PLIST
 WRKSRC=                ${WRKDIR}/mcsim
 



Home | Main Index | Thread Index | Old Index