[Midnightbsd-cvs] mports [20036] trunk/x11-wm/icewm: icewm 1.3.8
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 25 21:43:56 EDT 2015
Revision: 20036
http://svnweb.midnightbsd.org/mports/?rev=20036
Author: laffer1
Date: 2015-08-25 21:43:56 -0400 (Tue, 25 Aug 2015)
Log Message:
-----------
icewm 1.3.8
Modified Paths:
--------------
trunk/x11-wm/icewm/Makefile
trunk/x11-wm/icewm/distinfo
trunk/x11-wm/icewm/pkg-plist
Added Paths:
-----------
trunk/x11-wm/icewm/files/extra-menu-icon-fix.patch
trunk/x11-wm/icewm/files/patch-src__wmapp.cc
trunk/x11-wm/icewm/files/patch-src__wmapp.h
trunk/x11-wm/icewm/files/patch-src__wmmgr.cc
Removed Paths:
-------------
trunk/x11-wm/icewm/files/patch-src__aapm.cc
trunk/x11-wm/icewm/files/patch-src_ylocale.cc
Modified: trunk/x11-wm/icewm/Makefile
===================================================================
--- trunk/x11-wm/icewm/Makefile 2015-08-26 01:40:33 UTC (rev 20035)
+++ trunk/x11-wm/icewm/Makefile 2015-08-26 01:43:56 UTC (rev 20036)
@@ -1,28 +1,21 @@
-# New ports collection makefile for: icewm
-# Date created: 10 August 1997
-# Whom: Yukihiro Nakai <Nakai at Mlab.t.u-tokyo.ac.jp>
-#
# $MidnightBSD$
# $FreeBSD: ports/x11-wm/icewm/Makefile,v 1.134 2008/03/23 11:11:23 miwi Exp $
-#
PORTNAME= icewm
-PORTVERSION= 1.3.7
+PORTVERSION= 1.3.8
CATEGORIES= x11-wm
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
COMMENT= Window Manager designed for speed, usability and consistency
-LICENSE= lgpl
-WANT_GNOME= yes
-USE_XORG= x11 ice xinerama xext xrandr sm
-USE_GNOME= gtk20 # gdkpixbuf really :-)
-USE_GMAKE= yes
+LICENSE= gpl2
+
+USES= gmake iconv:translit pkgconfig
+USE_XORG= ice sm x11 xext
+USE_GNOME= gdkpixbuf2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-shaped-decorations \
- --enable-guievents \
+CONFIGURE_ARGS= --enable-guievents \
--with-cfgdir=${DATADIR} \
--with-libdir=${DATADIR} \
--with-kdedatadir=${LOCALBASE}/share \
@@ -29,62 +22,53 @@
--with-docdir=${PREFIX}/share/doc \
--with-mkfontdir=${NONEXISTENT}
-OPTIONS= GNOMEDESKTOP "Enable GNOME desktop support" off \
- ESOUND "Enable EsounD daemon support" off \
- XFT "Enable Xft support for fonts" on \
- XINERAMA "Enable Xinerama support" off \
- X86_ASM "Use optimized x86 assembly code" on \
- BEASTIE "Use Beastie'fied startup button" off \
- NLS "Enable National Language Support" on
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-# Restrict to stable (even) versions, indicated by the second component.
-#PORTSCOUT= limitw:1,even
+OPTIONS_DEFINE= BEASTIE ESOUND GNOME LITE MENUFIX NLS XFT XINERAMA \
+ XRANDR DOCS
+OPTIONS_DEFINE_i386= ASM
+OPTIONS_DEFAULT= BEASTIE MENUFIX NLS XFT XINERAMA XRANDR
+OPTIONS_DEFAULT_i386= ASM
+OPTIONS_SUB= yes
-.include <bsd.port.pre.mk>
+BEASTIE_DESC= Use Beastie'fied startup button
+ESOUND_USE= GNOME=esound
+ESOUND_CONFIGURE_ON= --with-icesound=esound
+ESOUND_CONFIGURE_OFF= --with-icesound=oss
+GNOME_DESC= Display GNOME 2 menus
+GNOME_USE= GNOME=gnomedesktop,libgnomeui
+GNOME_CONFIGURE_ENABLE= menus-gnome2
+LITE_CONFIGURE_ENABLE= lite
+MENUFIX_DESC= MenuIconSize fix
+MENUFIX_EXTRA_PATCHES= ${FILESDIR}/extra-menu-icon-fix.patch
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
+XFT_LIB_DEPENDS= libXft.so:${PORTSDIR}/x11-fonts/libXft
+XFT_CONFIGURE_OFF= --enable-corefonts --disable-xfreetype
+XINERAMA_USE= XORG=xinerama
+XINERAMA_CONFIGURE_ENABLE= xinerama
+XRANDR_USE= XORG=xrandr
+XRANDR_CONFIGURE_ENABLE= xrandr
-.if defined(WITH_GNOMEDESKTOP)
-USE_GNOME+= gnomedesktop
-CONFIGURE_ARGS+=--enable-menus-gnome2
-INSTALL_TARGET= install install-gnome
-PLIST_SUB+= GNOMEDESKTOP=""
-.else
-PLIST_SUB+= GNOMEDESKTOP="@comment "
-.endif
+.include <bsd.mport.options.mk>
-.if defined(WITH_ESOUND)
-USE_GNOME+= esound
-CONFIGURE_ARGS+=--with-icesound=esound
+.if ${PORT_OPTIONS:MASM}
+CONFIGURE_ARGS+=--enable-x86-asm
.else
-CONFIGURE_ARGS+=--with-icesound=oss
-.endif
-
-.if !defined(WITHOUT_XFT)
-LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
-CONFIGURE_ARGS+=--enable-gradients
-.else
-CONFIGURE_ARGS+=--enable-corefonts --disable-xfreetype
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-CONFIGURE_ARGS+=--disable-xinerama
-.endif
-
-.if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM)
CONFIGURE_ARGS+=--disable-x86-asm
.endif
-.if defined(WITH_BEASTIE)
+.if ${PORT_OPTIONS:MBEASTIE}
STARTUP_PIXMAP= ${DATADIR}/taskbar/bsd-daemon.xpm
.else
STARTUP_PIXMAP= icewm-logo.xpm
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
+.if ${PORT_OPTIONS:MLITE}
+PLIST_SUB+= NOLITE="@comment "
.else
-CONFIGURE_ARGS+=--disable-nls --disable-i18n
-PLIST_SUB+= NLS="@comment "
+PLIST_SUB+= NOLITE=""
.endif
post-extract:
@@ -100,21 +84,24 @@
s|/usr/share/app|${LOCALBASE}/share/app|g ; \
s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
${WRKSRC}/src/gnome2.cc
+ @${REINPLACE_CMD} -e \
+ 's|SHELL=.*|SHELL=@SHELL@| ; \
+ s|icewm-set-gnomewm||g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|icewm-$$(VERSION)|icewm| ; \
+ s|`pkg-config fontconfig --cflags`|| ; \
+ s|`pkg-config fontconfig --libs`|| ; \
+ /@echo/s|^|#| ; \
+ s|@$$(|$$(|' ${WRKSRC}/src/Makefile.in
-post-configure:
- ${REINPLACE_CMD} -e 's|icewm-set-gnomewm||g' ${WRKSRC}/Makefile
-
post-install:
.for dir in taskbar themes/Infadel2/taskbar
- @${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/${dir}/start.xpm
+ @${LN} -s ${STARTUP_PIXMAP} ${DATADIR}/${dir}/start.xpm
.endfor
-.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
. for f in CHANGES INSTALL README TODO
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
. endfor
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-.endif
- @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/x11-wm/icewm/distinfo
===================================================================
--- trunk/x11-wm/icewm/distinfo 2015-08-26 01:40:33 UTC (rev 20035)
+++ trunk/x11-wm/icewm/distinfo 2015-08-26 01:43:56 UTC (rev 20036)
@@ -1,3 +1,2 @@
-SHA256 (icewm-1.3.7.tar.gz) = ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b
-RMD160 (icewm-1.3.7.tar.gz) = 0b6682eff832b6b05200d5c9581d293b80af0ebb
-SIZE (icewm-1.3.7.tar.gz) = 898197
+SHA256 (icewm-1.3.8.tar.gz) = 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18
+SIZE (icewm-1.3.8.tar.gz) = 905680
Added: trunk/x11-wm/icewm/files/extra-menu-icon-fix.patch
===================================================================
--- trunk/x11-wm/icewm/files/extra-menu-icon-fix.patch (rev 0)
+++ trunk/x11-wm/icewm/files/extra-menu-icon-fix.patch 2015-08-26 01:43:56 UTC (rev 20036)
@@ -0,0 +1,73 @@
+diff -Naur src/yicon.cc src/yicon.cc
+--- src/yicon.cc 2010-10-31 15:09:36.000000000 +0100
++++ src/yicon.cc 2011-11-07 19:41:52.841910531 +0100
+@@ -270,6 +270,10 @@
+ iconCache.getItem(0)->removeFromCache();
+ }
+
++int YIcon::menuSize() {
++ return menuIconSize;
++}
++
+ int YIcon::smallSize() {
+ return smallIconSize;
+ }
+diff -Naur src/yicon.h src/yicon.h
+--- src/yicon.h 2010-10-31 15:09:36.000000000 +0100
++++ src/yicon.h 2011-11-07 19:41:28.555296033 +0100
+@@ -25,6 +25,7 @@
+ bool isCached() { return fCached; }
+ void setCached(bool cached) { fCached = cached; }
+
++ static int menuSize();
+ static int smallSize();
+ static int largeSize();
+ static int hugeSize();
+diff -Naur src/ymenu.cc src/ymenu.cc
+--- src/ymenu.cc 2010-10-31 15:09:36.000000000 +0100
++++ src/ymenu.cc 2011-11-07 19:42:40.498474049 +0100
+@@ -153,8 +153,8 @@
+
+ #ifndef LITE
+ if (getItem(selItem)->getIcon() != null &&
+- YIcon::smallSize() > h)
+- h = YIcon::smallSize();
++ YIcon::menuSize() > h)
++ h = YIcon::menuSize();
+ #endif
+
+ if (x <= int(width() - h - 4))
+@@ -1023,8 +1023,8 @@
+ mitem->getIcon()->draw(g,
+ l + 1 + delta, t + delta + top + pad +
+ (eh - top - pad * 2 - bottom -
+- YIcon::smallSize()) / 2,
+- YIcon::smallSize());
++ YIcon::menuSize()) / 2,
++ YIcon::menuSize());
+ #endif
+ }
+
+diff -Naur src/ymenuitem.cc src/ymenuitem.cc
+--- src/ymenuitem.cc 2010-10-31 15:09:36.000000000 +0100
++++ src/ymenuitem.cc 2011-11-07 19:50:04.458316916 +0100
+@@ -86,8 +86,8 @@
+ int ih = fontHeight;
+
+ #ifndef LITE
+- if (YIcon::smallSize() > ih)
+- ih = YIcon::smallSize();
++ if (YIcon::menuSize() > ih)
++ ih = YIcon::menuSize();
+ #endif
+
+ if (wmLook == lookWarp4 || wmLook == lookWin95) {
+@@ -123,7 +123,7 @@
+ return 0;
+ #else
+ ref<YIcon> icon = getIcon();
+- return icon != null ? YIcon::smallSize(): 0;
++ return icon != null ? YIcon::menuSize(): 0;
+ #endif
+ }
+
Property changes on: trunk/x11-wm/icewm/files/extra-menu-icon-fix.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/x11-wm/icewm/files/patch-src__aapm.cc
===================================================================
--- trunk/x11-wm/icewm/files/patch-src__aapm.cc 2015-08-26 01:40:33 UTC (rev 20035)
+++ trunk/x11-wm/icewm/files/patch-src__aapm.cc 2015-08-26 01:43:56 UTC (rev 20036)
@@ -1,10 +0,0 @@
---- ./src/aapm.cc.orig 2010-10-31 10:09:36.000000000 -0400
-+++ ./src/aapm.cc 2010-11-02 19:56:53.000000000 -0400
-@@ -243,6 +243,7 @@
- }
-
- void YApm::AcpiStr(char *s, bool Tool) {
-+ size_t len;
- char buf[80], buf2[80], bat_info[250];
- FILE *fd;
- //name of the battery
Added: trunk/x11-wm/icewm/files/patch-src__wmapp.cc
===================================================================
--- trunk/x11-wm/icewm/files/patch-src__wmapp.cc (rev 0)
+++ trunk/x11-wm/icewm/files/patch-src__wmapp.cc 2015-08-26 01:43:56 UTC (rev 20036)
@@ -0,0 +1,20 @@
+--- src/wmapp.cc.orig
++++ src/wmapp.cc
+@@ -337,7 +337,7 @@
+ int ndirs; // ------------------- retrieve the old X's font path ---
+ char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
+
+- char ** newFontPath = new char *[ndirs + 1];
++ const char ** newFontPath = new const char *[ndirs + 1];
+ newFontPath[ndirs] = fontsdir;
+
+ if (fontPath)
+@@ -383,7 +383,7 @@
+ XChangeProperty(xapp->display(), manager->handle(),
+ XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
+ (unsigned char *) fontsdir, strlen(fontsdir));
+- XSetFontPath(xapp->display(), newFontPath, ndirs + 1);
++ XSetFontPath(xapp->display(), (char **) newFontPath, ndirs + 1);
+
+ if (fontPath) XFreeFontPath(fontPath);
+ delete[] fontsdir;
Property changes on: trunk/x11-wm/icewm/files/patch-src__wmapp.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-wm/icewm/files/patch-src__wmapp.h
===================================================================
--- trunk/x11-wm/icewm/files/patch-src__wmapp.h (rev 0)
+++ trunk/x11-wm/icewm/files/patch-src__wmapp.h 2015-08-26 01:43:56 UTC (rev 20036)
@@ -0,0 +1,11 @@
+--- src/wmapp.h.orig
++++ src/wmapp.h
+@@ -78,7 +78,7 @@
+ Window managerWindow;
+ };
+
+-#if 0
++#ifdef CONFIG_GUIEVENTS
+ extern YWMApp * wmapp;
+ #endif
+
Property changes on: trunk/x11-wm/icewm/files/patch-src__wmapp.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-wm/icewm/files/patch-src__wmmgr.cc
===================================================================
--- trunk/x11-wm/icewm/files/patch-src__wmmgr.cc (rev 0)
+++ trunk/x11-wm/icewm/files/patch-src__wmmgr.cc 2015-08-26 01:43:56 UTC (rev 20036)
@@ -0,0 +1,13 @@
+diff --git src/wmmgr.cc src/wmmgr.cc
+index 4252bf6..dc1e703 100644
+--- src/wmmgr.cc
++++ src/wmmgr.cc
+@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) {
+ case ICEWM_ACTION_RESTARTWM:
+ case ICEWM_ACTION_WINDOWLIST:
+ case ICEWM_ACTION_ABOUT:
+- break;
++ //break;
+ default:
+ smActionListener->handleSMAction(message.data.l[1]);
+ break;
Property changes on: trunk/x11-wm/icewm/files/patch-src__wmmgr.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/x11-wm/icewm/files/patch-src_ylocale.cc
===================================================================
--- trunk/x11-wm/icewm/files/patch-src_ylocale.cc 2015-08-26 01:40:33 UTC (rev 20035)
+++ trunk/x11-wm/icewm/files/patch-src_ylocale.cc 2015-08-26 01:43:56 UTC (rev 20036)
@@ -1,12 +0,0 @@
---- src/ylocale.cc.orig Mon Aug 7 03:38:14 2006
-+++ src/ylocale.cc Tue Aug 8 01:00:33 2006
-@@ -149,7 +149,8 @@
- return NULL;
-
- YUChar * uStr(new YUChar[lLen + 1]);
-- char * inbuf((char *) lStr), * outbuf((char *) uStr);
-+ const char * inbuf((char *) lStr);
-+ char * outbuf((char *) uStr);
- size_t inlen(lLen), outlen(4 * lLen);
-
- if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
Modified: trunk/x11-wm/icewm/pkg-plist
===================================================================
--- trunk/x11-wm/icewm/pkg-plist 2015-08-26 01:40:33 UTC (rev 20035)
+++ trunk/x11-wm/icewm/pkg-plist 2015-08-26 01:43:56 UTC (rev 20036)
@@ -1,9 +1,8 @@
- at comment $FreeBSD: ports/x11-wm/icewm/pkg-plist,v 1.49 2006/12/28 13:29:04 alepulver Exp $
-bin/icehelp
+%%NOLITE%%bin/icehelp
bin/icesh
bin/icesound
bin/icewm
-%%GNOMEDESKTOP%%bin/icewm-menu-gnome2
+%%GNOME%%bin/icewm-menu-gnome2
bin/icewm-session
bin/icewmbg
bin/icewmhint
@@ -33,7 +32,6 @@
%%PORTDOCS%%%%DOCSDIR%%/icewm-8.html
%%PORTDOCS%%%%DOCSDIR%%/icewm-9.html
%%PORTDOCS%%%%DOCSDIR%%/icewm.html
-%%GNOMEDESKTOP%%share/gnome/wm-properties/IceWM.desktop
%%DATADIR%%/icons/app_16x16.xpm
%%DATADIR%%/icons/app_32x32.xpm
%%DATADIR%%/icons/emacs_16x16.xpm
@@ -332,25 +330,3 @@
%%NLS%%share/locale/vi/LC_MESSAGES/icewm.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/icewm.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/icewm.mo
- at dirrm %%DATADIR%%/themes/yellowmotif
- at dirrm %%DATADIR%%/themes/win95
- at dirrm %%DATADIR%%/themes/warp4
- at dirrm %%DATADIR%%/themes/warp3
- at dirrm %%DATADIR%%/themes/nice2
- at dirrm %%DATADIR%%/themes/nice
- at dirrm %%DATADIR%%/themes/motif
- at dirrm %%DATADIR%%/themes/metal2
- at dirrm %%DATADIR%%/themes/icedesert
- at dirrm %%DATADIR%%/themes/gtk2
- at dirrm %%DATADIR%%/themes/Infadel2/taskbar
- at dirrm %%DATADIR%%/themes/Infadel2/mailbox
- at dirrm %%DATADIR%%/themes/Infadel2/icons
- at dirrm %%DATADIR%%/themes/Infadel2/cursors
- at dirrm %%DATADIR%%/themes/Infadel2
- at dirrm %%DATADIR%%/themes
- at dirrm %%DATADIR%%/taskbar
- at dirrm %%DATADIR%%/mailbox
- at dirrm %%DATADIR%%/ledclock
- at dirrm %%DATADIR%%/icons
- at dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
More information about the Midnightbsd-cvs
mailing list