Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Apr 2006 17:37:38 -0700 (PDT)
From:      Eric Anholt <anholt@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        michaels@sdf.lonestar.org
Subject:   ports/95528: update cogito to 0.17.2
Message-ID:  <200604090037.k390bcFQ012427@leguin.anholt.net>
Resent-Message-ID: <200604090040.k390eF8v041827@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95528
>Category:       ports
>Synopsis:       update cogito to 0.17.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 09 00:40:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Eric Anholt
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD leguin.anholt.net 7.0-CURRENT FreeBSD 7.0-CURRENT #26: Mon Dec 26 02:08:57 PST 2005 anholt@leguin.anholt.net:/usr/obj/usr/src/current/sys/MYKERNEL amd64


	
>Description:
	Updates cogito to 0.17.2 and makes it coexist with (and depend on) git.

	If the maintainer would like to transfer maintainership, I would be
	happy to, but no pressure.
>How-To-Repeat:
	
>Fix:

	

--- cogito-update.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/cogito/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	14 Feb 2006 21:17:03 -0000	1.3
+++ Makefile	9 Apr 2006 00:17:01 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cogito
-PORTVERSION=	0.12
+PORTVERSION=	0.17.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/cogito/ \
 		http://www.uk.kernel.org/pub/software/scm/cogito/ \
@@ -16,117 +16,67 @@
 MAINTAINER=	michaels@sdf.lonestar.org
 COMMENT=	The Cogito Version Control System
 
+BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
+		xmlto:${PORTSDIR}/textproc/xmlto
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2 \
+RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
+		bash:${PORTSDIR}/shells/bash2 \
 		rsync:${PORTSDIR}/net/rsync
 
-CONFLICTS=	git-[0-9]*
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+.if !defined(NOPORTDOCS)
+ALL_TARGET=	all doc
+INSTALL_TARGET=	install install-doc
+.endif
 
 # We set HOME to PREFIX. This will install the files in the proper location.
 MAKE_ENV+=	HOME=${PREFIX} CPATH=${PREFIX}/include LIBRARY_PATH=${PREFIX}/lib
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-STRIP_FILES=	${PREFIX}/bin/git-apply \
-		${PREFIX}/bin/git-cat-file \
-		${PREFIX}/bin/git-check-files \
-		${PREFIX}/bin/git-checkout-cache \
-		${PREFIX}/bin/git-commit-tree \
-		${PREFIX}/bin/git-convert-cache \
-		${PREFIX}/bin/git-cvs2git \
-		${PREFIX}/bin/git-diff-cache \
-		${PREFIX}/bin/git-diff-files \
-		${PREFIX}/bin/git-diff-helper \
-		${PREFIX}/bin/git-diff-stages \
-		${PREFIX}/bin/git-diff-tree \
-		${PREFIX}/bin/git-export \
-		${PREFIX}/bin/git-fsck-cache \
-		${PREFIX}/bin/git-get-tar-commit-id \
-		${PREFIX}/bin/git-http-pull \
-		${PREFIX}/bin/git-init-db \
-		${PREFIX}/bin/git-local-pull \
-		${PREFIX}/bin/git-ls-files \
-		${PREFIX}/bin/git-ls-tree \
-		${PREFIX}/bin/git-merge-base \
-		${PREFIX}/bin/git-merge-cache \
-		${PREFIX}/bin/git-mktag \
-		${PREFIX}/bin/git-pack-objects \
-		${PREFIX}/bin/git-patch-id \
-		${PREFIX}/bin/git-prune-packed \
-		${PREFIX}/bin/git-read-tree \
-		${PREFIX}/bin/git-receive-pack \
-		${PREFIX}/bin/git-rev-list \
-		${PREFIX}/bin/git-rev-parse \
-		${PREFIX}/bin/git-rev-tree \
-		${PREFIX}/bin/git-send-pack \
-		${PREFIX}/bin/git-ssh-pull \
-		${PREFIX}/bin/git-ssh-push \
-		${PREFIX}/bin/git-stripspace \
-		${PREFIX}/bin/git-tar-tree \
-		${PREFIX}/bin/git-unpack-file \
-		${PREFIX}/bin/git-unpack-objects \
-		${PREFIX}/bin/git-update-cache \
-		${PREFIX}/bin/git-verify-pack \
-		${PREFIX}/bin/git-write-blob \
-		${PREFIX}/bin/git-write-tree
-
 CONTRIB_FILES=	${WRKDIR}/${DISTNAME}/contrib/gitfeedmaillist.sh \
 		${WRKDIR}/${DISTNAME}/contrib/ciabot.pl
 
-DOC_FILES=	${WRKDIR}/${DISTNAME}/README \
-		${WRKDIR}/${DISTNAME}/Documentation/diff-format.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/cvs-migration.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/diff-format.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/diffcore.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-apply-patch-script.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-apply.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-cat-file.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-check-files.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-checkout-cache.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-commit-tree.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-convert-cache.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-diff-cache.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-diff-files.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-diff-helper.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-diff-stages.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-diff-tree.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-export.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-fsck-cache.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-http-pull.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-init-db.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-local-pull.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-ls-files.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-ls-tree.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-merge-base.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-merge-cache.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-merge-one-file-script.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-mktag.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-prune-script.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-pull-script.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-read-tree.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-resolve-script.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-rev-list.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-rev-tree.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-ssh-pull.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-ssh-push.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-tag-script.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-tar-tree.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-unpack-file.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-update-cache.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-verify-pack.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-write-blob.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git-write-tree.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/git.txt \
-		${WRKDIR}/${DISTNAME}/Documentation/tutorial.txt
+MAN1 =		cg-add.1 \
+		cg-admin-cat.1 \
+		cg-admin-ls.1 \
+		cg-admin-lsobj.1 \
+		cg-admin-rewritehist.1 \
+		cg-admin-setuprepo.1 \
+		cg-admin-uncommit.1 \
+		cg-branch-add.1 \
+		cg-branch-chg.1 \
+		cg-branch-ls.1 \
+		cg-clean.1 \
+		cg-clone.1 \
+		cg-commit.1 \
+		cg-diff.1 \
+		cg-export.1 \
+		cg-fetch.1 \
+		cg-help.1 \
+		cg-init.1 \
+		cg-log.1 \
+		cg-merge.1 \
+		cg-mkpatch.1 \
+		cg-mv.1 \
+		cg-object-id.1 \
+		cg-patch.1 \
+		cg-push.1 \
+		cg-reset.1 \
+		cg-restore.1 \
+		cg-rm.1 \
+		cg-seek.1 \
+		cg-status.1 \
+		cg-switch.1 \
+		cg-tag-ls.1 \
+		cg-tag.1 \
+		cg-update.1 \
+		cg-version.1 \
+		cg.1
+MAN7=		cogito.7 \
+		cg-ref.7
 
 post-install:
-	${STRIP_CMD} ${STRIP_FILES}
 	${INSTALL_SCRIPT} ${CONTRIB_FILES} ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${DOC_FILES} ${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/cogito/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	22 Jan 2006 08:27:58 -0000	1.3
+++ distinfo	8 Apr 2006 23:35:43 -0000
@@ -1,3 +1,3 @@
-MD5 (cogito-0.12.tar.bz2) = 77e9d1a605d02895c021742da487bab7
-SHA256 (cogito-0.12.tar.bz2) = 39c96aa2120e4e3c2ef55e204eedfc7197cd97fb2bf80e0b3cb2e86cb7c1ea40
-SIZE (cogito-0.12.tar.bz2) = 241309
+MD5 (cogito-0.17.2.tar.bz2) = bdaa2dfc22f7fc561eb7a4a24aedf2e9
+SHA256 (cogito-0.17.2.tar.bz2) = 6bcd51b6f531ffee1ef72f9e86c544c1ac5b9518f96849699a43bfb5f7f9976e
+SIZE (cogito-0.17.2.tar.bz2) = 95514
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/cogito/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	22 Jan 2006 01:46:52 -0000	1.3
+++ pkg-plist	9 Apr 2006 00:22:23 -0000
@@ -1,153 +1,92 @@
-bin/cg-version
 bin/cg
 bin/cg-add
+bin/cg-admin-cat
 bin/cg-admin-ls
 bin/cg-admin-lsobj
+bin/cg-admin-rewritehist
+bin/cg-admin-setuprepo
 bin/cg-admin-uncommit
 bin/cg-branch-add
 bin/cg-branch-chg
 bin/cg-branch-ls
 bin/cg-cancel
+bin/cg-clean
 bin/cg-clone
 bin/cg-commit
+bin/cg-commit-id
 bin/cg-diff
 bin/cg-export
+bin/cg-fetch
 bin/cg-help
 bin/cg-init
 bin/cg-log
 bin/cg-merge
 bin/cg-mkpatch
+bin/cg-mv
+bin/cg-object-id
+bin/cg-parent-id
 bin/cg-patch
 bin/cg-pull
 bin/cg-push
+bin/cg-reset
 bin/cg-restore
 bin/cg-rm
 bin/cg-seek
 bin/cg-status
+bin/cg-switch
 bin/cg-tag
 bin/cg-tag-ls
+bin/cg-tree-id
 bin/cg-update
+bin/cg-version
+bin/ciabot.pl
 bin/commit-id
-bin/git
-bin/git-add-script
-bin/git-apply-patch-script
-bin/git-checkout-script
-bin/git-cherry
-bin/git-clone-script
-bin/git-commit-script
-bin/git-cvsimport-script
-bin/git-diff-script
-bin/git-fetch-script
-bin/git-log-script
-bin/git-merge-one-file-script
-bin/git-prune-script
-bin/git-pull-script
-bin/git-rebase-script
-bin/git-relink-script
-bin/git-repack-script
-bin/git-reset-script
-bin/git-resolve-script
-bin/git-shortlog
-bin/git-status-script
-bin/git-tag-script
-bin/git-whatchanged
-bin/gitk
+bin/gitfeedmaillist.sh
 bin/parent-id
 bin/tree-id
-bin/git-apply
-bin/git-cat-file
-bin/git-check-files
-bin/git-checkout-cache
-bin/git-commit-tree
-bin/git-convert-cache
-bin/git-cvs2git
-bin/git-diff-cache
-bin/git-diff-files
-bin/git-diff-helper
-bin/git-diff-stages
-bin/git-diff-tree
-bin/git-export
-bin/git-fsck-cache
-bin/git-get-tar-commit-id
-bin/git-http-pull
-bin/git-init-db
-bin/git-local-pull
-bin/git-ls-files
-bin/git-ls-tree
-bin/git-merge-base
-bin/git-merge-cache
-bin/git-mktag
-bin/git-pack-objects
-bin/git-patch-id
-bin/git-prune-packed
-bin/git-read-tree
-bin/git-receive-pack
-bin/git-rev-list
-bin/git-rev-parse
-bin/git-rev-tree
-bin/git-send-pack
-bin/git-ssh-pull
-bin/git-ssh-push
-bin/git-stripspace
-bin/git-tar-tree
-bin/git-unpack-file
-bin/git-unpack-objects
-bin/git-update-cache
-bin/git-verify-pack
-bin/git-write-blob
-bin/git-write-tree
-bin/gitfeedmaillist.sh
-bin/ciabot.pl
-@dirrmtry bin/
+lib/cogito/cg-Xfetchprogress
 lib/cogito/cg-Xlib
 lib/cogito/cg-Xmergefile
-lib/cogito/cg-Xnormid
-@dirrm lib/cogito
-@dirrmtry lib/
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/diff-format.txt
-%%PORTDOCS%%%%DOCSDIR%%/cvs-migration.txt
-%%PORTDOCS%%%%DOCSDIR%%/diffcore.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-apply-patch-script.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-apply.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-cat-file.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-check-files.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-checkout-cache.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-commit-tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-convert-cache.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-diff-cache.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-diff-files.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-diff-helper.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-diff-stages.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-diff-tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-export.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-fsck-cache.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-http-pull.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-init-db.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-local-pull.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-ls-files.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-ls-tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-merge-base.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-merge-cache.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-merge-one-file-script.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-mktag.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-prune-script.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-pull-script.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-read-tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-resolve-script.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-rev-list.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-rev-tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-ssh-pull.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-ssh-push.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-tag-script.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-tar-tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-unpack-file.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-update-cache.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-verify-pack.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-write-blob.txt
-%%PORTDOCS%%%%DOCSDIR%%/git-write-tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/git.txt
-%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
+%%DATADIR%%/default-exclude
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-add.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-admin-cat.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-admin-ls.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-admin-lsobj.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-admin-rewritehist.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-admin-setuprepo.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-admin-uncommit.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-branch-add.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-branch-chg.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-branch-ls.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-clean.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-clone.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-commit.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-diff.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-export.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-fetch.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-help.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-init.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-log.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-merge.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-mkpatch.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-mv.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-object-id.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-patch.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-push.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-ref.7.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-reset.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-restore.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-rm.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-seek.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-status.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-switch.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-tag-ls.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-tag.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-update.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg-version.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cg.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cogito.7.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/doc/
-@dirrmtry share/
+@dirrm lib/cogito
+@dirrm %%DATADIR%%
\ No newline at end of file
Index: files/patch-cg-Xlib
===================================================================
RCS file: /home/ncvs/ports/devel/cogito/files/patch-cg-Xlib,v
retrieving revision 1.1
diff -u -r1.1 patch-cg-Xlib
--- files/patch-cg-Xlib	6 Jul 2005 16:13:27 -0000	1.1
+++ files/patch-cg-Xlib	16 Mar 2006 23:05:02 -0000
@@ -1,11 +1,11 @@
---- cg-Xlib.orig	Tue Jul  5 16:44:36 2005
-+++ cg-Xlib	Tue Jul  5 17:00:30 2005
-@@ -55,7 +55,7 @@
+--- cg-Xlib.orig	Sun Feb 26 16:59:03 2006
++++ cg-Xlib	Thu Mar 16 15:04:40 2006
+@@ -88,7 +88,7 @@
  		return 1
  	fi
  	if [ "$has_stat" ]; then
--		$has_stat "$@"
-+		shift;shift; $has_stat -f '%z' "$@"
+-		"$has_stat" "$@"
++		shift;shift; "$has_stat" -f '%s' "$@"
  		return
  	fi
  
Index: files/patch-cg-add
===================================================================
RCS file: files/patch-cg-add
diff -N files/patch-cg-add
--- files/patch-cg-add	6 Jul 2005 16:13:27 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- cg-add.orig	Tue Jul  5 16:51:31 2005
-+++ cg-add	Tue Jul  5 16:52:09 2005
-@@ -27,6 +27,6 @@
- }
- 
- cat $TMPFILE | tr '\0' '\n' | sed 's/^/Adding file /'
--cat $TMPFILE | xargs -0r git-update-cache --add --
-+cat $TMPFILE | xargs -0 git-update-cache --add --
- 
- rm $TMPFILE
Index: files/patch-cg-init
===================================================================
RCS file: files/patch-cg-init
diff -N files/patch-cg-init
--- files/patch-cg-init	6 Jul 2005 16:13:27 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- cg-init.orig	Tue Jul  5 16:54:14 2005
-+++ cg-init	Tue Jul  5 16:54:20 2005
-@@ -38,7 +38,7 @@
- 	echo "Cloned (origin $uri available as branch \"origin\")"
- else
- 	git-read-tree # Seed the dircache
--	find * \( -type f -o -type l \) -print0 | xargs -0r cg-add
-+	find * \( -type f -o -type l \) -print0 | xargs -0 cg-add
- 	cg-commit -C -m"Initial commit" -E
- fi
- 
Index: files/patch-git-prune-script
===================================================================
RCS file: files/patch-git-prune-script
diff -N files/patch-git-prune-script
--- files/patch-git-prune-script	6 Jul 2005 16:13:27 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- git-prune-script.orig	Tue Jul  5 16:55:04 2005
-+++ git-prune-script	Tue Jul  5 16:55:29 2005
-@@ -20,6 +20,6 @@
-     s|\(..\)|\1/|p
- }' | {
- 	cd "$GIT_OBJECT_DIRECTORY" || exit
--	xargs -r $dryrun rm -f
-+	xargs $dryrun rm -f
- }
- 
--- cogito-update.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604090037.k390bcFQ012427>