5861e7d545
* The xfuncname pattern used by "git diff" and "git grep" to show the last notable line in context were broken for python and ruby for a long time. * "git merge" into an unborn branch removed an untracked file "foo" from the working tree when merged branch had "foo" (this fix was already in 1.7.3.3 but was omitted from the release notes by mistake). * "git status -s" did not quote unprintable characters in paths as documented. * "git am --abort" used to always reset to the commit at the beginning of the last "am" invocation that has stopped, losing any unrelated commits that may have been made since then. Now it refrains from doing so and instead issues a warning. * "git blame" incorrectly reused bogusly cached result of textconv filter for files from the working tree. * "git commit" used to abort after the user edited the log message when the committer information was not correctly set up. It now aborts before starting the editor. * "git commit --date=invalid" used to silently ignore the incorrectly specified date; it is now diagnosed as an error. * "git rebase --skip" to skip the last commit in a series used to fail to run post-rewrite hook and to copy notes from old commits that have successfully been rebased so far. Now it do (backmerge ef88ad2). * "gitweb" tried to show a wrong feed logo when none was specified.
97 lines
3 KiB
Makefile
97 lines
3 KiB
Makefile
# $NetBSD: Makefile,v 1.28 2011/01/28 08:11:30 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
|
|
|
|
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-commit.sample hooks/post-receive.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
|
|
|
|
#.include "../../editors/emacs/modules.mk" # XXX TODO (see patch-ad)
|
|
|
|
.include "options.mk"
|
|
.include "../../converters/libiconv/buildlink3.mk"
|
|
.include "../../devel/zlib/buildlink3.mk"
|
|
.include "../../security/openssl/buildlink3.mk"
|
|
.include "../../lang/perl5/module.mk"
|
|
.include "../../textproc/expat/buildlink3.mk"
|
|
.include "../../www/curl/buildlink3.mk"
|
|
|
|
.include "../../mk/bsd.pkg.mk"
|