diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-10-13 20:34:45 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-10-13 20:38:13 +0000 |
| commit | 9ede820eaec81dd81d767a90d8793052daa70696 (patch) | |
| tree | cbda53b79ff8f13965cf5f3c96e32b33f299f737 /dev-util/txt2regex/files | |
| parent | sys-apps/irqbalance: Merge improvements to service unit (diff) | |
| download | gentoo-9ede820eaec81dd81d767a90d8793052daa70696.tar.gz gentoo-9ede820eaec81dd81d767a90d8793052daa70696.tar.bz2 gentoo-9ede820eaec81dd81d767a90d8793052daa70696.zip | |
dev-util/txt2regex: Add patch to actually install txt2regex script courtesy of René Rhéaume <rene.rheaume@gmail.com>. Fixes bug 562856.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-util/txt2regex/files')
| -rw-r--r-- | dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch | 13 | ||||
| -rw-r--r-- | dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch | 21 |
2 files changed, 27 insertions, 7 deletions
diff --git a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch index 107b1b823753..878b84a7e3ea 100644 --- a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch +++ b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch @@ -1,13 +1,12 @@ -diff -ur txt2regex-0.8/Makefile txt2regex-0.8.nonls/Makefile ---- txt2regex-0.8/Makefile 2004-09-28 16:04:55 -0500 -+++ txt2regex-0.8.nonls/Makefile 2005-05-14 15:28:38 -0500 -@@ -80,15 +80,8 @@ +--- Makefile.orig 2015-10-13 20:09:55.612486000 +0000 ++++ Makefile 2015-10-13 20:11:19.166486000 +0000 +@@ -81,15 +81,9 @@ rm -rf $(DISTDIR) #TODO install man page and README -install: mo -- @[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \ -+install: ++install: + @[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \ [ -d $(BINDIR) ] || mkdir -p $(BINDIR); \ - for pot in `cd $(PODIR) && ls *.mo`; do \ - poti=`echo $$pot | sed 's/\.mo$$//'`; \ @@ -15,6 +14,6 @@ diff -ur txt2regex-0.8/Makefile txt2regex-0.8.nonls/Makefile - [ -d $$modir ] || mkdir -p $$modir; \ - install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \ - done; \ - sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \ + sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(BLOCALEDIR),' \ -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \ chmod +x $(BINDIR)/$(NAME) && \ diff --git a/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch new file mode 100644 index 000000000000..524f2af8b02e --- /dev/null +++ b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch @@ -0,0 +1,21 @@ +--- Makefile.orig 2015-10-13 19:24:21.799486000 +0000 ++++ Makefile 2015-10-13 19:26:05.187486000 +0000 +@@ -11,7 +11,8 @@ + + DESTDIR = + BINDIR = $(DESTDIR)/usr/bin +-LOCALEDIR = $(DESTDIR)/usr/share/locale ++BLOCALEDIR = /usr/share/locale ++LOCALEDIR = $(DESTDIR)$(BLOCALEDIR) + MANDIR = $(DESTDIR)/usr/share/man/man1 + + TARGET=all +@@ -89,7 +90,7 @@ + [ -d $$modir ] || mkdir -p $$modir; \ + install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \ + done; \ +- sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \ ++ sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(BLOCALEDIR),' \ + -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \ + chmod +x $(BINDIR)/$(NAME) && \ + echo "program '$(NAME)' installed. just run $(BINDIR)/$(NAME)" |