df0b3f3b4f
* The message file for German translation has been updated a bit.
* Running "git checkout" on an unborn branch used to corrupt HEAD.
* When checking out another commit from an already detached state, we
used to report all commits that are not reachable from any of the
refs as lossage, but some of them might be reachable from the new
HEAD, and there is no need to warn about them.
* Some time ago, "git clone" lost the progress output for its
"checkout" phase; when run without any "--quiet" option, it should
give progress to the lengthy operation.
* The directory path used in "git diff --no-index", when it recurses
down, was broken with a recent update after v1.7.10.1 release.
* "log -z --pretty=tformat:..." did not terminate each record with
NUL. The fix is not entirely correct when the output also asks for
--patch and/or --stat, though.
* The DWIM behaviour for "log --pretty=format:%gd -g" was somewhat
broken and gave undue precedence to configured log.date, causing
"git stash list" to show "stash@{time stamp string}".
* "git status --porcelain" ignored "--branch" option by mistake. The
output for "git status --branch -z" was also incorrect and did not
terminate the record for the current branch name with NUL as asked.
* When a submodule repository uses alternate object store mechanism,
some commands that were started from the superproject did not
notice it and failed with "No such object" errors. The subcommands
of "git submodule" command that recursed into the submodule in a
separate process were OK; only the ones that cheated and peeked
directly into the submodule's repository from the primary process
were affected.
104 lines
3.2 KiB
Makefile
104 lines
3.2 KiB
Makefile
# $NetBSD: Makefile,v 1.47 2012/05/28 13:33:20 adam Exp $
|
|
|
|
.include "../../devel/scmgit/Makefile.common"
|
|
|
|
PKGNAME= scmgit-base-${GIT_VERSION}
|
|
COMMENT= GIT Tree History Storage Tool (base package)
|
|
|
|
PKG_DESTDIR_SUPPORT= user-destdir
|
|
|
|
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-Authen-SASL>=1.0:../../security/p5-Authen-SASL
|
|
|
|
USE_LANGUAGES= c99
|
|
USE_TOOLS+= perl:run sh:run msgfmt
|
|
|
|
PERL5_CONFIGURE= no
|
|
PERL5_PACKLIST= auto/Git/.packlist
|
|
REPLACE_PERL+= *.perl */*.perl */*/*.perl
|
|
REPLACE_PERL+= contrib/hooks/update-paranoid
|
|
|
|
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
|
|
|
|
CONFIGURE_ARGS+= --with-curl=${BUILDLINK_PREFIX.curl}
|
|
CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
|
|
CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
|
|
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
|
|
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
|
|
|
|
BUILD_TARGET= all
|
|
|
|
REPLACE_SH+= contrib/hooks/post-receive-email
|
|
REPLACE_SH+= contrib/hooks/pre-auto-gc-battery
|
|
|
|
EGDIR= ${PREFIX}/share/examples/scmgit
|
|
|
|
GIT_COREDIR= git-core
|
|
GIT_TEMPLATEDIR= templates
|
|
|
|
GIT_TEMPLATES= description info/exclude
|
|
GIT_TEMPLATES+= hooks/applypatch-msg.sample hooks/commit-msg.sample
|
|
GIT_TEMPLATES+= hooks/post-update.sample hooks/pre-applypatch.sample
|
|
GIT_TEMPLATES+= hooks/pre-commit.sample hooks/pre-rebase.sample
|
|
GIT_TEMPLATES+= hooks/prepare-commit-msg.sample hooks/update.sample
|
|
|
|
# XXX unused as of now
|
|
#GIT_CORE_EXECDIR= libexec/${GIT_COREDIR}
|
|
GIT_CORE_DATADIR= share/${GIT_COREDIR}
|
|
GIT_CORE_TEMPLATEDIR= ${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR}
|
|
|
|
MAKE_DIRS= ${GIT_CORE_TEMPLATEDIR}
|
|
MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/hooks
|
|
MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/info
|
|
|
|
REQD_FILES+= ${GIT_TEMPLATES:@.t.@\
|
|
${EGDIR}/${GIT_TEMPLATEDIR}/${.t.}\
|
|
${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
|
|
@:M*}
|
|
|
|
CONFIGURE_ENV+= HOME=${PREFIX}
|
|
CONFIGURE_ENV+= gitexecdir=${GITCOREDIR}
|
|
|
|
MAKE_FLAGS+= INSTALL=${INSTALL:Q}
|
|
|
|
GIT_TEMPLATE_INSTDIR= ${EGDIR}/${GIT_TEMPLATEDIR}
|
|
MAKE_ENV+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
|
|
MESSAGE_SUBST+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
|
|
|
|
SUBST_CLASSES+= fix-paths
|
|
SUBST_FILES.fix-paths= templates/hooks--post-receive.sample
|
|
SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames
|
|
SUBST_STAGE.fix-paths= pre-build
|
|
SUBST_VARS.fix-paths= PREFIX
|
|
|
|
.include "../../mk/bsd.prefs.mk"
|
|
|
|
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare"
|
|
SUBST_CLASSES+= fix-cd-P
|
|
SUBST_FILES.fix-cd-P= git-sh-setup.sh
|
|
SUBST_FILES.fix-cd-P+= t/test-lib.sh
|
|
SUBST_MESSAGE.fix-cd-P= Fixing cd arguments.
|
|
SUBST_STAGE.fix-cd-P= pre-build
|
|
SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g"
|
|
.endif
|
|
|
|
LDFLAGS.SunOS+= -lintl -lnsl
|
|
|
|
post-install:
|
|
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
|
|
${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \
|
|
${DESTDIR}${EGDIR}
|
|
|
|
.include "options.mk"
|
|
|
|
.include "../../converters/libiconv/buildlink3.mk"
|
|
.include "../../devel/zlib/buildlink3.mk"
|
|
.include "../../lang/perl5/module.mk"
|
|
.include "../../security/openssl/buildlink3.mk"
|
|
.include "../../textproc/expat/buildlink3.mk"
|
|
.include "../../www/curl/buildlink3.mk"
|
|
.include "../../mk/bsd.pkg.mk"
|