Date: Sun, 24 Oct 2004 23:00:23 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73082: Update port: x11-wm/windowmaker Message-ID: <20041024230023.2d8dd1dd.tkato432@yahoo.com> Resent-Message-ID: <200410241410.i9OEALL0020719@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73082
>Category: ports
>Synopsis: Update port: x11-wm/windowmaker
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 24 14:10:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Fix build on 4-stable
- Fix libwraster shared library version
- Remove a patch which is no longer needed
- Remove options which are no longer supported
- Fix pkg-plist
- Revise pkg-descr
New file:
files/patch-src::switchpanel.c
files/patch-src::wmspec.c
files/patch-src::workspace.c
Remove file:
files/patch-ah
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/windowmaker/Makefile x11-wm/windowmaker/Makefile
--- /usr/ports/x11-wm/windowmaker/Makefile Sun Oct 24 20:51:12 2004
+++ x11-wm/windowmaker/Makefile Sun Oct 24 22:25:07 2004
@@ -7,6 +7,7 @@
PORTNAME= windowmaker
PORTVERSION= 0.90.0
+PORTREVISION= 1
CATEGORIES= x11-wm windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER}
MASTER_SITE_SUBDIR= source/release
@@ -22,51 +23,46 @@
RUN_DEPENDS= ${X11BASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
USE_BZIP2= yes
-USE_GETTEXT= yes
-USE_PERL5= yes
USE_X_PREFIX= yes
+USE_GNOME= gnomehack gnometarget pkgconfig
USE_XPM= yes
+USE_PERL5= yes
+USE_GETTEXT= yes
USE_REINPLACE= yes
-WANT_GNOME= yes
-INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
-CONFIGURE_ENV= X11BASE=${X11BASE} \
- LIBS="-L${LOCALBASE}/lib -lintl" \
- CPPFLAGS="-I${LOCALBASE}/include" \
+USE_LIBTOOL_VER= 15
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
LINGUAS="${LINGUAS}"
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
--with-nlsdir=${PREFIX}/share/locale \
--with-libs-from="-L${LOCALBASE}/lib" \
--with-incs-from="-I${LOCALBASE}/include" \
--with-appspath="${PREFIX}/GNUstep/Apps" \
+ --enable-vdesktop \
+ --enable-xinerama \
--disable-debug
-
-OPTIONS= XKB_STATUS "XKB STATUS" off \
- KDE "Add hooks for KDE" off
-
-.include <bsd.port.pre.mk>
+INSTALLS_SHLIB= yes
MANLANG= "" sk
MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
+OPTIONS= XKB_STATUS "XKB STATUS" off
+
+.include <bsd.port.pre.mk>
+
LINGUAS!= ${CAT} ${FILESDIR}/LINGUAS
.if defined(WITH_XKB_STATUS)
CONFIGURE_ARGS+= --enable-modelock
.endif
-.if defined(HAVE_GNOME)
-CONFIGURE_ARGS+= --enable-gnome
-.endif
-
-.if defined(WITH_KDE)
-CONFIGURE_ARGS+= --enable-kde
-.endif
-
post-patch:
+ @${REINPLACE_CMD} -e "s|TW\.Big5|TW|g" ${WRKSRC}/configure
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
@${REINPLACE_CMD} -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new
+ @${REINPLACE_CMD} -e "s|-version-info 3:|-version-info 5:|g" ${WRKSRC}/wrlib/Makefile.in
+ @${REINPLACE_CMD} -e "s|Trebuchet MS,Luxi Sans|sans|g" ${WRKSRC}/WindowMaker/Defaults/WMGLOBAL
@${REINPLACE_CMD} -e "s|/usr/local/GNUstep|${PREFIX}/GNUstep|g" \
${WRKSRC}/WindowMaker/*menu*
diff -urN /usr/ports/x11-wm/windowmaker/files/patch-ah x11-wm/windowmaker/files/patch-ah
--- /usr/ports/x11-wm/windowmaker/files/patch-ah Fri Oct 30 17:24:36 1998
+++ x11-wm/windowmaker/files/patch-ah Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- WINGs/usleep.c.orig Wed Oct 21 14:43:55 1998
-+++ WINGs/usleep.c Mon Oct 26 19:27:37 1998
-@@ -11,6 +11,8 @@
- # include <sys/types.h>
- #endif
-
-+#include <unistd.h>
-+#include <string.h>
-
- #if defined(HAVE_SELECT)
-
diff -urN /usr/ports/x11-wm/windowmaker/files/patch-src::switchpanel.c x11-wm/windowmaker/files/patch-src::switchpanel.c
--- /usr/ports/x11-wm/windowmaker/files/patch-src::switchpanel.c Thu Jan 1 09:00:00 1970
+++ x11-wm/windowmaker/files/patch-src::switchpanel.c Sun Oct 24 02:56:44 2004
@@ -0,0 +1,12 @@
+--- src/switchpanel.c.orig Sat Oct 23 10:56:59 2004
++++ src/switchpanel.c Sun Oct 24 02:56:19 2004
+@@ -198,8 +198,8 @@
+ static void addIconForWindow(WSwitchPanel *panel, WWindow *wwin, int iconWidth)
+ {
+ WMLabel *label= WMCreateLabel(panel->hbox);
+- WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(label), False, True, iconWidth + ICON_EXTRASPACE, 0, 0);
+ RImage *image = NULL;
++ WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(label), False, True, iconWidth + ICON_EXTRASPACE, 0, 0);
+
+ if (!WFLAGP(wwin, always_user_icon) && wwin->net_icon_image)
+ image = RRetainImage(wwin->net_icon_image);
diff -urN /usr/ports/x11-wm/windowmaker/files/patch-src::wmspec.c x11-wm/windowmaker/files/patch-src::wmspec.c
--- /usr/ports/x11-wm/windowmaker/files/patch-src::wmspec.c Thu Jan 1 09:00:00 1970
+++ x11-wm/windowmaker/files/patch-src::wmspec.c Sun Oct 24 02:57:55 2004
@@ -0,0 +1,12 @@
+--- src/wmspec.c.orig Sat Oct 23 12:18:47 2004
++++ src/wmspec.c Sun Oct 24 02:57:37 2004
+@@ -392,8 +392,8 @@
+ RImage *new_rimage;
+
+ do {
+- len = data[pos+0]*data[pos+1];
+ unsigned int tmp = pref_sq-len;
++ len = data[pos+0]*data[pos+1];
+ if (tmp < best_tmp && tmp > 0) {
+ best_tmp = tmp;
+ best_pos = pos;
diff -urN /usr/ports/x11-wm/windowmaker/files/patch-src::workspace.c x11-wm/windowmaker/files/patch-src::workspace.c
--- /usr/ports/x11-wm/windowmaker/files/patch-src::workspace.c Thu Jan 1 09:00:00 1970
+++ x11-wm/windowmaker/files/patch-src::workspace.c Sun Oct 24 22:32:25 2004
@@ -0,0 +1,27 @@
+--- src/workspace.c.orig Fri Oct 15 06:14:43 2004
++++ src/workspace.c Sun Oct 24 22:32:02 2004
+@@ -738,16 +738,20 @@
+ vdMouseMoveDesktop(XEvent *event, WMPoint direction)
+ {
+ static int lock = False;
+- if (lock) return;
+- lock = True;
+
+ Bool done = False;
+ Bool moved = True;
+- WScreen *scr = wScreenForRootWindow(event->xcrossing.root);
+- WMPoint old_pos = wmkpoint(event->xcrossing.x_root, event->xcrossing.y_root);
++ WScreen *scr;
++ WMPoint old_pos;
+ WMPoint step;
+ int x, y;
+ int resisted = 0;
++
++ if (lock) return;
++ lock = True;
++
++ scr = wScreenForRootWindow(event->xcrossing.root);
++ old_pos = wmkpoint(event->xcrossing.x_root, event->xcrossing.y_root);
+
+ if (XGrabPointer(dpy, event->xcrossing.window, False,
+ PointerMotionMask, GrabModeAsync, GrabModeAsync,
diff -urN /usr/ports/x11-wm/windowmaker/pkg-descr x11-wm/windowmaker/pkg-descr
--- /usr/ports/x11-wm/windowmaker/pkg-descr Thu Sep 2 06:20:09 1999
+++ x11-wm/windowmaker/pkg-descr Sun Oct 24 22:39:43 2004
@@ -1,6 +1,9 @@
-Window Maker is a new Windowmanager for X written by Alfredo Kojima. It follows
-in the tradition of Afterstep, attempting to emulate the most fantastic of
-UI's posessed by the NeXT STEP(tm) operating system. Window Maker is an
-official part of the GNU Project.
+Window Maker is an X11 window manager designed to give additional
+integration support to the GNUstep Desktop Environment. In every
+way possible, it reproduces the elegant look and feel of the
+NeXTSTEP[tm] GUI. It is fast, feature rich, easy to configure, and
+easy to use. In addition, Window Maker works with GNOME and KDE,
+making it one of the most useful and universal window managers
+available.
-WWW: http://www.windowmaker.org/
+WWW: http://www.windowmaker.org/
diff -urN /usr/ports/x11-wm/windowmaker/pkg-plist x11-wm/windowmaker/pkg-plist
--- /usr/ports/x11-wm/windowmaker/pkg-plist Sun Oct 24 20:51:12 2004
+++ x11-wm/windowmaker/pkg-plist Sun Oct 24 10:03:33 2004
@@ -103,10 +103,10 @@
lib/libWUtil.a
lib/libwraster.a
lib/libwraster.so
-lib/libwraster.so.3
-lib/pkgconfig/wrlib.pc
-lib/pkgconfig/WINGs.pc
-lib/pkgconfig/wmlib.pc
+lib/libwraster.so.5
+libdata/pkgconfig/WINGs.pc
+libdata/pkgconfig/wmlib.pc
+libdata/pkgconfig/wrlib.pc
share/WINGs/Images.tiff
share/WINGs/Images.xpm
share/WINGs/defaultIcon.tiff
@@ -277,8 +277,8 @@
share/locale/bg/LC_MESSAGES/WindowMaker.mo
share/locale/bs/LC_MESSAGES/WindowMaker.mo
share/locale/ca/LC_MESSAGES/WINGs.mo
-share/locale/ca/LC_MESSAGES/WindowMaker.mo
share/locale/ca/LC_MESSAGES/WPrefs.mo
+share/locale/ca/LC_MESSAGES/WindowMaker.mo
share/locale/cs/LC_MESSAGES/WINGs.mo
share/locale/cs/LC_MESSAGES/WPrefs.mo
share/locale/cs/LC_MESSAGES/WindowMaker.mo
@@ -323,6 +323,8 @@
share/locale/tr/LC_MESSAGES/WindowMaker.mo
share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
+share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
+share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
@exec mkdir -p %D/GNUstep/Apps/WPrefs.app/xpm
@exec mkdir -p %D/share/WindowMaker/Sounds
@dirrm share/WindowMaker/Styles
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041024230023.2d8dd1dd.tkato432>