kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-base: fixed PERLLIBDIR; removed unused SUBST

Browse source
This commit is contained in:
adam 2018-04-14 06:18:24 +00:00
parent f813d154b5
commit 66cf6714f8
4 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
devel/git-base/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.53 2018/04/14 05:42:36 wiz Exp $
# $NetBSD: Makefile,v 1.54 2018/04/14 06:18:24 adam Exp $
.include "../../devel/git/Makefile.common"
@ -65,21 +65,12 @@ CONFIGURE_ENV+= HOME=${PREFIX}
CONFIGURE_ENV+= gitexecdir=${GITCOREDIR}
MAKE_FLAGS+= INSTALL=${INSTALL:Q}
.include "../../lang/perl5/buildlink3.mk"
PERLLIBDIR_cmd= ${PERL5} -MConfig -wle 'print substr $$Config{installvendorlib}, 1 + length $$Config{vendorprefixexp}'
MAKE_ENV+= PERLLIBDIR=${PERLLIBDIR_cmd:sh}
MAKE_ENV+= PERLLIBDIR=${PERL5_INSTALLVENDORLIB}
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"
@ -116,6 +107,8 @@ post-install:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
.include "../../lang/perl5/vars.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

21
devel/git-base/PLIST
View file

@ -1,10 +1,29 @@
@comment $NetBSD: PLIST,v 1.19 2018/04/11 19:39:34 adam Exp $
@comment $NetBSD: PLIST,v 1.20 2018/04/14 06:18:24 adam Exp $
bin/git
bin/git-cvsserver
bin/git-receive-pack
bin/git-shell
bin/git-upload-archive
bin/git-upload-pack
${PERL5_SUB_INSTALLVENDORLIB}/FromCPAN/Error.pm
${PERL5_SUB_INSTALLVENDORLIB}/FromCPAN/Mail/Address.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/I18N.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/IndexInfo.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/LoadCPAN.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/LoadCPAN/Error.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/LoadCPAN/Mail/Address.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/Packet.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Editor.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Fetcher.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/GlobSpec.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Log.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Memoize/YAML.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Migration.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Prompt.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Ra.pm
${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Utils.pm
libexec/git-core/git
libexec/git-core/git-add
libexec/git-core/git-add--interactive

4
devel/git-base/distinfo
View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.79 2018/04/11 19:39:34 adam Exp $
$NetBSD: distinfo,v 1.80 2018/04/14 06:18:24 adam Exp $
SHA1 (git-2.17.0.tar.xz) = f0d4139af75bfdbe306387358b2e40eb541ccc06
RMD160 (git-2.17.0.tar.xz) = d419c1d8cb9aaf976853ae088e8b1a72cb5ddd38
SHA512 (git-2.17.0.tar.xz) = dab1c1d5d384b36720abc049a66ba60631e17958b214cfbec467be7adc02e82190e5282554da71797892c16bfe52d65b6244a281f504385083125bcb98ec7ee9
Size (git-2.17.0.tar.xz) = 5011556 bytes
SHA1 (patch-Makefile) = 13b3e19ae7eec5612137a1e299f3efd3d3555874
SHA1 (patch-Makefile) = c053b0ba6a84a2bb745a7ea60ed519c84cc3fb22
SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0

4
devel/git-base/patches/patch-Makefile
View file

@ -1,4 +1,4 @@
$NetBSD: patch-Makefile,v 1.1 2018/04/11 19:39:35 adam Exp $
$NetBSD: patch-Makefile,v 1.2 2018/04/14 06:18:24 adam Exp $
Do not override compiler/linker flags.
Provide proper path for Perl module.
@ -21,7 +21,7 @@ Fix tar operations.
sharedir = $(prefix)/share
gitwebdir = $(sharedir)/gitweb
-perllibdir = $(sharedir)/perl5
+perllibdir = $(prefix)${PERLLIBDIR}
+perllibdir = ${PERLLIBDIR}
localedir = $(sharedir)/locale
template_dir = share/git-core/templates
htmldir = $(prefix)/share/doc/git-doc