diff options
| author | wiz <wiz@pkgsrc.org> | 2013-09-09 14:07:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-09-09 14:07:58 +0000 |
| commit | b83d6fbfce1ad89096492aae2eef589886e93648 (patch) | |
| tree | a01cd1410064a2c35042e517571bf5a1b90b58d4 | |
| parent | 7ce6f93e47c974929b5039c1eae54b21c15e50e9 (diff) | |
| download | pkgsrc-b83d6fbfce1ad89096492aae2eef589886e93648.tar.gz | |
Finish git rename from scmgit to git.
43 files changed, 56 insertions, 1089 deletions
diff --git a/databases/pgbuildfarm/Makefile b/databases/pgbuildfarm/Makefile index 485dc738e24..c980ebd72d1 100644 --- a/databases/pgbuildfarm/Makefile +++ b/databases/pgbuildfarm/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2013/08/21 11:25:04 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2013/09/09 14:07:58 wiz Exp $ DISTNAME= build-farm-4_11 PKGNAME= ${DISTNAME:S/build-farm/pgbuildfarm/:S/_/./} +PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.pgbuildfarm.org/downloads/releases/ EXTRACT_SUFX= .tgz @@ -11,7 +12,7 @@ HOMEPAGE= http://www.pgbuildfarm.org/ COMMENT= PostgreSQL Build Farm client LICENSE= postgresql-license -DEPENDS+= scmgit-base>=1.6:../../devel/scmgit-base +DEPENDS+= git-base>=1.6:../../devel/git-base DEPENDS+= p5-libwww>=5.0:../../www/p5-libwww WRKSRC= ${WRKDIR}/${DISTNAME:S/_/./} diff --git a/devel/Makefile b/devel/Makefile index 5488860edc9..19e3e03e4df 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1772 2013/09/05 08:51:47 wen Exp $ +# $NetBSD: Makefile,v 1.1773 2013/09/09 14:07:58 wiz Exp $ # COMMENT= Development utilities @@ -233,6 +233,10 @@ SUBDIR+= gettext-tools SUBDIR+= gflib SUBDIR+= giblib SUBDIR+= gindent +SUBDIR+= git +SUBDIR+= git-base +SUBDIR+= git-docs +SUBDIR+= git-gitk SUBDIR+= gitolite SUBDIR+= glade SUBDIR+= glade3 @@ -1602,10 +1606,6 @@ SUBDIR+= rx SUBDIR+= sablecc SUBDIR+= scintilla SUBDIR+= scmcvs -SUBDIR+= scmgit -SUBDIR+= scmgit-base -SUBDIR+= scmgit-docs -SUBDIR+= scmgit-gitk SUBDIR+= scons SUBDIR+= sdcc SUBDIR+= semantic diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile index fd74455c357..ad47abe0185 100644 --- a/devel/cogito/Makefile +++ b/devel/cogito/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2013/05/31 12:39:58 wiz Exp $ -# +# $NetBSD: Makefile,v 1.18 2013/09/09 14:07:58 wiz Exp $ DISTNAME= cogito-0.18.2 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= devel MASTER_SITES= http://www.kernel.org/pub/software/scm/cogito/ EXTRACT_SUFX= .tar.bz2 @@ -11,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://git.or.cz/cogito/ COMMENT= Version control system of the Linux kernel -DEPENDS+= scmgit-[0-9]*:../../devel/scmgit +DEPENDS+= git-[0-9]*:../../devel/git USE_TOOLS+= gmake bash:run perl:run USE_TOOLS+= fgrep:run grep:run mktemp:run xargs:run diff --git a/devel/easygit/Makefile b/devel/easygit/Makefile index fd8aee386b0..d9aa74fc80b 100644 --- a/devel/easygit/Makefile +++ b/devel/easygit/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2013/05/31 12:39:58 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2013/09/09 14:07:58 wiz Exp $ DISTNAME= easygit-1.6.5.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= http://people.gnome.org/~newren/eg/download/1.6.5.3/ DIST_SUBDIR= ${PKGNAME_NOREV} @@ -13,7 +13,7 @@ COMMENT= Git porcelain wrapper in Perl LICENSE= gnu-gpl-v2 -DEPENDS+= scmgit>=1.6.1:../../devel/scmgit +DEPENDS+= git>=1.6.1:../../devel/git WRKSRC= ${WRKDIR} NO_BUILD= yes USE_TOOLS+= perl diff --git a/devel/fromcvs/MESSAGE b/devel/fromcvs/MESSAGE index 781586303a5..6c3282daadf 100644 --- a/devel/fromcvs/MESSAGE +++ b/devel/fromcvs/MESSAGE @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2007/04/21 10:38:06 wiz Exp $ +$NetBSD: MESSAGE,v 1.2 2013/09/09 14:07:58 wiz Exp $ -You'll need git-1.5 or newer (from devel/scmgit) for togit, +You'll need git-1.5 or newer (from devel/git) for togit, or mercurial (from devel/mercurial) for tohg. =========================================================================== diff --git a/devel/fromcvs/Makefile b/devel/fromcvs/Makefile index 88f66676032..9a9ca149240 100644 --- a/devel/fromcvs/Makefile +++ b/devel/fromcvs/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2013/05/26 01:48:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2013/09/09 14:07:58 wiz Exp $ DISTNAME= fromcvs-fromcvs-184311d # Bump simply to 0.0.0.133, I am not sure... PKGNAME= fromcvs-0.0.0.133 +PKGREVISION= 1 CATEGORIES= devel scm MASTER_SITES= -http://gitorious.org/fromcvs/fromcvs/archive-tarball/184311d EXTRACT_SUFX= .tar.gz diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile index ac451eb5a9c..94bb6ddb2af 100644 --- a/devel/gitolite/Makefile +++ b/devel/gitolite/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2013/06/11 13:37:20 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.13 2013/09/09 14:07:58 wiz Exp $ GLVER= 3.5.1 DISTNAME= gitolite-${GLVER} +PKGREVISION= 1 CATEGORIES= devel net MASTER_SITES= -https://github.com/sitaramc/gitolite/archive/v${GLVER}.tar.gz @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/sitaramc/gitolite/wiki COMMENT= Gitolite allows you to host Git repositories easily and securely LICENSE= gnu-gpl-v2 -DEPENDS+= scmgit-base>=1.6.6:../../devel/scmgit-base +DEPENDS+= git-base>=1.6.6:../../devel/git-base USE_LANGUAGES= # none USE_TOOLS+= pax perl:run diff --git a/devel/p5-Git-Repository/Makefile b/devel/p5-Git-Repository/Makefile index 024de6b50bb..baf3a8a6f3b 100644 --- a/devel/p5-Git-Repository/Makefile +++ b/devel/p5-Git-Repository/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2013/07/02 14:51:34 wen Exp $ +# $NetBSD: Makefile,v 1.10 2013/09/09 14:07:58 wiz Exp $ DISTNAME= Git-Repository-1.306 PKGNAME= p5-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Git/} @@ -10,7 +11,7 @@ HOMEPAGE= http://search.cpan.org/dist/Git-Repository/ COMMENT= Perl interface to Git repositories LICENSE= ${PERL5_LICENSE} -DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base +DEPENDS+= git-base-[0-9]*:../../devel/git-base DEPENDS+= p5-System-Command>=1.100:../../devel/p5-System-Command USE_LANGUAGES= # empty diff --git a/devel/p5-Git-Wrapper/Makefile b/devel/p5-Git-Wrapper/Makefile index 76aba8b8353..8f4651119de 100644 --- a/devel/p5-Git-Wrapper/Makefile +++ b/devel/p5-Git-Wrapper/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2013/05/31 12:40:22 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2013/09/09 14:07:59 wiz Exp $ DISTNAME= Git-Wrapper-0.028 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Git/} @@ -21,7 +21,7 @@ DEPENDS+= p5-File-Temp-[0-9]*:../../devel/p5-File-Temp DEPENDS+= p5-File-pushd-[0-9]*:../../devel/p5-File-pushd DEPENDS+= p5-IPC-Cmd-[0-9]*:../../devel/p5-IPC-Cmd DEPENDS+= p5-Sort-Versions-[0-9]*:../../devel/p5-Sort-Versions -DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base +DEPENDS+= git-base-[0-9]*:../../devel/git-base USE_LANGUAGES= # empty PERL5_PACKLIST= auto/Git/Wrapper/.packlist diff --git a/devel/scmgit-base/DESCR b/devel/scmgit-base/DESCR deleted file mode 100644 index 48778b139ee..00000000000 --- a/devel/scmgit-base/DESCR +++ /dev/null @@ -1,11 +0,0 @@ -Git is a free and open source distributed version control system -designed to handle everything from small to very large projects with -speed and efficiency. - -Git is easy to learn and has a tiny footprint with lightning fast -performance. It outclasses SCM tools like Subversion, CVS, Perforce, -and ClearCase with features like cheap local branching, convenient -staging areas, and multiple workflows. - -This package contains only the git program (and subcommands). It does -not contain man pages or the tk-based repository browser. diff --git a/devel/scmgit-base/MESSAGE b/devel/scmgit-base/MESSAGE deleted file mode 100644 index 90c8b3d9dec..00000000000 --- a/devel/scmgit-base/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2012/04/08 05:31:07 dholland Exp $ - -NOTE: Pristine templates are located in: - ${GIT_TEMPLATE_INSTDIR}. - -To use the git-svn interface to Subversion you must also install the -p5-subversion package in devel/p5-subversion. -=========================================================================== diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile deleted file mode 100644 index 6161c212589..00000000000 --- a/devel/scmgit-base/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# $NetBSD: Makefile,v 1.67 2013/08/26 16:32:30 adam Exp $ - -.include "../../devel/scmgit/Makefile.common" - -PKGNAME= scmgit-base-${GIT_VERSION} -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 - -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-perl=${PERL5:Q} -CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} -CONFIGURE_ARGS+= --without-tcltk - -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} - ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \ - ${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" diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST deleted file mode 100644 index 7400ba7045b..00000000000 --- a/devel/scmgit-base/PLIST +++ /dev/null @@ -1,251 +0,0 @@ -@comment $NetBSD: PLIST,v 1.43 2013/08/26 16:32:30 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}/Git.pm -${PERL5_SUB_INSTALLVENDORLIB}/Git/I18N.pm -${PERL5_SUB_INSTALLVENDORLIB}/Git/IndexInfo.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 -${PERL5_SUB_INSTALLVENDORARCH}/auto/Git/.packlist -${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git.3 -${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::I18N.3 -${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Editor.3 -${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Fetcher.3 -${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Memoize::YAML.3 -${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Prompt.3 -${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Ra.3 -${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Utils.3 -${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py -${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.pyc -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.py -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.pyc -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.py -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.pyc -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/importer.py -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/importer.pyc -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/non_local.py -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/non_local.pyc -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/repo.py -${PLIST.python}${PYSITELIB}/git_remote_helpers/git/repo.pyc -${PLIST.python}${PYSITELIB}/git_remote_helpers/util.py -${PLIST.python}${PYSITELIB}/git_remote_helpers/util.pyc -libexec/git-core/git -libexec/git-core/git-add -libexec/git-core/git-add--interactive -libexec/git-core/git-am -libexec/git-core/git-annotate -libexec/git-core/git-apply -libexec/git-core/git-archimport -libexec/git-core/git-archive -libexec/git-core/git-bisect -libexec/git-core/git-bisect--helper -libexec/git-core/git-blame -libexec/git-core/git-branch -libexec/git-core/git-bundle -libexec/git-core/git-cat-file -libexec/git-core/git-check-attr -libexec/git-core/git-check-ignore -libexec/git-core/git-check-mailmap -libexec/git-core/git-check-ref-format -libexec/git-core/git-checkout -libexec/git-core/git-checkout-index -libexec/git-core/git-cherry -libexec/git-core/git-cherry-pick -libexec/git-core/git-clean -libexec/git-core/git-clone -libexec/git-core/git-column -libexec/git-core/git-commit -libexec/git-core/git-commit-tree -libexec/git-core/git-config -libexec/git-core/git-count-objects -libexec/git-core/git-credential -libexec/git-core/git-credential-cache -libexec/git-core/git-credential-cache--daemon -libexec/git-core/git-credential-store -libexec/git-core/git-cvsexportcommit -libexec/git-core/git-cvsimport -libexec/git-core/git-cvsserver -libexec/git-core/git-daemon -libexec/git-core/git-describe -libexec/git-core/git-diff -libexec/git-core/git-diff-files -libexec/git-core/git-diff-index -libexec/git-core/git-diff-tree -libexec/git-core/git-difftool -libexec/git-core/git-difftool--helper -libexec/git-core/git-fast-export -libexec/git-core/git-fast-import -libexec/git-core/git-fetch -libexec/git-core/git-fetch-pack -libexec/git-core/git-filter-branch -libexec/git-core/git-fmt-merge-msg -libexec/git-core/git-for-each-ref -libexec/git-core/git-format-patch -libexec/git-core/git-fsck -libexec/git-core/git-fsck-objects -libexec/git-core/git-gc -libexec/git-core/git-get-tar-commit-id -libexec/git-core/git-grep -libexec/git-core/git-hash-object -libexec/git-core/git-help -libexec/git-core/git-http-backend -libexec/git-core/git-http-fetch -libexec/git-core/git-http-push -libexec/git-core/git-imap-send -libexec/git-core/git-index-pack -libexec/git-core/git-init -libexec/git-core/git-init-db -libexec/git-core/git-instaweb -libexec/git-core/git-log -libexec/git-core/git-lost-found -libexec/git-core/git-ls-files -libexec/git-core/git-ls-remote -libexec/git-core/git-ls-tree -libexec/git-core/git-mailinfo -libexec/git-core/git-mailsplit -libexec/git-core/git-merge -libexec/git-core/git-merge-base -libexec/git-core/git-merge-file -libexec/git-core/git-merge-index -libexec/git-core/git-merge-octopus -libexec/git-core/git-merge-one-file -libexec/git-core/git-merge-ours -libexec/git-core/git-merge-recursive -libexec/git-core/git-merge-resolve -libexec/git-core/git-merge-subtree -libexec/git-core/git-merge-tree -libexec/git-core/git-mergetool -libexec/git-core/git-mergetool--lib -libexec/git-core/git-mktag -libexec/git-core/git-mktree -libexec/git-core/git-mv -libexec/git-core/git-name-rev -libexec/git-core/git-notes -libexec/git-core/git-p4 -libexec/git-core/git-pack-objects -libexec/git-core/git-pack-redundant -libexec/git-core/git-pack-refs -libexec/git-core/git-parse-remote -libexec/git-core/git-patch-id -libexec/git-core/git-peek-remote -libexec/git-core/git-prune -libexec/git-core/git-prune-packed -libexec/git-core/git-pull -libexec/git-core/git-push -libexec/git-core/git-quiltimport -libexec/git-core/git-read-tree -libexec/git-core/git-rebase -libexec/git-core/git-rebase--am -libexec/git-core/git-rebase--interactive -libexec/git-core/git-rebase--merge -libexec/git-core/git-receive-pack -libexec/git-core/git-reflog -libexec/git-core/git-relink -libexec/git-core/git-remote -libexec/git-core/git-remote-ext -libexec/git-core/git-remote-fd -libexec/git-core/git-remote-ftp -libexec/git-core/git-remote-ftps -libexec/git-core/git-remote-http -libexec/git-core/git-remote-https -libexec/git-core/git-remote-testsvn -libexec/git-core/git-repack -libexec/git-core/git-replace -libexec/git-core/git-repo-config -libexec/git-core/git-request-pull -libexec/git-core/git-rerere -libexec/git-core/git-reset -libexec/git-core/git-rev-list -libexec/git-core/git-rev-parse -libexec/git-core/git-revert -libexec/git-core/git-rm -libexec/git-core/git-send-email -libexec/git-core/git-send-pack -libexec/git-core/git-sh-i18n -libexec/git-core/git-sh-i18n--envsubst -libexec/git-core/git-sh-setup -libexec/git-core/git-shell -libexec/git-core/git-shortlog -libexec/git-core/git-show -libexec/git-core/git-show-branch -libexec/git-core/git-show-index -libexec/git-core/git-show-ref -libexec/git-core/git-stage -libexec/git-core/git-stash -libexec/git-core/git-status -libexec/git-core/git-stripspace -libexec/git-core/git-submodule -libexec/git-core/git-svn -libexec/git-core/git-symbolic-ref -libexec/git-core/git-tag -libexec/git-core/git-tar-tree -libexec/git-core/git-unpack-file -libexec/git-core/git-unpack-objects -libexec/git-core/git-update-index -libexec/git-core/git-update-ref -libexec/git-core/git-update-server-info -libexec/git-core/git-upload-archive -libexec/git-core/git-upload-pack -libexec/git-core/git-var -libexec/git-core/git-verify-pack -libexec/git-core/git-verify-tag -libexec/git-core/git-web--browse -libexec/git-core/git-whatchanged -libexec/git-core/git-write-tree -libexec/git-core/mergetools/araxis -libexec/git-core/mergetools/bc3 -libexec/git-core/mergetools/codecompare -libexec/git-core/mergetools/deltawalker -libexec/git-core/mergetools/diffuse -libexec/git-core/mergetools/ecmerge -libexec/git-core/mergetools/emerge -libexec/git-core/mergetools/gvimdiff -libexec/git-core/mergetools/gvimdiff2 -libexec/git-core/mergetools/kdiff3 -libexec/git-core/mergetools/kompare -libexec/git-core/mergetools/meld -libexec/git-core/mergetools/opendiff -libexec/git-core/mergetools/p4merge -libexec/git-core/mergetools/tkdiff -libexec/git-core/mergetools/tortoisemerge -libexec/git-core/mergetools/vimdiff -libexec/git-core/mergetools/vimdiff2 -libexec/git-core/mergetools/xxdiff -share/examples/scmgit/git-completion.bash -share/examples/scmgit/git-prompt.sh -share/examples/scmgit/templates/description -share/examples/scmgit/templates/hooks/applypatch-msg.sample -share/examples/scmgit/templates/hooks/commit-msg.sample -share/examples/scmgit/templates/hooks/post-update.sample -share/examples/scmgit/templates/hooks/pre-applypatch.sample -share/examples/scmgit/templates/hooks/pre-commit.sample -share/examples/scmgit/templates/hooks/pre-push.sample -share/examples/scmgit/templates/hooks/pre-rebase.sample -share/examples/scmgit/templates/hooks/prepare-commit-msg.sample -share/examples/scmgit/templates/hooks/update.sample -share/examples/scmgit/templates/info/exclude -share/locale/da/LC_MESSAGES/git.mo -share/locale/de/LC_MESSAGES/git.mo -share/locale/fr/LC_MESSAGES/git.mo -share/locale/is/LC_MESSAGES/git.mo -share/locale/it/LC_MESSAGES/git.mo -share/locale/nl/LC_MESSAGES/git.mo -share/locale/pt_PT/LC_MESSAGES/git.mo -share/locale/sv/LC_MESSAGES/git.mo -share/locale/vi/LC_MESSAGES/git.mo -share/locale/zh_CN/LC_MESSAGES/git.mo -@pkgdir share/examples/scmgit/templates/branches diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo deleted file mode 100644 index 42ac75fd689..00000000000 --- a/devel/scmgit-base/distinfo +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: distinfo,v 1.76 2013/08/26 16:32:30 adam Exp $ - -SHA1 (git-1.8.4.tar.gz) = 2a361a2d185b8bc604f7f2ce2f502d0dea9d3279 -RMD160 (git-1.8.4.tar.gz) = 546720ff4234e0aec4867a81c7fba3130ccae397 -Size (git-1.8.4.tar.gz) = 4657759 bytes -SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4 -SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 -SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca -SHA1 (patch-af) = d4741caeaed3ef6cfabf415f9fdbc95968307131 -SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 -SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 -SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e -SHA1 (patch-config.mak.uname) = e7fa7a91d4d9dd6793d752b1833f97fcaea236b1 -SHA1 (patch-wrapper.c) = d8252c63cca9a134fca3f8f6f28663f563c7b4bc diff --git a/devel/scmgit-base/options.mk b/devel/scmgit-base/options.mk deleted file mode 100644 index a3758c0af24..00000000000 --- a/devel/scmgit-base/options.mk +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: options.mk,v 1.7 2013/06/10 11:35:13 gdt Exp $ -# -PKG_OPTIONS_VAR= PKG_OPTIONS.scmgit -PKG_SUPPORTED_OPTIONS= python -# python is not suggested because upstream's INSTALL does not list python -# as a dependency and because all it does is install a python module, -# which does not seem worth the dependency for everyone else. -PKG_SUGGESTED_OPTIONS= - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= python - -.if !empty(PKG_OPTIONS:Mpython) -PY_PATCHPLIST= yes -MAKE_FLAGS+= PYTHON_PATH=${PYTHONBIN} -PLIST.python= yes -# not executable -CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/*.py -CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/git/*.py -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.else -CONFIGURE_ARGS+= --without-python -.endif diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa deleted file mode 100644 index 83ffb58ea63..00000000000 --- a/devel/scmgit-base/patches/patch-aa +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-aa,v 1.20 2013/04/08 14:12:25 mef Exp $ - ---- Makefile.orig 2012-10-21 21:32:15.000000000 +0000 -+++ Makefile -@@ -343,8 +343,6 @@ endif - - CFLAGS = -g -O2 -Wall - LDFLAGS = --ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) --ALL_LDFLAGS = $(LDFLAGS) - STRIP ?= strip - - # Among the variables below, these: -@@ -379,13 +377,9 @@ pathsep = : - - export prefix bindir sharedir sysconfdir gitwebdir localedir - --CC = cc --AR = ar - RM = rm -f - DIFF = diff --TAR = tar - FIND = find --INSTALL = install - RPMBUILD = rpmbuild - TCL_PATH = tclsh - TCLTK_PATH = wish -@@ -2038,8 +2031,8 @@ ifdef DEFAULT_HELP_FORMAT - BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' - endif - --ALL_CFLAGS += $(BASIC_CFLAGS) --ALL_LDFLAGS += $(BASIC_LDFLAGS) -+ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) -+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS) - - export DIFF TAR INSTALL DESTDIR SHELL_PATH - -@@ -2732,7 +2725,6 @@ ifndef NO_GETTEXT - endif - ifndef NO_PERL - $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install -- $(MAKE) -C gitweb install - endif - ifndef NO_PYTHON - $(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install diff --git a/devel/scmgit-base/patches/patch-ac b/devel/scmgit-base/patches/patch-ac deleted file mode 100644 index 4ae46969c06..00000000000 --- a/devel/scmgit-base/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2008/08/20 03:04:20 bjs Exp $ - ---- gitk-git/Makefile.orig 2008-08-17 16:43:06.000000000 -0400 -+++ gitk-git/Makefile -@@ -40,9 +40,9 @@ endif - all:: gitk-wish $(ALL_MSGFILES) - - install:: all -- $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk -- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)' -- $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true -+ $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk -+ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)' -+ $(foreach p,$(ALL_MSGFILES), $(BSD_INSTALL_DATA) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true - - uninstall:: - $(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true diff --git a/devel/scmgit-base/patches/patch-ae b/devel/scmgit-base/patches/patch-ae deleted file mode 100644 index 079c6da220c..00000000000 --- a/devel/scmgit-base/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2012/07/09 14:30:50 adam Exp $ - -In pkgsrc, all Perl modules are installed into vendor_perl, not -site_perl. - ---- perl/Makefile.orig 2008-08-17 16:43:06.000000000 -0400 -+++ perl/Makefile -@@ -13,7 +13,7 @@ ifndef V - endif - - all install instlibdir: $(makfile) -- $(QUIET)$(MAKE) -f $(makfile) $@ -+ $(QUIET)$(MAKE) -f $(makfile) INSTALLDIRS=vendor $@ - - clean: - $(QUIET)test -f $(makfile) && $(MAKE) -f $(makfile) $@ || exit 0 diff --git a/devel/scmgit-base/patches/patch-af b/devel/scmgit-base/patches/patch-af deleted file mode 100644 index b598f13a206..00000000000 --- a/devel/scmgit-base/patches/patch-af +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-af,v 1.11 2013/08/26 16:32:30 adam Exp $ - -* Use BSR_INSTALL_*. -* FIXME: Add "--skip-validation" to xmlto command. - ---- Documentation/Makefile.orig 2013-08-23 19:38:43.000000000 +0000 -+++ Documentation/Makefile -@@ -92,7 +92,7 @@ man7dir = $(mandir)/man7 - ASCIIDOC = asciidoc - ASCIIDOC_EXTRA = - MANPAGE_XSL = manpage-normal.xsl --XMLTO = xmlto -+XMLTO = xmlto --skip-validation - XMLTO_EXTRA = - INSTALL ?= install - RM ?= rm -f -@@ -212,16 +212,16 @@ pdf: user-manual.pdf - install: install-man - - install-man: man -- $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) -- $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) -- $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir) -- $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir) -- $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir) -- $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir) -+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir) -+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir) -+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir) -+ $(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir) -+ $(BSD_INSTALL_MAN) $(DOC_MAN5) $(DESTDIR)$(man5dir) -+ $(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir) - - install-info: info -- $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) -- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir) -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir) -+ $(BSD_INSTALL_DATA) git.info gitman.info $(DESTDIR)$(infodir) - if test -r $(DESTDIR)$(infodir)/dir; then \ - $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\ - $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\ diff --git a/devel/scmgit-base/patches/patch-ag b/devel/scmgit-base/patches/patch-ag deleted file mode 100644 index 0124684a47d..00000000000 --- a/devel/scmgit-base/patches/patch-ag +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ag,v 1.8 2010/10/28 10:23:08 adam Exp $ - ---- templates/Makefile.orig 2010-10-22 03:49:16.000000000 +0000 -+++ templates/Makefile -@@ -8,7 +8,7 @@ INSTALL ?= install - TAR ?= tar - RM ?= rm -f - prefix ?= $(HOME) --template_instdir ?= $(prefix)/share/git-core/templates -+template_instdir = ${GIT_TEMPLATE_INSTDIR} - # DESTDIR= - - ifndef SHELL_PATH -@@ -39,7 +39,7 @@ boilerplates.made : $(bpsrc) - case "$$boilerplate" in *~) continue ;; esac && \ - dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \ - dir=`expr "$$dst" : '\(.*\)/'` && \ -- mkdir -p blt/$$dir && \ -+ $(BSD_INSTALL_DATA_DIR) blt/$$dir && \ - case "$$boilerplate" in \ - *--) continue;; \ - esac && \ -@@ -61,6 +61,6 @@ clean: - $(RM) -r blt boilerplates.made - - install: all -- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)' -+ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(template_instdir_SQ)' - (cd blt && $(TAR) cf - .) | \ - (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xof -) diff --git a/devel/scmgit-base/patches/patch-ah b/devel/scmgit-base/patches/patch-ah deleted file mode 100644 index 9e8c35e32fb..00000000000 --- a/devel/scmgit-base/patches/patch-ah +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2011/05/28 08:03:30 tnn Exp $ - ---- git-gui/Makefile.orig 2010-12-16 02:52:11.000000000 +0000 -+++ git-gui/Makefile -@@ -48,11 +48,11 @@ endif - RM_RF ?= rm -rf - RMDIR ?= rmdir - --INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here -+INSTALL_D0 = $(BSD_INSTALL_DATA_DIR) # space is required here - INSTALL_D1 = --INSTALL_R0 = $(INSTALL) -m 644 # space is required here -+INSTALL_R0 = $(BSD_INSTALL_DATA) # space is required here - INSTALL_R1 = --INSTALL_X0 = $(INSTALL) -m 755 # space is required here -+INSTALL_X0 = $(BSD_INSTALL_SCRIPT) # space is required here - INSTALL_X1 = - INSTALL_A0 = find # space is required here - INSTALL_A1 = | cpio -pud -@@ -76,11 +76,11 @@ ifndef V - QUIET_2DEVNULL = 2>/dev/null - - INSTALL_D0 = dir= -- INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" -+ INSTALL_D1 = && echo ' ' DEST $$dir && $(BSD_INSTALL_DATA_DIR) "$$dir" - INSTALL_R0 = src= -- INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src -+ INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(BSD_INSTALL_DATA) $$src - INSTALL_X0 = src= -- INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src -+ INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(BSD_INSTALL_SCRIPT) $$src - INSTALL_A0 = src= - INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud - -@@ -105,7 +105,7 @@ endif - - ifeq ($(uname_S),Darwin) - TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app -- ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n) -+ ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 8) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n) - TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app - ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n) - TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app diff --git a/devel/scmgit-base/patches/patch-ai b/devel/scmgit-base/patches/patch-ai deleted file mode 100644 index db9a8cc02a0..00000000000 --- a/devel/scmgit-base/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2008/08/20 03:04:20 bjs Exp $ - -Beginnings of emacs support, not enabled yet. We must use mk/emacs.mk. - ---- contrib/emacs/Makefile.orig 2008-08-17 16:43:06.000000000 -0400 -+++ contrib/emacs/Makefile -@@ -12,8 +12,8 @@ RM ?= rm -f - all: $(ELC) - - install: all -- $(INSTALL) -d $(DESTDIR)$(emacsdir) -- $(INSTALL_ELC) $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir) -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(emacsdir) -+ ${BSD_INSTALL_DATA} $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir) - - %.elc: %.el - $(EMACS) -batch -f batch-byte-compile $< diff --git a/devel/scmgit-base/patches/patch-config.mak.uname b/devel/scmgit-base/patches/patch-config.mak.uname deleted file mode 100644 index b3bb7623298..00000000000 --- a/devel/scmgit-base/patches/patch-config.mak.uname +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-config.mak.uname,v 1.1 2013/04/08 14:12:25 mef Exp $ - - ---- config.mak.uname.orig 2013-03-14 04:15:22.000000000 +0900 -+++ config.mak.uname 2013-04-08 19:11:58.000000000 +0900 -@@ -101,7 +101,7 @@ - ifeq ($(uname_S),SunOS) - NEEDS_SOCKET = YesPlease - NEEDS_NSL = YesPlease -- SHELL_PATH = /bin/bash -+ SHELL_PATH = ${BASH} - SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin - NO_STRCASESTR = YesPlease - NO_MEMMEM = YesPlease -@@ -144,8 +144,6 @@ - NO_STRTOUMAX = YesPlease - GIT_TEST_CMP = cmp - endif -- INSTALL = /usr/ucb/install -- TAR = gtar - BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H - endif - ifeq ($(uname_O),Cygwin) diff --git a/devel/scmgit-base/patches/patch-wrapper.c b/devel/scmgit-base/patches/patch-wrapper.c deleted file mode 100644 index 1239b72fc14..00000000000 --- a/devel/scmgit-base/patches/patch-wrapper.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-wrapper.c,v 1.1 2013/06/07 13:05:42 gdt Exp $ - -git's wrapper around mkstemp assumes that the libc function will not -modify the argument when the call fails. This causes one of git's -tests to fail. This patch is from Junio C. Hamano, and will likely be -included in future versions of git. - ---- wrapper.c.orig 2012-11-26 03:18:01.000000000 +0000 -+++ wrapper.c -@@ -229,7 +229,7 @@ int xmkstemp(char *template) - int saved_errno = errno; - const char *nonrelative_template; - -- if (!template[0]) -+ if (strlen(template) != strlen(origtemplate)) - template = origtemplate; - - nonrelative_template = absolute_path(template); diff --git a/devel/scmgit-docs/DESCR b/devel/scmgit-docs/DESCR deleted file mode 100644 index 2e4840acf6f..00000000000 --- a/devel/scmgit-docs/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This package installs documentation for the GIT distributed version control -suite. diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile deleted file mode 100644 index 663981d143b..00000000000 --- a/devel/scmgit-docs/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.19 2013/06/16 06:31:12 adam Exp $ - -PKGNAME= scmgit-docs-${GIT_VERSION} -COMMENT= GIT Tree History Storage Tool (documentation) - -CONFLICTS+= git<4.9.5nb1 # misc/git - -DISTINFO_FILE= ../../devel/scmgit-base/distinfo - -BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc -BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto - -USE_LANGUAGES= c -BUILD_TARGET= man -INSTALL_TARGET= install-man - -UNLIMIT_RESOURCES+= datasize - -USE_TOOLS+= perl -CONFIGURE_ARGS+= --with-perl=${PERL5:Q} - -.include "../../devel/scmgit/Makefile.common" - -.include "../../mk/bsd.pkg.mk" diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST deleted file mode 100644 index e4bdb7786a1..00000000000 --- a/devel/scmgit-docs/PLIST +++ /dev/null @@ -1,171 +0,0 @@ -@comment $NetBSD: PLIST,v 1.18 2013/08/26 16:32:31 adam Exp $ -man/man1/git-add.1 -man/man1/git-am.1 -man/man1/git-annotate.1 -man/man1/git-apply.1 -man/man1/git-archimport.1 -man/man1/git-archive.1 -man/man1/git-bisect.1 -man/man1/git-blame.1 -man/man1/git-branch.1 -man/man1/git-bundle.1 -man/man1/git-cat-file.1 -man/man1/git-check-attr.1 -man/man1/git-check-ignore.1 -man/man1/git-check-mailmap.1 -man/man1/git-check-ref-format.1 -man/man1/git-checkout-index.1 -man/man1/git-checkout.1 -man/man1/git-cherry-pick.1 -man/man1/git-cherry.1 -man/man1/git-citool.1 -man/man1/git-clean.1 -man/man1/git-clone.1 -man/man1/git-column.1 -man/man1/git-commit-tree.1 -man/man1/git-commit.1 -man/man1/git-config.1 -man/man1/git-count-objects.1 -man/man1/git-credential-cache--daemon.1 -man/man1/git-credential-cache.1 -man/man1/git-credential-store.1 -man/man1/git-credential.1 -man/man1/git-cvsexportcommit.1 -man/man1/git-cvsimport.1 -man/man1/git-cvsserver.1 -man/man1/git-daemon.1 -man/man1/git-describe.1 -man/man1/git-diff-files.1 -man/man1/git-diff-index.1 -man/man1/git-diff-tree.1 -man/man1/git-diff.1 -man/man1/git-difftool.1 -man/man1/git-fast-export.1 -man/man1/git-fast-import.1 -man/man1/git-fetch-pack.1 -man/man1/git-fetch.1 -man/man1/git-filter-branch.1 -man/man1/git-fmt-merge-msg.1 -man/man1/git-for-each-ref.1 -man/man1/git-format-patch.1 -man/man1/git-fsck-objects.1 -man/man1/git-fsck.1 -man/man1/git-gc.1 -man/man1/git-get-tar-commit-id.1 -man/man1/git-grep.1 -man/man1/git-gui.1 -man/man1/git-hash-object.1 -man/man1/git-help.1 -man/man1/git-http-backend.1 -man/man1/git-http-fetch.1 -man/man1/git-http-push.1 -man/man1/git-imap-send.1 -man/man1/git-index-pack.1 -man/man1/git-init-db.1 -man/man1/git-init.1 -man/man1/git-instaweb.1 -man/man1/git-log.1 -man/man1/git-lost-found.1 -man/man1/git-ls-files.1 -man/man1/git-ls-remote.1 -man/man1/git-ls-tree.1 -man/man1/git-mailinfo.1 -man/man1/git-mailsplit.1 -man/man1/git-merge-base.1 -man/man1/git-merge-file.1 -man/man1/git-merge-index.1 -man/man1/git-merge-one-file.1 -man/man1/git-merge-tree.1 -man/man1/git-merge.1 -man/man1/git-mergetool--lib.1 -man/man1/git-mergetool.1 -man/man1/git-mktag.1 -man/man1/git-mktree.1 -man/man1/git-mv.1 -man/man1/git-name-rev.1 -man/man1/git-notes.1 -man/man1/git-p4.1 -man/man1/git-pack-objects.1 -man/man1/git-pack-redundant.1 -man/man1/git-pack-refs.1 -man/man1/git-parse-remote.1 -man/man1/git-patch-id.1 -man/man1/git-peek-remote.1 -man/man1/git-prune-packed.1 -man/man1/git-prune.1 -man/man1/git-pull.1 -man/man1/git-push.1 -man/man1/git-quiltimport.1 -man/man1/git-read-tree.1 -man/man1/git-rebase.1 -man/man1/git-receive-pack.1 -man/man1/git-reflog.1 -man/man1/git-relink.1 -man/man1/git-remote-ext.1 -man/man1/git-remote-fd.1 -man/man1/git-remote-testgit.1 -man/man1/git-remote.1 -man/man1/git-repack.1 -man/man1/git-replace.1 -man/man1/git-repo-config.1 -man/man1/git-request-pull.1 -man/man1/git-rerere.1 -man/man1/git-reset.1 -man/man1/git-rev-list.1 -man/man1/git-rev-parse.1 -man/man1/git-revert.1 -man/man1/git-rm.1 -man/man1/git-send-email.1 -man/man1/git-send-pack.1 -man/man1/git-sh-i18n--envsubst.1 -man/man1/git-sh-i18n.1 -man/man1/git-sh-setup.1 -man/man1/git-shell.1 -man/man1/git-shortlog.1 -man/man1/git-show-branch.1 -man/man1/git-show-index.1 -man/man1/git-show-ref.1 -man/man1/git-show.1 -man/man1/git-stage.1 -man/man1/git-stash.1 -man/man1/git-status.1 -man/man1/git-stripspace.1 -man/man1/git-submodule.1 -man/man1/git-svn.1 -man/man1/git-symbolic-ref.1 -man/man1/git-tag.1 -man/man1/git-tar-tree.1 -man/man1/git-unpack-file.1 -man/man1/git-unpack-objects.1 -man/man1/git-update-index.1 -man/man1/git-update-ref.1 -man/man1/git-update-server-info.1 -man/man1/git-upload-archive.1 -man/man1/git-upload-pack.1 -man/man1/git-var.1 -man/man1/git-verify-pack.1 -man/man1/git-verify-tag.1 -man/man1/git-web--browse.1 -man/man1/git-whatchanged.1 -man/man1/git-write-tree.1 -man/man1/git.1 -man/man1/gitk.1 -man/man1/gitremote-helpers.1 -man/man1/gitweb.1 -man/man5/gitattributes.5 -man/man5/githooks.5 -man/man5/gitignore.5 -man/man5/gitmodules.5 -man/man5/gitrepository-layout.5 -man/man5/gitweb.conf.5 -man/man7/gitcli.7 -man/man7/gitcore-tutorial.7 -man/man7/gitcredentials.7 -man/man7/gitcvs-migration.7 -man/man7/gitdiffcore.7 -man/man7/gitglossary.7 -man/man7/gitnamespaces.7 -man/man7/gitrevisions.7 -man/man7/gittutorial-2.7 -man/man7/gittutorial.7 -man/man7/gitworkflows.7 diff --git a/devel/scmgit-gitk/DESCR b/devel/scmgit-gitk/DESCR deleted file mode 100644 index 213a3960fd7..00000000000 --- a/devel/scmgit-gitk/DESCR +++ /dev/null @@ -1 +0,0 @@ -This package installs gitk. diff --git a/devel/scmgit-gitk/Makefile b/devel/scmgit-gitk/Makefile deleted file mode 100644 index 82ac012aa4b..00000000000 --- a/devel/scmgit-gitk/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $NetBSD: Makefile,v 1.3 2013/01/30 17:39:39 adam Exp $ - -PKGNAME= scmgit-gitk-${GIT_VERSION} -COMMENT= GIT Tree History Storage Tool (gitk) - -CONFLICTS+= scmgit-base<1.7.12nb1 -DEPENDS+= scmgit-base>=1.7.12nb1:../../devel/scmgit-base - -USE_LANGUAGES= c - -BUILD_DIRS= git-gui gitk-git -INSTALL_DIRS= ${BUILD_DIRS} -MAKE_ENV+= prefix=${PREFIX} - -USE_TOOLS+= wish:run -CONFIGURE_ARGS+= --with-tcltk=${WISH:Q} - -INSTALLATION_DIRS+= bin -PLIST_VARS+= macosx - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework) -. if exists(/System/Library/Frameworks/Tk.framework/Resources/Wish.app) -WISH_APP=Wish -. else -WISH_APP=Wish Shell -. endif -PLIST_SUBST+= WISH_APP=${WISH_APP:Q} -PLIST.macosx= yes -.endif - -.include "../../devel/scmgit/Makefile.common" - -.include "../../mk/bsd.pkg.mk" diff --git a/devel/scmgit-gitk/PLIST b/devel/scmgit-gitk/PLIST deleted file mode 100644 index dd59f483707..00000000000 --- a/devel/scmgit-gitk/PLIST +++ /dev/null @@ -1,73 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2012/09/16 21:50:16 cheusov Exp $ -bin/gitk -libexec/git-core/git-citool -libexec/git-core/git-gui -libexec/git-core/git-gui--askpass -share/git-gui/lib/about.tcl -share/git-gui/lib/blame.tcl -share/git-gui/lib/branch.tcl -share/git-gui/lib/branch_checkout.tcl -share/git-gui/lib/branch_create.tcl -share/git-gui/lib/branch_delete.tcl -share/git-gui/lib/branch_rename.tcl -share/git-gui/lib/browser.tcl -share/git-gui/lib/checkout_op.tcl -share/git-gui/lib/choose_font.tcl -share/git-gui/lib/choose_repository.tcl -share/git-gui/lib/choose_rev.tcl -share/git-gui/lib/class.tcl -share/git-gui/lib/commit.tcl -share/git-gui/lib/console.tcl -share/git-gui/lib/database.tcl -share/git-gui/lib/date.tcl -share/git-gui/lib/diff.tcl -share/git-gui/lib/encoding.tcl -share/git-gui/lib/error.tcl -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Info.plist -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/${WISH_APP} -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/Scripts/AppMain.tcl -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/git-gui.icns -share/git-gui/lib/git-gui.ico -${PLIST.macosx}share/git-gui/lib/git-gui.tcl -share/git-gui/lib/index.tcl -share/git-gui/lib/line.tcl -share/git-gui/lib/logo.tcl -share/git-gui/lib/merge.tcl -share/git-gui/lib/mergetool.tcl -share/git-gui/lib/msgs/de.msg -share/git-gui/lib/msgs/el.msg -share/git-gui/lib/msgs/fr.msg -share/git-gui/lib/msgs/hu.msg -share/git-gui/lib/msgs/it.msg -share/git-gui/lib/msgs/ja.msg -share/git-gui/lib/msgs/nb.msg -share/git-gui/lib/msgs/pt_br.msg -share/git-gui/lib/msgs/ru.msg -share/git-gui/lib/msgs/sv.msg -share/git-gui/lib/msgs/zh_cn.msg -share/git-gui/lib/option.tcl -share/git-gui/lib/remote.tcl -share/git-gui/lib/remote_add.tcl -share/git-gui/lib/remote_branch_delete.tcl -share/git-gui/lib/search.tcl -share/git-gui/lib/shortcut.tcl -share/git-gui/lib/spellcheck.tcl -share/git-gui/lib/sshkey.tcl -share/git-gui/lib/status_bar.tcl -share/git-gui/lib/tclIndex -share/git-gui/lib/themed.tcl -share/git-gui/lib/tools.tcl -share/git-gui/lib/tools_dlg.tcl -share/git-gui/lib/transport.tcl -share/git-gui/lib/win32.tcl -share/git-gui/lib/win32_shortcut.js -share/gitk/lib/msgs/de.msg -share/gitk/lib/msgs/es.msg -share/gitk/lib/msgs/fr.msg -share/gitk/lib/msgs/hu.msg -share/gitk/lib/msgs/it.msg -share/gitk/lib/msgs/ja.msg -share/gitk/lib/msgs/pt_br.msg -share/gitk/lib/msgs/ru.msg -share/gitk/lib/msgs/sv.msg -@pkgdir share/examples/scmgit/templates/branches diff --git a/devel/scmgit/DESCR b/devel/scmgit/DESCR deleted file mode 100644 index 3f4885afcf5..00000000000 --- a/devel/scmgit/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -This package is a meta package, collecting the components normally -expected to be installed for the GIT distributed version control -suite (the tool itself, the tk-based browser gitk, and the man pages). diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile deleted file mode 100644 index 24e69ae436a..00000000000 --- a/devel/scmgit/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile,v 1.35 2013/06/16 07:40:22 adam Exp $ - -.include "../../devel/scmgit/Makefile.version" - -DISTNAME= # empty -PKGNAME= scmgit-${GIT_VERSION} -CATEGORIES+= meta-pkgs devel -DISTFILES= # empty -MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ - -MAINTAINER= pkgsrc-users@NetBSD.org -COMMENT= GIT version control suite meta-package - -META_PACKAGE= yes - -DEPENDS+= scmgit-base>=${GIT_VERSION}:../../devel/scmgit-base -DEPENDS+= scmgit-docs>=${GIT_VERSION}:../../devel/scmgit-docs -DEPENDS+= scmgit-gitk>=${GIT_VERSION}:../../devel/scmgit-gitk - -.include "../../mk/bsd.pkg.mk" diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common deleted file mode 100644 index d34c91fc45f..00000000000 --- a/devel/scmgit/Makefile.common +++ /dev/null @@ -1,30 +0,0 @@ -# $NetBSD: Makefile.common,v 1.24 2012/10/31 11:19:44 asau Exp $ -# -# used by devel/scmgit-base/Makefile -# used by devel/scmgit-docs/Makefile -# used by devel/scmgit-gitk/Makefile - -.include "../../devel/scmgit/Makefile.version" - -DISTNAME= git-${GIT_VERSION} -CATEGORIES= devel scm -MASTER_SITES?= http://git-core.googlecode.com/files/ - -MAINTAINER?= pkgsrc-users@NetBSD.org -HOMEPAGE?= http://git-scm.com/ -LICENSE= gnu-gpl-v2 - -.include "../../mk/bsd.fast.prefs.mk" - -PATCHDIR= ${.CURDIR}/../../devel/scmgit-base/patches -DISTINFO_FILE= ${.CURDIR}/../../devel/scmgit-base/distinfo - -USE_TOOLS+= gmake tar sh - -PKG_SYSCONFSUBDIR= git - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-shell=${SH:Q} -CONFIGURE_ARGS+= TAR=${TAR:Q} -CONFIGURE_ARGS+= --mandir=${${PREFIX}/${PKGMANDIR}:L:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version deleted file mode 100644 index 53e1685da16..00000000000 --- a/devel/scmgit/Makefile.version +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile.version,v 1.61 2013/08/26 16:32:30 adam Exp $ -# -# used by devel/scmgit/Makefile.common -# used by www/gitweb/Makefile - -GIT_VERSION= 1.8.4 diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile index b0a7766286d..a97a27e5a76 100644 --- a/devel/stgit/Makefile +++ b/devel/stgit/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2013/05/31 12:40:57 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2013/09/09 14:07:59 wiz Exp $ DISTNAME= stgit-0.14.3 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= devel MASTER_SITES= http://homepage.ntlworld.com/cmarinas/stgit/ @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto -DEPENDS+= scmgit-base>=1.5.2:../../devel/scmgit-base +DEPENDS+= git-base>=1.5.2:../../devel/git-base AUTO_MKDIRS= yes USE_TOOLS+= bash:run perl gmake diff --git a/devel/tig/Makefile b/devel/tig/Makefile index 599b98c897d..211d958bbc5 100644 --- a/devel/tig/Makefile +++ b/devel/tig/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2013/08/23 05:09:28 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.9 2013/09/09 14:07:59 wiz Exp $ DISTNAME= tig-1.2 +PKGREVISION= 1 CATEGORIES= devel scm MASTER_SITES= http://jonas.nitro.dk/tig/releases/ @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto -DEPENDS+= scmgit-[0-9]*:../../devel/scmgit +DEPENDS+= git-[0-9]*:../../devel/git GNU_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/devel/topgit/Makefile b/devel/topgit/Makefile index d7fddd7648f..d8cf3cc19fd 100644 --- a/devel/topgit/Makefile +++ b/devel/topgit/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2012/10/31 11:19:51 asau Exp $ +# $NetBSD: Makefile,v 1.3 2013/09/09 14:07:59 wiz Exp $ DISTNAME= topgit_0.7.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/t/topgit/} @@ -9,7 +10,7 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://repo.or.cz/w/topgit.git COMMENT= Different patch queue manager -DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base +DEPENDS+= git-base-[0-9]*:../../devel/git-base WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_LANGUAGES= # none diff --git a/editors/p5-Padre-Plugin-Git/Makefile b/editors/p5-Padre-Plugin-Git/Makefile index b278388bfd8..57489c93a30 100644 --- a/editors/p5-Padre-Plugin-Git/Makefile +++ b/editors/p5-Padre-Plugin-Git/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2013/05/31 12:40:59 wiz Exp $ -# +# $NetBSD: Makefile,v 1.8 2013/09/09 14:07:59 wiz Exp $ DISTNAME= Padre-Plugin-Git-0.03 PKGNAME= p5-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= editors perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Padre/} @@ -14,7 +13,7 @@ LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-Capture-Tiny>=0.03:../../devel/p5-Capture-Tiny DEPENDS+= p5-Padre>=0.67:../../editors/p5-Padre -DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base +DEPENDS+= git-base-[0-9]*:../../devel/git-base PERL5_PACKLIST= auto/Padre/Plugin/Git/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile index 7297584f838..247d0953b51 100644 --- a/meta-pkgs/bulk-medium/Makefile +++ b/meta-pkgs/bulk-medium/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2013/06/06 03:00:07 taca Exp $ +# $NetBSD: Makefile,v 1.11 2013/09/09 14:07:59 wiz Exp $ -DISTNAME= bulk-medium-20130606 +DISTNAME= bulk-medium-20130909 CATEGORIES= meta-pkgs MASTER_SITES= # empty DISTFILES= # empty @@ -63,9 +63,9 @@ BUILD_DEPENDS+= mysql-client>=5.5:../../databases/mysql55-client BUILD_DEPENDS+= openldap-client-[0-9]*:../../databases/openldap-client BUILD_DEPENDS+= postgresql84-client-[0-9]*:../../databases/postgresql84-client BUILD_DEPENDS+= postgresql91-client-[0-9]*:../../databases/postgresql91-client -BUILD_DEPENDS+= scmgit-[0-9]*:../../devel/scmgit -BUILD_DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base -BUILD_DEPENDS+= scmgit-docs-[0-9]*:../../devel/scmgit-docs +BUILD_DEPENDS+= git-[0-9]*:../../devel/git +BUILD_DEPENDS+= git-base-[0-9]*:../../devel/git-base +BUILD_DEPENDS+= git-docs-[0-9]*:../../devel/git-docs BUILD_DEPENDS+= mercurial-[0-9]*:../../devel/mercurial BUILD_DEPENDS+= emacs24>=24<25:../../editors/emacs24 BUILD_DEPENDS+= emacs-packages-[0-9]*:../../editors/emacs-packages diff --git a/mk/defaults/options.description b/mk/defaults/options.description index c1db4b181ef..294e1819e52 100644 --- a/mk/defaults/options.description +++ b/mk/defaults/options.description @@ -565,7 +565,7 @@ saslauthd Use the Cyrus saslauthd daemon for authentication. sbcl Use Steel-Bank Common Lisp. scapy-crypto Add in crypto support. scapy-pyx Add in py-X support. -scmgit-gui Build the GUI in Tcl/Tk. +git-gui Build the GUI in Tcl/Tk. sdl Use SDL as display library. seamonkey Use seamonkey as gecko rendering engine. sendmail-milter Build the milter with support for the Sendmail MTA. diff --git a/net/calypso/Makefile b/net/calypso/Makefile index 836a39ad704..e0cd602b62b 100644 --- a/net/calypso/Makefile +++ b/net/calypso/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2012/10/23 17:18:13 asau Exp $ +# $NetBSD: Makefile,v 1.6 2013/09/09 14:07:59 wiz Exp $ DISTNAME= calypso-1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net time MASTER_SITES= http://keithp.com/calypso/ @@ -11,7 +11,7 @@ COMMENT= CardDAV/CalDAV server LICENSE= gnu-gpl-v3 DEPENDS+= ${PYPKGPREFIX}-vobject>=0.8.1c:../../textproc/py-vobject -DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base +DEPENDS+= git-base-[0-9]*:../../devel/git-base #WRKSRC= ${WRKDIR}/calypso diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile index e785387ef4a..84ba16daf41 100644 --- a/sysutils/bup/Makefile +++ b/sysutils/bup/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2013/05/31 12:41:59 wiz Exp $ -# +# $NetBSD: Makefile,v 1.10 2013/09/09 14:07:59 wiz Exp $ DISTNAME= bup-0.25rc1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= sysutils MASTER_SITES= # manually packaged since master site is git repository # and only available via https @@ -21,7 +20,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= par2-[0-9]*:../../archivers/par2 DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline -DEPENDS+= scmgit-base-[0-9]*:../../devel/scmgit-base +DEPENDS+= git-base-[0-9]*:../../devel/git-base # needs changing on each update DOCDIR= ${WRKDIR}/lelutin-bup-7e0bc2e diff --git a/www/gitweb/Makefile b/www/gitweb/Makefile index f6f35bdffca..515f649477f 100644 --- a/www/gitweb/Makefile +++ b/www/gitweb/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2013/06/16 06:31:12 adam Exp $ +# $NetBSD: Makefile,v 1.18 2013/09/09 14:07:59 wiz Exp $ -.include "../../devel/scmgit/Makefile.version" +.include "../../devel/git/Makefile.version" DISTNAME= git-${GIT_VERSION} PKGNAME= ${DISTNAME:S/git/gitweb/} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ @@ -12,10 +13,10 @@ HOMEPAGE= http://git.or.cz/ COMMENT= Web interface for GIT repositories #DEPENDS+= apache{,2,22}-[0-9]*:../../www/apache22 -DEPENDS+= scmgit-base>=${GIT_VERSION}:../../devel/scmgit-base +DEPENDS+= git-base>=${GIT_VERSION}:../../devel/git-base DEPENDS+= p5-Time-HiRes>=1.9725:../../time/p5-Time-HiRes -DISTINFO_FILE= ${.CURDIR}/../../devel/scmgit-base/distinfo +DISTINFO_FILE= ${.CURDIR}/../../devel/git-base/distinfo USE_TOOLS+= gmake perl:run |