[89636] trunk/dports/devel/git-core

[ryandesign at macports.org]

Revision: 89636
          http://trac.macports.org/changeset/89636
Author:   ryandesign at macports.org
Date:     2012-02-04 17:40:47 -0800 (Sat, 04 Feb 2012)
Log Message:
-----------
git-core: avoid deleting /dev/null during the build (!); see #33127

Modified Paths:
--------------
    trunk/dports/devel/git-core/Portfile
    trunk/dports/devel/git-core/files/patch-Makefile.diff

Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile	2012-02-05 00:22:55 UTC (rev 89635)
+++ trunk/dports/devel/git-core/Portfile	2012-02-05 01:40:47 UTC (rev 89636)
@@ -12,7 +12,7 @@
 categories          devel
 license             GPL-2 LGPL-2.1+
 platforms           darwin
-homepage            http://git-scm.com
+homepage            http://git-scm.com/
 #use_bzip2           yes
 #master_sites        http://www.kernel.org/pub/software/scm/git/
 master_sites        googlecode

Modified: trunk/dports/devel/git-core/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/git-core/files/patch-Makefile.diff	2012-02-05 00:22:55 UTC (rev 89635)
+++ trunk/dports/devel/git-core/files/patch-Makefile.diff	2012-02-05 01:40:47 UTC (rev 89636)
@@ -1,15 +1,24 @@
---- a/Makefile.orig	2011-09-02 21:46:23.000000000 -0400
-+++ b/Makefile	2011-09-02 21:46:23.000000000 -0400
-@@ -306,7 +306,7 @@
- sharedir = $(prefix)/share
+--- a/Makefile.orig	2012-01-27 14:51:04.000000000 -0600
++++ b/Makefile	2012-02-04 19:38:26.000000000 -0600
+@@ -330,7 +330,7 @@
  gitwebdir = $(sharedir)/gitweb
+ localedir = $(sharedir)/locale
  template_dir = share/git-core/templates
 -htmldir = share/doc/git-doc
 +htmldir = share/doc/git-core
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -1288,7 +1288,7 @@
+@@ -1309,7 +1309,7 @@
+ 
+ ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto)
+ dep_check = $(shell $(CC) $(ALL_CFLAGS) \
+-	-c -MF /dev/null -MMD -MP -x c /dev/null -o /dev/null 2>&1; \
++	-c -MF /dev/null -MMD -MP -x c /dev/null -o dummy 2>&1; \
+ 	echo $$?)
+ ifeq ($(dep_check),0)
+ override COMPUTE_HEADER_DEPENDENCIES = yes
+@@ -1363,7 +1363,7 @@
  	ifdef NO_R_TO_GCC_LINKER
  		# Some gcc does not accept and pass -R to the linker to specify
  		# the runtime dynamic library path.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120204/29477cf7/attachment.html>