--- a/git-1.8.4.4/config.mak.uname +++ a/git-1.8.4.4/config.mak.uname @@ -174,7 +174,9 @@ ifeq ($(uname_O),Cygwin) SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield endif ifeq ($(uname_S),FreeBSD) - NEEDS_LIBICONV = YesPlease + ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2) + NEEDS_LIBICONV = YesPlease + endif OLD_ICONV = YesPlease NO_MEMMEM = YesPlease BASIC_CFLAGS += -I/usr/local/include