diff options
| author | wxs <wxs@FreeBSD.org> | 2011-07-01 06:19:09 +0800 |
|---|---|---|
| committer | wxs <wxs@FreeBSD.org> | 2011-07-01 06:19:09 +0800 |
| commit | 33aa5d41e9167e32315d4448a7afb2c9e5e8e623 (patch) | |
| tree | c1d1abd6177e342cc56e9dede328f90becee7805 | |
| parent | a369f264135e693f64c170ab0e2252a0bbcc88c4 (diff) | |
| download | freebsd-ports-gnome-33aa5d41e9167e32315d4448a7afb2c9e5e8e623.tar.gz freebsd-ports-gnome-33aa5d41e9167e32315d4448a7afb2c9e5e8e623.tar.zst freebsd-ports-gnome-33aa5d41e9167e32315d4448a7afb2c9e5e8e623.zip | |
- Update to 1.7.6.
- Remove some of the warnings when building with clang by separating
LDFLAGS from CFLAGS. Still some harmless warnings left though.[1]
Submitted by: [1]: sahil@
| -rw-r--r-- | devel/git/Makefile | 7 | ||||
| -rw-r--r-- | devel/git/distinfo | 12 | ||||
| -rw-r--r-- | devel/git/pkg-plist | 9 |
3 files changed, 20 insertions, 8 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile index e63eeb768b64..0f5a64bfa071 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -6,7 +6,7 @@ # PORTNAME= git -PORTVERSION= 1.7.5.4 +PORTVERSION= 1.7.6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} MASTER_SITE_SUBDIR= software/scm/${PORTNAME} @@ -128,6 +128,8 @@ MAN1= git.1 \ git-send-email.1 \ git-send-pack.1 \ git-sh-setup.1 \ + git-sh-i18n.1 \ + git-sh-i18n--envsubst.1 \ git-shell.1 \ git-shortlog.1 \ git-show-branch.1 \ @@ -175,7 +177,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= LIBMD_SHA1=yes \ V=1 MAKE_ARGS+= prefix="${PREFIX}" diff --git a/devel/git/distinfo b/devel/git/distinfo index f582a979519c..1c77f67502ff 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,6 +1,6 @@ -SHA256 (git-1.7.5.4.tar.bz2) = fed9a6c7d07b063cfba9e3eb40fbd0d8120785225289fcf2fb56bee18dffd5ee -SIZE (git-1.7.5.4.tar.bz2) = 2768851 -SHA256 (git-manpages-1.7.5.4.tar.bz2) = 87d612195426fedfe4ee5274d9903e8f85aa16c410b4a3ba41610c23ed9211d7 -SIZE (git-manpages-1.7.5.4.tar.bz2) = 304222 -SHA256 (git-htmldocs-1.7.5.4.tar.bz2) = 13f38a7c342c34b4ead81a56d0302fe724bdbde25a8a15c7dd546cddd3e7fc14 -SIZE (git-htmldocs-1.7.5.4.tar.bz2) = 960370 +SHA256 (git-1.7.6.tar.bz2) = 778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082 +SIZE (git-1.7.6.tar.bz2) = 2806337 +SHA256 (git-manpages-1.7.6.tar.bz2) = a0ffd7e16997262ef741db5e2dd8eabf44b6767cf1a213753c7d8a268b4553ad +SIZE (git-manpages-1.7.6.tar.bz2) = 309563 +SHA256 (git-htmldocs-1.7.6.tar.bz2) = 7e6685c89149d1e1e84a916d913452cfbac3ae801d02a0631243e41c25949277 +SIZE (git-htmldocs-1.7.6.tar.bz2) = 974583 diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 292cdea2f90c..08e7ce0c38c6 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -124,7 +124,9 @@ libexec/git-core/git-push libexec/git-core/git-quiltimport libexec/git-core/git-read-tree libexec/git-core/git-rebase +libexec/git-core/git-rebase--am libexec/git-core/git-rebase--interactive +libexec/git-core/git-rebase--merge libexec/git-core/git-receive-pack libexec/git-core/git-reflog libexec/git-core/git-relink @@ -148,6 +150,8 @@ libexec/git-core/git-revert libexec/git-core/git-rm libexec/git-core/git-send-email libexec/git-core/git-send-pack +libexec/git-core/git-sh-i18n +libexec/git-core/git-sh-i18n--envsubst libexec/git-core/git-sh-setup libexec/git-core/git-shell libexec/git-core/git-stage @@ -377,6 +381,8 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/git-rm.html %%HTMLDOCS%%%%DOCSDIR%%/git-send-email.html %%HTMLDOCS%%%%DOCSDIR%%/git-send-pack.html +%%HTMLDOCS%%%%DOCSDIR%%/git-sh-i18n.html +%%HTMLDOCS%%%%DOCSDIR%%/git-sh-i18n--envsubst.html %%HTMLDOCS%%%%DOCSDIR%%/git-sh-setup.html %%HTMLDOCS%%%%DOCSDIR%%/git-shell.html %%HTMLDOCS%%%%DOCSDIR%%/git-shortlog.html @@ -586,6 +592,8 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/git-cvsimport.txt %%HTMLDOCS%%%%DOCSDIR%%/user-manual.html %%HTMLDOCS%%%%DOCSDIR%%/git-gui.txt +%%HTMLDOCS%%%%DOCSDIR%%/git-sh-i18n.txt +%%HTMLDOCS%%%%DOCSDIR%%/git-sh-i18n--envsubst.txt %%HTMLDOCS%%%%DOCSDIR%%/git-sh-setup.txt %%HTMLDOCS%%%%DOCSDIR%%/git.txt %%HTMLDOCS%%%%DOCSDIR%%/git-cherry-pick.txt @@ -818,6 +826,7 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.5.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.5.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.5.4.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.6.txt %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css |