diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-12-14 09:00:50 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-12-14 09:00:50 +0000 |
| commit | 6391eda00ff9567fd1110468ea92f6a5b800ed58 (patch) | |
| tree | 7131f509bd0da187c5435ec0466d53961d01adcc /x11-wm | |
| parent | Update ZSH to 5.3 (diff) | |
- Fix CONFLICTS on wmii
- Silence stripping
- Regenerate patches
Notes
Notes:
svn path=/head/; revision=428551
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/wmii-devel/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/wmii-devel/files/patch-cmd__Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/wmii-devel/files/patch-cmd__menu__Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile index c6cbec121186..71ef70bef9d4 100644 --- a/x11-wm/wmii-devel/Makefile +++ b/x11-wm/wmii-devel/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libixp.so:devel/libixp -CONFLICTS= wmii-3.6* +CONFLICTS= wmii-[0-9]* USES= pkgconfig tar:tbz USE_XORG= x11 xext xrandr xrender xinerama xft @@ -37,7 +37,7 @@ post-patch: post-install: .for f in bin/wimenu bin/wmii bin/wmii9menu bin/wmiir lib/libwmii_hack.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} .endfor .include <bsd.port.mk> diff --git a/x11-wm/wmii-devel/files/patch-cmd__Makefile b/x11-wm/wmii-devel/files/patch-cmd__Makefile index 313e8ebfa2d0..cf601fa585c1 100644 --- a/x11-wm/wmii-devel/files/patch-cmd__Makefile +++ b/x11-wm/wmii-devel/files/patch-cmd__Makefile @@ -1,6 +1,6 @@ ---- cmd/Makefile..orig +--- cmd/Makefile.orig 2010-06-10 07:24:01 UTC +++ cmd/Makefile -@@ -20,14 +20,14 @@ +@@ -20,14 +20,14 @@ CFLAGS += $(INCX11) include $(ROOT)/mk/many.mk include $(ROOT)/mk/dir.mk diff --git a/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile b/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile index d1d7ccbd01a8..56292ae97974 100644 --- a/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile +++ b/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile @@ -1,6 +1,6 @@ ---- cmd/menu/Makefile.orig +--- cmd/menu/Makefile.orig 2010-06-10 07:24:01 UTC +++ cmd/menu/Makefile -@@ -14,8 +14,8 @@ +@@ -14,8 +14,8 @@ HFILES= dat.h fns.h PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama diff --git a/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile b/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile index 3f99e7886016..4ccb7e755e72 100644 --- a/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile +++ b/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile @@ -1,6 +1,6 @@ ---- cmd/wmii/Makefile.orig +--- cmd/wmii/Makefile.orig 2010-06-10 07:24:02 UTC +++ cmd/wmii/Makefile -@@ -9,7 +9,7 @@ +@@ -9,7 +9,7 @@ HFILES= dat.h fns.h PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama |