-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into perlmods-5341
- Loading branch information
Showing
3 changed files
with
250 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,246 @@ | ||
| # -*- coding: ascii; tab-width: 4; x-counterpart: git.patch -*- | ||
| Info2:<< | ||
| Package: git | ||
| Version: 2.34.0 | ||
| # Note: keep version in sync with git-remote-mediawiki.info | ||
| Revision: 1 | ||
| Type: pm 5.34.1 | ||
| Distribution: 15.0 | ||
|
|
||
| Depends: << | ||
| expat1-shlibs (>= 2.4.0-1), | ||
| libcurl4-shlibs (>= 7.74.0-1), | ||
| libgettext8-shlibs, | ||
| libiconv, | ||
| locale-textdomain-pm, | ||
| libpcre2-shlibs | ||
| << | ||
| BuildDepends: << | ||
| expat1 (>= 2.4.0-1), | ||
| fink (>= 0.32), | ||
| gettext-tools, | ||
| libcurl4 (>= 7.74.0-1), | ||
| libgettext8-dev, | ||
| libiconv-dev, | ||
| libpcre2 | ||
| << | ||
| Replaces: git-core, git-cvsimport (<< 1.7.2.3-1002), git-archimport (<< 1.7.2.3-1002), git-svn (<< 1.7.2.3-1002) | ||
| Conflicts: git-cvsimport (<< 1.7.2.3-1002), git-archimport (<< 1.7.2.3-1002), git-svn (<< 1.7.2.3-1002) | ||
|
|
||
| Source: https://mirrors.edge.kernel.org/pub/software/scm/git/git-%v.tar.gz | ||
| Source-Checksum: SHA256(0ce6222bfd31938b29360150286b51c77c643fa97740b1d35b6d1ceef8b0ecd7) | ||
| Source2: https://mirrors.edge.kernel.org/pub/software/scm/git/git-htmldocs-%v.tar.gz | ||
| Source2-Checksum: SHA256(d6892e9e9e7e3cce2e873f0e51fd55a32402d05a319442068fe6646b60ce6642) | ||
| Source2ExtractDir: doc | ||
| Source3: https://mirrors.edge.kernel.org/pub/software/scm/git/git-manpages-%v.tar.gz | ||
| Source3-Checksum: SHA256(fe66a69244def488306c3e05c1362ea53d8626d2a7e57cd7311df2dab1ef8356) | ||
| Source4: https://dl.dropboxusercontent.com/u/9988666/git-subtree-doc-20150817.tar.bz2 | ||
| Source4-Checksum: SHA256(92da368f8ea0920790836e426dce791a2b47b0c02002bd98556e004009080099) | ||
|
|
||
| PatchFile: %n.patch | ||
| PatchFile-MD5: 46433fd2a87e057df9f2434dda7b5c59 | ||
| PatchScript: << | ||
| #!/bin/bash -ev | ||
| %{default_script} | ||
| # Fix up paths in documentation to point to %p. | ||
| perl -pi -e 's,/usr/(share|bin)/git,%p/\1/git,g; s,/usr/libexec,%p/lib,g' ../man1/* ../doc/* | ||
| # Setting these variables in 'config.mak' lets Makefile import them | ||
| # automatically instead of always manually passing them to make. | ||
| cat >> config.mak << EOF | ||
| NO_FINK=1 | ||
| NO_DARWIN_PORTS=1 | ||
| #NO_SVN_TESTS=1 | ||
| GITWEB_CONFIG_SYSTEM=%p/gitweb.conf | ||
| CC_LD_DYNPATH=-L | ||
| AR=ar | ||
| htmldir=share/doc/git | ||
| NO_CROSS_DIRECTORY_HARDLINKS=1 | ||
| NO_INSTALL_HARDLINKS=1 | ||
| NO_REGEX=1 | ||
| NO_OPENSSL=1 | ||
| PERLLIB_EXTRA=%p/lib/perl5 | ||
| NO_PERL_CPAN_FALLBACKS=1 | ||
| EOF | ||
| perl -pi -e 's/\"\$PERL\"/\$PERL/' git-instaweb.sh | ||
| #perl -pi -e 's|use 5.008;|use 5.008;\nuse lib "%p/lib/perl5";|' *.perl | ||
|
|
||
| # Create a global config file with some sensible defaults. | ||
| cat >> gitconfig << EOF | ||
| [color] | ||
| ui = auto | ||
| [web] | ||
| browser = open | ||
| [credential] | ||
| helper = osxkeychain | ||
| EOF | ||
| << | ||
|
|
||
| UseMaxBuildJobs: true | ||
|
|
||
| # Let configure do the work of setting up the environment instead of | ||
| # patching and passing things manually to make. | ||
| SetLDFLAGS: -Wl,-dead_strip_dylibs | ||
| # Darwin needs no special flags for pthreads, so set flags to ' ' because | ||
| # "-pthreads" causes problems for gcc-4.0. | ||
| ConfigureParams: << | ||
| --libexecdir='${exec_prefix}/lib' \ | ||
| --enable-pthreads=' ' \ | ||
| --with-python='/usr/bin/python' \ | ||
| --with-perl='/usr/bin/perl' \ | ||
| --with-tcltk='/usr/bin/wish' \ | ||
| --with-libpcre2=%p | ||
| << | ||
|
|
||
| CompileScript: << | ||
| #!/bin/bash -ev | ||
| ./configure %c | ||
| make perllibdir='%p/lib/perl5' | ||
|
|
||
| # Build OS X Keychain integration. | ||
| cd contrib/credential/osxkeychain | ||
| make | ||
|
|
||
| # Build subtree command. | ||
| cd ../../subtree | ||
| make | ||
| << | ||
|
|
||
| InfoTest: << | ||
| TestDepends: << | ||
| libwww-pm%type_pkg[pm], | ||
| svn-swig-pm%type_pkg[pm] (>= 1.9.0-1), | ||
| svn19, | ||
| system-perl%type_pkg[pm], | ||
| term-readkey-pm%type_pkg[pm], | ||
| test-harness-pm%type_pkg[pm] (>= 3.25-1) | ||
| << | ||
| TestConflicts: bash, bash-completion, bash-builtins | ||
|
|
||
| TestScript: << | ||
| #!/bin/bash -ev | ||
|
|
||
| PERL_PATH=/usr/bin/perl | ||
|
|
||
| ln -s %p/bin/svn19 bin-wrappers/svn | ||
| ln -s %p/bin/svnadmin19 bin-wrappers/svnadmin | ||
| ln -s %p/bin/svnserve19 bin-wrappers/svnserve | ||
|
|
||
| # Need to pass -j1 to 'prove' since some tests don't seem to like running in parallel. | ||
|
|
||
| if [ $UID = 0 ]; then | ||
| # Some tests fail when run as root. | ||
| GIT_SKIP_TESTS="t0301 t9020 t3210.26 t9903.14 t9903.15" make -k DEFAULT_TEST_TARGET="prove" PROVE="%p/bin/prove-%type_pkg[pm]" GIT_PROVE_OPTS="--timer --failures -j1" test PERL_PATH="$PERL_PATH" || exit 1 | ||
| else | ||
| GIT_SKIP_TESTS="t0301 t9020 t3210.26 t9903.14 t9903.15" make -k DEFAULT_TEST_TARGET="prove" PROVE="%p/bin/prove-%type_pkg[pm]" GIT_PROVE_OPTS="--timer --failures -j1" test PERL_PATH="$PERL_PATH" || exit 2 | ||
| fi | ||
| << | ||
| TestSuiteSize: large | ||
| << | ||
|
|
||
| InstallScript: << | ||
| make install DESTDIR=%d NO_PYTHON=1 perllibdir='%p/lib/perl5' | ||
|
|
||
| mkdir -p %i/share/man %i/share/doc | ||
| cp -R ../man* %i/share/man | ||
| cp -R ../doc %i/share/doc/%n | ||
| cp ../git-subtree-doc/git-subtree.txt %i/share/doc/%n | ||
| cp ../git-subtree-doc/git-subtree.html %i/share/doc/%n | ||
| cp ../git-subtree-doc/git-subtree.1 %i/share/man/man1 | ||
| mkdir -p %i/share/emacs/site-lisp | ||
| cp contrib/emacs/*.el %i/share/emacs/site-lisp | ||
| mkdir -p %i/etc/bash_completion.d | ||
| install -m 755 contrib/completion/git-completion.bash %i/etc/bash_completion.d/ | ||
| install -m 755 contrib/credential/osxkeychain/git-credential-osxkeychain %i/lib/git-core | ||
| mkdir -p %i/etc/profile.d | ||
| install -m 755 contrib/completion/git-prompt.sh %i/etc/profile.d | ||
| # Install global gitconfig file. | ||
| install -m 755 gitconfig %i/etc | ||
|
|
||
| # Install subtree command. | ||
| cd contrib/subtree && make install DESTDIR=%d NO_PYTHON=1 | ||
|
|
||
| # These go in separate packages. | ||
| rm %i/lib/git-core/git-cvsimport | ||
| rm %i/share/doc/%n/git-cvsimport.* | ||
| rm %i/share/man/man1/git-cvsimport.1 | ||
| rm %i/lib/git-core/git-archimport | ||
| rm %i/share/doc/%n/git-archimport.* | ||
| rm %i/share/man/man1/git-archimport.1 | ||
| rm %i/lib/git-core/git-svn | ||
| rm %i/share/doc/%n/git-svn.* | ||
| rm %i/share/man/man1/git-svn.1 | ||
| rm %i/lib/git-core/git-send-email | ||
| rm %i/share/doc/%n/git-send-email.* | ||
| rm %i/share/man/man1/git-send-email.1 | ||
| << | ||
| ConfFiles: %p/etc/gitconfig | ||
|
|
||
| UpdatePOD: true | ||
| DocFiles: COPYING README.md contrib | ||
|
|
||
| Description: Distributed version control system | ||
| DescDetail: << | ||
| Git is an open source, distributed version control system designed to | ||
| handle everything from small to very large projects with speed and | ||
| efficiency. | ||
|
|
||
| Every Git clone is a full-fledged repository with complete history and | ||
| full revision tracking capabilities, not dependent on network access or | ||
| a central server. Branching and merging are fast and easy to do. | ||
| << | ||
| DescPackaging: << | ||
| Patched Makefile to use symlinks instead of hard links since it causes | ||
| problems if %p is a symlink to a different volume. | ||
|
|
||
| Previously maintained by Brendan Cully <[email protected]> | ||
|
|
||
| Make sure local -I comes before global (otherwise compiler sees | ||
| libarchive's archive.h instead of own archive.h). | ||
|
|
||
| Upstream fixes for grep.c (fixes a failing self-test). | ||
| << | ||
| DescUsage: << | ||
| Backward compatibility notes | ||
| ---------------------------- | ||
|
|
||
| When "git push [$there]" does not say what to push, we have used the | ||
| traditional "matching" semantics so far (all your branches were sent | ||
| to the remote as long as there already are branches of the same name | ||
| over there). In Git 2.0, the default is now the "simple" semantics, | ||
| which pushes: | ||
|
|
||
| - only the current branch to the branch with the same name, and only | ||
| when the current branch is set to integrate with that remote | ||
| branch, if you are pushing to the same remote as you fetch from; or | ||
|
|
||
| - only the current branch to the branch with the same name, if you | ||
| are pushing to a remote that is not where you usually fetch from. | ||
|
|
||
| You can use the configuration variable "push.default" to change | ||
| this. If you are an old-timer who wants to keep using the | ||
| "matching" semantics, you can set the variable to "matching", for | ||
| example. Read the documentation for other possibilities. | ||
|
|
||
| When "git add -u" and "git add -A" are run inside a subdirectory | ||
| without specifying which paths to add on the command line, they | ||
| operate on the entire tree for consistency with "git commit -a" and | ||
| other commands (these commands used to operate only on the current | ||
| subdirectory). Say "git add -u ." or "git add -A ." if you want to | ||
| limit the operation to the current directory. | ||
|
|
||
| "git add <path>" is the same as "git add -A <path>" now, so that | ||
| "git add dir/" will notice paths you removed from the directory and | ||
| record the removal. In older versions of Git, "git add <path>" used | ||
| to ignore removals. You can say "git add --ignore-removal <path>" to | ||
| add only added or modified paths in <path>, if you really want to. | ||
|
|
||
| The "-q" option to "git diff-files", which does *NOT* mean "quiet", | ||
| has been removed (it told Git to ignore deletion, which you can do | ||
| with "git diff-files --diff-filter=d"). | ||
|
|
||
| "git request-pull" lost a few "heuristics" that often led to mistakes. | ||
| << | ||
| License: GPL | ||
| Homepage: http://git-scm.com/ | ||
| Maintainer: Daniel Johnson <[email protected]> | ||
| << |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| Info2: << | ||
| Package: vim%type_pkg[-nox] | ||
| Type: -nox (boolean) | ||
| Version: 9.1.822 | ||
| Version: 9.1.847 | ||
| Revision: 1 | ||
| Description: Improved version of the editor "vi" | ||
| License: Restrictive/Distributable | ||
| Maintainer: Hisashi Todd Fujinaka <[email protected]> | ||
| Source: http://www.i8u.org/~htodd/finksrc/vim-%v.tar.bz2 | ||
| Source-Checksum: SHA256(ccf37cf5fdb717e930312ec46a51bdeb98d2d987e145011c9ae1b8e6ccef7bde) | ||
| Source-Checksum: SHA256(e3e80fa42dfee0e95b1d2a09945178f517cfa3bcdc8aefd4d238182c678b9510) | ||
| SourceDirectory: vim | ||
| PatchScript: << | ||
| # autoconf2.6ish patch for modern XQuartz paths | ||
|
|
||
4 changes: 2 additions & 2 deletions
4
10.9-libcxx/stable/main/finkinfo/libs/perlmods/test-simple-pm-15.0.info
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters