diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile index 29e2801e1206..0b9aef7aa136 100644 --- a/x11-wm/treewm/Makefile +++ b/x11-wm/treewm/Makefile @@ -1,53 +1,56 @@ PORTNAME= treewm PORTVERSION= 0.4.5 PORTREVISION= 6 CATEGORIES= x11-wm MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Window manager that arranges windows in a tree WWW= https://treewm.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +DEPRECATED= Last upstream release was in 2003 +EXPIRATION_DATE= 2024-01-17 + USES= gmake imake:env tar:bzip2 xorg USE_XORG= x11 ice sm xext xmu xpm xt xxf86vm PORTDOCS= AUTHORS ChangeLog PROBLEMS README README.tiling TODO PORTEXAMPLES= default.cfg sample.cfg OPTIONS_DEFINE= DOCS EXAMPLES post-patch: @${REINPLACE_CMD} -e \ '/^PREFIX/s| =| ?=| ; \ /^CXXFLAGS/s| =| ?=| ; \ s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e \ '/DF_GRABKEYBOARD/s|1L|1UL|' ${WRKSRC}/src/client.h do-install: (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} treewm \ ${STAGEDIR}${PREFIX}/bin) (cd ${WRKSRC}/xprop && ${INSTALL_PROGRAM} xprop \ ${STAGEDIR}${PREFIX}/bin/xprop-treewm) (cd ${WRKSRC}/xkill && ${INSTALL_PROGRAM} xkill \ ${STAGEDIR}${PREFIX}/bin/xkill-treewm) @${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps (cd ${WRKSRC}/src/pixmaps && ${INSTALL_DATA} *.xpm \ ${STAGEDIR}${DATADIR}/pixmaps) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for F in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${F} ${STAGEDIR}${DOCSDIR} .endfor do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for F in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${F} ${STAGEDIR}${EXAMPLESDIR} .endfor .include diff --git a/x11-wm/treewm/files/patch-menuinfo.cc b/x11-wm/treewm/files/patch-src_menuinfo.cc similarity index 57% rename from x11-wm/treewm/files/patch-menuinfo.cc rename to x11-wm/treewm/files/patch-src_menuinfo.cc index c7c169b2b205..61a3ef95aa82 100644 --- a/x11-wm/treewm/files/patch-menuinfo.cc +++ b/x11-wm/treewm/files/patch-src_menuinfo.cc @@ -1,12 +1,11 @@ -diff -ru treewm-0.4.5.orig/src/menuinfo.cc treewm-0.4.5/src/menuinfo.cc ---- src/menuinfo.cc Mon Mar 8 00:20:42 2004 -+++ src/menuinfo.cc Mon Mar 8 00:22:37 2004 -@@ -21,7 +21,7 @@ +--- src/menuinfo.cc.orig 2003-02-15 21:05:41 UTC ++++ src/menuinfo.cc +@@ -21,7 +21,7 @@ void MenuInfo::Init() { MenuItemList *actions=0,*last=0; for (Entry *e=s->fe;e;e=e->next) if (e->tag) { - lower(e->value); + // lower(e->value); // why? (RP) if (last) { last->next = new MenuItemList; last = last->next; diff --git a/x11-wm/treewm/files/patch-resmanager.cc b/x11-wm/treewm/files/patch-src_resmanager.cc similarity index 67% rename from x11-wm/treewm/files/patch-resmanager.cc rename to x11-wm/treewm/files/patch-src_resmanager.cc index 2c06c0371687..209401c0a2ba 100644 --- a/x11-wm/treewm/files/patch-resmanager.cc +++ b/x11-wm/treewm/files/patch-src_resmanager.cc @@ -1,10 +1,10 @@ ---- ../treewm-0.4.5.orig/src/resmanager.cc Mon Mar 8 00:20:42 2004 -+++ src/resmanager.cc Mon Mar 8 00:40:02 2004 -@@ -127,6 +127,7 @@ +--- src/resmanager.cc.orig 2003-02-15 21:05:41 UTC ++++ src/resmanager.cc +@@ -127,6 +127,7 @@ void ResManager::CreateScemes() { for (int j=0; j!=mi->n; ++j) { MenuItem &mitem = mi->menu[j]; if (mitem.key[0] == '$') { + lower(mitem.key); MenuInfo *mi2 = (MenuInfo *)rman->GetInfo(SE_MENUINFO,mitem.key+1); if (mi2) { mitem.submenu = new SubMenuInfo; diff --git a/x11-wm/treewm/files/patch-tile.cc b/x11-wm/treewm/files/patch-src_tile.cc similarity index 81% rename from x11-wm/treewm/files/patch-tile.cc rename to x11-wm/treewm/files/patch-src_tile.cc index ea179a42bb0a..771598e353e4 100644 --- a/x11-wm/treewm/files/patch-tile.cc +++ b/x11-wm/treewm/files/patch-src_tile.cc @@ -1,10 +1,10 @@ ---- src/tile.cc.orig +--- src/tile.cc.orig 2003-09-11 10:55:34 UTC +++ src/tile.cc @@ -5,6 +5,7 @@ #include #include //#include +#include /* * changed<05.02.2003> by Rudolf Polzer: including namespace std (C++) diff --git a/x11-wm/treewm/files/patch-uehandler.cc b/x11-wm/treewm/files/patch-src_uehandler.cc similarity index 55% rename from x11-wm/treewm/files/patch-uehandler.cc rename to x11-wm/treewm/files/patch-src_uehandler.cc index 1fe202174d3d..ab9d18107cae 100644 --- a/x11-wm/treewm/files/patch-uehandler.cc +++ b/x11-wm/treewm/files/patch-src_uehandler.cc @@ -1,10 +1,10 @@ ---- ../treewm-0.4.5.orig/src/uehandler.cc Mon Mar 8 00:20:42 2004 -+++ src/uehandler.cc Mon Mar 8 00:42:26 2004 -@@ -955,6 +955,7 @@ +--- src/uehandler.cc.orig 2003-09-12 19:06:06 UTC ++++ src/uehandler.cc +@@ -955,6 +955,7 @@ bool UEHandler::ExecCommand(Client *ref, Icon *i,char if (!ExecAll) return false; { + lower(str); MenuInfo *mi = ((MenuInfo *)rman->GetInfo(SE_MENUINFO,str+1)); if (mi) { int x,y; diff --git a/x11-wm/treewm/files/patch-xprop__xprop.c b/x11-wm/treewm/files/patch-xprop_xprop.c similarity index 76% rename from x11-wm/treewm/files/patch-xprop__xprop.c rename to x11-wm/treewm/files/patch-xprop_xprop.c index 488b55ccbec1..40a57352055a 100644 --- a/x11-wm/treewm/files/patch-xprop__xprop.c +++ b/x11-wm/treewm/files/patch-xprop_xprop.c @@ -1,49 +1,49 @@ ---- xprop/xprop.c.orig 2002-03-14 21:14:47.000000000 +0900 -+++ xprop/xprop.c 2012-09-13 15:21:40.000000000 +0900 -@@ -586,7 +586,7 @@ +--- xprop/xprop.c.orig 2002-03-14 12:14:47 UTC ++++ xprop/xprop.c +@@ -586,7 +586,7 @@ _put_char(c) { if (--_buf_len<0) { _buf_ptr[0]='\0'; - return; + return 0; } _buf_ptr++[0] = c; } -@@ -1357,10 +1357,10 @@ +@@ -1357,10 +1357,10 @@ remove_property (dpy, w, propname) if (id == None) { fprintf (stderr, "%s: no such property \"%s\"\n", program_name, propname); - return; + return 0; } XDeleteProperty (dpy, w, id); - return; + return 0; } thunk *Handle_Prop_Requests(argc, argv) -@@ -1514,13 +1514,13 @@ +@@ -1514,13 +1514,13 @@ Show_Prop(format, dformat, prop) printf("%s", prop); if (!(atom = Parse_Atom(prop, True))) { printf(": no such atom on any window.\n"); - return; + return 0; } data = Get_Property_Data_And_Type(atom, &length, &type, &size); if (!size) { puts(": not found."); - return; + return 0; } if (!notype && type) -@@ -1535,7 +1535,7 @@ +@@ -1535,7 +1535,7 @@ Show_Prop(format, dformat, prop) if (fsize!=size && fsize!=0) { printf(": Type mismatch: assumed size %d bits, actual size %d bits.\n", fsize, size); - return; + return 0; } thunks = Break_Down_Property(data, (int)length, format, size);