From 354f76fcc2f96095c5012093913a891c22dbdbe7 Mon Sep 17 00:00:00 2001 From: schmonz Date: Thu, 15 Mar 2007 07:14:27 +0000 Subject: Update to 2006.1, based on PR pkg/35287 by Marc Tooley. From the changelog: * Client file tamper checking * New client option 'SubmitOptions' * Speedup of 'p4 submit' branched files * 'Automatic' labels * Improved management of remote depots * New MaxLockTime in 'p4 group' * Improved license file handling * User file access tracking * 'p4 integrate' improvements * Optimization of head revision operations * Speedup for the 'integ' command * Early release of db.working/db.resolve during sync * Server Performance Tracking * Spec depot interferes less with other commands * Special handling for @changelist * Speedup for clients with many opened files * External authentication triggers * UTF-16 support * Speedup for the 'dirs' command * Speedup for the 'obliterate' command * Btree passive reorganization * MapState simplification * Spec depot * Partial filetypes * Delete triggers * Authorization and security levels * New login/logout commands * New trigger support * New indirect integration default * New smart resolve logic * Filepaths that contain characters @#%* can be added to the depot * New tag command provides easy way to assign a label to a filelist * Optimization for frequent syncs * Label use speedups * Locking and memory use improvements * Speedups for large client views and protections tables * Indirect integration much faster * New monitor command displays status of running p4 processes * Integrate across distant branches * New annotate command shows history of lines in a file * Sharing clients using multiple client roots * Sprucing up diffs * tempobj filetype redux * New protection level for semi-super users and a bunch of other features and bug fixes. --- devel/p4-docs/Makefile | 60 ++++++------------- devel/p4-docs/PLIST | 153 ++----------------------------------------------- devel/p4-docs/distinfo | 50 ++++++++-------- 3 files changed, 50 insertions(+), 213 deletions(-) (limited to 'devel/p4-docs') diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile index 48bbf1bdba4..b1a2ebdc2cd 100644 --- a/devel/p4-docs/Makefile +++ b/devel/p4-docs/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:51 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2007/03/15 07:14:27 schmonz Exp $ # DISTNAME= p4-docs -PKGREVISION= 2 COMMENT= Perforce SCM documentation .include "../../devel/p4/Makefile.common" # override, since the docs have changed at least once more often # than the binaries for NetBSD -DIST_SUBDIR= perforce-20040716 +DIST_SUBDIR= perforce-20070118 HOMEPAGE= http://www.perforce.com/perforce/technical.html @@ -17,55 +16,34 @@ DISTFILES= p4.1 DISTFILES+= p4d.1 DISTFILES+= relnotes.txt DISTFILES+= platformnotes.html -DISTFILES+= cmdref_html.zip -DISTFILES+= p4ftp_html.zip -DISTFILES+= p4guide_html.zip -DISTFILES+= p4sag_html.zip +DISTFILES+= cmdref.pdf +DISTFILES+= p4ftp.pdf +DISTFILES+= p4guide.pdf +DISTFILES+= p4sag.pdf -P4_DOCURL_PREFIX= http://www.perforce.com/perforce/doc.021 +P4_DOCURL_PREFIX= http://www.perforce.com/perforce/doc.062 +P4_MANURL_PREFIX= http://www.perforce.com/perforce/doc.052 -SITES.p4.1= ${P4_DOCURL_PREFIX}/man/ -SITES.p4d.1= ${P4_DOCURL_PREFIX}/man/ +SITES.p4.1= ${P4_MANURL_PREFIX}/man/ +SITES.p4d.1= ${P4_MANURL_PREFIX}/man/ SITES.relnotes.txt= ${P4_DOCURL_PREFIX}/user/ SITES.platformnotes.html= ${P4_DOCURL_PREFIX}/user/ -SITES.cmdref_html.zip= ${P4_DOCURL_PREFIX}/manuals/cmdref/ -SITES.p4ftp_html.zip= ${P4_DOCURL_PREFIX}/manuals/p4ftp/ -SITES.p4guide_html.zip= ${P4_DOCURL_PREFIX}/manuals/p4guide/ -SITES.p4sag_html.zip= ${P4_DOCURL_PREFIX}/manuals/p4sag/ - -EXTRACT_ONLY= cmdref_html.zip p4ftp_html.zip -EXTRACT_ONLY+= p4guide_html.zip p4sag_html.zip -EXTRACT_OPTS+= -d `${BASENAME} "$$extract_file" _html.zip` -EXTRACT_OPTS_ZIP= -Laq +SITES.cmdref.pdf= ${P4_DOCURL_PREFIX}/manuals/cmdref/ +SITES.p4ftp.pdf= ${P4_DOCURL_PREFIX}/manuals/p4ftp/ +SITES.p4guide.pdf= ${P4_DOCURL_PREFIX}/manuals/p4guide/ +SITES.p4sag.pdf= ${P4_DOCURL_PREFIX}/manuals/p4sag/ DOCDIR= share/doc/p4 -HTMLDIR= share/doc/html/p4 PLIST_SUBST+= DOCDIR=${DOCDIR:Q} -PLIST_SUBST+= HTMLDIR=${HTMLDIR:Q} -INSTALLATION_DIRS= ${PKGMANDIR}/man1 +INSTALLATION_DIRS= ${DOCDIR} ${PKGMANDIR}/man1 do-install: ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/*.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/relnotes.txt \ - ${PREFIX}/${DOCDIR} - - ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/platformnotes.html \ - ${PREFIX}/${HTMLDIR} - - ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/cmdref - ${INSTALL_DATA} ${WRKSRC}/cmdref/* ${PREFIX}/${HTMLDIR}/cmdref - - ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/p4ftp - ${INSTALL_DATA} ${WRKSRC}/p4ftp/* ${PREFIX}/${HTMLDIR}/p4ftp - - ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/p4guide - ${INSTALL_DATA} ${WRKSRC}/p4guide/* ${PREFIX}/${HTMLDIR}/p4guide - - ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/p4sag - ${INSTALL_DATA} ${WRKSRC}/p4sag/* ${PREFIX}/${HTMLDIR}/p4sag + cd ${WRKSRC}; \ + for f in *.html *.pdf *.txt; do \ + ${INSTALL_DATA} $${f} ${PREFIX}/${DOCDIR}; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/devel/p4-docs/PLIST b/devel/p4-docs/PLIST index 9a33a88b262..4ff6b958ccb 100644 --- a/devel/p4-docs/PLIST +++ b/devel/p4-docs/PLIST @@ -1,151 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/01 02:34:37 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/03/15 07:14:27 schmonz Exp $ man/man1/p4.1 man/man1/p4d.1 -${HTMLDIR}/cmdref/_about.html -${HTMLDIR}/cmdref/_cmdrefIX.html -${HTMLDIR}/cmdref/_env.html -${HTMLDIR}/cmdref/_other.html -${HTMLDIR}/cmdref/add.html -${HTMLDIR}/cmdref/admin.html -${HTMLDIR}/cmdref/branch.html -${HTMLDIR}/cmdref/branches.html -${HTMLDIR}/cmdref/change.html -${HTMLDIR}/cmdref/changes.html -${HTMLDIR}/cmdref/client.html -${HTMLDIR}/cmdref/clients.html -${HTMLDIR}/cmdref/counter.html -${HTMLDIR}/cmdref/counters.html -${HTMLDIR}/cmdref/delete.html -${HTMLDIR}/cmdref/depot.html -${HTMLDIR}/cmdref/depots.html -${HTMLDIR}/cmdref/describe.html -${HTMLDIR}/cmdref/diff.html -${HTMLDIR}/cmdref/diff2.html -${HTMLDIR}/cmdref/dirs.html -${HTMLDIR}/cmdref/edit.html -${HTMLDIR}/cmdref/env.P4CHARSET.html -${HTMLDIR}/cmdref/env.P4CLIENT.html -${HTMLDIR}/cmdref/env.P4CONFIG.html -${HTMLDIR}/cmdref/env.P4DEBUG.html -${HTMLDIR}/cmdref/env.P4DIFF.html -${HTMLDIR}/cmdref/env.P4EDITOR.html -${HTMLDIR}/cmdref/env.P4HOST.html -${HTMLDIR}/cmdref/env.P4JOURNAL.html -${HTMLDIR}/cmdref/env.P4LANGUAGE.html -${HTMLDIR}/cmdref/env.P4LOG.html -${HTMLDIR}/cmdref/env.P4MERGE.html -${HTMLDIR}/cmdref/env.P4PAGER.html -${HTMLDIR}/cmdref/env.P4PASSWD.html -${HTMLDIR}/cmdref/env.P4PORT.html -${HTMLDIR}/cmdref/env.P4ROOT.html -${HTMLDIR}/cmdref/env.P4USER.html -${HTMLDIR}/cmdref/env.PWD.html -${HTMLDIR}/cmdref/env.TMP.html -${HTMLDIR}/cmdref/filelog.html -${HTMLDIR}/cmdref/files.html -${HTMLDIR}/cmdref/fix.html -${HTMLDIR}/cmdref/fixes.html -${HTMLDIR}/cmdref/flush.html -${HTMLDIR}/cmdref/fstat.html -${HTMLDIR}/cmdref/greendot.gif -${HTMLDIR}/cmdref/group.html -${HTMLDIR}/cmdref/groups.html -${HTMLDIR}/cmdref/have.html -${HTMLDIR}/cmdref/help.html -${HTMLDIR}/cmdref/index.html -${HTMLDIR}/cmdref/info.html -${HTMLDIR}/cmdref/integrate.html -${HTMLDIR}/cmdref/integrated.html -${HTMLDIR}/cmdref/job.html -${HTMLDIR}/cmdref/jobs.html -${HTMLDIR}/cmdref/jobspec.html -${HTMLDIR}/cmdref/label.html -${HTMLDIR}/cmdref/labels.html -${HTMLDIR}/cmdref/labelsync.html -${HTMLDIR}/cmdref/lock.html -${HTMLDIR}/cmdref/logger.html -${HTMLDIR}/cmdref/o.fspecs.html -${HTMLDIR}/cmdref/o.ftypes.html -${HTMLDIR}/cmdref/o.gopts.html -${HTMLDIR}/cmdref/o.views.html -${HTMLDIR}/cmdref/obliterate.html -${HTMLDIR}/cmdref/opened.html -${HTMLDIR}/cmdref/passwd.html -${HTMLDIR}/cmdref/print.html -${HTMLDIR}/cmdref/protect.html -${HTMLDIR}/cmdref/protecta.gif -${HTMLDIR}/cmdref/rename.html -${HTMLDIR}/cmdref/reopen.html -${HTMLDIR}/cmdref/resolve.html -${HTMLDIR}/cmdref/resolved.html -${HTMLDIR}/cmdref/revert.html -${HTMLDIR}/cmdref/review.html -${HTMLDIR}/cmdref/reviews.html -${HTMLDIR}/cmdref/set.html -${HTMLDIR}/cmdref/submit.html -${HTMLDIR}/cmdref/sync.html -${HTMLDIR}/cmdref/triggers.html -${HTMLDIR}/cmdref/typemap.html -${HTMLDIR}/cmdref/unlock.html -${HTMLDIR}/cmdref/user.html -${HTMLDIR}/cmdref/users.html -${HTMLDIR}/cmdref/verify.html -${HTMLDIR}/cmdref/where.html -${HTMLDIR}/p4ftp/00_p4ftpIX.html -${HTMLDIR}/p4ftp/00_preface.html -${HTMLDIR}/p4ftp/01_install.html -${HTMLDIR}/p4ftp/01_install_001.gif -${HTMLDIR}/p4ftp/01_install_002.gif -${HTMLDIR}/p4ftp/01_install_003.gif -${HTMLDIR}/p4ftp/01_install_004.gif -${HTMLDIR}/p4ftp/01_install_005.gif -${HTMLDIR}/p4ftp/01_install_006.gif -${HTMLDIR}/p4ftp/01_install_007.gif -${HTMLDIR}/p4ftp/01_installa.gif -${HTMLDIR}/p4ftp/02_troubleshoot.html -${HTMLDIR}/p4ftp/03_differences.html -${HTMLDIR}/p4ftp/greendot.gif -${HTMLDIR}/p4ftp/index.html -${HTMLDIR}/p4guide/00_p4guideIX.html -${HTMLDIR}/p4guide/00_preface.html -${HTMLDIR}/p4guide/01_concepts.html -${HTMLDIR}/p4guide/02_connect.html -${HTMLDIR}/p4guide/03_quickstart.html -${HTMLDIR}/p4guide/04_details.html -${HTMLDIR}/p4guide/05_conflicts.html -${HTMLDIR}/p4guide/06_misc.html -${HTMLDIR}/p4guide/07_changelists.html -${HTMLDIR}/p4guide/08_labels.html -${HTMLDIR}/p4guide/09_branching.html -${HTMLDIR}/p4guide/10_jobtrack.html -${HTMLDIR}/p4guide/11_reporting.html -${HTMLDIR}/p4guide/aa_install.html -${HTMLDIR}/p4guide/ab_envvars.html -${HTMLDIR}/p4guide/ac_glossary.html -${HTMLDIR}/p4guide/greendot.gif -${HTMLDIR}/p4guide/index.html -${HTMLDIR}/p4sag/00_p4sagIX.html -${HTMLDIR}/p4sag/00_preface.html -${HTMLDIR}/p4sag/01_install.html -${HTMLDIR}/p4sag/02_backup.html -${HTMLDIR}/p4sag/03_superuser.html -${HTMLDIR}/p4sag/03_superuser1.gif -${HTMLDIR}/p4sag/03_superuser3.gif -${HTMLDIR}/p4sag/03_superusera.gif -${HTMLDIR}/p4sag/03_superusera3.gif -${HTMLDIR}/p4sag/04_protect.html -${HTMLDIR}/p4sag/05_jobspec.html -${HTMLDIR}/p4sag/06_scripting.html -${HTMLDIR}/p4sag/07_perftune.html -${HTMLDIR}/p4sag/08_nt.html -${HTMLDIR}/p4sag/aa_p4d.html -${HTMLDIR}/p4sag/greendot.gif -${HTMLDIR}/p4sag/index.html -${HTMLDIR}/platformnotes.html +${DOCDIR}/cmdref.pdf +${DOCDIR}/p4ftp.pdf +${DOCDIR}/p4guide.pdf +${DOCDIR}/p4sag.pdf +${DOCDIR}/platformnotes.html ${DOCDIR}/relnotes.txt @dirrm ${DOCDIR} -@dirrm ${HTMLDIR}/p4sag -@dirrm ${HTMLDIR}/p4guide -@dirrm ${HTMLDIR}/p4ftp -@dirrm ${HTMLDIR}/cmdref -@dirrm ${HTMLDIR} diff --git a/devel/p4-docs/distinfo b/devel/p4-docs/distinfo index 6f7b531c21d..bdc033d7479 100644 --- a/devel/p4-docs/distinfo +++ b/devel/p4-docs/distinfo @@ -1,26 +1,26 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 22:24:22 agc Exp $ +$NetBSD: distinfo,v 1.6 2007/03/15 07:14:27 schmonz Exp $ -SHA1 (perforce-20040716/p4.1) = b0ba4933132d513bd4082fc6ec85d6768e179e16 -RMD160 (perforce-20040716/p4.1) = a9307097238eb4d670eeee2ec5786f68e8cc9a65 -Size (perforce-20040716/p4.1) = 72954 bytes -SHA1 (perforce-20040716/p4d.1) = df3033843830ef17c781ef7b84dcbadc958834b1 -RMD160 (perforce-20040716/p4d.1) = 4fdedc2b11930eaac3585ad3e38a723611cd2923 -Size (perforce-20040716/p4d.1) = 4343 bytes -SHA1 (perforce-20040716/relnotes.txt) = 93bed5eba7cd0eda00a98a81709dcd14cb38e00a -RMD160 (perforce-20040716/relnotes.txt) = 5512a7174a020a496e88d5377a115d7d7a19a819 -Size (perforce-20040716/relnotes.txt) = 131837 bytes -SHA1 (perforce-20040716/platformnotes.html) = ee866da6ebf818c1d6d61e0383b4305537665e40 -RMD160 (perforce-20040716/platformnotes.html) = e313cd1dc6d2e623d0f7f03c70652d1fc697ffda -Size (perforce-20040716/platformnotes.html) = 16151 bytes -SHA1 (perforce-20040716/cmdref_html.zip) = 7747580482a5ec3842c7e4910d24c3e01bba1080 -RMD160 (perforce-20040716/cmdref_html.zip) = 8df4d86691a4dfa63ae414e4dc07599f9a123376 -Size (perforce-20040716/cmdref_html.zip) = 240693 bytes -SHA1 (perforce-20040716/p4ftp_html.zip) = 7df4c9ff4db77cc08bd24a7442b52150e6101496 -RMD160 (perforce-20040716/p4ftp_html.zip) = fa012953f8db94c0c7c831ccd893516715967816 -Size (perforce-20040716/p4ftp_html.zip) = 145833 bytes -SHA1 (perforce-20040716/p4guide_html.zip) = b76ffcd28092b6d06fff66c220e77a9801acab54 -RMD160 (perforce-20040716/p4guide_html.zip) = bf573d7f620f8ceb40b0fecfdd07790214e3b39b -Size (perforce-20040716/p4guide_html.zip) = 133887 bytes -SHA1 (perforce-20040716/p4sag_html.zip) = 818f811345b322913e2d5e581f9e2cea5680be4e -RMD160 (perforce-20040716/p4sag_html.zip) = c394eac7e9290d61ad1a6f06fab262a7abde40fc -Size (perforce-20040716/p4sag_html.zip) = 151860 bytes +SHA1 (perforce-20070118/cmdref.pdf) = dc760d0d87ce93f396c323cf6df1f13c55b64d8b +RMD160 (perforce-20070118/cmdref.pdf) = 399334f64cf175687f3f9d647181bebf1bb58471 +Size (perforce-20070118/cmdref.pdf) = 2402173 bytes +SHA1 (perforce-20070118/p4.1) = f0740627c5232e2eb72a278fd62d5764b7fcbdbb +RMD160 (perforce-20070118/p4.1) = c32ac846dfa8110fadba131ca4c7a3782cf1c180 +Size (perforce-20070118/p4.1) = 72954 bytes +SHA1 (perforce-20070118/p4d.1) = 0383e5eb515ff1a4ecd6fb148aa544a49e68eb59 +RMD160 (perforce-20070118/p4d.1) = 913efbe9b299030a143e3c6a1fbf672ec526d7b7 +Size (perforce-20070118/p4d.1) = 4529 bytes +SHA1 (perforce-20070118/p4ftp.pdf) = 2ad78ba6aa9a2dd987dbaeda7d3a8570afc9bac2 +RMD160 (perforce-20070118/p4ftp.pdf) = 7f1e5a410b1334d93911952a526e997f3f532180 +Size (perforce-20070118/p4ftp.pdf) = 480949 bytes +SHA1 (perforce-20070118/p4guide.pdf) = ae8b38f59c8551cd380fd13177064ba82d8b9cca +RMD160 (perforce-20070118/p4guide.pdf) = cf5f4ed7caba774e0ac228dff3d1a6a3ae36641e +Size (perforce-20070118/p4guide.pdf) = 977323 bytes +SHA1 (perforce-20070118/p4sag.pdf) = f71d09edde77874635ba4c703ce15c38af27ee33 +RMD160 (perforce-20070118/p4sag.pdf) = 73b99ae72a10f84875b5f230bccd018587b87a7e +Size (perforce-20070118/p4sag.pdf) = 1418556 bytes +SHA1 (perforce-20070118/platformnotes.html) = f7939595e49bb00959c9c4620fc22be239417d6d +RMD160 (perforce-20070118/platformnotes.html) = 94ef9fc7366419639e04bdb678c215393dd2de8e +Size (perforce-20070118/platformnotes.html) = 15987 bytes +SHA1 (perforce-20070118/relnotes.txt) = b460d33767fc0687b63cf47265ba1ca99313a27b +RMD160 (perforce-20070118/relnotes.txt) = c983a91ea4539c8c0b5de9e31b0e626e53132526 +Size (perforce-20070118/relnotes.txt) = 239876 bytes -- cgit v1.2.3