diff options
| author |   Keri Harris <keri@gentoo.org> | 2008-11-30 05:45:33 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2008-11-30 05:45:33 +0000 |
| commit | f5c40da9aa241b57c954336157d1faf25a658487 (patch) | |
| tree | 4f5770ed8944a2300f6f10c757dec320339a2773 /dev-lang/mercury | |
| parent | pull in dev-util/cvs for live ebuilds as gettext (autopoint) needs it #245073... (diff) | |
| download | gentoo-2-f5c40da9aa241b57c954336157d1faf25a658487.tar.gz gentoo-2-f5c40da9aa241b57c954336157d1faf25a658487.tar.bz2 gentoo-2-f5c40da9aa241b57c954336157d1faf25a658487.zip | |
Do not install redundant reconf script
(Portage version: 2.1.4.5)
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch | 24 |
2 files changed, 21 insertions, 8 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index a6991de751c7..ee2cd307da26 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.90 2008/11/29 23:45:14 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.91 2008/11/30 05:45:33 keri Exp $ + + 30 Nov 2008; <keri@gentoo.org> files/mercury-0.13.1-no-reconf.patch: + Do not install redundant reconf script 29 Nov 2008; <keri@gentoo.org> mercury-0.13.1-r2.ebuild: Remove redundant mdbrc patching diff --git a/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch b/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch index 5b7be8a470c3..5db2cab234e9 100644 --- a/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch +++ b/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch @@ -1,6 +1,7 @@ +diff -ur mercury-compiler-0.13.1.orig/runtime/Mmakefile mercury-compiler-0.13.1/runtime/Mmakefile --- mercury-compiler-0.13.1.orig/runtime/Mmakefile 2006-11-15 03:09:20.000000000 +1300 -+++ mercury-compiler-0.13.1/runtime/Mmakefile 2006-12-04 21:37:11.000000000 +1300 -@@ -434,8 +437,6 @@ ++++ mercury-compiler-0.13.1/runtime/Mmakefile 2008-11-30 18:05:17.000000000 +1300 +@@ -434,8 +434,6 @@ -[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR) -[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR) -[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR) @@ -9,7 +10,7 @@ ifeq ($(findstring java,$(GRADE)),java) -@@ -481,7 +482,6 @@ +@@ -481,7 +479,6 @@ rm -f $(INSTALL_INC_DIR)/mercury_conf.h cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR) -chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h @@ -17,9 +18,18 @@ cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps .PHONY: install_init +diff -ur mercury-compiler-0.13.1.orig/scripts/Mmakefile mercury-compiler-0.13.1/scripts/Mmakefile --- mercury-compiler-0.13.1.orig/scripts/Mmakefile 2006-04-04 19:41:49.000000000 +1200 -+++ mercury-compiler-0.13.1/scripts/Mmakefile 2006-12-04 21:37:11.000000000 +1300 -@@ -26,16 +26,12 @@ ++++ mercury-compiler-0.13.1/scripts/Mmakefile 2008-11-30 18:05:32.000000000 +1300 +@@ -15,7 +15,6 @@ + #-----------------------------------------------------------------------------# + + NONCONF_SCRIPTS = \ +- mercury_cleanup_install \ + mprof_merge_runs \ + mtags \ + mtc \ +@@ -26,16 +25,12 @@ canonical_grade \ mdb \ mdprof \ @@ -37,7 +47,7 @@ SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS) -@@ -103,8 +99,6 @@ +@@ -103,8 +98,6 @@ [ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb [ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR) [ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR) @@ -46,7 +56,7 @@ .PHONY: install_mmake install_mmake: Mmake.vars Mmake.rules install_dirs -@@ -122,7 +116,6 @@ +@@ -122,7 +115,6 @@ -for file in $(SCRIPTS); do \ chmod u+w $(INSTALL_BINDIR)/$$file ;\ done |