Mon Jul 20 03:43:07 2009 UTC ()
Make it build on DragonFly again.


(hasso)
diff -r1.18 -r1.19 pkgsrc/devel/scmgit-base/distinfo
diff -r1.8 -r1.9 pkgsrc/devel/scmgit-base/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/devel/scmgit-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/scmgit-base/Attic/distinfo 2009/07/19 01:29:33 1.18
+++ pkgsrc/devel/scmgit-base/Attic/distinfo 2009/07/20 03:43:07 1.19
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.18 2009/07/19 01:29:33 minskim Exp $ 1$NetBSD: distinfo,v 1.19 2009/07/20 03:43:07 hasso Exp $
2 2
3SHA1 (git-1.6.3.3.tar.gz) = 8eb22cafe085d3297872f817106fc00ad1c7ea0b 3SHA1 (git-1.6.3.3.tar.gz) = 8eb22cafe085d3297872f817106fc00ad1c7ea0b
4RMD160 (git-1.6.3.3.tar.gz) = ac31ab58c2ab138ad3cb9c6044547b62ae4b3f31 4RMD160 (git-1.6.3.3.tar.gz) = ac31ab58c2ab138ad3cb9c6044547b62ae4b3f31
5Size (git-1.6.3.3.tar.gz) = 2517144 bytes 5Size (git-1.6.3.3.tar.gz) = 2517144 bytes
6SHA1 (patch-aa) = 3d7f65f3f0f7e473ad969e98ae628c4df36b5e62 6SHA1 (patch-aa) = 486cc9b322fc1f8f63ef5457ab49000d81f4707f
7SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1 7SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1
8SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 8SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
9SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce 9SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
10SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8 10SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8
11SHA1 (patch-ag) = a6c586cdfbad923a3497fa4ab0c73840dc035737 11SHA1 (patch-ag) = a6c586cdfbad923a3497fa4ab0c73840dc035737
12SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac 12SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
13SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e 13SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
cvs diff -r1.8 -r1.9 pkgsrc/devel/scmgit-base/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/scmgit-base/patches/Attic/patch-aa 2009/07/19 01:29:33 1.8
+++ pkgsrc/devel/scmgit-base/patches/Attic/patch-aa 2009/07/20 03:43:07 1.9
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.8 2009/07/19 01:29:33 minskim Exp $ 1$NetBSD: patch-aa,v 1.9 2009/07/20 03:43:07 hasso Exp $
2 2
3--- Makefile.orig 2009-06-21 23:24:25.000000000 -0700 3--- Makefile.orig 2009-06-22 09:24:25 +0300
4+++ Makefile 4+++ Makefile 2009-07-20 06:07:34 +0300
5@@ -249,12 +249,8 @@ GITWEB_SITE_FOOTER = 5@@ -249,12 +249,8 @@ GITWEB_SITE_FOOTER =
6  6
7 export prefix bindir sharedir sysconfdir 7 export prefix bindir sharedir sysconfdir
8  8
9-CC = gcc 9-CC = gcc
10-AR = ar 10-AR = ar
11 RM = rm -f 11 RM = rm -f
12-TAR = tar 12-TAR = tar
13 FIND = find 13 FIND = find
14-INSTALL = install 14-INSTALL = install
15 RPMBUILD = rpmbuild 15 RPMBUILD = rpmbuild
16 TCL_PATH = tclsh 16 TCL_PATH = tclsh
17 TCLTK_PATH = wish 17 TCLTK_PATH = wish
@@ -26,47 +26,59 @@ $NetBSD: patch-aa,v 1.8 2009/07/19 01:29 @@ -26,47 +26,59 @@ $NetBSD: patch-aa,v 1.8 2009/07/19 01:29
26+ SHELL_PATH = ${BASH} 26+ SHELL_PATH = ${BASH}
27 NO_STRCASESTR = YesPlease 27 NO_STRCASESTR = YesPlease
28 NO_MEMMEM = YesPlease 28 NO_MEMMEM = YesPlease
29 NO_HSTRERROR = YesPlease 29 NO_HSTRERROR = YesPlease
30@@ -714,8 +711,6 @@ ifeq ($(uname_S),SunOS) 30@@ -714,8 +711,6 @@ ifeq ($(uname_S),SunOS)
31 NO_C99_FORMAT = YesPlease 31 NO_C99_FORMAT = YesPlease
32 NO_STRTOUMAX = YesPlease 32 NO_STRTOUMAX = YesPlease
33 endif 33 endif
34- INSTALL = ginstall 34- INSTALL = ginstall
35- TAR = gtar 35- TAR = gtar
36 BASIC_CFLAGS += -D__EXTENSIONS__ 36 BASIC_CFLAGS += -D__EXTENSIONS__
37 endif 37 endif
38 ifeq ($(uname_O),Cygwin) 38 ifeq ($(uname_O),Cygwin)
39@@ -759,9 +754,7 @@ ifeq ($(uname_S),OpenBSD) 39@@ -759,14 +754,19 @@ ifeq ($(uname_S),OpenBSD)
40 THREADED_DELTA_SEARCH = YesPlease 40 THREADED_DELTA_SEARCH = YesPlease
41 endif 41 endif
42 ifeq ($(uname_S),NetBSD) 42 ifeq ($(uname_S),NetBSD)
43- ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) 43- ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
44- NEEDS_LIBICONV = YesPlease 44- NEEDS_LIBICONV = YesPlease
45- endif 45- endif
46+ NEEDS_LIBICONV = YesPlease 46+ NEEDS_LIBICONV = YesPlease
47 BASIC_CFLAGS += -I/usr/pkg/include 47 BASIC_CFLAGS += -I/usr/pkg/include
48 BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib 48 BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
49 THREADED_DELTA_SEARCH = YesPlease 49 THREADED_DELTA_SEARCH = YesPlease
50@@ -1183,7 +1176,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P 50 USE_ST_TIMESPEC = YesPlease
 51 endif
 52+ifeq ($(uname_S),DragonFly)
 53+ NEEDS_LIBICONV = YesPlease
 54+ BASIC_CFLAGS += -I/usr/pkg/include
 55+ BASIC_LDFLAGS += -L/usr/pkg/lib
 56+ USE_ST_TIMESPEC = YesPlease
 57+ THREADED_DELTA_SEARCH = YesPlease
 58+endif
 59 ifeq ($(uname_S),AIX)
 60 NO_STRCASESTR=YesPlease
 61 NO_MEMMEM = YesPlease
 62@@ -1183,7 +1183,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
51 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) 63 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
52 TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) 64 TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
53  65
54-LIBS = $(GITLIBS) $(EXTLIBS) 66-LIBS = $(GITLIBS) $(EXTLIBS)
55+LIBS += $(GITLIBS) $(EXTLIBS) 67+LIBS += $(GITLIBS) $(EXTLIBS)
56  68
57 BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \ 69 BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
58 $(COMPAT_CFLAGS) 70 $(COMPAT_CFLAGS)
59@@ -1535,10 +1528,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi 71@@ -1535,10 +1535,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
60 export gitexec_instdir 72 export gitexec_instdir
61  73
62 install: all 74 install: all
63- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' 75- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
64- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' 76- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
65- $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' 77- $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
66- $(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)' 78- $(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
67+ $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)' 79+ $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)'
68+ $(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' 80+ $(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
69+ $(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' 81+ $(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
70+ $(BSD_INSTALL_SCRIPT) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)' 82+ $(BSD_INSTALL_SCRIPT) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
71 $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install 83 $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
72 ifndef NO_PERL 84 ifndef NO_PERL