From 2515667d5dec29b0af088e6eaa11bfbe11f2f37f Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 7 Apr 2006 15:28:49 +0000 Subject: List the info files directly in the PLIST and honor PKG{INFO,MAN}DIR. --- security/fsh/Makefile | 4 ++-- security/fsh/PLIST | 3 ++- security/gnupg/Makefile | 5 ++--- security/gnupg/PLIST | 4 +++- security/lsh2/Makefile | 6 +++--- security/lsh2/PLIST | 4 +++- security/sfs/Makefile | 6 +++--- security/sfs/PLIST | 3 ++- shells/esh/Makefile | 12 +++++++----- shells/esh/PLIST | 3 ++- shells/zsh-current/PLIST | 3 ++- shells/zsh-current/distinfo | 3 +-- shells/zsh-current/patches/patch-aa | 13 ------------- shells/zsh/Makefile.common | 4 ++-- shells/zsh/PLIST | 3 ++- shells/zsh/distinfo | 3 +-- shells/zsh/patches/patch-aa | 13 ------------- shells/zsh3/Makefile | 4 ++-- shells/zsh3/PLIST | 3 ++- shells/zsh3/distinfo | 3 +-- shells/zsh3/patches/patch-ab | 23 ----------------------- 21 files changed, 42 insertions(+), 83 deletions(-) delete mode 100644 shells/zsh-current/patches/patch-aa delete mode 100644 shells/zsh/patches/patch-aa delete mode 100644 shells/zsh3/patches/patch-ab diff --git a/security/fsh/Makefile b/security/fsh/Makefile index 4dd88874918..4d495a9e85e 100644 --- a/security/fsh/Makefile +++ b/security/fsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:10:43 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/04/07 15:28:49 jlam Exp $ # DISTNAME= fsh-1.2 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.lysator.liu.se/fsh/ COMMENT= Fast remote command execution GNU_CONFIGURE= YES -INFO_FILES= fsh.info +INFO_FILES= # PLIST CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/security/fsh/PLIST b/security/fsh/PLIST index 440b83b8890..a6f75660e06 100644 --- a/security/fsh/PLIST +++ b/security/fsh/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.5 2004/03/09 23:01:17 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/04/07 15:28:49 jlam Exp $ bin/fcp bin/fsh bin/fshd bin/in.fshd +info/fsh.info libexec/fcpwrap share/fsh/fsh.py share/fsh/fshcompat.py diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 8d7aa09ab9a..b120ab0d405 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2006/04/04 21:16:37 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2006/04/07 15:28:49 jlam Exp $ DISTNAME= gnupg-1.4.3 CATEGORIES= security @@ -27,11 +27,10 @@ USE_TOOLS+= gmake CONFIGURE_ARGS+= --with-static-rnd=auto CONFIGURE_ARGS+= --with-mailprog=/usr/sbin/sendmail TEST_TARGET= check +INFO_FILES= # PLIST EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -INFO_FILES= gpg.info gpgv.info - .include "options.mk" .if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)) diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST index f144d85f1fc..3fa1ad590e8 100644 --- a/security/gnupg/PLIST +++ b/security/gnupg/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.16 2006/04/04 21:16:37 wiz Exp $ +@comment $NetBSD: PLIST,v 1.17 2006/04/07 15:28:49 jlam Exp $ bin/gpg bin/gpg-zip bin/gpgsplit bin/gpgv +info/gpg.info +info/gpgv.info libexec/gnupg/gpgkeys_curl libexec/gnupg/gpgkeys_finger libexec/gnupg/gpgkeys_hkp diff --git a/security/lsh2/Makefile b/security/lsh2/Makefile index 155eef3593a..826dce13182 100644 --- a/security/lsh2/Makefile +++ b/security/lsh2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/19 12:22:12 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2006/04/07 15:28:49 jlam Exp $ # DISTNAME= lsh-2.0.2 @@ -12,6 +12,8 @@ COMMENT= SSH2 client/server GNU_CONFIGURE= yes USE_TOOLS+= gmake gm4 CONFIGURE_ARGS+= --disable-openssl --disable-pam +INFO_FILES= # PLIST + # lcp test depends on /bin/bash and thus fails, others work TEST_TARGET= check @@ -21,8 +23,6 @@ CONFLICTS+= openssh-[0-9]* openssh+gssapi-[0-9]* # src/nettle/examples/nettle-openssl.c needs des_key* USE_OLD_DES_API= yes -INFO_FILES= lsh.info nettle.info - .include "../../devel/gmp/buildlink3.mk" .include "../../devel/liboop/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/lsh2/PLIST b/security/lsh2/PLIST index 83377a14685..283ae7e2db3 100644 --- a/security/lsh2/PLIST +++ b/security/lsh2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2006/03/14 19:30:12 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/04/07 15:28:49 jlam Exp $ bin/lcp bin/lsftp bin/lsh @@ -53,6 +53,8 @@ include/nettle/sexp.h include/nettle/sha.h include/nettle/twofish.h include/nettle/yarrow.h +info/lsh.info +info/nettle.info lib/libnettle.a man/man1/lsftp.1 man/man1/lsh-authorize.1 diff --git a/security/sfs/Makefile b/security/sfs/Makefile index 5e3e27d13d6..1c052e87885 100644 --- a/security/sfs/Makefile +++ b/security/sfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/03/05 16:27:28 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2006/04/07 15:28:49 jlam Exp $ # DISTNAME= sfs-0.7.2 @@ -23,6 +23,8 @@ USE_TOOLS+= makeinfo perl:run GCC_REQD+= 2.95.3 +INFO_FILES= # PLIST + PKG_USERS= sfs:sfs::Self-certifying\ file\ system:/ PKG_GROUPS= sfs PKG_SYSCONFSUBDIR= sfs @@ -40,8 +42,6 @@ SFSEXAMPLEDIR= ${PREFIX}/share/examples/sfs MESSAGE_SUBST+= SFSDIR=${SFS_ROOT} SFSEXAMPLEDIR=${SFSEXAMPLEDIR} -INFO_FILES= sfs.info - post-install: ${INSTALL_DATA_DIR} ${SFSEXAMPLEDIR} @${SED} -e 's|@SFSDIR@|${SFS_ROOT}|g' ${FILESDIR}/sfsrwsd_config.sample \ diff --git a/security/sfs/PLIST b/security/sfs/PLIST index dbcf5da28cd..59233c3c463 100644 --- a/security/sfs/PLIST +++ b/security/sfs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2005/05/03 15:50:26 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2006/04/07 15:28:49 jlam Exp $ bin/dirsearch bin/newaid bin/rex @@ -126,6 +126,7 @@ include/${PKGNAME}/xdr_suio.h include/${PKGNAME}/xdrmisc.h include/${PKGNAME}/xhinfo.h include/sfs.h +info/sfs.info lib/libsfs.a lib/sfs lib/${PKGNAME}/aiod diff --git a/shells/esh/Makefile b/shells/esh/Makefile index b470b55d2a5..6657daee881 100644 --- a/shells/esh/Makefile +++ b/shells/esh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:39 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2006/04/07 15:28:49 jlam Exp $ DISTNAME= esh-0.8 PKGREVISION= 1 @@ -8,11 +8,10 @@ MASTER_SITES= ${MASTER_SITE_BACKUP} MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Unix shell with Lisp-like syntax -INFO_FILES= esh.info - WRKSRC= ${WRKDIR}/esh PKG_SHELL= bin/esh -INSTALLATION_DIRS= bin info +INFO_FILES= # PLIST +INSTALLATION_DIRS= bin ${PKGINFODIR} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/esh ${PREFIX}/bin @@ -22,7 +21,10 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/emacs/esh-mode.el \ ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/doc/esh.info ${PREFIX}/info + cd ${WRKSRC}/doc; for f in *.info *.info-[0-9]*; do \ + ${TEST} ! -f "$$f" || \ + ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR}; \ + done ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/esh cd ${WRKSRC}/doc && ${INSTALL_DATA} esh.html esh_toc.html \ ${PREFIX}/share/doc/esh/ diff --git a/shells/esh/PLIST b/shells/esh/PLIST index eb7f756f2fa..5c63d374724 100644 --- a/shells/esh/PLIST +++ b/shells/esh/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.6 2004/03/10 00:58:44 seb Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/04/07 15:28:49 jlam Exp $ bin/esh +info/esh.info share/doc/esh/esh.html share/doc/esh/esh_toc.html share/emacs/site-lisp/esh-mode.el diff --git a/shells/zsh-current/PLIST b/shells/zsh-current/PLIST index 5ea6e537030..e250edabdb8 100644 --- a/shells/zsh-current/PLIST +++ b/shells/zsh-current/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.6 2006/03/18 01:02:21 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/04/07 15:28:50 jlam Exp $ bin/${PKGNAME} bin/zsh +info/zsh.info man/man1/zsh.1 man/man1/zshall.1 man/man1/zshbuiltins.1 diff --git a/shells/zsh-current/distinfo b/shells/zsh-current/distinfo index b6c45269816..407d64ec843 100644 --- a/shells/zsh-current/distinfo +++ b/shells/zsh-current/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.8 2006/03/11 13:20:15 uebayasi Exp $ +$NetBSD: distinfo,v 1.9 2006/04/07 15:28:50 jlam Exp $ SHA1 (zsh-4.3.2.tar.bz2) = a6dd50c7578812bdb30f4cb65c8ac280c86dbfc3 RMD160 (zsh-4.3.2.tar.bz2) = 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e Size (zsh-4.3.2.tar.bz2) = 2263544 bytes -SHA1 (patch-aa) = b066925bacaf5bbeb0da2ab0863c4e93288fc3da SHA1 (patch-ab) = 6ffe8b8b82d04bb27c5e4fb43b75f7f8de64f7c9 SHA1 (patch-ac) = 95e15527e75685cbc140066efeec12127a4863ce SHA1 (patch-ae) = dbf50ba5bb5141ea4583c02963d7e114e402d022 diff --git a/shells/zsh-current/patches/patch-aa b/shells/zsh-current/patches/patch-aa deleted file mode 100644 index f0e44b906e4..00000000000 --- a/shells/zsh-current/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2006/03/11 13:20:15 uebayasi Exp $ - ---- Doc/Makefile.in.orig 2005-10-29 01:40:15.000000000 +0900 -+++ Doc/Makefile.in -@@ -37,7 +37,7 @@ INSTALL = @INSTALL@ - - @DEFS_MK@ - --MAKEINFO = makeinfo -+MAKEINFO = makeinfo --no-split - TEXI2DVI = texi2dvi - DVIPS = dvips - TEXI2HTML = texi2html --output . --ifinfo --split=chapter diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 180b9b2b325..d0fae5e264c 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2006/03/05 16:27:28 jlam Exp $ +# $NetBSD: Makefile.common,v 1.34 2006/04/07 15:28:49 jlam Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q} USE_TOOLS+= makeinfo -INFO_FILES= zsh.info +INFO_FILES= # PLIST TEXINFO_REQD= 4.0 PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index e55143d99d4..a776eae7612 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.17 2005/12/07 03:00:50 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.18 2006/04/07 15:28:49 jlam Exp $ bin/${PKGNAME} bin/zsh +info/zsh.info man/man1/zsh.1 man/man1/zshall.1 man/man1/zshbuiltins.1 diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 47e1514a8d8..e52ee9a80fd 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.25 2005/12/07 03:00:50 uebayasi Exp $ +$NetBSD: distinfo,v 1.26 2006/04/07 15:28:49 jlam Exp $ SHA1 (zsh-4.2.6.tar.bz2) = e00c3eda3f52c9514bb625bb56e4480358170d39 RMD160 (zsh-4.2.6.tar.bz2) = e4400fc6311bf6996128ecf7899592d6d8cdb310 Size (zsh-4.2.6.tar.bz2) = 2098671 bytes -SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb SHA1 (patch-ab) = 815de90c379035dbc02b251cee148f6df47f9a65 SHA1 (patch-ac) = 965b56e5ae39d6523416752c1390f01315c5d758 SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48 diff --git a/shells/zsh/patches/patch-aa b/shells/zsh/patches/patch-aa deleted file mode 100644 index a38c417ef5f..00000000000 --- a/shells/zsh/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2001/11/29 09:16:28 martti Exp $ - ---- Doc/Makefile.in.orig Fri Oct 26 22:18:31 2001 -+++ Doc/Makefile.in -@@ -37,7 +37,7 @@ - - @DEFS_MK@ - --MAKEINFO = makeinfo -+MAKEINFO = makeinfo --no-split - TEXI2DVI = texi2dvi - DVIPS = dvips - TEXI2HTML = texi2html -expand info -split chapter diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile index 341704cbf34..e7d60565d5d 100644 --- a/shells/zsh3/Makefile +++ b/shells/zsh3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:28 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/04/07 15:28:50 jlam Exp $ # DISTNAME= zsh-3.0.8 @@ -16,7 +16,7 @@ COMMENT= The Z shell GNU_CONFIGURE= yes USE_TOOLS+= makeinfo -INFO_FILES= zsh.info +INFO_FILES= # PLIST .include "../../mk/bsd.prefs.mk" diff --git a/shells/zsh3/PLIST b/shells/zsh3/PLIST index f6c2a0cf84f..a857c20e5b9 100644 --- a/shells/zsh3/PLIST +++ b/shells/zsh3/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.6 2005/10/23 15:37:24 rillig Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/04/07 15:28:50 jlam Exp $ bin/${PKGNAME} bin/zsh +info/zsh.info man/man1/zsh.1.gz man/man1/zshall.1.gz man/man1/zshbuiltins.1.gz diff --git a/shells/zsh3/distinfo b/shells/zsh3/distinfo index 913972c0a85..fdc03a71e8d 100644 --- a/shells/zsh3/distinfo +++ b/shells/zsh3/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 13:14:42 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/04/07 15:28:50 jlam Exp $ SHA1 (zsh-3.0.8.tar.gz) = d5d07abdd9c0f063c79d19de9482f7517016b54d RMD160 (zsh-3.0.8.tar.gz) = ea0f8e026f71e56ddaab04d8e5926bfd0914a4f1 Size (zsh-3.0.8.tar.gz) = 657979 bytes SHA1 (patch-aa) = 7209d74d6a7535e41d8db1d1109a6039b9bb3e0e -SHA1 (patch-ab) = be8e64c07903177c1912ef52798d2c3dafcc2520 SHA1 (patch-ac) = 5e5c47d218a191692907b67839a8e874857fe2be SHA1 (patch-ad) = 613fcaaa117aa38ff2e41eddaad5947bd5e0190d diff --git a/shells/zsh3/patches/patch-ab b/shells/zsh3/patches/patch-ab deleted file mode 100644 index 6431e9bc0ce..00000000000 --- a/shells/zsh3/patches/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/06/05 16:30:14 jtb Exp $ - ---- Doc/Makefile.in.orig Thu Jan 6 15:40:23 2000 -+++ Doc/Makefile.in Thu Jan 6 15:42:03 2000 -@@ -91,7 +91,8 @@ - everything: all zsh_us.ps zsh_a4.ps zsh_toc.html - - zsh.info: zsh.texi -- @$(MAKEINFO) -I$(srcdir) $(srcdir)/zsh.texi || { \ -+ @rm -f zsh.info* -+ @$(MAKEINFO) --no-split -I$(srcdir) $(srcdir)/zsh.texi || { \ - echo Info documentation cannot be compiled without $(MAKEINFO). ; \ - echo You can find precompiled info files in zsh-doc.tar.gz. ; } - -@@ -125,7 +126,7 @@ - # install info pages, creating install directory if necessary - install.info: zsh.info - $(top_srcdir)/mkinstalldirs $(infodir) -- for file in zsh.info zsh.info-[1-9]*; do \ -+ for file in zsh.info*; do \ - [ -f "$$file" ] && $(INSTALL_DATA) $$file $(infodir) ; \ - done - -- cgit v1.2.3