Diff below updates x11/pekwm to 0.1.7.
New patches are to make it use libpng instead of looking for libpng12, and to
replace swprintf (which OpenBSD doesn't seem to have).
Tested on i386.
Please test, comment, etc.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 26 Aug 2007 19:21:07 -0000 1.12
+++ Makefile 7 Oct 2008 18:18:16 -0000
@@ -2,8 +2,7 @@
COMMENT= aewm++ based pretty themable window manager
-DISTNAME= pekwm-0.1.6
-PKGNAME= ${DISTNAME}p1
+DISTNAME= pekwm-0.1.7
CATEGORIES= x11
HOMEPAGE= http://pekwm.org/
@@ -19,7 +18,10 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xft Xpm Xrandr Xrender Xau Xdmcp \
Xinerama expat z c fontconfig freetype m stdc++
-MASTER_SITES= ${HOMEPAGE}files/
+MODULES= converters/libiconv
+
+EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${HOMEPAGE}projects/3/files/
LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
png.>=5::graphics/png
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 11 Jun 2007 08:56:43 -0000 1.5
+++ distinfo 7 Oct 2008 18:18:16 -0000
@@ -1,5 +1,5 @@
-MD5 (pekwm-0.1.6.tar.gz) = ppJAGhGTb0PbHbU7z/XrUQ==
-RMD160 (pekwm-0.1.6.tar.gz) = VLDTx6pftTtEShj7UBIObZPh4u4=
-SHA1 (pekwm-0.1.6.tar.gz) = Q/vFLA00CXfm0BlPGd8cPFXgcgQ=
-SHA256 (pekwm-0.1.6.tar.gz) = HkUtjASZYKtb3RNrTlzL4hmvPkXwxWpC1rpIA+SPJFM=
-SIZE (pekwm-0.1.6.tar.gz) = 357267
+MD5 (pekwm-0.1.7.tar.bz2) = MKz6QaUAWp8xEXBB7DLrDQ==
+RMD160 (pekwm-0.1.7.tar.bz2) = d8YY3e/qrRapt1cwTKIz7Omxjjw=
+SHA1 (pekwm-0.1.7.tar.bz2) = 3NkdyNCAAL2N9AKwi3z7LXGwOLw=
+SHA256 (pekwm-0.1.7.tar.bz2) = IhbrDHIvSq0Vdhp/Ts7WfqEoSgDjLgPWbeS1X4wclSQ=
+SIZE (pekwm-0.1.7.tar.bz2) = 363788
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 7 Oct 2008 18:18:16 -0000
@@ -0,0 +1,35 @@
+$OpenBSD$
+--- configure.orig Tue Oct 7 17:37:23 2008
++++ configure Tue Oct 7 17:37:15 2008
+@@ -7397,12 +7397,12 @@ if test -n "$libpng12_CFLAGS"; then
+ pkg_cv_libpng12_CFLAGS="$libpng12_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12
>= 1.2.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libpng12 >= 1.2.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng >=
1.2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libpng >= 1.2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags "libpng12 >= 1.2.0"
2>/dev/null`
++ pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -7413,12 +7413,12 @@ if test -n "$libpng12_LIBS"; then
+ pkg_cv_libpng12_LIBS="$libpng12_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12
>= 1.2.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libpng12 >= 1.2.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng >=
1.2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libpng >= 1.2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs "libpng12 >= 1.2.0" 2>/dev/null`
++ pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
Index: patches/patch-src_FrameListMenu_cc
===================================================================
RCS file: patches/patch-src_FrameListMenu_cc
diff -N patches/patch-src_FrameListMenu_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_FrameListMenu_cc 7 Oct 2008 18:18:16 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/FrameListMenu.cc.orig Tue Oct 7 18:21:44 2008
++++ src/FrameListMenu.cc Tue Oct 7 18:23:23 2008
+@@ -118,6 +118,7 @@ FrameListMenu::updateFrameListMenu(void)
+ removeAll();
+
+ wchar_t buf[16];
++ char buf2[16];
+ wstring name;
+
+ // need to add an action, otherwise it looks as if we don't have anything
+@@ -141,7 +142,8 @@ FrameListMenu::updateFrameListMenu(void)
+
+ for (uint i = 0; i < Workspaces::instance()->size(); ++i) {
+ if (Workspaces::instance()->size() > 1) {
+- swprintf(buf, 16, L"<%d> ", i + 1);
++ snprintf(buf2, sizeof buf2, "<%d> ", i + 1);
++ mbstowcs(buf, buf2, 16);
+ }
+
+ for (it = Frame::frame_begin(); it != Frame::frame_end(); ++it) {
Index: patches/patch-src_Frame_cc
===================================================================
RCS file: patches/patch-src_Frame_cc
diff -N patches/patch-src_Frame_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Frame_cc 7 Oct 2008 18:18:16 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/Frame.cc.orig Tue Oct 7 18:15:58 2008
++++ src/Frame.cc Tue Oct 7 18:22:05 2008
+@@ -469,6 +469,7 @@ Frame::updatedActiveChild(void)
+ void
+ Frame::getDecorInfo(wchar_t *buf, uint size)
+ {
++ char buf2[256];
+ uint width, height;
+ if (_client) {
+ calcSizeInCells(width, height);
+@@ -476,7 +477,8 @@ Frame::getDecorInfo(wchar_t *buf, uint size)
+ width = _gm.width;
+ height = _gm.height;
+ }
+- swprintf(buf, size, L"%d+%d+%d+%d", width, height, _gm.x, _gm.y);
++ snprintf(buf2, sizeof buf2, "%d+%d+%d+%d", width, height, _gm.x, _gm.y);
++ mbstowcs(buf, buf2, size);
+ }
+
+ //! @brief
Index: patches/patch-src_PDecor_cc
===================================================================
RCS file: /cvs/ports/x11/pekwm/patches/patch-src_PDecor_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_PDecor_cc
--- patches/patch-src_PDecor_cc 26 Aug 2007 19:21:07 -0000 1.1
+++ patches/patch-src_PDecor_cc 7 Oct 2008 18:18:16 -0000
@@ -1,16 +1,14 @@
-$OpenBSD: patch-src_PDecor_cc,v 1.1 2007/08/26 19:21:07 mbalmer Exp $
---- src/PDecor.cc.orig Fri Aug 24 18:35:19 2007
-+++ src/PDecor.cc Fri Aug 24 18:35:47 2007
-@@ -253,8 +253,10 @@ PDecor::~PDecor(void)
- }
- }
+$OpenBSD$
+--- src/PDecor.cc.orig Tue Oct 7 18:21:36 2008
++++ src/PDecor.cc Tue Oct 7 18:22:20 2008
+@@ -1025,7 +1025,9 @@ PDecor::activateChild(PWinObj *child)
+ void
+ PDecor::getDecorInfo(wchar_t *buf, uint size)
+ {
+- swprintf(buf, size, L"%dx%d+%d+%d", _gm.width, _gm.height, _gm.x, _gm.y);
++ char buf2[256];
++ snprintf(buf2, sizeof buf2, "%dx%d+%d+%d", _gm.width, _gm.height, _gm.x,
_gm.y);
++ mbstowcs(buf, buf2, size);
+ }
-- // make things look smoother, buttons will be noticed as deleted otherwise
-- unmapWindow();
-+ // Make things look smoother, buttons will be noticed as deleted
-+ // otherwise. Using X call directly to avoid re-drawing and other
-+ // special features not required when removing the window.
-+ XUnmapWindow(_dpy, _window);
-
- // free buttons
- unloadDecor();
+ //! @brief
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 11 Jun 2007 08:56:43 -0000 1.4
+++ pkg/PLIST 7 Oct 2008 18:18:16 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2007/06/11 08:56:43 ajacoutot Exp $
-bin/pekwm
[EMAIL PROTECTED] bin/pekwm
@man man/man1/pekwm.1
share/examples/pekwm/
@sample ${SYSCONFDIR}/pekwm/
@@ -19,9 +19,8 @@ share/examples/pekwm/vars
@sample ${SYSCONFDIR}/pekwm/vars
share/pekwm/
share/pekwm/scripts/
-share/pekwm/scripts/pekwm_themeset.pl
share/pekwm/scripts/pekwm_themeset.sh
-share/pekwm/scripts/pekwm_ws_menu.pl
+share/pekwm/scripts/pekwm_ws_menu.sh
share/pekwm/themes/
share/pekwm/themes/default/
share/pekwm/themes/default/theme
