pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

i3-git: Convert a patch to SUBST.



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Tue Jun 14 15:21:58 2016 +0200
Changeset:	5eeb0c2668c72f5e8b7782908a5c13ca3b19552c

Modified Files:
	i3-git/Makefile
	i3-git/distinfo
Removed Files:
	i3-git/patches/patch-i3-dmenu-desktop

Log Message:
i3-git: Convert a patch to SUBST.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5eeb0c2668c72f5e8b7782908a5c13ca3b19552c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 i3-git/Makefile                       |  6 ++++++
 i3-git/distinfo                       |  1 -
 i3-git/patches/patch-i3-dmenu-desktop | 15 ---------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diffs:
diff --git a/i3-git/Makefile b/i3-git/Makefile
index c5d0696..a677baa 100644
--- a/i3-git/Makefile
+++ b/i3-git/Makefile
@@ -43,6 +43,12 @@ SUBST_MESSAGE.conf=	Change src/i3.mk to install conf files in share/examples
 SUBST_FILES.conf=	src/i3.mk
 SUBST_SED.conf=		-e s,$$\(SYSCONFDIR\),$$\(PREFIX\)/share/examples,g
 
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-install
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+SUBST_FILES.fix-paths=		i3-dmenu-desktop
+SUBST_SED.fix-paths+=		-e 's,/usr/local/share,${PREFIX}/share,g'
+
 BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 
 post-install:
diff --git a/i3-git/distinfo b/i3-git/distinfo
index c021db1..4db0872 100644
--- a/i3-git/distinfo
+++ b/i3-git/distinfo
@@ -1,5 +1,4 @@
 $NetBSD: distinfo,v 1.9 2015/11/09 11:05:44 nros Exp $
 
 SHA1 (patch-common.mk) = 219f43cf29b19d43885c17e7b6e203ce05afc2e0
-SHA1 (patch-i3-dmenu-desktop) = 92386af126f5ba69da4de5bc89c9b4b731f57fd7
 SHA1 (patch-src_log.c) = 3b70d5be029936e02bb2e5beddf2cd7d6adc7328
diff --git a/i3-git/patches/patch-i3-dmenu-desktop b/i3-git/patches/patch-i3-dmenu-desktop
deleted file mode 100644
index b2c906e..0000000
--- a/i3-git/patches/patch-i3-dmenu-desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Add /usr/pkg/share/applications to paths searched for .desktop files
-
---- i3-dmenu-desktop.orig	2016-03-24 17:50:36.000000000 +0000
-+++ i3-dmenu-desktop
-@@ -111,7 +111,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/s
-     ! -d $xdg_data_home;
- 
- my $xdg_data_dirs = $ENV{XDG_DATA_DIRS};
--$xdg_data_dirs = '/usr/local/share/:/usr/share/' if
-+$xdg_data_dirs = '/usr/local/share/:/usr/share/:/usr/pkg/share/' if
-     !defined($xdg_data_dirs) ||
-     $xdg_data_dirs eq '';
- 


Home | Main Index | Thread Index | Old Index