diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cogito/Makefile | 85 | ||||
| -rw-r--r-- | devel/cogito/distinfo | 4 | ||||
| -rw-r--r-- | devel/cogito/files/patch-Makefile | 14 | ||||
| -rw-r--r-- | devel/cogito/files/patch-cg-Xlib | 11 | ||||
| -rw-r--r-- | devel/cogito/files/patch-cg-add | 10 | ||||
| -rw-r--r-- | devel/cogito/files/patch-cg-init | 11 | ||||
| -rw-r--r-- | devel/cogito/files/patch-git-prune-script | 10 | ||||
| -rw-r--r-- | devel/cogito/pkg-descr | 8 | ||||
| -rw-r--r-- | devel/cogito/pkg-plist | 108 |
9 files changed, 214 insertions, 47 deletions
diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile index f83745d0649..c27411722f4 100644 --- a/devel/cogito/Makefile +++ b/devel/cogito/Makefile @@ -6,14 +6,15 @@ # PORTNAME= cogito -PORTVERSION= 0.10 +PORTVERSION= 0.12 CATEGORIES= devel MASTER_SITES= http://www.kernel.org/pub/software/scm/cogito/ \ http://www.uk.kernel.org/pub/software/scm/cogito/ \ - http://www.us.kernel.org/pub/software/scm/cogito/ + http://www.us.kernel.org/pub/software/scm/cogito/ \ + http://www.jp.kernel.org/pub/software/scm/cogito/ MAINTAINER= michaels@sdf.lonestar.org -COMMENT= Cogito, GIT - the content tracker +COMMENT= The Cogito Version Control System LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ @@ -22,22 +23,25 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ USE_BZIP2= yes USE_GMAKE= yes -# We set HOME to PREFIX, this is the easiest way to install in -# the proper location without patching. +# 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-cat-file \ +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-diff-tree-helper \ ${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 \ @@ -46,24 +50,81 @@ STRIP_FILES= ${PREFIX}/bin/git-cat-file \ ${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-rpull \ - ${PREFIX}/bin/git-rpush \ + ${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 + post-install: ${STRIP_CMD} ${STRIP_FILES} - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/contrib/gitfeedmaillist.sh ${PREFIX}/bin + ${INSTALL_SCRIPT} ${CONTRIB_FILES} ${PREFIX}/bin .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/README ${DOCSDIR} - ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/Documentation/core-git.txt ${DOCSDIR} + ${INSTALL_MAN} ${DOC_FILES} ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/devel/cogito/distinfo b/devel/cogito/distinfo index 9cf4e73e6f0..337869ceb23 100644 --- a/devel/cogito/distinfo +++ b/devel/cogito/distinfo @@ -1,2 +1,2 @@ -MD5 (cogito-0.10.tar.bz2) = 5bce32ffd5c7de01fb4785b44a48b11d -SIZE (cogito-0.10.tar.bz2) = 89000 +MD5 (cogito-0.12.tar.bz2) = 77e9d1a605d02895c021742da487bab7 +SIZE (cogito-0.12.tar.bz2) = 241309 diff --git a/devel/cogito/files/patch-Makefile b/devel/cogito/files/patch-Makefile deleted file mode 100644 index bdf490073fd..00000000000 --- a/devel/cogito/files/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -80,7 +80,7 @@ - LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o - else - SHA1_HEADER=<openssl/sha.h> -- LIBS += -lssl -+ LIBS += -lssl -lcrypto - endif - endif - diff --git a/devel/cogito/files/patch-cg-Xlib b/devel/cogito/files/patch-cg-Xlib new file mode 100644 index 00000000000..07f833cc6b7 --- /dev/null +++ b/devel/cogito/files/patch-cg-Xlib @@ -0,0 +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 @@ + return 1 + fi + if [ "$has_stat" ]; then +- $has_stat "$@" ++ shift;shift; $has_stat -f '%z' "$@" + return + fi + diff --git a/devel/cogito/files/patch-cg-add b/devel/cogito/files/patch-cg-add new file mode 100644 index 00000000000..00accbd60d9 --- /dev/null +++ b/devel/cogito/files/patch-cg-add @@ -0,0 +1,10 @@ +--- 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 diff --git a/devel/cogito/files/patch-cg-init b/devel/cogito/files/patch-cg-init new file mode 100644 index 00000000000..1bf59a0980b --- /dev/null +++ b/devel/cogito/files/patch-cg-init @@ -0,0 +1,11 @@ +--- 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 + diff --git a/devel/cogito/files/patch-git-prune-script b/devel/cogito/files/patch-git-prune-script new file mode 100644 index 00000000000..b0cb7b2d196 --- /dev/null +++ b/devel/cogito/files/patch-git-prune-script @@ -0,0 +1,10 @@ +--- 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 + } + diff --git a/devel/cogito/pkg-descr b/devel/cogito/pkg-descr index b402fc52097..c928bd6eeb6 100644 --- a/devel/cogito/pkg-descr +++ b/devel/cogito/pkg-descr @@ -1,4 +1,7 @@ - Cogito, GIT - the content tracker + Cogito - version control system + +Cogito is a version control system layered on top of the git tree history +storage system. The GIT itself is merely an extremely fast and flexible filesystem-based database designed to store directory trees with regard to their history. @@ -7,6 +10,3 @@ with the database in a manner to a degree similar to other SCM tools (like CVS, BitKeeper or Monotone). WWW: http://kernel.org/pub/software/scm/cogito/ - -- Michael Seyfert -michaels@sdf.lonestar.org diff --git a/devel/cogito/pkg-plist b/devel/cogito/pkg-plist index f38ae529b0f..f86afe0e034 100644 --- a/devel/cogito/pkg-plist +++ b/devel/cogito/pkg-plist @@ -1,8 +1,11 @@ -bin/gitfeedmaillist.sh +bin/cg-version +bin/cg bin/cg-add +bin/cg-admin-ls bin/cg-admin-lsobj bin/cg-admin-uncommit bin/cg-branch-add +bin/cg-branch-chg bin/cg-branch-ls bin/cg-cancel bin/cg-clone @@ -12,11 +15,11 @@ bin/cg-export bin/cg-help bin/cg-init bin/cg-log -bin/cg-ls bin/cg-merge bin/cg-mkpatch bin/cg-patch bin/cg-pull +bin/cg-push bin/cg-restore bin/cg-rm bin/cg-seek @@ -24,21 +27,48 @@ bin/cg-status bin/cg-tag bin/cg-tag-ls bin/cg-update -bin/cg-version -bin/git-resolve-script 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/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-diff-tree-helper 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 @@ -46,30 +76,78 @@ bin/git-ls-files bin/git-ls-tree bin/git-merge-base bin/git-merge-cache -bin/git-merge-one-file-script bin/git-mktag -bin/git-prune-script -bin/git-pull-script +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-rpull -bin/git-rpush -bin/git-tag-script +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/parent-id -bin/tree-id -lib/cogito/cg-Xdiffdo +bin/gitfeedmaillist.sh +bin/ciabot.pl +@unexec rmdir %D/bin/ 2>/dev/null || true lib/cogito/cg-Xlib lib/cogito/cg-Xmergefile +lib/cogito/cg-Xnormid @dirrm lib/cogito @unexec rmdir %D/lib/ 2>/dev/null || true %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/core-git.txt +%%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 %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec rmdir %D/share/doc/ 2>/dev/null || true @unexec rmdir %D/share/ 2>/dev/null || true |