cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to git-1.5.4.5 and introduce a git-x11 package which contains

Browse Source 
all graphical git stuff.

Initial git-x11 diff from Josh Elsasser. Thanks!
This commit is contained in:
bernd 2008-04-01 22:36:30 +00:00
parent 4ff4b681e4
commit b0a4301f89
6 changed files with 106 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devel/git/Makefile
View File

@ -1,12 +1,14 @@
# $OpenBSD: Makefile,v 1.21 2008/03/28 19:06:20 bernd Exp $
# $OpenBSD: Makefile,v 1.22 2008/04/01 22:36:30 bernd Exp $
COMMENT-main= GIT - Tree History Storage Tool
COMMENT-svn= GIT - subversion interoperability tools
COMMENT-x11= GIT - graphical tools
V= 1.5.4.2
V= 1.5.4.5
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
PKGNAME-x11= git-x11-${V}
CATEGORIES= devel
HOMEPAGE= http://git.or.cz/
@ -33,11 +35,10 @@ MODULES= converters/libiconv
BUILD_DEPENDS= ::archivers/gtar \
::devel/p5-Error
MULTI_PACKAGES= -main -svn
MULTI_PACKAGES= -main -svn -x11
WANTLIB-main= c expat crypto z
RUN_DEPENDS-main= ::x11/tk/8.4 \
::net/rsync \
RUN_DEPENDS-main= ::net/rsync \
::devel/p5-Error \
${MODLIBICONV_RUN_DEPENDS}
LIB_DEPENDS-main= curl.>=3::net/curl \
@ -50,6 +51,11 @@ RUN_DEPENDS-svn= ::${BASE_PKGPATH} \
LIB_DEPENDS-svn=
PKG_ARCH-svn= *
RUN_DEPENDS-x11= :${PKGNAME}:${BASE_PKGPATH},-main \
::x11/tk/8.4
LIB_DEPENDS-x11=
PKG_ARCH-x11= *
MAKE_ENV= prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
SYSCONFDIR=${SYSCONFDIR} \
TCLTK_PATH=${LOCALBASE}/bin/wish8.4 \

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.5.4.2.tar.gz) = MqH12UuwzqXph9hUAHshpA==
MD5 (git-htmldocs-1.5.4.2.tar.gz) = Khh3pLTIhRXMTYb/0K8muQ==
MD5 (git-manpages-1.5.4.2.tar.gz) = Apeh2kISGFoNaaWrMLDdAQ==
RMD160 (git-1.5.4.2.tar.gz) = G0gW1X/fo/Ucf3+qYwxQXBXonOM=
RMD160 (git-htmldocs-1.5.4.2.tar.gz) = GjjXVVaSKgAFqCeh7NQcgpkAlJo=
RMD160 (git-manpages-1.5.4.2.tar.gz) = Y3NT87b4L8O5NzoYN59PAO9EcRU=
SHA1 (git-1.5.4.2.tar.gz) = sfrzjF19gB+gNRAqGdVh8+DYwrY=
SHA1 (git-htmldocs-1.5.4.2.tar.gz) = oQew3W+RDTG9saZ85DVdVn6hvmM=
SHA1 (git-manpages-1.5.4.2.tar.gz) = t1J/F3MHNBmPteCtkw2X/e2dlUU=
SHA256 (git-1.5.4.2.tar.gz) = Z061Cbv7gNBTS48FCrdkTA8QnkIgJl/pYBNhljNmB50=
SHA256 (git-htmldocs-1.5.4.2.tar.gz) = gUEacfIxe6yLgVMR/HM+1FQP+p6xay9BhZ+vyO1V/b4=
SHA256 (git-manpages-1.5.4.2.tar.gz) = QNsdYuxMjHx8e5k4FuXxfWn2bEWqdtyv96Jy9ihb+/0=
SIZE (git-1.5.4.2.tar.gz) = 1898026
SIZE (git-htmldocs-1.5.4.2.tar.gz) = 876864
SIZE (git-manpages-1.5.4.2.tar.gz) = 241643
MD5 (git-1.5.4.5.tar.gz) = n4PRi+QciOXfaicYwIFSDA==
MD5 (git-htmldocs-1.5.4.5.tar.gz) = 7JCEjz3ZnOC0c+piU4Xx6w==
MD5 (git-manpages-1.5.4.5.tar.gz) = GtR33T6YJUJU7MvmUwmejQ==
RMD160 (git-1.5.4.5.tar.gz) = GaC58Dun3dFEareXktw8oMt2uNk=
RMD160 (git-htmldocs-1.5.4.5.tar.gz) = NJ3MgCcN6OD6FnlO5x2T8ce6lW4=
RMD160 (git-manpages-1.5.4.5.tar.gz) = 0xQU52PHltdBOE0wRiq4b1l3rXg=
SHA1 (git-1.5.4.5.tar.gz) = oOI3PMqEDvKsMRxONkrvoTetT5I=
SHA1 (git-htmldocs-1.5.4.5.tar.gz) = yz99J45DTvFHZoV20NYAIa9vyyk=
SHA1 (git-manpages-1.5.4.5.tar.gz) = 8uvDzdq4az3SP7o3E//VXfw4UyQ=
SHA256 (git-1.5.4.5.tar.gz) = zpcTMXe3PVADBZwUhqWmk4aCWLq+StRzrLR0yBukkFo=
SHA256 (git-htmldocs-1.5.4.5.tar.gz) = pyX5uuiaWF4dszIlB0dxqW79WH5qq5i2KXPDhZHt6qw=
SHA256 (git-manpages-1.5.4.5.tar.gz) = oMkAMQ4jAuzyZb3tJSTSdMcCCUrc0vsamK1xZV/d5sY=
SIZE (git-1.5.4.5.tar.gz) = 1908589
SIZE (git-htmldocs-1.5.4.5.tar.gz) = 882542
SIZE (git-manpages-1.5.4.5.tar.gz) = 243013

12
devel/git/patches/patch-t_t9200-git-cvsexportcommit_sh Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-t_t9200-git-cvsexportcommit_sh,v 1.1 2008/04/01 22:36:30 bernd Exp $
--- t/t9200-git-cvsexportcommit.sh.orig Fri Mar 28 23:04:03 2008
+++ t/t9200-git-cvsexportcommit.sh Fri Mar 28 23:04:12 2008
@@ -30,7 +30,7 @@ exit 1
check_entries () {
# $1 == directory, $2 == expected
- grep '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
+ grep -a '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
if test -z "$2"
then
>expected

1
devel/git/pkg/DESCR-x11 Normal file
View File

@ -0,0 +1 @@
X11 tools for GIT.

65
devel/git/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.11 2008/02/19 09:05:58 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.12 2008/04/01 22:36:30 bernd Exp $
@pkgpath devel/git
bin/git
bin/git-add
@ -19,7 +19,6 @@ bin/git-checkout
bin/git-checkout-index
bin/git-cherry
bin/git-cherry-pick
bin/git-citool
bin/git-clean
bin/git-clone
bin/git-commit
@ -49,7 +48,6 @@ bin/git-fsck-objects
bin/git-gc
bin/git-get-tar-commit-id
bin/git-grep
bin/git-gui
bin/git-hash-object
bin/git-help--browse
bin/git-http-fetch
@ -138,7 +136,6 @@ bin/git-verify-pack
bin/git-verify-tag
bin/git-whatchanged
bin/git-write-tree
bin/gitk
lib/libgit.a
libdata/perl5/site_perl/Git.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@ -159,7 +156,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-checkout.1
@man man/man1/git-cherry-pick.1
@man man/man1/git-cherry.1
@man man/man1/git-citool.1
@man man/man1/git-clean.1
@man man/man1/git-clone.1
@man man/man1/git-commit-tree.1
@ -188,7 +184,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-gc.1
@man man/man1/git-get-tar-commit-id.1
@man man/man1/git-grep.1
@man man/man1/git-gui.1
@man man/man1/git-hash-object.1
@man man/man1/git-help.1
@man man/man1/git-http-fetch.1
@ -271,7 +266,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-whatchanged.1
@man man/man1/git-write-tree.1
@man man/man1/git.1
@man man/man1/gitk.1
@man man/man3p/Git.3p
@man man/man5/gitattributes.5
@man man/man5/gitcli.5
@ -310,6 +304,9 @@ share/doc/git/RelNotes-1.5.3.8.txt
share/doc/git/RelNotes-1.5.3.txt
share/doc/git/RelNotes-1.5.4.1.txt
share/doc/git/RelNotes-1.5.4.2.txt
share/doc/git/RelNotes-1.5.4.3.txt
share/doc/git/RelNotes-1.5.4.4.txt
share/doc/git/RelNotes-1.5.4.5.txt
share/doc/git/RelNotes-1.5.4.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
@ -368,8 +365,6 @@ share/doc/git/git-cherry-pick.html
share/doc/git/git-cherry-pick.txt
share/doc/git/git-cherry.html
share/doc/git/git-cherry.txt
share/doc/git/git-citool.html
share/doc/git/git-citool.txt
share/doc/git/git-clean.html
share/doc/git/git-clean.txt
share/doc/git/git-clone.html
@ -426,8 +421,6 @@ share/doc/git/git-get-tar-commit-id.html
share/doc/git/git-get-tar-commit-id.txt
share/doc/git/git-grep.html
share/doc/git/git-grep.txt
share/doc/git/git-gui.html
share/doc/git/git-gui.txt
share/doc/git/git-hash-object.html
share/doc/git/git-hash-object.txt
share/doc/git/git-help.html
@ -602,8 +595,6 @@ share/doc/git/gitcli.html
share/doc/git/gitcli.txt
share/doc/git/gitignore.html
share/doc/git/gitignore.txt
share/doc/git/gitk.html
share/doc/git/gitk.txt
share/doc/git/gitmodules.html
share/doc/git/gitmodules.txt
share/doc/git/glossary.html
@ -665,51 +656,3 @@ share/git-core/templates/hooks/pre-rebase
share/git-core/templates/hooks/update
share/git-core/templates/info/
share/git-core/templates/info/exclude
share/git-gui/
share/git-gui/lib/
share/git-gui/lib/about.tcl
share/git-gui/lib/blame.tcl
share/git-gui/lib/branch.tcl
share/git-gui/lib/branch_checkout.tcl
share/git-gui/lib/branch_create.tcl
share/git-gui/lib/branch_delete.tcl
share/git-gui/lib/branch_rename.tcl
share/git-gui/lib/browser.tcl
share/git-gui/lib/checkout_op.tcl
share/git-gui/lib/choose_font.tcl
share/git-gui/lib/choose_repository.tcl
share/git-gui/lib/choose_rev.tcl
share/git-gui/lib/class.tcl
share/git-gui/lib/commit.tcl
share/git-gui/lib/console.tcl
share/git-gui/lib/database.tcl
share/git-gui/lib/date.tcl
share/git-gui/lib/diff.tcl
share/git-gui/lib/encoding.tcl
share/git-gui/lib/error.tcl
share/git-gui/lib/git-gui.ico
share/git-gui/lib/index.tcl
share/git-gui/lib/logo.tcl
share/git-gui/lib/merge.tcl
share/git-gui/lib/msgs/
share/git-gui/lib/msgs/de.msg
share/git-gui/lib/msgs/fr.msg
share/git-gui/lib/msgs/hu.msg
share/git-gui/lib/msgs/it.msg
share/git-gui/lib/msgs/ja.msg
share/git-gui/lib/msgs/ru.msg
share/git-gui/lib/msgs/sv.msg
share/git-gui/lib/msgs/zh_cn.msg
share/git-gui/lib/option.tcl
share/git-gui/lib/remote.tcl
share/git-gui/lib/remote_branch_delete.tcl
share/git-gui/lib/shortcut.tcl
share/git-gui/lib/status_bar.tcl
share/git-gui/lib/tclIndex
share/git-gui/lib/transport.tcl
share/git-gui/lib/win32.tcl
share/git-gui/lib/win32_shortcut.js
share/gitk/
share/gitk/lib/
share/gitk/lib/msgs/
share/gitk/lib/msgs/de.msg

62
devel/git/pkg/PLIST-x11 Normal file
View File

@ -0,0 +1,62 @@
@comment $OpenBSD: PLIST-x11,v 1.1 2008/04/01 22:36:30 bernd Exp $
@conflict git-<=1.5.4.2p0
bin/git-citool
bin/git-gui
bin/gitk
@man man/man1/git-citool.1
@man man/man1/git-gui.1
@man man/man1/gitk.1
share/doc/git/git-citool.html
share/doc/git/git-citool.txt
share/doc/git/git-gui.html
share/doc/git/git-gui.txt
share/doc/git/gitk.html
share/doc/git/gitk.txt
share/git-gui/
share/git-gui/lib/
share/git-gui/lib/about.tcl
share/git-gui/lib/blame.tcl
share/git-gui/lib/branch.tcl
share/git-gui/lib/branch_checkout.tcl
share/git-gui/lib/branch_create.tcl
share/git-gui/lib/branch_delete.tcl
share/git-gui/lib/branch_rename.tcl
share/git-gui/lib/browser.tcl
share/git-gui/lib/checkout_op.tcl
share/git-gui/lib/choose_font.tcl
share/git-gui/lib/choose_repository.tcl
share/git-gui/lib/choose_rev.tcl
share/git-gui/lib/class.tcl
share/git-gui/lib/commit.tcl
share/git-gui/lib/console.tcl
share/git-gui/lib/database.tcl
share/git-gui/lib/date.tcl
share/git-gui/lib/diff.tcl
share/git-gui/lib/encoding.tcl
share/git-gui/lib/error.tcl
share/git-gui/lib/git-gui.ico
share/git-gui/lib/index.tcl
share/git-gui/lib/logo.tcl
share/git-gui/lib/merge.tcl
share/git-gui/lib/msgs/
share/git-gui/lib/msgs/de.msg
share/git-gui/lib/msgs/fr.msg
share/git-gui/lib/msgs/hu.msg
share/git-gui/lib/msgs/it.msg
share/git-gui/lib/msgs/ja.msg
share/git-gui/lib/msgs/ru.msg
share/git-gui/lib/msgs/sv.msg
share/git-gui/lib/msgs/zh_cn.msg
share/git-gui/lib/option.tcl
share/git-gui/lib/remote.tcl
share/git-gui/lib/remote_branch_delete.tcl
share/git-gui/lib/shortcut.tcl
share/git-gui/lib/status_bar.tcl
share/git-gui/lib/tclIndex
share/git-gui/lib/transport.tcl
share/git-gui/lib/win32.tcl
share/git-gui/lib/win32_shortcut.js
share/gitk/
share/gitk/lib/
share/gitk/lib/msgs/
share/gitk/lib/msgs/de.msg