2 files changed, 6 insertions, 69 deletions
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index d31143d21b7..ccaf7debf71 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2010/04/28 22:01:43 morr Exp $
 
---- Makefile.orig	2009-12-24 00:00:22.000000000 +0000
-+++ Makefile
-@@ -305,12 +305,8 @@ GITWEB_SITE_FOOTER =
+--- Makefile.orig	2010-04-12 19:23:36.000000000 +0400
++++ Makefile	2010-04-16 14:07:10.000000000 +0400
+@@ -277,12 +277,8 @@
  
  export prefix bindir sharedir sysconfdir
  
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -768,9 +764,10 @@ ifeq ($(uname_S),Darwin)
+@@ -762,9 +758,10 @@
  	USE_ST_TIMESPEC = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
  	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
-@@ -801,8 +798,6 @@ ifeq ($(uname_S),SunOS)
+@@ -793,8 +790,6 @@
  		NO_C99_FORMAT = YesPlease
  		NO_STRTOUMAX = YesPlease
  	endif
@@ -36,51 +36,3 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
  	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -850,15 +845,20 @@ ifeq ($(uname_S),OpenBSD)
- 	THREADED_DELTA_SEARCH = YesPlease
- endif
- ifeq ($(uname_S),NetBSD)
--	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
--		NEEDS_LIBICONV = YesPlease
--	endif
-+	NEEDS_LIBICONV = YesPlease
- 	BASIC_CFLAGS += -I/usr/pkg/include
- 	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
- 	THREADED_DELTA_SEARCH = YesPlease
- 	USE_ST_TIMESPEC = YesPlease
- 	NO_MKSTEMPS = 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
-@@ -1395,7 +1395,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
- PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
- TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
- 
--LIBS = $(GITLIBS) $(EXTLIBS)
-+LIBS += $(GITLIBS) $(EXTLIBS)
- 
- BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
- 	$(COMPAT_CFLAGS)
-@@ -1788,10 +1788,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
- export gitexec_instdir
- 
- install: all
--	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
--	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
--	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
--	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
-+	$(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)'
-+	$(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-+	$(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-+	$(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)'
- 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
- ifndef NO_PERL
- 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
diff --git a/devel/scmgit-base/patches/patch-ab b/devel/scmgit-base/patches/patch-ab
deleted file mode 100644
index 03293a7828a..00000000000
--- a/devel/scmgit-base/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2010/03/31 00:44:40 gdt Exp $
-
-Patch from http://article.gmane.org/gmane.comp.version-control.git/143453
-
---- compat/bswap.h.orig	2009-12-24 00:00:22.000000000 +0000
-+++ compat/bswap.h
-@@ -17,6 +17,8 @@ static inline uint32_t default_swab32(ui
- 		((val & 0x000000ff) << 24));
- }
- 
-+#undef bswap32
-+
- #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
- 
- #define bswap32(x) ({ \