scmgit-base patch

[diger <admin%freenet59.ru@localhost>]

This patch adds an option "git-send-email" & fix build scmgit-base on
Haiku


---
sorry, dup
-- 
Jabber ID: admin%freenet59.ru@localhost
-- 

diff --git a/Makefile b/Makefile
index c5e02fd..aa8d4f3 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,6 @@ COMMENT=       GIT Tree History Storage Tool (base package)
 CONFLICTS+=            git<4.9.5nb1            # misc/git
 
 DEPENDS+=              p5-Error>=0.17015:../../devel/p5-Error
-# for git-send-email
-DEPENDS+=              p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64
-DEPENDS+=              p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
-DEPENDS+=              p5-MailTools>=2.11:../../mail/p5-MailTools
-DEPENDS+=              p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
-DEPENDS+=              p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
 
 USE_LANGUAGES=         c99
 USE_TOOLS+=            perl:run sh:run msgfmt
@@ -26,6 +20,11 @@ REPLACE_PERL+=               contrib/hooks/update-paranoid
 
 CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 
+.if ${OPSYS}=="Haiku"
+CONFIGURE_ENV+=     ac_cv_lib_c_socket=yes ac_cv_lib_c_basename=yes 
+.endif
+
+
 CONFIGURE_ARGS+=       --with-curl=${BUILDLINK_PREFIX.curl}
 CONFIGURE_ARGS+=       --with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
@@ -91,6 +90,7 @@ SUBST_SED.fix-cd-P=   -e "s/cd -P/cd/g"
 .endif
 
 LDFLAGS.SunOS+=                -lintl -lnsl
+LDFLAGS.Haiku+=     -lbsd -lroot -lnetwork
 
 post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
diff --git a/options.mk b/options.mk
index 8f1b02c..6c05eda 100644
--- a/options.mk
+++ b/options.mk
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.5 2011/04/19 17:08:18 drochner Exp $
 #
 PKG_OPTIONS_VAR=       PKG_OPTIONS.scmgit
-PKG_SUPPORTED_OPTIONS= python
-PKG_SUGGESTED_OPTIONS= python
+PKG_SUPPORTED_OPTIONS= python git-send-email
+PKG_SUGGESTED_OPTIONS= python git-send-email
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,3 +20,11 @@ CHECK_INTERPRETER_SKIP+= 
${PYSITELIB}/git_remote_helpers/git/*.py
 .else
 CONFIGURE_ARGS+=       --without-python
 .endif
+
+.if !empty(PKG_OPTIONS:Mgit-send-email)
+DEPENDS+=              p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64
+DEPENDS+=              p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
+DEPENDS+=              p5-MailTools>=2.11:../../mail/p5-MailTools
+DEPENDS+=              p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
+DEPENDS+=              p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
+.endif
diff --git a/patches/patch-aa b/patches/patch-aa
index 8c98566..e12e08d 100644
--- a/patches/patch-aa
+++ b/patches/patch-aa
@@ -46,7 +46,24 @@ $NetBSD$
        BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -2038,8 +2031,8 @@ ifdef DEFAULT_HELP_FORMAT
+@@ -1211,6 +1204,16 @@ ifeq ($(uname_S),HP-UX)
+       endif
+       GIT_TEST_CMP = cmp
+ endif
++ifeq ($(uname_S),Haiku)
++    NO_R_TO_GCC_LINKER = YesPlease
++    NO_LIBGEN_H = YesPlease
++    NO_MEMMEM = YesPlease
++    NO_MKSTEMPS = YesPlease
++    NEEDS_LIBICONV = YesPlease
++    DEFAULT_EDITOR = nano
++    PTHREAD_LIBS =    -lroot
++    NO_CROSS_DIRECTORY_HARDLINKS = YesPlease
++endif
+ ifeq ($(uname_S),Windows)
+       GIT_VERSION := $(GIT_VERSION).MSVC
+       pathsep = ;
+@@ -1942,8 +1945,8 @@ ifdef DEFAULT_HELP_FORMAT
  BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
  endif