NetBSD 3.0 needs -liconv.

scmgit/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/19 08:46:09 poppnk Exp $
+# $NetBSD: Makefile,v 1.9 2006/07/06 18:32:40 rillig Exp $
 #
 
 DISTNAME=		git-1.4.0
@@ -21,10 +21,12 @@ EXTRACT_USING=  gtar
 MAKE_ENV+=	PERL_PATH=${PERL5:Q}
 MAKE_ENV+=	PYTHON_PATH=${PYTHONBIN:Q}
 #MAKE_ENV+=	SHELL_PATH=${SH:Q}
+LDFLAGS+=	${BUILDLINK_LDADD.iconv}
 
-.include "../../textproc/expat/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

scmgit/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/06/19 08:46:09 poppnk Exp $
+$NetBSD: distinfo,v 1.7 2006/07/06 18:32:40 rillig Exp $
 
 SHA1 (git-1.4.0.tar.gz) = ddd3a3f4cb843f6f8b2d5cb5a6ce7b1a6f6d0970
 RMD160 (git-1.4.0.tar.gz) = 1b0fca9fe44030f2f7fb63a1c3a8d696e50d4cc8
 Size (git-1.4.0.tar.gz) = 850544 bytes
+SHA1 (patch-aa) = fb4753cb046c99c4985a2de50bc1feb562eee743

scmgit/patches/patch-aa

@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2006/07/06 18:32:41 rillig Exp $
+
+NetBSD 3.0 needs -liconv, too.
+
+--- Makefile.orig	2006-06-10 21:41:54.000000000 +0200
++++ Makefile	2006-07-06 20:28:19.000000000 +0200
+@@ -297,9 +297,7 @@ ifeq ($(uname_S),OpenBSD)
+ 	ALL_LDFLAGS += -L/usr/local/lib
+ endif
+ ifeq ($(uname_S),NetBSD)
+-	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
+-		NEEDS_LIBICONV = YesPlease
+-	endif
++	NEEDS_LIBICONV = YesPlease
+ 	ALL_CFLAGS += -I/usr/pkg/include
+ 	ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
+ endif