Hi,
this diff updates WindowMaker 0.92.0 to 0.95.2. Most of the diffs have
been kindly integrated into 0.95.2 we previously applied to 0.92.0.
I have contacted the devs to integrate the new diffs -- as far as possible.
Tested on my i386 machine, broad testing greatly appreciated! Especially
regarding the fact that this is my first update to port. ;)
Tobias
Index: Makefile
===================================================================
RCS file: /home/tobias/anoncvs/ports/x11/windowmaker/Makefile,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile
--- Makefile 29 Mar 2012 13:39:01 -0000 1.83
+++ Makefile 29 Apr 2012 11:59:46 -0000
@@ -3,13 +3,15 @@
COMMENT-main= window manager that emulates NEXTSTEP(tm)
COMMENT-lang= language subpackage for Window Maker
-V= 0.92.0
+V= 0.95.2
DISTNAME= WindowMaker-${V}
PKGNAME-main= ${DISTNAME:L}
-REVISION-main= 11
+REVISION-main= 0
FULLPKGNAME-lang= windowmaker-lang-${V}
-REVISION-lang= 2
-SHARED_LIBS= wraster 5.0
+REVISION-lang= 0
+SHARED_LIBS= WINGs 2.1 \
+ WUtil 2.0 \
+ wraster 5.0
CATEGORIES= x11 x11/windowmaker
HOMEPAGE= http://www.windowmaker.info/
@@ -23,7 +25,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER:=source/release/}
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.gz
NO_REGRESS= Yes
SEPARATE_BUILD= Yes
@@ -37,7 +39,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-nlsdir="${LOCALBASE}/share/locale"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" LIBS="-L${LOCALBASE}/lib" \
- LINGUAS='be bg bs ca cs da de el es et fi fr gl hr hu
it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW'
+ LINGUAS='be bg bs ca cs da de el es et fi fr gl hr hu
hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW'
MULTI_PACKAGES= -main -lang
Index: distinfo
===================================================================
RCS file: /home/tobias/anoncvs/ports/x11/windowmaker/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 5 Apr 2007 17:36:25 -0000 1.6
+++ distinfo 29 Apr 2012 12:00:59 -0000
@@ -1,5 +1,5 @@
-MD5 (WindowMaker-0.92.0.tar.bz2) = qqxUIbaG7S0+arZSKcmAlw==
-RMD160 (WindowMaker-0.92.0.tar.bz2) = wWHu5kCS+vtIaBgf4qC225btbeA=
-SHA1 (WindowMaker-0.92.0.tar.bz2) = T3/qb0C5up+HDS4vDORidHUO2yw=
-SHA256 (WindowMaker-0.92.0.tar.bz2) =
tDHOn0fF1M1Sq1uCmM/1b9VwDW5gUrFJ4ZtsVn5SbbE=
-SIZE (WindowMaker-0.92.0.tar.bz2) = 2202748
+MD5 (WindowMaker-0.95.2.tar.gz) = ae62bad9c4dee504066e0f172b565ff0
+RIPEMD160(WindowMaker-0.95.2.tar.gz) = bd0e1737ca356a0178afdbaac156abb50115fb1d
+SHA1 (WindowMaker-0.95.2.tar.gz) = 9fa55d525a04377089caf6ffc0c4d8d0aebe9d61
+SHA256 (WindowMaker-0.95.2.tar.gz) =
6b271e9427f5207484ec21c25e114e4eb1eafa957b446a1ff516f0c41ac19c59
+SIZE (WindowMaker-0.95.2.tar.gz) = 2753910
Index: patches/patch-WINGs_Makefile_in
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WINGs_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-WINGs_Makefile_in
--- patches/patch-WINGs_Makefile_in 1 Nov 2005 17:28:34 -0000 1.7
+++ patches/patch-WINGs_Makefile_in 28 Apr 2012 20:50:14 -0000
@@ -1,21 +1,28 @@
-$OpenBSD: patch-WINGs_Makefile_in,v 1.7 2005/11/01 17:28:34 wilfried Exp $
---- WINGs/Makefile.in.orig Sun Jun 19 05:23:00 2005
-+++ WINGs/Makefile.in Mon Oct 31 18:34:05 2005
-@@ -114,7 +114,7 @@ wprefs_datadir = @wprefs_datadir@
+--- WINGs/Makefile.in.orig Sat Apr 28 21:24:08 2012
++++ WINGs/Makefile.in Sat Apr 28 21:27:43 2012
+@@ -402,7 +402,7 @@
+ wconfig.h \
+ wutil.c
+
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\"
-DDEBUG
++AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\"
+ AM_CFLAGS =
+ INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib
-I$(top_srcdir)/src \
+ @XFTFLAGS@ @HEADER_SEARCH_PATH@
+@@ -964,14 +964,14 @@
+ -e 's#$${GFXLIBS}#$(GFXLIBS)#;' \
+ -e 's#$${XFTLIBS}#$(XFTLIBS)#;' \
+ -e 's#$${INTLIBS}#$(INTLIBS)#;' \
+- -e 's#$${XLIBS}#$(XLIBS)#;' < $(dir $<@)get-wings-flags.in > $@
++ -e 's#$${XLIBS}#$(XLIBS)#;' < $(abs_srcdir)/get-wings-flags.in
> $@
+ @chmod 755 $@
+
+ get-wutil-flags: get-wutil-flags.in Makefile
+ @echo "Generating $@"
+ @$(SED) -e 's#$${includedir}#$(includedir)#;' \
+ -e 's#$${libdir}#$(libdir)#;' \
+- -e 's#$${INTLIBS}#$(INTLIBS)#;' < $(dir $<@)get-wutil-flags.in
> $@
++ -e 's#$${INTLIBS}#$(INTLIBS)#;' <
$(abs_srcdir)/get-wutil-flags.in > $@
+ @chmod 755 $@
- AUTOMAKE_OPTIONS = no-dependencies
-
--SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
-+SUBDIRS = WINGs . po Documentation Resources Extras
-
- #libWINGs_la_LDFLAGS = -version-info 1:1:0
-
-@@ -138,7 +138,7 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
-
- AM_CFLAGS = @NOSTRICTALIASING@
-
--INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib
-I$(top_srcdir)/src -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@
@HEADER_SEARCH_PATH@ -DDEBUG
-+INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib
-I$(top_srcdir)/src -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@
@HEADER_SEARCH_PATH@
-
-
- DISTCLEANFILES = WINGs.pc
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: patches/patch-WINGs_array_c
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WINGs_array_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-WINGs_array_c
--- patches/patch-WINGs_array_c 20 May 2010 10:58:08 -0000 1.2
+++ patches/patch-WINGs_array_c 28 Apr 2012 18:11:37 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-WINGs_array_c,v 1.2 2010/05/20 10:58:08 espie Exp $
---- WINGs/array.c.orig Tue Oct 12 20:28:08 2004
-+++ WINGs/array.c Thu May 20 12:50:56 2010
-@@ -230,6 +230,8 @@ WMGetFromArray(WMArray *array, int index)
- void*
- WMPopFromArray(WMArray *array)
+$OpenBSD$
+--- WINGs/array.c.orig Sat Apr 28 20:10:29 2012
++++ WINGs/array.c Sat Apr 28 20:11:04 2012
+@@ -198,6 +198,8 @@
+
+ void *WMPopFromArray(WMArray * array)
{
-+ wassertr(array->itemCount > 0);
++ wassertr(array->itemCount > 0);
+
- array->itemCount--;
+ array->itemCount--;
- return array->items[array->itemCount];
+ return array->items[array->itemCount];
Index: patches/patch-WINGs_findfile_c
===================================================================
RCS file: patches/patch-WINGs_findfile_c
diff -N patches/patch-WINGs_findfile_c
--- patches/patch-WINGs_findfile_c 25 Apr 2007 11:31:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,127 +0,0 @@
-$OpenBSD: patch-WINGs_findfile_c,v 1.1 2007/04/25 11:31:53 wilfried Exp $
---- WINGs/findfile.c.orig Tue Oct 12 20:30:07 2004
-+++ WINGs/findfile.c Wed Mar 14 21:16:22 2007
-@@ -23,6 +23,7 @@
-
- #include "WUtil.h"
-
-+#include <errno.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-@@ -79,6 +80,7 @@ getuserhomedir(char *username)
- char*
- wexpandpath(char *path)
- {
-+ char *origpath = path;
- char buffer2[PATH_MAX+2];
- char buffer[PATH_MAX+2];
- int i;
-@@ -91,25 +93,29 @@ wexpandpath(char *path)
- path++;
- if (*path=='/' || *path==0) {
- home = wgethomedir();
-+ if (strlen(home) > PATH_MAX)
-+ goto error;
- strcat(buffer, home);
- } else {
- int j;
- j = 0;
- while (*path!=0 && *path!='/') {
-+ if (j > PATH_MAX)
-+ goto error;
- buffer2[j++] = *path;
- buffer2[j] = 0;
- path++;
- }
- home = getuserhomedir(buffer2);
-- if (!home)
-- return NULL;
-+ if (!home || strlen(home) > PATH_MAX)
-+ goto error;
- strcat(buffer, home);
- }
- }
-
- i = strlen(buffer);
-
-- while (*path!=0) {
-+ while (*path!=0 && i <= PATH_MAX) {
- char *tmp;
-
- if (*path=='$') {
-@@ -119,35 +125,50 @@ wexpandpath(char *path)
- if (*path=='(') {
- path++;
- while (*path!=0 && *path!=')') {
-+ if (j > PATH_MAX)
-+ goto error;
- buffer2[j++] = *(path++);
- buffer2[j] = 0;
- }
-- if (*path==')')
-+ if (*path==')') {
- path++;
-- tmp = getenv(buffer2);
-+ tmp = getenv(buffer2);
-+ } else {
-+ tmp = NULL;
-+ }
- if (!tmp) {
-+ if ((i += strlen(buffer2)+2) > PATH_MAX)
-+ goto error;
- buffer[i] = 0;
- strcat(buffer, "$(");
- strcat(buffer, buffer2);
-- strcat(buffer, ")");
-- i += strlen(buffer2)+3;
-+ if (*(path-1)==')') {
-+ if (++i > PATH_MAX)
-+ goto error;
-+ strcat(buffer, ")");
-+ }
- } else {
-+ if ((i += strlen(tmp)) > PATH_MAX)
-+ goto error;
- strcat(buffer, tmp);
-- i += strlen(tmp);
- }
- } else {
- while (*path!=0 && *path!='/') {
-+ if (j > PATH_MAX)
-+ goto error;
- buffer2[j++] = *(path++);
- buffer2[j] = 0;
- }
- tmp = getenv(buffer2);
- if (!tmp) {
-+ if ((i += strlen(buffer2)+1) > PATH_MAX)
-+ goto error;
- strcat(buffer, "$");
- strcat(buffer, buffer2);
-- i += strlen(buffer2)+1;
- } else {
-+ if ((i += strlen(tmp)) > PATH_MAX)
-+ goto error;
- strcat(buffer, tmp);
-- i += strlen(tmp);
- }
- }
- } else {
-@@ -156,7 +177,16 @@ wexpandpath(char *path)
- }
- }
-
-+ if (*path!=0)
-+ goto error;
-+
- return wstrdup(buffer);
-+
-+error:
-+ errno = ENAMETOOLONG;
-+ wsyserror(_("could not expand %s"), origpath);
-+ /* FIXME: too many functions handle a return value of NULL incorrectly */
-+ exit(1);
- }
-
-
Index: patches/patch-WINGs_string_c
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WINGs_string_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-WINGs_string_c
--- patches/patch-WINGs_string_c 25 Apr 2007 11:32:55 -0000 1.4
+++ patches/patch-WINGs_string_c 28 Apr 2012 19:34:57 -0000
@@ -1,20 +1,11 @@
-$OpenBSD: patch-WINGs_string_c,v 1.4 2007/04/25 11:32:55 wilfried Exp $
---- WINGs/string.c.orig Tue Oct 12 20:32:12 2004
-+++ WINGs/string.c Thu Mar 15 20:00:31 2007
-@@ -1,6 +1,6 @@
+$OpenBSD$
+--- WINGs/string.c.orig Sat Apr 28 21:33:56 2012
++++ WINGs/string.c Sat Apr 28 21:34:23 2012
+@@ -10,6 +10,7 @@
- #include "wconfig.h"
--
-+#include <assert.h>
#include <string.h>
#include <stdlib.h>
++#include <assert.h>
#include <ctype.h>
-@@ -153,7 +153,7 @@ wtokenjoin(char **list, int count)
- void
- wtokenfree(char **tokens, int count)
- {
-- while (--count) wfree(tokens[count]);
-+ while (count--) wfree(tokens[count]);
- wfree(tokens);
- }
-
+ #ifdef HAVE_BSD_STRING_H
+ #include <bsd/string.h>
Index: patches/patch-WINGs_wapplication_c
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WINGs_wapplication_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-WINGs_wapplication_c
--- patches/patch-WINGs_wapplication_c 20 May 2010 10:58:08 -0000 1.4
+++ patches/patch-WINGs_wapplication_c 28 Apr 2012 18:15:22 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-WINGs_wapplication_c,v 1.4 2010/05/20 10:58:08 espie Exp $
---- WINGs/wapplication.c.orig Sun Oct 24 05:13:29 2004
-+++ WINGs/wapplication.c Thu May 20 12:50:56 2010
-@@ -175,7 +175,7 @@ WMPathForResourceOfType(char *resource, char *ext)
- }
- }
+$OpenBSD$
+--- WINGs/wapplication.c.orig Sat Apr 28 20:14:27 2012
++++ WINGs/wapplication.c Sat Apr 28 20:14:43 2012
+@@ -159,7 +159,7 @@
+ if (path)
+ goto out;
+
+- path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
++ path = checkFile("%%PREFIX%%/GNUstep", appdir, ext, resource);
+ if (path)
+ goto out;
-- path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
-+ path = checkFile("%%PREFIX%%/GNUstep", appdir, ext, resource);
- if (path) {
- wfree(appdir);
- return path;
Index: patches/patch-WINGs_wwindow_c
===================================================================
RCS file: patches/patch-WINGs_wwindow_c
diff -N patches/patch-WINGs_wwindow_c
--- patches/patch-WINGs_wwindow_c 20 May 2010 10:58:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-WINGs_wwindow_c,v 1.3 2010/05/20 10:58:08 espie Exp $
---- WINGs/wwindow.c.orig Sun Oct 24 04:58:20 2004
-+++ WINGs/wwindow.c Thu May 20 12:50:56 2010
-@@ -254,14 +254,14 @@ static void
- setMiniwindow(WMWindow *win, RImage *image)
- {
- WMScreen *scr= win->view->screen;
-- CARD32 *data;
-+ long *data;
- int x, y;
- int o;
-
- if (!image)
- return;
-
-- data = wmalloc((image->width * image->height + 2) * sizeof(CARD32));
-+ data = wmalloc((image->width * image->height + 2) * sizeof(long));
-
- o= 0;
- data[o++] = image->width;
-@@ -269,7 +269,7 @@ setMiniwindow(WMWindow *win, RImage *image)
-
- for (y= 0; y < image->height; y++) {
- for (x= 0; x < image->width; x++) {
-- CARD32 pixel;
-+ long pixel;
- int offs= (x+y*image->width);
-
- if (image->format == RRGBFormat)
Index: patches/patch-WPrefs_app_Menu_c
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WPrefs_app_Menu_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-WPrefs_app_Menu_c
--- patches/patch-WPrefs_app_Menu_c 25 Aug 2007 09:27:12 -0000 1.4
+++ patches/patch-WPrefs_app_Menu_c 28 Apr 2012 18:20:35 -0000
@@ -1,29 +1,12 @@
-$OpenBSD: patch-WPrefs_app_Menu_c,v 1.4 2007/08/25 09:27:12 mglocker Exp $
---- WPrefs.app/Menu.c.orig Tue Oct 26 04:23:39 2004
-+++ WPrefs.app/Menu.c Fri Aug 17 20:58:09 2007
-@@ -577,7 +577,7 @@ createPanel(_Panel *p)
- data->param.exec.command = "xv";
+$OpenBSD$
+--- WPrefs.app/Menu.c.orig Sat Apr 28 20:19:30 2012
++++ WPrefs.app/Menu.c Sat Apr 28 20:20:01 2012
+@@ -514,7 +514,7 @@
+ data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
+ data->param.directory.command = "setstyle";
+ data->param.directory.directory =
+- "/usr/share/WindowMaker/Themes
/usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
++ "/usr/share/WindowMaker/Themes
%%PREFIX%%/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
+ data->param.directory.stripExt = 1;
- data = putNewItem(panel, pad, ExecInfo, _("Acrobat Reader"));
-- data->param.exec.command = "acroread ||
/usr/local/Acrobat4/bin/acroread";
-+ data->param.exec.command = "acroread";
-
- data = putNewItem(panel, pad, ExecInfo, _("ghostview"));
- data->param.exec.command = "gv";
-@@ -616,7 +616,7 @@ createPanel(_Panel *p)
-
- data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
- data->param.directory.command = "setstyle";
-- data->param.directory.directory = "/usr/share/WindowMaker/Themes
/usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
-+ data->param.directory.directory = "/usr/share/WindowMaker/Themes
%%PREFIX%%/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
- data->param.directory.stripExt = 1;
-
- data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
-@@ -1068,7 +1068,6 @@ parseCommand(WMPropList *item)
-
- for (i = 0, j = 0; i < tokn; i++) {
- if (strcmp(tokens[i], "-noext") == 0) {
-- wfree(tokens[i]);
- data->param.directory.stripExt = 1;
- } else {
- ctokens[j++] = tokens[i];
+ data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images
(scale)"));
Index: patches/patch-WPrefs_app_Paths_c
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WPrefs_app_Paths_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-WPrefs_app_Paths_c
--- patches/patch-WPrefs_app_Paths_c 1 Nov 2005 17:28:34 -0000 1.3
+++ patches/patch-WPrefs_app_Paths_c 28 Apr 2012 18:22:15 -0000
@@ -1,23 +1,23 @@
-$OpenBSD: patch-WPrefs_app_Paths_c,v 1.3 2005/11/01 17:28:34 wilfried Exp $
---- WPrefs.app/Paths.c.orig Tue Oct 12 22:18:33 2004
-+++ WPrefs.app/Paths.c Mon Oct 31 18:56:11 2005
-@@ -86,8 +86,8 @@ showData(_Panel *panel)
- addPathToList(panel->icoL, -1, "~/pixmaps");
- addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
- addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
-- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
-- addPathToList(panel->icoL, -1,
"/usr/local/share/WindowMaker/Pixmaps");
-+ addPathToList(panel->icoL, -1, "%%PREFIX%%/share/WindowMaker/Icons");
-+ addPathToList(panel->icoL, -1,
"%%PREFIX%%/share/WindowMaker/Pixmaps");
- addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
- } else {
- for (i=0; i<WMGetPropListItemCount(array); i++) {
-@@ -102,7 +102,7 @@ showData(_Panel *panel)
- wwarning(_("bad value in option PixmapPath. Using default path
list"));
- addPathToList(panel->pixL, -1, "~/pixmaps");
- addPathToList(panel->pixL, -1,
"~/GNUstep/Library/WindowMaker/Pixmaps");
-- addPathToList(panel->pixL, -1,
"/usr/local/share/WindowMaker/Pixmaps");
-+ addPathToList(panel->pixL, -1,
"%%PREFIX%%/share/WindowMaker/Pixmaps");
- } else {
- for (i=0; i<WMGetPropListItemCount(array); i++) {
- val = WMGetFromPLArray(array, i);
+$OpenBSD$
+--- WPrefs.app/Paths.c.orig Sat Apr 28 20:20:53 2012
++++ WPrefs.app/Paths.c Sat Apr 28 20:21:26 2012
+@@ -79,8 +79,8 @@
+ addPathToList(panel->icoL, -1, "~/pixmaps");
+ addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
+ addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
+- addPathToList(panel->icoL, -1,
"/usr/local/share/WindowMaker/Icons");
+- addPathToList(panel->icoL, -1,
"/usr/local/share/WindowMaker/Pixmaps");
++ addPathToList(panel->icoL, -1,
"%%PREFIX%%/share/WindowMaker/Icons");
++ addPathToList(panel->icoL, -1,
"%%PREFIX%%/share/WindowMaker/Pixmaps");
+ addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
+ } else {
+ for (i = 0; i < WMGetPropListItemCount(array); i++) {
+@@ -95,7 +95,7 @@
+ wwarning(_("bad value in option PixmapPath. Using
default path list"));
+ addPathToList(panel->pixL, -1, "~/pixmaps");
+ addPathToList(panel->pixL, -1,
"~/GNUstep/Library/WindowMaker/Pixmaps");
+- addPathToList(panel->pixL, -1,
"/usr/local/share/WindowMaker/Pixmaps");
++ addPathToList(panel->pixL, -1,
"%%PREFIX%%/share/WindowMaker/Pixmaps");
+ } else {
+ for (i = 0; i < WMGetPropListItemCount(array); i++) {
+ val = WMGetFromPLArray(array, i);
Index: patches/patch-WindowMaker_Defaults_WindowMaker_in
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WindowMaker_Defaults_WindowMaker_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-WindowMaker_Defaults_WindowMaker_in
--- patches/patch-WindowMaker_Defaults_WindowMaker_in 1 Nov 2005 17:28:34
-0000 1.1
+++ patches/patch-WindowMaker_Defaults_WindowMaker_in 28 Apr 2012 18:43:48
-0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-WindowMaker_Defaults_WindowMaker_in,v 1.1 2005/11/01 17:28:34
wilfried Exp $
---- WindowMaker/Defaults/WindowMaker.in.orig Wed Oct 27 05:01:38 2004
-+++ WindowMaker/Defaults/WindowMaker.in Mon Oct 31 18:52:02 2005
+$OpenBSD$
+--- WindowMaker/Defaults/WindowMaker.in.orig Sat Apr 28 20:42:50 2012
++++ WindowMaker/Defaults/WindowMaker.in Sat Apr 28 20:43:19 2012
@@ -15,7 +15,7 @@
"/usr/X11R6/include/X11/pixmaps",
"~/GNUstep/Library/WindowMaker/Pixmaps",
Index: patches/patch-WindowMaker_Makefile_in
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WindowMaker_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-WindowMaker_Makefile_in
--- patches/patch-WindowMaker_Makefile_in 20 May 2010 10:58:08 -0000
1.6
+++ patches/patch-WindowMaker_Makefile_in 29 Apr 2012 11:20:24 -0000
@@ -1,12 +1,21 @@
-$OpenBSD: patch-WindowMaker_Makefile_in,v 1.6 2010/05/20 10:58:08 espie Exp $
---- WindowMaker/Makefile.in.orig Sun Jun 19 05:23:01 2005
-+++ WindowMaker/Makefile.in Thu May 20 12:50:56 2010
-@@ -116,7 +116,7 @@ SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps
-
- prefsdatadir = $(pkgdatadir)
-
--prefsdata_DATA = README README.themes autostart.sh exitscript.sh
menu menu.bg menu.ca menu.cz menu.da menu.de
menu.el menu.es menu.fi menu.fr menu.gl
menu.he menu.hr menu.hu menu.it menu.ja
menu.ko menu.nl menu.no menu.pl menu.pt
menu.ro menu.ru menu.se menu.sk menu.sl
menu.tr menu.zh_CN menu.zh_TW plmenu plmenu.bg
plmenu.da plmenu.de plmenu.es plmenu.fi plmenu.fr
plmenu.hr plmenu.it plmenu.ja plmenu.ko plmenu.pl
plmenu.ro plmenu.sk plmenu.zh_CN plmenu.zh_TW wmmacros
xtree.dat
-+prefsdata_DATA = README README.themes autostart.sh exitscript.sh
menu menu.bg menu.ca menu.cs menu.da menu.de
menu.el menu.es menu.fi menu.fr menu.gl
menu.he menu.hr menu.hu menu.it menu.ja
menu.ko menu.nl menu.no menu.pl menu.pt
menu.ro menu.ru menu.sv menu.sk menu.sl
menu.tr menu.zh_CN menu.zh_TW plmenu plmenu.bg
plmenu.da plmenu.de plmenu.es plmenu.fi plmenu.fr
plmenu.hr plmenu.it plmenu.ja plmenu.ko plmenu.pl
plmenu.ro plmenu.sk plmenu.zh_CN plmenu.zh_TW wmmacros
xtree.dat
-
-
- EXTRA_DIST = $(prefsdata_DATA) mkMakefile
+$OpenBSD$
+--- WindowMaker/Makefile.in.orig Sat Apr 28 22:11:43 2012
++++ WindowMaker/Makefile.in Sat Apr 28 22:13:38 2012
+@@ -285,7 +285,7 @@
+ menu\
+ menu.bg\
+ menu.ca\
+- menu.cz\
++ menu.cs\
+ menu.da\
+ menu.de\
+ menu.el\
+@@ -305,7 +305,7 @@
+ menu.pt\
+ menu.ro\
+ menu.ru\
+- menu.se\
++ menu.sv\
+ menu.sk\
+ menu.sl\
+ menu.tr\
Index: patches/patch-WindowMaker_menu
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WindowMaker_menu,v
retrieving revision 1.3
diff -u -p -r1.3 patch-WindowMaker_menu
--- patches/patch-WindowMaker_menu 1 Nov 2005 17:28:34 -0000 1.3
+++ patches/patch-WindowMaker_menu 28 Apr 2012 18:25:53 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-WindowMaker_menu,v 1.3 2005/11/01 17:28:34 wilfried Exp $
---- WindowMaker/menu.orig Sat Oct 23 05:47:52 2004
-+++ WindowMaker/menu Mon Oct 31 18:40:37 2005
+$OpenBSD$
+--- WindowMaker/menu.orig Sat Apr 28 20:25:02 2012
++++ WindowMaker/menu Sat Apr 28 20:25:19 2012
@@ -208,7 +208,7 @@
"Background" END
"Save Theme" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
Index: patches/patch-WindowMaker_plmenu
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-WindowMaker_plmenu,v
retrieving revision 1.3
diff -u -p -r1.3 patch-WindowMaker_plmenu
--- patches/patch-WindowMaker_plmenu 1 Nov 2005 17:28:34 -0000 1.3
+++ patches/patch-WindowMaker_plmenu 28 Apr 2012 18:27:14 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-WindowMaker_plmenu,v 1.3 2005/11/01 17:28:34 wilfried Exp $
---- WindowMaker/plmenu.orig Sat Oct 23 05:49:23 2004
-+++ WindowMaker/plmenu Mon Oct 31 18:41:14 2005
+$OpenBSD$
+--- WindowMaker/plmenu.orig Sat Apr 28 20:26:15 2012
++++ WindowMaker/plmenu Sat Apr 28 20:26:32 2012
@@ -93,7 +93,7 @@
- ),
- ("Save Theme", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
- ("Save IconSet", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-- ("Preferences Utility", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+ ("Preferences Utility", EXEC, "#wprefsdir#/WPrefs")
- ),
- ("Session",
- ("Save Session", SAVE_SESSION),
+ ),
+ ("Save Theme", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+ ("Save IconSet", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
+- ("Preferences Utility", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
++ ("Preferences Utility", EXEC, "#wprefsdir#/WPrefs")
+ ),
+ ("Session",
+ ("Save Session", SAVE_SESSION),
Index: patches/patch-configure
===================================================================
RCS file: /home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 27 Dec 2005 23:12:24 -0000 1.3
+++ patches/patch-configure 28 Apr 2012 18:30:40 -0000
@@ -1,45 +1,27 @@
-$OpenBSD: patch-configure,v 1.3 2005/12/27 23:12:24 naddy Exp $
---- configure.orig Sun Jun 19 05:23:02 2005
-+++ configure Tue Dec 27 22:18:30 2005
-@@ -21237,7 +21237,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--{int x; asm volatile("movl %%eax, %%ebx\n"::
-+{int x; asm volatile("pushal\n movl %%eax, %%ebx\n popal\n"::
- "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
- "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}
- ;
-@@ -21301,7 +21301,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--asm ("movq %mm0, %mm1");
-+asm ("movq (%ebx), %mm1");
- ;
- return 0;
- }
-@@ -21489,13 +21489,13 @@ echo "${ECHO_T}$ac_cv_func_gettext" >&6
- if test $ac_cv_func_gettext = yes; then
+$OpenBSD$
+--- configure.orig Sat Apr 28 20:29:35 2012
++++ configure Sat Apr 28 20:30:09 2012
+@@ -12388,13 +12388,13 @@
+ if test "x$ac_cv_func_gettext" = x""yes; then :
HAVEGETTEXT="yes"
else
-- echo "$as_me:$LINENO: checking for gettext in -lintl" >&5
--echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for gettext in -lintl -liconv" >&5
-+echo $ECHO_N "checking for gettext in -lintl -liconv... $ECHO_C" >&6
- if test "${ac_cv_lib_intl_gettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
+-$as_echo_n "checking for gettext in -lintl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl
-liconv" >&5
++$as_echo_n "checking for gettext in -lintl -liconv... " >&6; }
+ if test "${ac_cv_lib_intl_gettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21553,7 +21553,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
- echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6
- if test $ac_cv_lib_intl_gettext = yes; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -12425,7 +12425,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_gettext" >&5
+ $as_echo "$ac_cv_lib_intl_gettext" >&6; }
+ if test "x$ac_cv_lib_intl_gettext" = x""yes; then :
- INTLIBS="-lintl" HAVEGETTEXT="yes"
+ INTLIBS="-lintl -liconv" HAVEGETTEXT="yes"
else
Index: patches/patch-src_actions_c
===================================================================
RCS file: patches/patch-src_actions_c
diff -N patches/patch-src_actions_c
--- patches/patch-src_actions_c 17 Mar 2012 17:32:28 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-src_actions_c,v 1.3 2012/03/17 17:32:28 dcoppa Exp $
-
-This is a backport from WindowMaker cvs which fixes the
-"periodic focus bug" described at:
-http://repo.or.cz/w/wmaker-crm.git/commitdiff/c91bb1ba1360006c568db37438779e525868cf17
-
---- src/actions.c.orig Fri Mar 16 17:10:27 2012
-+++ src/actions.c Fri Mar 16 17:11:57 2012
-@@ -78,6 +78,15 @@ static struct {
- #define SHADE_STEPS shadePars[(int)wPreferences.shade_speed].steps
- #define SHADE_DELAY shadePars[(int)wPreferences.shade_speed].delay
-
-+static int
-+compareTimes(Time t1, Time t2)
-+{
-+ Time diff;
-+ if (t1 == t2)
-+ return 0;
-+ diff = t1 - t2;
-+ return (diff < 60000) ? 1 : -1;
-+}
-
- /*
- *----------------------------------------------------------------------
-@@ -99,11 +108,11 @@ wSetFocusTo(WScreen *scr, WWindow *wwin)
-
- WWindow *old_focused;
- WWindow *focused=scr->focused_window;
-- int timestamp=LastTimestamp;
-+ Time timestamp=LastTimestamp;
- WApplication *oapp=NULL, *napp=NULL;
- int wasfocused;
-
-- if (scr->flags.ignore_focus_events || LastFocusChange > timestamp)
-+ if (scr->flags.ignore_focus_events || compareTimes(LastFocusChange,
timestamp) > 0)
- return;
-
- if (!old_scr)
Index: patches/patch-src_dock_c
===================================================================
RCS file: patches/patch-src_dock_c
diff -N patches/patch-src_dock_c
--- patches/patch-src_dock_c 20 May 2010 10:58:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_dock_c,v 1.2 2010/05/20 10:58:08 espie Exp $
---- src/dock.c.orig Sat Oct 23 05:10:40 2004
-+++ src/dock.c Thu May 20 12:50:56 2010
-@@ -2977,7 +2977,7 @@ execCommand(WAppIcon *btn, char *command, WSavedState
-
- wtokensplit(cmdline, &argv, &argc);
-
-- if (argv==NULL) {
-+ if (!argc) {
- if (cmdline)
- wfree(cmdline);
- if (state)
Index: patches/patch-src_main_c
===================================================================
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- patches/patch-src_main_c 20 May 2010 10:58:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_main_c,v 1.2 2010/05/20 10:58:08 espie Exp $
---- src/main.c.orig Mon Oct 25 03:32:51 2004
-+++ src/main.c Thu May 20 12:50:56 2010
-@@ -331,6 +331,7 @@ ExecuteShellCommand(WScreen *scr, char *command)
- * forked by wmaker.
- *---------------------------------------------------------------------------
- */
-+#if 0
- void
- StartLogShell(WScreen *scr)
- {
-@@ -403,7 +404,7 @@ StartLogShell(WScreen *scr)
- LogStdErr = err_fd[0];
- }
- }
--
-+#endif
-
- /*
- *---------------------------------------------------------------------
Index: patches/patch-src_session_c
===================================================================
RCS file: patches/patch-src_session_c
diff -N patches/patch-src_session_c
--- patches/patch-src_session_c 20 May 2010 10:58:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_session_c,v 1.2 2010/05/20 10:58:08 espie Exp $
---- src/session.c.orig Fri Mar 11 22:35:38 2005
-+++ src/session.c Thu May 20 12:50:56 2010
-@@ -381,7 +381,7 @@ execCommand(WScreen *scr, char *command, char *host)
-
- wtokensplit(command, &argv, &argc);
-
-- if (argv==NULL) {
-+ if (!argc) {
- return 0;
- }
-
Index: patches/patch-src_wmspec_c
===================================================================
RCS file: patches/patch-src_wmspec_c
diff -N patches/patch-src_wmspec_c
--- patches/patch-src_wmspec_c 20 May 2010 10:58:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,74 +0,0 @@
-$OpenBSD: patch-src_wmspec_c,v 1.3 2010/05/20 10:58:08 espie Exp $
---- src/wmspec.c.orig Sun May 15 18:41:09 2005
-+++ src/wmspec.c Thu May 20 12:50:56 2010
-@@ -322,14 +322,14 @@ setSupportedHints(WScreen *scr)
- void
- wNETWMUpdateDesktop(WScreen *scr)
- {
-- CARD32 *views, sizes[2];
-+ long *views, sizes[2];
- int count, i;
-
- if (scr->workspace_count==0)
- return;
-
- count = scr->workspace_count * 2;
-- views = wmalloc(sizeof(CARD32) * count);
-+ views = wmalloc(sizeof(long) * count);
- /*memset(views, 0, sizeof(CARD32) * count);*/
-
- #ifdef VIRTUAL_DESKTOP
-@@ -487,7 +487,7 @@ updateIconImage(WScreen *scr, WWindow *wwin)
- static void
- updateShowDesktop(WScreen * scr, Bool show)
- {
-- CARD32 foo;
-+ long foo;
-
- foo = (show == True);
- XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
-@@ -660,7 +660,7 @@ wNETWMUpdateActions(WWindow *wwin, Bool del)
- void
- wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
- {
-- CARD32 *area;
-+ long *area;
- int count, i;
-
- /* XXX: not Xinerama compatible,
-@@ -670,7 +670,7 @@ wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
- return;
-
- count = scr->workspace_count * 4;
-- area = wmalloc(sizeof(CARD32) * count);
-+ area = wmalloc(sizeof(long) * count);
- for (i=0; i<scr->workspace_count; i++) {
- area[4*i + 0] = usableArea.x1;
- area[4*i + 1] = usableArea.y1;
-@@ -793,7 +793,7 @@ updateClientListStacking(WScreen *scr, WWindow *wwin_e
- static void
- updateWorkspaceCount(WScreen *scr) /* changeable */
- {
-- CARD32 count;
-+ long count;
-
- count = scr->workspace_count;
-
-@@ -805,7 +805,7 @@ updateWorkspaceCount(WScreen *scr) /* changeable */
- static void
- updateCurrentWorkspace(WScreen *scr) /* changeable */
- {
-- CARD32 count;
-+ long count;
-
- count = scr->current_workspace;
-
-@@ -852,7 +852,7 @@ updateFocusHint(WScreen *scr, WWindow *wwin) /* change
- static void
- updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
- {
-- CARD32 l;
-+ long l;
-
- if (del) {
- XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
Index: patches/patch-util_wmaker_inst_in
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-util_wmaker_inst_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-util_wmaker_inst_in
--- patches/patch-util_wmaker_inst_in 15 Feb 2009 20:12:17 -0000 1.5
+++ patches/patch-util_wmaker_inst_in 28 Apr 2012 18:36:18 -0000
@@ -1,29 +1,24 @@
-$OpenBSD: patch-util_wmaker_inst_in,v 1.5 2009/02/15 20:12:17 wilfried Exp $
---- util/wmaker.inst.in.orig Fri Apr 8 13:24:14 2005
-+++ util/wmaker.inst.in Sun Feb 15 20:31:10 2009
-@@ -22,6 +22,7 @@ fi
+$OpenBSD$
+--- util/wmaker.inst.in.orig Sat Apr 28 20:34:24 2012
++++ util/wmaker.inst.in Sat Apr 28 20:35:49 2012
+@@ -19,6 +19,7 @@
# directory where system wide configuration is stored
GLOBALDIR="#pkgdatadir#"
GLOBALDEFDIR="#sysconfdir#"
+WPREFSDIR="#bindir#"
- USERDIR=$HOME
+ USERDIR="$HOME"
-@@ -81,14 +82,17 @@ copy() {
- source=$GLOBALDIR/plmenu
- fi
- sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
-+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
- $source > $GSDIR/Defaults/WMRootMenu
+@@ -64,10 +65,12 @@
else
if test "x$GNUSTEP_USER_ROOT" = "x"; then
sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
- $source > $target
+ "$source" > "$target"
else
sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
-e "s:#wmdatadir#:$GLOBALDIR:g" \
+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
- $source > $target
+ "$source" > "$target"
fi
fi
Index: patches/patch-wrlib_Makefile_in
===================================================================
RCS file:
/home/tobias/anoncvs/ports/x11/windowmaker/patches/patch-wrlib_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-wrlib_Makefile_in
--- patches/patch-wrlib_Makefile_in 27 Dec 2005 23:12:24 -0000 1.2
+++ patches/patch-wrlib_Makefile_in 28 Apr 2012 19:21:03 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-wrlib_Makefile_in,v 1.2 2005/12/27 23:12:24 naddy Exp $
---- wrlib/Makefile.in.orig Sun Jun 19 05:23:01 2005
-+++ wrlib/Makefile.in Tue Dec 27 22:18:30 2005
-@@ -112,7 +112,7 @@ supported_locales = @supported_locales@
- wprefs_bindir = @wprefs_bindir@
- wprefs_datadir = @wprefs_datadir@
-
--SUBDIRS = . tests
-+SUBDIRS = .
-
- AUTOMAKE_OPTIONS = no-dependencies
+$OpenBSD$
+--- wrlib/Makefile.in.orig Sat Apr 28 21:18:04 2012
++++ wrlib/Makefile.in Sat Apr 28 21:20:44 2012
+@@ -892,7 +892,7 @@
+ @$(SED) -e 's#$${inc_search_path}#$(inc_search_path)#;' \
+ -e 's#$${lib_search_path}#$(lib_search_path)#;' \
+ -e 's#$${GFXLIBS}#$(GFXLIBS)#;' \
+- -e 's#$${XLIBS}#$(XLIBS)#;' < $(dir $<@)get-wraster-flags.in >
$@
++ -e 's#$${XLIBS}#$(XLIBS)#;' <
$(abs_srcdir)/get-wraster-flags.in > $@
+ @chmod 755 $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: patches/patch-wrlib_png_c
===================================================================
RCS file: patches/patch-wrlib_png_c
diff -N patches/patch-wrlib_png_c
--- patches/patch-wrlib_png_c 8 Jul 2011 20:38:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-wrlib_png_c,v 1.1 2011/07/08 20:38:01 naddy Exp $
-
-Fix build with png-1.5.
-
---- wrlib/png.c.orig Tue Jul 5 22:30:42 2011
-+++ wrlib/png.c Tue Jul 5 22:31:03 2011
-@@ -97,7 +97,7 @@ RLoadPNG(RContext *context, char *file, int index)
- }
-
- RErrorCode = RERR_INTERNAL;
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- fclose(f);
- png_destroy_read_struct(&png, &pinfo, &einfo);
- if (image)
Index: patches/patch-wrlib_x86_specific_c
===================================================================
RCS file: patches/patch-wrlib_x86_specific_c
diff -N patches/patch-wrlib_x86_specific_c
--- patches/patch-wrlib_x86_specific_c 20 May 2010 10:58:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,131 +0,0 @@
-$OpenBSD: patch-wrlib_x86_specific_c,v 1.1 2010/05/20 10:58:08 espie Exp $
---- wrlib/x86_specific.c.orig Sun Oct 31 02:44:01 2004
-+++ wrlib/x86_specific.c Thu May 20 12:50:56 2010
-@@ -98,15 +98,23 @@ x86_mmx_TrueColor_32_to_16(unsigned char *image,
- int height,
- int line_offset)
- {
-- long long rrggbbaa;
-- long long pixel;
-+ union {
-+ long long rrggbbaa;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } rrggbbaa;
-+
-+ union {
-+ long long pixel;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } pixel;
-+
- short *tmp_err;
- short *tmp_nerr;
- int x;
-
- asm volatile
- (
-- "pushal \n\t"
-+ "pushl %%ebx \n\t"
-
- // pack dr, dg and db into mm6
- "movl %7, %%eax \n\t"
-@@ -290,7 +298,7 @@ x86_mmx_TrueColor_32_to_16(unsigned char *image,
-
- ".Enda: \n\t" // THE END
- "emms \n\t"
-- "popal \n\t"
-+ "popl %%ebx \n\t"
- :
- :
- "m" (image), // %0
-@@ -309,17 +317,18 @@ x86_mmx_TrueColor_32_to_16(unsigned char *image,
- "m" (width), // %13
- "m" (height), // %14
- "m" (line_offset), // %15
-- "m" (rrggbbaa), // %16 (access to rr)
-- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-- "m" (pixel), // %20 (access to pixel.r)
-- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
-- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
-- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
-+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
-+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
-+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
-+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
-+ "m" (pixel.pixel), // %20 (access to pixel.r)
-+ "m" (pixel.words.gg), // %21 (access to pixel.g)
-+ "m" (pixel.words.bb), // %22 (access to pixel.b)
-+ "m" (pixel.words.aa), // %23 (access to pixel.a)
- "m" (tmp_err), // %24
- "m" (tmp_nerr), // %25
- "m" (x) // %26
-+ : "eax", "ecx", "edx", "esi", "edi"
- );
- }
-
-@@ -342,8 +351,15 @@ x86_mmx_TrueColor_24_to_16(unsigned char *image,
- int height,
- int line_offset)
- {
-- long long rrggbbaa;
-- long long pixel;
-+ union {
-+ long long rrggbbaa;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } rrggbbaa;
-+
-+ union {
-+ long long pixel;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } pixel;
-
- short *tmp_err;
- short *tmp_nerr;
-@@ -354,7 +370,7 @@ x86_mmx_TrueColor_24_to_16(unsigned char *image,
-
- asm volatile
- (
-- "pushal \n\t"
-+ "pushl %%ebx \n\t"
-
- "movl %13, %%eax \n\t" // eax = width
- "movl %%eax, %%ebx \n\t"
-@@ -424,7 +440,7 @@ x86_mmx_TrueColor_24_to_16(unsigned char *image,
-
- ".Endc: \n\t" // THE END
- "emms \n\t"
-- "popal \n\t"
-+ "popl %%ebx \n\t"
- :
- :
- "m" (image), // %0
-@@ -443,19 +459,20 @@ x86_mmx_TrueColor_24_to_16(unsigned char *image,
- "m" (width), // %13
- "m" (height), // %14
- "m" (line_offset), // %15
-- "m" (rrggbbaa), // %16 (access to rr)
-- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-- "m" (pixel), // %20 (access to pixel.r)
-- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
-- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
-- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
-+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
-+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
-+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
-+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
-+ "m" (pixel.pixel), // %20 (access to pixel.r)
-+ "m" (pixel.words.gg), // %21 (access to pixel.g)
-+ "m" (pixel.words.bb), // %22 (access to pixel.b)
-+ "m" (pixel.words.aa), // %23 (access to pixel.a)
- "m" (tmp_err), // %24
- "m" (tmp_nerr), // %25
- "m" (x), // %26
- "m" (w1), // %27
- "m" (w2) // %28
-+ : "eax", "ecx", "edx", "esi", "edi"
- );
- }
-
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /home/tobias/anoncvs/ports/x11/windowmaker/pkg/PFRAG.shared-main,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.shared-main
--- pkg/PFRAG.shared-main 21 Nov 2006 22:07:07 -0000 1.1
+++ pkg/PFRAG.shared-main 28 Apr 2012 20:46:41 -0000
@@ -1,2 +1,4 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 22:07:07 espie Exp $
@lib lib/libwraster.so.${LIBwraster_VERSION}
+@lib lib/libWINGs.so.${LIBWINGs_VERSION}
+@lib lib/libWUtil.so.${LIBWUtil_VERSION}
Index: pkg/PLIST-main
===================================================================
RCS file: /home/tobias/anoncvs/ports/x11/windowmaker/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- pkg/PLIST-main 21 Nov 2006 22:07:07 -0000 1.1
+++ pkg/PLIST-main 28 Apr 2012 20:37:30 -0000
@@ -19,29 +19,36 @@ bin/wm-oldmenu2new
bin/wmagnify
bin/wmaker
bin/wmaker.inst
+bin/wmgenmenu
+bin/wmmenugen
bin/wmsetbg
-bin/wmsetup
bin/wxcopy
bin/wxpaste
include/WINGs/
include/WINGs/WINGs.h
include/WINGs/WINGsP.h
include/WINGs/WUtil.h
-include/WINGs/proplist-compat.h
-include/WINGs/wtabledelegates.h
-include/WINGs/wtableview.h
-include/WMaker.h
include/wraster.h
-lib/libExtraWINGs.a
lib/libWINGs.a
-lib/libWMaker.a
+lib/libWINGs.la
lib/libWUtil.a
+lib/libWUtil.la
lib/libwraster.a
lib/libwraster.la
lib/pkgconfig/
lib/pkgconfig/WINGs.pc
-lib/pkgconfig/wmlib.pc
lib/pkgconfig/wrlib.pc
+man/cs/
+man/cs/man1/
+@man man/cs/man1/geticonset.1x
+@man man/cs/man1/getstyle.1x
+@man man/cs/man1/seticons.1x
+@man man/cs/man1/setstyle.1x
+@man man/cs/man1/wdwrite.1x
+@man man/cs/man1/wmaker.1x
+@man man/cs/man1/wmsetbg.1x
+@man man/cs/man1/wxcopy.1x
+@man man/cs/man1/wxpaste.1x
@man man/man1/geticonset.1x
@man man/man1/getstyle.1x
@man man/man1/seticons.1x
@@ -51,6 +58,17 @@ lib/pkgconfig/wrlib.pc
@man man/man1/wmsetbg.1x
@man man/man1/wxcopy.1x
@man man/man1/wxpaste.1x
+man/ru/
+man/ru/man1/
+@man man/ru/man1/geticonset.1x
+@man man/ru/man1/getstyle.1x
+@man man/ru/man1/seticons.1x
+@man man/ru/man1/setstyle.1x
+@man man/ru/man1/wdwrite.1x
+@man man/ru/man1/wmaker.1x
+@man man/ru/man1/wmsetbg.1x
+@man man/ru/man1/wxcopy.1x
+@man man/ru/man1/wxpaste.1x
man/sk/
man/sk/man1/
@man man/sk/man1/geticonset.1x
@@ -90,6 +108,7 @@ share/WPrefs/tiff/menualign1.tiff
share/WPrefs/tiff/menualign2.tiff
share/WPrefs/tiff/menuprefs.tiff
share/WPrefs/tiff/menus.tiff
+share/WPrefs/tiff/miscprefs2.tiff
share/WPrefs/tiff/moreanim.tiff
share/WPrefs/tiff/mousesettings.tiff
share/WPrefs/tiff/mousespeed.tiff
@@ -97,9 +116,12 @@ share/WPrefs/tiff/msty1.tiff
share/WPrefs/tiff/msty2.tiff
share/WPrefs/tiff/msty3.tiff
share/WPrefs/tiff/newstyle.tiff
+share/WPrefs/tiff/nextstyle.tiff
share/WPrefs/tiff/nonopaque.tiff
+share/WPrefs/tiff/noopaqueresize.tiff
share/WPrefs/tiff/oldstyle.tiff
share/WPrefs/tiff/opaque.tiff
+share/WPrefs/tiff/opaqueresize.tiff
share/WPrefs/tiff/paths.tiff
share/WPrefs/tiff/smooth.tiff
share/WPrefs/tiff/sound.tiff
@@ -115,6 +137,7 @@ share/WPrefs/tiff/speed4.tiff
share/WPrefs/tiff/speed4s.tiff
share/WPrefs/tiff/tdel.tiff
share/WPrefs/tiff/tedit.tiff
+share/WPrefs/tiff/temp.tiff
share/WPrefs/tiff/textr.tiff
share/WPrefs/tiff/theme.tiff
share/WPrefs/tiff/timer0.tiff
@@ -144,7 +167,7 @@ share/WindowMaker/IconSets/Default.icons
share/WindowMaker/Icons/
share/WindowMaker/Icons/BitchX.tiff
share/WindowMaker/Icons/BitchX.xpm
-share/WindowMaker/Icons/DefaultAppIcon.tiff
+share/WindowMaker/Icons/Ear.png
share/WindowMaker/Icons/Ftp.png
share/WindowMaker/Icons/GNUstep.tiff
share/WindowMaker/Icons/GNUstep.xpm
@@ -157,10 +180,13 @@ share/WindowMaker/Icons/GNUterm.xpm
share/WindowMaker/Icons/GreenWilber.png
share/WindowMaker/Icons/ICQ.png
share/WindowMaker/Icons/Jabber.png
+share/WindowMaker/Icons/Magnify.tiff
+share/WindowMaker/Icons/Magnify.xpm
+share/WindowMaker/Icons/Mouth.png
share/WindowMaker/Icons/Mozilla.png
-share/WindowMaker/Icons/Netscape.png
share/WindowMaker/Icons/Pen.png
share/WindowMaker/Icons/Pencil.png
+share/WindowMaker/Icons/README
share/WindowMaker/Icons/Real.png
share/WindowMaker/Icons/Shell.png
share/WindowMaker/Icons/Speaker.png
@@ -170,6 +196,7 @@ share/WindowMaker/Icons/TerminalGNUstep.
share/WindowMaker/Icons/TerminalGNUstep.xpm
share/WindowMaker/Icons/TerminalLinux.tiff
share/WindowMaker/Icons/TerminalLinux.xpm
+share/WindowMaker/Icons/Wine.png
share/WindowMaker/Icons/XChat.png
share/WindowMaker/Icons/clip.tiff
share/WindowMaker/Icons/clip.xpm
@@ -193,8 +220,6 @@ share/WindowMaker/Icons/real.tiff
share/WindowMaker/Icons/real.xpm
share/WindowMaker/Icons/sgiterm.tiff
share/WindowMaker/Icons/sgiterm.xpm
-share/WindowMaker/Icons/sound.tiff
-share/WindowMaker/Icons/sound.xpm
share/WindowMaker/Icons/staroffice2.tiff
share/WindowMaker/Icons/staroffice2.xpm
share/WindowMaker/Icons/timer.tiff
@@ -253,16 +278,18 @@ share/WindowMaker/Styles/Summer.style
share/WindowMaker/Styles/Traditional.style
share/WindowMaker/Styles/VioletBlue.style
share/WindowMaker/Themes/
+share/WindowMaker/Themes/Blau.style
share/WindowMaker/Themes/Default.style
share/WindowMaker/Themes/OpenStep.style
share/WindowMaker/Themes/Pastel.style
share/WindowMaker/Themes/SteelBlueSilk.style
+share/WindowMaker/appearance.menu
share/WindowMaker/autostart.sh
+share/WindowMaker/background.menu
share/WindowMaker/exitscript.sh
share/WindowMaker/menu
share/WindowMaker/plmenu
share/WindowMaker/wmmacros
-share/WindowMaker/xtree.dat
%%SHARED%%
share/examples/WindowMaker/
@sample ${SYSCONFDIR}/WindowMaker/
