| 1 |
dilfridge 14/01/04 22:35:55 |
| 2 |
|
| 3 |
Added: git-1.8.5-mw-destdir.patch |
| 4 |
git-1.8.5-mw-vendor.patch |
| 5 |
Log: |
| 6 |
Add (masked until dependencies are keyworded) support for mediawiki, use subslot dependency on perl |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-vcs/git/files/git-1.8.5-mw-destdir.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-1.8.5-mw-destdir.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-1.8.5-mw-destdir.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: git-1.8.5-mw-destdir.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile |
| 19 |
index f206f96..a4b6f7a 100644 |
| 20 |
--- a/contrib/mw-to-git/Makefile |
| 21 |
+++ b/contrib/mw-to-git/Makefile |
| 22 |
@@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl |
| 23 |
GIT_ROOT_DIR=../.. |
| 24 |
HERE=contrib/mw-to-git/ |
| 25 |
|
| 26 |
+INSTALL = install |
| 27 |
+ |
| 28 |
SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) |
| 29 |
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ |
| 30 |
-s --no-print-directory instlibdir) |
| 31 |
+DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) |
| 32 |
+INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) |
| 33 |
|
| 34 |
all: build |
| 35 |
|
| 36 |
@@ -30,7 +34,9 @@ test: all |
| 37 |
check: perlcritic test |
| 38 |
|
| 39 |
install_pm: |
| 40 |
- install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) |
| 41 |
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git' |
| 42 |
+ $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \ |
| 43 |
+ '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)' |
| 44 |
|
| 45 |
build: |
| 46 |
$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ |
| 47 |
@@ -43,7 +49,6 @@ install: install_pm |
| 48 |
clean: |
| 49 |
$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ |
| 50 |
clean-perl-script |
| 51 |
- rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) |
| 52 |
|
| 53 |
perlcritic: |
| 54 |
perlcritic -5 $(SCRIPT_PERL) |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 dev-vcs/git/files/git-1.8.5-mw-vendor.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-1.8.5-mw-vendor.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-1.8.5-mw-vendor.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: git-1.8.5-mw-vendor.patch |
| 64 |
=================================================================== |
| 65 |
diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile |
| 66 |
index a4b6f7a..d83df2c 100644 |
| 67 |
--- a/contrib/mw-to-git/Makefile |
| 68 |
+++ b/contrib/mw-to-git/Makefile |
| 69 |
@@ -22,7 +22,7 @@ INSTALL = install |
| 70 |
|
| 71 |
SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) |
| 72 |
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ |
| 73 |
- -s --no-print-directory instlibdir) |
| 74 |
+ -s --no-print-directory instvendorlibdir) |
| 75 |
DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) |
| 76 |
INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) |
| 77 |
|
| 78 |
diff --git a/perl/Makefile b/perl/Makefile |
| 79 |
index 15d96fc..91348c6 100644 |
| 80 |
--- a/perl/Makefile |
| 81 |
+++ b/perl/Makefile |
| 82 |
@@ -12,7 +12,7 @@ ifndef V |
| 83 |
QUIET = @ |
| 84 |
endif |
| 85 |
|
| 86 |
-all install instlibdir: $(makfile) |
| 87 |
+all install instlibdir instvendorlibdir: $(makfile) |
| 88 |
$(QUIET)$(MAKE) -f $(makfile) $@ |
| 89 |
|
| 90 |
clean: |
| 91 |
diff --git a/perl/Makefile.PL b/perl/Makefile.PL |
| 92 |
index 3f29ba9..c0b3508 100644 |
| 93 |
--- a/perl/Makefile.PL |
| 94 |
+++ b/perl/Makefile.PL |
| 95 |
@@ -17,6 +17,8 @@ sub MY::postamble { |
| 96 |
return <<'MAKE_FRAG'; |
| 97 |
instlibdir: |
| 98 |
@echo '$(INSTALLSITELIB)' |
| 99 |
+instvendorlibdir: |
| 100 |
+ @echo '$(INSTALLVENDORLIB)' |
| 101 |
|
| 102 |
ifneq (,$(DESTDIR)) |
| 103 |
ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10)) |
Archives