[Lunar-commits] <moonbase-other> Merge pull request #29 from Ratler/git

[Florin Braescu]

commit b81d953f5b05a7145c5989e57b910b070fe40ee4
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun, 02 Sep 2012 00:19:47 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/b81d953f5b05a7145c5989e57b910b070fe40ee4

Merge pull request #29 from Ratler/git

git: Reworked the module
---
  devel/git/BUILD                                              +4/-7     
  devel/git/DEPENDS                                            +1/-0     
  devel/git/DETAILS                                            +2/-6     
  3 files changed, 0 insertions (+), 0 deletions (-)

--- a/devel/git/BUILD
+++ b/devel/git/BUILD
@@ -1,15 +1,12 @@
 (
 
-  patch_it $SOURCE3 0 &&
   unpack $SOURCE2 &&
-  sedit "s/-g -O2/${CFLAGS}/" Makefile &&
-  make prefix=/usr strip &&
+  make prefix=/usr CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" NO_CROSS_DIRECTORY_HARDLINKS=1 $OPTS all &&
   prepare_install  &&
-  make prefix=/usr install &&
-  # this hack added by tchan 20080915, because the lunar git-makefile patch is doing strange things
-  cd /usr/libexec/git-core && ln -sf /usr/bin/git git && cd - &&
-  cp -p contrib/gitview/gitview /usr/bin &&
+  make prefix=/usr CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" NO_CROSS_DIRECTORY_HARDLINKS=1 $OPTS install &&
+  install -m 755 contrib/gitview/gitview /usr/bin/ &&
   install -m 644 contrib/completion/git-completion.bash /etc/profile.d/git-completion.rc &&
+  install -m 644 contrib/completion/git-prompt.sh /etc/profile.d/git-prompt.rc &&
   for i in man?; do
       [ -d /usr/share/man/$i ] || mkdir -p /usr/share/man/$i
       install -m 644 $i/* /usr/share/man/$i/
--- a/devel/git/DEPENDS
+++ b/devel/git/DEPENDS
@@ -4,5 +4,6 @@ depends  openssl
 depends  rsync
 depends  Python
 
+optional_depends pcre  "USE_LIBPCRE=1" "" "for perl regexp support in git-grep"
 optional_depends cvsps "" "" "for CVS repository support"
 optional_depends tk    "" "" "for a TK front-end git tool"
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -2,18 +2,14 @@
          VERSION=1.7.12
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-manpages-$VERSION.tar.gz
-         SOURCE3=$MODULE-makefile-install-10.patch
       SOURCE_URL=http://git-core.googlecode.com/files
      SOURCE2_URL=http://git-core.googlecode.com/files
-     SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:42ec1037f1ee5bfeb405710c83b73c0515ad26e6
      SOURCE2_VFY=sha1:fb572729ca5c60161dc651564a50d4378507e20f
-     SOURCE3_VFY=sha1:8e1de6ce0c00514e03dc84fed1642ea07f69b70b
-        WEB_SITE=http://git-scm.com
+        WEB_SITE=http://git-scm.com/
          ENTERED=20050707
-         UPDATED=20120821
+         UPDATED=20120902
            SHORT="Fast version control system"
-           PSAFE=no
 
 cat << EOF
 Git is a popular version control system designed to handle very large projects