diff options
author | Dmitri Goutnik <dmgk@FreeBSD.org> | 2021-02-27 14:29:00 +0000 |
---|---|---|
committer | Dmitri Goutnik <dmgk@FreeBSD.org> | 2021-02-27 14:29:00 +0000 |
commit | 2d4c98529e0466795980fa9d78615b0fdc79cdda (patch) | |
tree | 0e2192cd735924a9a84880d7a0e6eda3a9b718d6 /x11-wm | |
parent | b9dfc6e1031f76c242197bffeec5b5d931b4281d (diff) | |
download | ports-2d4c98529e0466795980fa9d78615b0fdc79cdda.tar.gz ports-2d4c98529e0466795980fa9d78615b0fdc79cdda.zip |
x11-wm/i3-gaps: Cleanup
- Remove local meson.build patch which has been merged upstream
- Update manpages to respect PREFIX
Notes
Notes:
svn path=/head/; revision=566703
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/i3-gaps/Makefile | 9 | ||||
-rw-r--r-- | x11-wm/i3-gaps/distinfo | 4 | ||||
-rw-r--r-- | x11-wm/i3-gaps/files/patch-meson.build | 34 |
3 files changed, 12 insertions, 35 deletions
diff --git a/x11-wm/i3-gaps/Makefile b/x11-wm/i3-gaps/Makefile index a0d2ed479121..12aa6ab3543c 100644 --- a/x11-wm/i3-gaps/Makefile +++ b/x11-wm/i3-gaps/Makefile @@ -2,9 +2,13 @@ PORTNAME= i3 DISTVERSION= 4.19.1 +PORTREVISION= 1 CATEGORIES= x11-wm PKGNAMESUFFIX= -gaps +PATCH_SITES= https://github.com/i3/i3/commit/ +PATCHFILES= a7d873f8ccb117c8e0775fe5bfe5804416b89709.patch:-p1 + MAINTAINER= dmgk@FreeBSD.org COMMENT= Fork of i3 tiling window manager with more features, including gaps @@ -51,4 +55,9 @@ MANPAGES_BUILD_DEPENDS= asciidoc:textproc/asciidoc \ xmlto:textproc/xmlto MANPAGES_MESON_TRUE= mans +post-patch: + @${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' -e 's,/etc,${PREFIX}&,g' \ + ${WRKSRC}/man/i3-config-wizard.man \ + ${WRKSRC}/man/i3.man + .include <bsd.port.mk> diff --git a/x11-wm/i3-gaps/distinfo b/x11-wm/i3-gaps/distinfo index d10e4edd00f8..9b9acea6ce85 100644 --- a/x11-wm/i3-gaps/distinfo +++ b/x11-wm/i3-gaps/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1612267081 +TIMESTAMP = 1613826242 SHA256 (Airblader-i3-4.19.1_GH0.tar.gz) = 97f33544f0a64a325b7b98cd4ad17dcf6f2c8ead1350d378154b76af1798e8fc SIZE (Airblader-i3-4.19.1_GH0.tar.gz) = 4189285 +SHA256 (a7d873f8ccb117c8e0775fe5bfe5804416b89709.patch) = 50216bf695c17fa498c281bdf5ba2194c10ed2d42480b70f81d81651648177ff +SIZE (a7d873f8ccb117c8e0775fe5bfe5804416b89709.patch) = 1166 diff --git a/x11-wm/i3-gaps/files/patch-meson.build b/x11-wm/i3-gaps/files/patch-meson.build deleted file mode 100644 index 3fd04947eb76..000000000000 --- a/x11-wm/i3-gaps/files/patch-meson.build +++ /dev/null @@ -1,34 +0,0 @@ -Upstream PR: https://github.com/i3/i3/pull/4264 ---- meson.build.orig 2020-11-15 18:11:08 UTC -+++ meson.build -@@ -428,7 +428,9 @@ command_parser = custom_target( - command: [perl, parser_gen, '--input=@INPUT@', '--prefix=command'], - ) - --i3srcs += command_parser -+command_parser_dep = declare_dependency( -+ sources : [command_parser] -+) - - config_parser = custom_target( - 'config_parser', -@@ -441,7 +443,9 @@ config_parser = custom_target( - command: [parser_gen, '--input=@INPUT@', '--prefix=config'], - ) - --i3srcs += config_parser -+config_parser_dep = declare_dependency( -+ sources : [config_parser] -+) - - # src/log.c uses threading primitives for synchronization - thread_dep = dependency('threads') -@@ -472,6 +476,8 @@ common_deps = [ - gobject_dep, - ev_dep, - config_h, -+ command_parser_dep, -+ config_parser_dep - ] - - executable( |