pkg/42965: devel/scmgit-base fails to build on Linux

[jan.smydke%jh-inst.cas.cz@localhost]

>Number:         42965
>Category:       pkg
>Synopsis:       devel/scmgit-base fails to build on Linux
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Mar 13 00:10:00 +0000 2010
>Originator:     Jan Šmydke
>Release:        Linux
>Organization:
>Environment:
x86_64 GNU/Linux
>Description:
Build fails on amd64 Debian Linux pkgsrc-2009Q4

(But the same pkgsrc-2009Q4 on NetBSD i386 works fine)

...

GIT_VERSION = 1.6.6
    * new build flags or prefix
    GEN git-am
    GEN git-bisect
    GEN git-difftool--helper
    GEN git-filter-branch
    GEN git-lost-found
    GEN git-merge-octopus
    GEN git-merge-one-file
    GEN git-merge-resolve
    GEN git-mergetool
    GEN git-mergetool--lib
    GEN git-notes
    GEN git-parse-remote
    GEN git-pull
    GEN git-quiltimport
    GEN git-rebase--interactive
    GEN git-rebase
    GEN git-repack
    GEN git-request-pull
    GEN git-sh-setup
    GEN git-stash
    GEN git-submodule
    GEN git-web--browse
    SUBDIR perl
/home/jan_s/local/pkg/bin/perl Makefile.PL PREFIX='/home/jan_s/local/pkg'
    GEN gitweb/gitweb.cgi
    GEN common-cmds.h
    CC builtin-add.o
Writing perl.mak for Git
    CC builtin-annotate.o
In file included from builtin-add.c:12:
parse-options.h:97: error: redefinition of 'struct option'
make: *** [builtin-add.o] Error 1

>How-To-Repeat:
cd devel/scmgit-base && bmake
>Fix: