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/0c069d7dad16
branches: trunk
changeset: 510984:0c069d7dad16
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Apr 07 15:28:49 2006 +0000
description:
List the info files directly in the PLIST and honor PKG{INFO,MAN}DIR.
diffstat:
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(-)
diffs (truncated from 379 to 300 lines):
diff -r 065f70936b7d -r 0c069d7dad16 security/fsh/Makefile
--- a/security/fsh/Makefile Fri Apr 07 15:09:06 2006 +0000
+++ b/security/fsh/Makefile Fri Apr 07 15:28:49 2006 +0000
@@ -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 @@
COMMENT= Fast remote command execution
GNU_CONFIGURE= YES
-INFO_FILES= fsh.info
+INFO_FILES= # PLIST
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
diff -r 065f70936b7d -r 0c069d7dad16 security/fsh/PLIST
--- a/security/fsh/PLIST Fri Apr 07 15:09:06 2006 +0000
+++ b/security/fsh/PLIST Fri Apr 07 15:28:49 2006 +0000
@@ -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 -r 065f70936b7d -r 0c069d7dad16 security/gnupg/Makefile
--- a/security/gnupg/Makefile Fri Apr 07 15:09:06 2006 +0000
+++ b/security/gnupg/Makefile Fri Apr 07 15:28:49 2006 +0000
@@ -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 @@
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 -r 065f70936b7d -r 0c069d7dad16 security/gnupg/PLIST
--- a/security/gnupg/PLIST Fri Apr 07 15:09:06 2006 +0000
+++ b/security/gnupg/PLIST Fri Apr 07 15:28:49 2006 +0000
@@ -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 -r 065f70936b7d -r 0c069d7dad16 security/lsh2/Makefile
--- a/security/lsh2/Makefile Fri Apr 07 15:09:06 2006 +0000
+++ b/security/lsh2/Makefile Fri Apr 07 15:28:49 2006 +0000
@@ -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 @@
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 @@
# 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 -r 065f70936b7d -r 0c069d7dad16 security/lsh2/PLIST
--- a/security/lsh2/PLIST Fri Apr 07 15:09:06 2006 +0000
+++ b/security/lsh2/PLIST Fri Apr 07 15:28:49 2006 +0000
@@ -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/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 -r 065f70936b7d -r 0c069d7dad16 security/sfs/Makefile
--- a/security/sfs/Makefile Fri Apr 07 15:09:06 2006 +0000
+++ b/security/sfs/Makefile Fri Apr 07 15:28:49 2006 +0000
@@ -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 @@
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 @@
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 -r 065f70936b7d -r 0c069d7dad16 security/sfs/PLIST
--- a/security/sfs/PLIST Fri Apr 07 15:09:06 2006 +0000
+++ b/security/sfs/PLIST Fri Apr 07 15:28:49 2006 +0000
@@ -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}/xdrmisc.h
include/${PKGNAME}/xhinfo.h
include/sfs.h
+info/sfs.info
lib/libsfs.a
lib/sfs
lib/${PKGNAME}/aiod
diff -r 065f70936b7d -r 0c069d7dad16 shells/esh/Makefile
--- a/shells/esh/Makefile Fri Apr 07 15:09:06 2006 +0000
+++ b/shells/esh/Makefile Fri Apr 07 15:28:49 2006 +0000
@@ -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 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
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 @@
${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 -r 065f70936b7d -r 0c069d7dad16 shells/esh/PLIST
--- a/shells/esh/PLIST Fri Apr 07 15:09:06 2006 +0000
+++ b/shells/esh/PLIST Fri Apr 07 15:28:49 2006 +0000
@@ -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 -r 065f70936b7d -r 0c069d7dad16 shells/zsh-current/PLIST
--- a/shells/zsh-current/PLIST Fri Apr 07 15:09:06 2006 +0000
+++ b/shells/zsh-current/PLIST Fri Apr 07 15:28:49 2006 +0000
@@ -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 -r 065f70936b7d -r 0c069d7dad16 shells/zsh-current/distinfo
--- a/shells/zsh-current/distinfo Fri Apr 07 15:09:06 2006 +0000
+++ b/shells/zsh-current/distinfo Fri Apr 07 15:28:49 2006 +0000
@@ -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 -r 065f70936b7d -r 0c069d7dad16 shells/zsh-current/patches/patch-aa
--- a/shells/zsh-current/patches/patch-aa Fri Apr 07 15:09:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 065f70936b7d -r 0c069d7dad16 shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common Fri Apr 07 15:09:06 2006 +0000
+++ b/shells/zsh/Makefile.common Fri Apr 07 15:28:49 2006 +0000
@@ -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 @@
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 -r 065f70936b7d -r 0c069d7dad16 shells/zsh/PLIST
--- a/shells/zsh/PLIST Fri Apr 07 15:09:06 2006 +0000
+++ b/shells/zsh/PLIST Fri Apr 07 15:28:49 2006 +0000
@@ -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 -r 065f70936b7d -r 0c069d7dad16 shells/zsh/distinfo
--- a/shells/zsh/distinfo Fri Apr 07 15:09:06 2006 +0000
+++ b/shells/zsh/distinfo Fri Apr 07 15:28:49 2006 +0000
@@ -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 -r 065f70936b7d -r 0c069d7dad16 shells/zsh/patches/patch-aa
--- a/shells/zsh/patches/patch-aa Fri Apr 07 15:09:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 @@
Home |
Main Index |
Thread Index |
Old Index