diff options
author | bjs <bjs@pkgsrc.org> | 2007-12-12 04:00:52 +0000 |
---|---|---|
committer | bjs <bjs@pkgsrc.org> | 2007-12-12 04:00:52 +0000 |
commit | 927c84ec12964a16e1b12d606ec96fa931454342 (patch) | |
tree | 42f62128b2d06990ff1a4c263380d882cf9da2e2 /devel | |
parent | fec4eb90360c4d6b3284498028ba82a66963565b (diff) | |
download | pkgsrc-927c84ec12964a16e1b12d606ec96fa931454342.tar.gz |
Removal of devel/scmgit in preparation for new meta-pkg-based hierarchy
Diffstat (limited to 'devel')
-rw-r--r-- | devel/scmgit/DESCR | 9 | ||||
-rw-r--r-- | devel/scmgit/Makefile | 74 | ||||
-rw-r--r-- | devel/scmgit/PLIST | 330 | ||||
-rw-r--r-- | devel/scmgit/distinfo | 12 | ||||
-rw-r--r-- | devel/scmgit/patches/patch-aa | 87 | ||||
-rw-r--r-- | devel/scmgit/patches/patch-ab | 22 | ||||
-rw-r--r-- | devel/scmgit/patches/patch-ae | 16 | ||||
-rw-r--r-- | devel/scmgit/patches/patch-af | 29 | ||||
-rw-r--r-- | devel/scmgit/patches/patch-ag | 12 | ||||
-rw-r--r-- | devel/scmgit/patches/patch-ah | 34 | ||||
-rw-r--r-- | devel/scmgit/patches/patch-ai | 17 |
11 files changed, 0 insertions, 642 deletions
diff --git a/devel/scmgit/DESCR b/devel/scmgit/DESCR deleted file mode 100644 index 3bcfce99244..00000000000 --- a/devel/scmgit/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -GIT is a "directory content manager" designed to handle absolutely massive -projects with speed and efficiency, and the release of the 2.6.12 (and later) -versions of the Linux kernel as well as more and more other projects switching -to it would indicate that it does this task well. - -GIT falls in the category of distributed source code management tools, similar -to e.g. GNU Arch or Monotone (or, in the commercial world, BitKeeper). Every -GIT working directory is a full-fledged repository with full revision tracking -capabilities, not dependent on network access to a central server. diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile deleted file mode 100644 index 7e118388815..00000000000 --- a/devel/scmgit/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# $NetBSD: Makefile,v 1.20 2007/11/19 06:31:55 bjs Exp $ -# - -DISTNAME= git-1.5.3.6 -PKGNAME= scm${DISTNAME} -CATEGORIES= devel scm -MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ - -MAINTAINER= pancake@phreaker.net -HOMEPAGE= http://git.or.cz/ -COMMENT= Tree History Storage Tool - -PKG_DESTDIR_SUPPORT= user-destdir - -CONFLICTS+= git-[0-9]* # misc/git -BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc -BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto - -MAKE_ENV+= HOME=${PREFIX:Q} -USE_LANGUAGES= c99 -USE_TOOLS+= gmake perl:run sh:run wish:run tar -EXTRACT_USING= gtar - -MAKE_ENV+= CURLDIR=${BUILDLINK_PREFIX.curl:Q} -MAKE_ENV+= PERL_PATH=${PERL5:Q} -MAKE_ENV+= PYTHON_PATH=${PYTHONBIN:Q} -MAKE_ENV+= SHELL_PATH=${SH:Q} -MAKE_ENV+= TAR=${TAR:Q} -BUILD_TARGET= all doc -INSTALL_TARGET= install install-doc -MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} -LDFLAGS= ${COMPILER_RPATH_FLAG}${PREFIX}/lib -LIBS.SunOS+= -liconv -CFLAGS.NetBSD+= -D_NETBSD_SOURCE - -PERL5_PACKLIST= auto/Git/.packlist -PERL5_CONFIGURE_DIRS= ${WRKSRC}/perl - -.include "../../mk/bsd.prefs.mk" - -### -### XXX Do all the BSDs fit this category? -### -.if ${OPSYS} == "NetBSD" -. include "../../converters/libiconv/builtin.mk" -. if ${ICONV_TYPE} == "native" -CFLAGS+= -DOLD_ICONV -. endif -.endif - -.include "../../lang/python/application.mk" - -NEEDS_SUBPROCESS_PY!= \ - if ok=`${PYTHONBIN} -c 'import subprocess; print "OK"' 2>/dev/null` \ - && ${TEST} "$$ok" = "OK"; then echo "no"; else echo "yes"; fi -.if ${NEEDS_SUBPROCESS_PY} == "yes" -PLIST_SUBST+= IF_NEEDS_SUBPROCESS_PY="" -.else -PLIST_SUBST+= IF_NEEDS_SUBPROCESS_PY="@comment " -.endif - -#.include "../../mk/emacs.mk" # XXX TODO (see patch-ad) - -post-install: - chmod 644 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/git*.1 - chmod 644 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/git*.7 - -.include "../../lang/perl5/module.mk" -.include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/zlib/buildlink3.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/PLIST b/devel/scmgit/PLIST deleted file mode 100644 index bcad458e585..00000000000 --- a/devel/scmgit/PLIST +++ /dev/null @@ -1,330 +0,0 @@ -@comment $NetBSD: PLIST,v 1.9 2007/09/21 23:13:26 bjs Exp $ -bin/git -bin/git-add -bin/git-add--interactive -bin/git-am -bin/git-annotate -bin/git-apply -bin/git-archimport -bin/git-archive -bin/git-bisect -bin/git-blame -bin/git-branch -bin/git-bundle -bin/git-cat-file -bin/git-check-attr -bin/git-check-ref-format -bin/git-checkout -bin/git-checkout-index -bin/git-cherry -bin/git-cherry-pick -bin/git-citool -bin/git-clean -bin/git-clone -bin/git-commit -bin/git-commit-tree -bin/git-config -bin/git-convert-objects -bin/git-count-objects -bin/git-cvsexportcommit -bin/git-cvsimport -bin/git-cvsserver -bin/git-daemon -bin/git-describe -bin/git-diff -bin/git-diff-files -bin/git-diff-index -bin/git-diff-tree -bin/git-fast-import -bin/git-fetch -bin/git-fetch--tool -bin/git-fetch-pack -bin/git-filter-branch -bin/git-fmt-merge-msg -bin/git-for-each-ref -bin/git-format-patch -bin/git-fsck -bin/git-fsck-objects -bin/git-gc -bin/git-get-tar-commit-id -bin/git-grep -bin/git-gui -bin/git-hash-object -bin/git-http-fetch -bin/git-http-push -bin/git-imap-send -bin/git-index-pack -bin/git-init -bin/git-init-db -bin/git-instaweb -bin/git-local-fetch -bin/git-log -bin/git-lost-found -bin/git-ls-files -bin/git-ls-remote -bin/git-ls-tree -bin/git-mailinfo -bin/git-mailsplit -bin/git-merge -bin/git-merge-base -bin/git-merge-file -bin/git-merge-index -bin/git-merge-octopus -bin/git-merge-one-file -bin/git-merge-ours -bin/git-merge-recursive -bin/git-merge-resolve -bin/git-merge-stupid -bin/git-merge-subtree -bin/git-merge-tree -bin/git-mergetool -bin/git-mktag -bin/git-mktree -bin/git-mv -bin/git-name-rev -bin/git-pack-objects -bin/git-pack-redundant -bin/git-pack-refs -bin/git-parse-remote -bin/git-patch-id -bin/git-peek-remote -bin/git-prune -bin/git-prune-packed -bin/git-pull -bin/git-push -bin/git-quiltimport -bin/git-read-tree -bin/git-rebase -bin/git-rebase--interactive -bin/git-receive-pack -bin/git-reflog -bin/git-relink -bin/git-remote -bin/git-repack -bin/git-repo-config -bin/git-request-pull -bin/git-rerere -bin/git-reset -bin/git-rev-list -bin/git-rev-parse -bin/git-revert -bin/git-rm -bin/git-runstatus -bin/git-send-email -bin/git-send-pack -bin/git-sh-setup -bin/git-shell -bin/git-shortlog -bin/git-show -bin/git-show-branch -bin/git-show-index -bin/git-show-ref -bin/git-ssh-fetch -bin/git-ssh-pull -bin/git-ssh-push -bin/git-ssh-upload -bin/git-stash -bin/git-status -bin/git-stripspace -bin/git-submodule -bin/git-svn -bin/git-svnimport -bin/git-symbolic-ref -bin/git-tag -bin/git-tar-tree -bin/git-unpack-file -bin/git-unpack-objects -bin/git-update-index -bin/git-update-ref -bin/git-update-server-info -bin/git-upload-archive -bin/git-upload-pack -bin/git-var -bin/git-verify-pack -bin/git-verify-tag -bin/git-whatchanged -bin/git-write-tree -bin/gitk -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-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-commit-tree.1 -man/man1/git-commit.1 -man/man1/git-config.1 -man/man1/git-convert-objects.1 -man/man1/git-count-objects.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-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-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-local-fetch.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.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-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.1 -man/man1/git-repack.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-runstatus.1 -man/man1/git-send-email.1 -man/man1/git-send-pack.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-ssh-fetch.1 -man/man1/git-ssh-upload.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-svnimport.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-whatchanged.1 -man/man1/git-write-tree.1 -man/man1/gitk.1 -man/man5/gitattributes.5 -man/man5/gitignore.5 -man/man5/gitmodules.5 -man/man7/git.7 -share/git-core/templates/description -share/git-core/templates/hooks/applypatch-msg -share/git-core/templates/hooks/commit-msg -share/git-core/templates/hooks/post-commit -share/git-core/templates/hooks/post-receive -share/git-core/templates/hooks/post-update -share/git-core/templates/hooks/pre-applypatch -share/git-core/templates/hooks/pre-commit -share/git-core/templates/hooks/pre-rebase -share/git-core/templates/hooks/update -share/git-core/templates/info/exclude -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_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/diff.tcl -share/git-gui/lib/encoding.tcl -share/git-gui/lib/error.tcl -share/git-gui/lib/index.tcl -share/git-gui/lib/merge.tcl -share/git-gui/lib/option.tcl -share/git-gui/lib/remote.tcl -share/git-gui/lib/remote_branch_delete.tcl -share/git-gui/lib/shortcut.tcl -share/git-gui/lib/status_bar.tcl -share/git-gui/lib/tclIndex -share/git-gui/lib/transport.tcl -@dirrm share/git-gui/lib -@dirrm share/git-gui -@dirrm share/git-core/templates/info -@dirrm share/git-core/templates/hooks -@exec ${MKDIR} %D/share/git-core/templates/branches -@dirrm share/git-core/templates/branches -@dirrm share/git-core/templates -@dirrm share/git-core diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo deleted file mode 100644 index c7cba6572b8..00000000000 --- a/devel/scmgit/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: distinfo,v 1.18 2007/11/29 22:32:39 rillig Exp $ - -SHA1 (git-1.5.3.6.tar.gz) = 12b4fdd37404a4462fe7849156ac075773a72b28 -RMD160 (git-1.5.3.6.tar.gz) = 1f7960ba2c2bf3c134566c03ac2c2a9259bb5cbf -Size (git-1.5.3.6.tar.gz) = 1607263 bytes -SHA1 (patch-aa) = dd2075bb0bd330d286e792564f28691cba3120ca -SHA1 (patch-ab) = 6d9b08b20b3bbee931c8aa5842b03953e7cd2a7d -SHA1 (patch-ae) = 44f30c796c922b028773668e80d71c0a48606f5c -SHA1 (patch-af) = d2b6fff88913d89f37bf5453babc65027a6a5a54 -SHA1 (patch-ag) = feb17b439e0e4e89c25985f2e14e300d698c8dcf -SHA1 (patch-ah) = 4cf802facbc3dd9f78e923427c4b5f455f954722 -SHA1 (patch-ai) = 569ca315a6ed73f8d06fa265945af3e2d920556a diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa deleted file mode 100644 index 1d6a2ebccdc..00000000000 --- a/devel/scmgit/patches/patch-aa +++ /dev/null @@ -1,87 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2007/09/11 09:23:55 bjs Exp $ - -NetBSD 3.0 needs -liconv, too. - -AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment. - ---- Makefile.orig 2007-09-02 01:57:44.000000000 -0400 -+++ Makefile -@@ -135,8 +135,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de - - # CFLAGS and LDFLAGS are for the users to override from the command line. - --CFLAGS = -g -O2 -Wall --LDFLAGS = - ALL_CFLAGS = $(CFLAGS) - ALL_LDFLAGS = $(LDFLAGS) - STRIP ?= strip -@@ -173,12 +171,8 @@ GITWEB_SITE_FOOTER = - - export prefix bindir gitexecdir sharedir template_dir sysconfdir - --CC = gcc --AR = ar - RM = rm -f --TAR = tar - FIND = find --INSTALL = install - RPMBUILD = rpmbuild - TCL_PATH = tclsh - TCLTK_PATH = wish -@@ -398,6 +392,7 @@ ifeq ($(uname_S),Darwin) - NO_STRLCPY = YesPlease - endif - ifeq ($(uname_S),SunOS) -+ NEEDS_LIBICONV = YesPlease - NEEDS_SOCKET = YesPlease - NEEDS_NSL = YesPlease - SHELL_PATH = /bin/bash -@@ -416,8 +411,6 @@ ifeq ($(uname_S),SunOS) - NO_C99_FORMAT = YesPlease - NO_STRTOUMAX = YesPlease - endif -- INSTALL = ginstall -- TAR = gtar - BASIC_CFLAGS += -D__EXTENSIONS__ - endif - ifeq ($(uname_O),Cygwin) -@@ -447,9 +440,7 @@ ifeq ($(uname_S),OpenBSD) - BASIC_LDFLAGS += -L/usr/local/lib - endif - ifeq ($(uname_S),NetBSD) -- ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) -- NEEDS_LIBICONV = YesPlease -- endif -+ NEEDS_LIBICONV = YesPlease - BASIC_CFLAGS += -I/usr/pkg/include - BASIC_LDFLAGS += -L/usr/pkg/lib - ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib -@@ -710,7 +701,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P - PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) - TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) - --LIBS = $(GITLIBS) $(EXTLIBS) -+LIBS += $(GITLIBS) $(EXTLIBS) - - BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \ - -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS) -@@ -986,14 +977,14 @@ remove-dashes: - ### Installation rules - - install: all -- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)' -- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' -- $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' -- $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' -+ $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)' -+ $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)' -+ $(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' -+ $(BSD_INSTALL_SCRIPT) git$X '$(DESTDIR_SQ)$(bindir_SQ)' - $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install - $(MAKE) -C perl prefix='$(prefix_SQ)' install - ifndef NO_TCLTK -- $(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk -+ $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk - $(MAKE) -C git-gui install - endif - if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ diff --git a/devel/scmgit/patches/patch-ab b/devel/scmgit/patches/patch-ab deleted file mode 100644 index d2dbad90c46..00000000000 --- a/devel/scmgit/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2007/11/29 22:32:39 rillig Exp $ - ---- git-compat-util.h.orig 2007-10-31 21:04:37.000000000 +0100 -+++ git-compat-util.h 2007-11-29 16:24:57.810134000 +0100 -@@ -6,6 +6,8 @@ - #ifndef FLEX_ARRAY - #if defined(__GNUC__) && (__GNUC__ < 3) - #define FLEX_ARRAY 0 -+#elif defined(__SUNPRO_C) -+#define FLEX_ARRAY 1 - #else - #define FLEX_ARRAY /* empty */ - #endif -@@ -24,7 +26,7 @@ - /* Approximation of the length of the decimal representation of this type. */ - #define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1) - --#if !defined(__APPLE__) && !defined(__FreeBSD__) -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__sun) - #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */ - #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */ - #endif diff --git a/devel/scmgit/patches/patch-ae b/devel/scmgit/patches/patch-ae deleted file mode 100644 index 9b316e7d0e3..00000000000 --- a/devel/scmgit/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2007/09/11 09:23:55 bjs Exp $ - -In pkgsrc, all Perl modules are installed into vendor_perl, not -site_perl. - ---- perl/Makefile.orig 2007-09-02 01:57:44.000000000 -0400 -+++ perl/Makefile -@@ -11,7 +11,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/patches/patch-af b/devel/scmgit/patches/patch-af deleted file mode 100644 index d66006ec3be..00000000000 --- a/devel/scmgit/patches/patch-af +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-af,v 1.3 2007/09/11 09:23:55 bjs Exp $ - ---- Documentation/Makefile.orig 2007-09-02 01:57:44.000000000 -0400 -+++ Documentation/Makefile -@@ -75,16 +75,16 @@ man7: $(DOC_MAN7) - info: git.info - - install: man -- $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) -- $(INSTALL) -d -m755 $(DESTDIR)$(man5dir) -- $(INSTALL) -d -m755 $(DESTDIR)$(man7dir) -- $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) -- $(INSTALL) -m644 $(DOC_MAN5) $(DESTDIR)$(man5dir) -- $(INSTALL) -m644 $(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 -m755 $(DESTDIR)$(infodir) -- $(INSTALL) -m644 git.info $(DESTDIR)$(infodir) -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir) -+ $(BSD_INSTALL_DATA) git.info $(DESTDIR)$(infodir) - if test -r $(DESTDIR)$(infodir)/dir; then \ - $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\ - else \ diff --git a/devel/scmgit/patches/patch-ag b/devel/scmgit/patches/patch-ag deleted file mode 100644 index 48c30a94e02..00000000000 --- a/devel/scmgit/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2007/09/21 23:13:26 bjs Exp $ - ---- templates/Makefile.orig 2007-09-19 14:02:17.000000000 -0400 -+++ templates/Makefile -@@ -46,6 +46,6 @@ clean: - $(RM) -r blt boilerplates.made - - install: all -- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)' -+ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(template_dir_SQ)' - (cd blt && $(TAR) cf - .) | \ - (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -) diff --git a/devel/scmgit/patches/patch-ah b/devel/scmgit/patches/patch-ah deleted file mode 100644 index 4943266c70c..00000000000 --- a/devel/scmgit/patches/patch-ah +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2007/09/21 23:13:26 bjs Exp $ - ---- git-gui/Makefile.orig 2007-09-19 14:02:17.000000000 -0400 -+++ git-gui/Makefile -@@ -34,11 +34,11 @@ endif - RM_F ?= rm -f - RMDIR ?= rmdir - --INSTALL_D0 = $(INSTALL) -d -m755 # space is required here -+INSTALL_D0 = ${BSD_INSTALL_DATA_DIR} # space is required here - INSTALL_D1 = --INSTALL_R0 = $(INSTALL) -m644 # space is required here -+INSTALL_R0 = ${BSD_INSTALL_DATA} # space is required here - INSTALL_R1 = --INSTALL_X0 = $(INSTALL) -m755 # space is required here -+INSTALL_X0 = ${BSD_INSTALL_SCRIPT} # space is required here - INSTALL_X1 = - INSTALL_L0 = rm -f # space is required here - INSTALL_L1 = && ln # space is required here -@@ -59,11 +59,11 @@ ifndef V - QUIET_2DEVNULL = 2>/dev/null - - INSTALL_D0 = dir= -- INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir" -+ INSTALL_D1 = && echo ' ' DEST $$dir && $(BSD_INSTALL_DATA_DIR) "$$dir" - INSTALL_R0 = src= -- INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src -+ INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(BSD_INSTALL_DATA) $$src - INSTALL_X0 = src= -- INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src -+ INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(BSD_INSTALL_SCRIPT) $$src - - INSTALL_L0 = dst= - INSTALL_L1 = && src= diff --git a/devel/scmgit/patches/patch-ai b/devel/scmgit/patches/patch-ai deleted file mode 100644 index 6757f54b64c..00000000000 --- a/devel/scmgit/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2007/09/21 23:13:26 bjs Exp $ - -Beginnings of emacs support, not enabled yet. We must use mk/emacs.mk. - ---- contrib/emacs/Makefile.orig 2007-09-19 14:02:17.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 $< |