diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2005-07-17 03:47:53 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2005-07-17 03:47:53 +0000 |
| commit | c000ff051738f5b3658ffb68c9f568650c3aed2f (patch) | |
| tree | ce20e4ad51a4352e170df5575a1bd0036a83e7e6 /x11-wm | |
| parent | bbe2a03d8ef0f4d8e1270ec3dc901cc268efb41a (diff) | |
| download | ports-c000ff051738f5b3658ffb68c9f568650c3aed2f.tar.gz ports-c000ff051738f5b3658ffb68c9f568650c3aed2f.zip | |
Notes
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fvwm2-devel/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/distinfo | 4 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/files/patch-fvwm::icons.c | 36 |
3 files changed, 5 insertions, 40 deletions
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index 7ed8cc3b3443..89781a92bf35 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= fvwm -PORTVERSION= 2.5.12 -PORTREVISION= 1 +PORTVERSION= 2.5.13 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ @@ -37,6 +36,8 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke .endif +# Other ports this port cannot coexist with +CONFLICTS?= fvwm-1.* fvwm-2.4.* NO_LATEST_LINK= yes USE_REINPLACE= yes USE_GMAKE= yes diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo index 2d784ec59427..f6c7b779099c 100644 --- a/x11-wm/fvwm2-devel/distinfo +++ b/x11-wm/fvwm2-devel/distinfo @@ -1,4 +1,4 @@ -MD5 (fvwm-2.5.12.tar.bz2) = f323c59c2becb6766648b25b2111501c -SIZE (fvwm-2.5.12.tar.bz2) = 1917317 +MD5 (fvwm-2.5.13.tar.bz2) = b95df3d751da3f5fc803a117de758723 +SIZE (fvwm-2.5.13.tar.bz2) = 1936745 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665 SIZE (fvwm_icons.tgz) = 363406 diff --git a/x11-wm/fvwm2-devel/files/patch-fvwm::icons.c b/x11-wm/fvwm2-devel/files/patch-fvwm::icons.c deleted file mode 100644 index 7d7884f4e073..000000000000 --- a/x11-wm/fvwm2-devel/files/patch-fvwm::icons.c +++ /dev/null @@ -1,36 +0,0 @@ ---- fvwm/icons.c.orig Wed Mar 17 09:42:54 2004 -+++ fvwm/icons.c Tue Oct 19 16:13:55 2004 -@@ -2251,7 +2251,7 @@ - */ - void DeIconify(FvwmWindow *fw) - { -- FvwmWindow *t,*tmp; -+ FvwmWindow *t, *tmp, *ofw; - FvwmWindow *sf = get_focus_window(); - rectangle icon_rect; - XWindowAttributes winattrs = {0}; -@@ -2276,15 +2276,18 @@ - SET_ICONIFY_AFTER_MAP(fw, 0); - return; - } -- while (IS_ICONIFIED_BY_PARENT(fw)) -+ for (ofw = NULL; fw != ofw && IS_ICONIFIED_BY_PARENT(fw); ) - { -- for (t = Scr.FvwmRoot.next; t != NULL; t = t->next) -+ t = get_transientfor_fvwmwindow(fw); -+ if (t != NULL) - { -- if (t != fw && FW_W_TRANSIENTFOR(fw) == FW_W(t)) -- { -- fw = t; -- } -+ ofw = fw; -+ fw = t; - } -+ } -+ if (IS_ICONIFIED_BY_PARENT(fw)) -+ { -+ SET_ICONIFIED_BY_PARENT(fw, 0); - } - - /* AS dje RaiseWindow(fw); */ |