summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorhasso <hasso>2009-07-20 03:43:07 +0000
committerhasso <hasso>2009-07-20 03:43:07 +0000
commit979b8258e00663c0b7edd18d9cf5a4fee5b3d820 (patch)
tree7e61be3e3b9368cce2c83b09954385626d7c2f96 /devel
parentdaa38ba196e3d4ebc6cb689de5f8e23f790d0f26 (diff)
downloadpkgsrc-979b8258e00663c0b7edd18d9cf5a4fee5b3d820.tar.gz
Make it build on DragonFly again.
Diffstat (limited to 'devel')
-rw-r--r--devel/scmgit-base/distinfo4
-rw-r--r--devel/scmgit-base/patches/patch-aa24
2 files changed, 20 insertions, 8 deletions
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 1e1ae5c2aa1..5275dac9640 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2009/07/19 01:29:33 minskim Exp $
+$NetBSD: distinfo,v 1.19 2009/07/20 03:43:07 hasso Exp $
SHA1 (git-1.6.3.3.tar.gz) = 8eb22cafe085d3297872f817106fc00ad1c7ea0b
RMD160 (git-1.6.3.3.tar.gz) = ac31ab58c2ab138ad3cb9c6044547b62ae4b3f31
Size (git-1.6.3.3.tar.gz) = 2517144 bytes
-SHA1 (patch-aa) = 3d7f65f3f0f7e473ad969e98ae628c4df36b5e62
+SHA1 (patch-aa) = 486cc9b322fc1f8f63ef5457ab49000d81f4707f
SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index d21bdce91cc..a1a1b06dbdb 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2009/07/19 01:29:33 minskim Exp $
+$NetBSD: patch-aa,v 1.9 2009/07/20 03:43:07 hasso Exp $
---- Makefile.orig 2009-06-21 23:24:25.000000000 -0700
-+++ Makefile
+--- Makefile.orig 2009-06-22 09:24:25 +0300
++++ Makefile 2009-07-20 06:07:34 +0300
@@ -249,12 +249,8 @@ GITWEB_SITE_FOOTER =
export prefix bindir sharedir sysconfdir
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.8 2009/07/19 01:29:33 minskim Exp $
BASIC_CFLAGS += -D__EXTENSIONS__
endif
ifeq ($(uname_O),Cygwin)
-@@ -759,9 +754,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -759,14 +754,19 @@ ifeq ($(uname_S),OpenBSD)
THREADED_DELTA_SEARCH = YesPlease
endif
ifeq ($(uname_S),NetBSD)
@@ -47,7 +47,19 @@ $NetBSD: patch-aa,v 1.8 2009/07/19 01:29:33 minskim Exp $
BASIC_CFLAGS += -I/usr/pkg/include
BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
THREADED_DELTA_SEARCH = YesPlease
-@@ -1183,7 +1176,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+ USE_ST_TIMESPEC = YesPlease
+ endif
++ifeq ($(uname_S),DragonFly)
++ NEEDS_LIBICONV = YesPlease
++ BASIC_CFLAGS += -I/usr/pkg/include
++ BASIC_LDFLAGS += -L/usr/pkg/lib
++ USE_ST_TIMESPEC = YesPlease
++ THREADED_DELTA_SEARCH = YesPlease
++endif
+ ifeq ($(uname_S),AIX)
+ NO_STRCASESTR=YesPlease
+ NO_MEMMEM = YesPlease
+@@ -1183,7 +1183,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
@@ -56,7 +68,7 @@ $NetBSD: patch-aa,v 1.8 2009/07/19 01:29:33 minskim Exp $
BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
$(COMPAT_CFLAGS)
-@@ -1535,10 +1528,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
+@@ -1535,10 +1535,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
export gitexec_instdir
install: all