Timo Myyra writes:
> Hi,
>
> Here's a updated windowmaker port.
> Most of the patches appeared to have reached upstream so got deleted
> in update.
> For some parts I couldn't find relevant sections where to apply those
> so I just deleted them.
>
> This is slightly tested on amd64 so could you wider testing.
>
> Timo
Here's updated version for the windowmaker, now with actual diff.
Changed the configure flags a bit to include new features.
Timo
Index: Makefile
===
RCS file: /cvs/ports/x11/windowmaker/Makefile,v
retrieving revision 1.90
diff -u -u -r1.90 Makefile
--- Makefile25 Sep 2013 07:58:50 - 1.90
+++ Makefile28 Jan 2014 15:45:21 -
@@ -3,14 +3,15 @@
COMMENT-main= window manager that emulates NEXTSTEP(tm)
COMMENT-lang= language subpackage for Window Maker
-V= 0.92.0
+V= 0.95.5
DISTNAME= WindowMaker-${V}
PKGNAME-main= ${DISTNAME:L}
-REVISION-main= 54
FULLPKGNAME-lang= windowmaker-lang-${V}
-REVISION-lang= 3
-SHARED_LIBS += wraster 5.0 # 4.0
+SHARED_LIBS += wraster 6.0 # 5.0
+SHARED_LIBS += WINGs0.0 # 2.1
+SHARED_LIBS += WMaker 0.0 # 1.1
+SHARED_LIBS += WUtil0.0 # 3.0
CATEGORIES=x11 x11/windowmaker
@@ -19,18 +20,19 @@
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += X11 Xext Xft Xinerama Xpm Xrender c expat fontconfig
-WANTLIB += freetype jpeg m png pthread-stubs tiff gif xcb z
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xinerama Xmu Xpm
+WANTLIB += Xrender Xt c expat fontconfig freetype intl iconv
+WANTLIB += jpeg kvm m png pthread-stubs tiff gif xcb z
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER:=source/release/}
-EXTRACT_SUFX= .tar.bz2
NO_TEST= Yes
SEPARATE_BUILD=Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --enable-static \
--enable-xinerama \
+ --enable-usermenu \
+ --enable-xrandr \
--with-datadir="${LOCALBASE}/share/WindowMaker" \
--with-nlsdir="${LOCALBASE}/share/locale"
@@ -44,7 +46,7 @@
graphics/png \
graphics/giflib
-RUN_DEPENDS-lang= x11/windowmaker>=0.90.0
+RUN_DEPENDS-lang= x11/windowmaker>=0.95.5
LIB_DEPENDS-lang=
WANTLIB-lang=
Index: distinfo
===
RCS file: /cvs/ports/x11/windowmaker/distinfo,v
retrieving revision 1.6
diff -u -u -r1.6 distinfo
--- distinfo5 Apr 2007 17:36:25 - 1.6
+++ distinfo28 Jan 2014 15:45:21 -
@@ -1,5 +1,2 @@
-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
+SHA256 (WindowMaker-0.95.5.tar.gz) =
SyX0dP3gMqBgyT+8UPHOBHKasX6pY8o+uNu4L0mvcNA=
+SIZE (WindowMaker-0.95.5.tar.gz) = 2927995
Index: patches/patch-WINGs_Makefile_in
===
RCS file: patches/patch-WINGs_Makefile_in
diff -N patches/patch-WINGs_Makefile_in
--- patches/patch-WINGs_Makefile_in 1 Nov 2005 17:28:34 - 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$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@
-
- 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
Index: patches/patch-WINGs_array_c
===
RCS file: patches/patch-WINGs_array_c
diff -N patches/patch-WINGs_array_c
--- patches/patch-WINGs_array_c 20 May 2010 10:58:08 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$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
