Index: head/x11-wm/icewm/Makefile =================================================================== --- head/x11-wm/icewm/Makefile (revision 198785) +++ head/x11-wm/icewm/Makefile (revision 198786) @@ -1,124 +1,122 @@ # New ports collection makefile for: icewm # Date created: 10 August 1997 # Whom: Yukihiro Nakai # # $FreeBSD$ # PORTNAME= icewm -PORTVERSION= 1.2.30 -PORTREVISION= 3 +PORTVERSION= 1.2.32 CATEGORIES= x11-wm MASTER_SITES= SF MAINTAINER= alepulver@FreeBSD.org COMMENT= Window Manager designed for speed, usability and consistency WANT_GNOME= yes USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-shaped-decorations \ --enable-guievents \ --with-cfgdir=${DATADIR} \ --with-libdir=${DATADIR} \ --with-kdedatadir=${LOCALBASE}/share \ --with-docdir=${PREFIX}/share/doc \ --with-mkfontdir=${NONEXISTENT} OPTIONS= GNOMEDESKTOP "Enable GNOME desktop support" off \ IMLIB "Build with Imlib support" on \ ESOUND "Enable EsounD daemon support" off \ XFT "Enable Xft support for fonts" on \ XINERAMA "Enable Xinerama support" on \ X86_ASM "Use optimized x86 assembly code" on \ BEASTIE "Use Beastie'fied startup button" off \ NLS "Enable National Language Support" on PORTSCOUT= limitw:2,even skipb:yes .include .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 .if !defined(WITHOUT_IMLIB) USE_GNOME+= imlib CONFIGURE_ARGS+=--with-imlib .else USE_XPM= yes CONFIGURE_ARGS+=--without-imlib .endif .if defined(WITH_ESOUND) USE_GNOME+= esound CONFIGURE_ARGS+=--with-icesound=esound .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) STARTUP_PIXMAP= ${DATADIR}/taskbar/bsd-daemon.xpm .else STARTUP_PIXMAP= icewm-logo.xpm .endif .if !defined(WITHOUT_NLS) USE_GETTEXT= yes PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls --disable-i18n PLIST_SUB+= NLS="@comment " .endif post-extract: .for dir in taskbar themes/Infadel2/taskbar @cd ${WRKSRC}/lib/${dir} && ${MV} start.xpm icewm-logo.xpm .endfor @${CP} -f ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|/usr/share/control|${LOCALBASE}/share/gnome/control|g ; \ s|/usr/share/app|${LOCALBASE}/share/gnome/app|g ; \ s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \ ${WRKSRC}/src/gnome2.cc post-install: .for dir in taskbar themes/Infadel2/taskbar @${LN} -sf ${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 Property changes on: head/x11-wm/icewm/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.129 \ No newline at end of property +1.130 \ No newline at end of property Index: head/x11-wm/icewm/distinfo =================================================================== --- head/x11-wm/icewm/distinfo (revision 198785) +++ head/x11-wm/icewm/distinfo (revision 198786) @@ -1,3 +1,3 @@ -MD5 (icewm-1.2.30.tar.gz) = 8a302c5e629bb81d87cc02004a694ece -SHA256 (icewm-1.2.30.tar.gz) = 4b802cf77ecf09bc44345f8fba3c11fd08dca0e8272e628b447ecf7289637e1d -SIZE (icewm-1.2.30.tar.gz) = 809353 +MD5 (icewm-1.2.32.tar.gz) = 49084971689c04b739766a3f5d576d83 +SHA256 (icewm-1.2.32.tar.gz) = c2fe6ef0bdc0a9f841ae6fe214c06a15d666f90df027d105305f3e0dc109a667 +SIZE (icewm-1.2.32.tar.gz) = 821920 Property changes on: head/x11-wm/icewm/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.63 \ No newline at end of property +1.64 \ No newline at end of property Index: head/x11-wm/icewm/files/patch-src_aapm.cc =================================================================== --- head/x11-wm/icewm/files/patch-src_aapm.cc (revision 198785) +++ head/x11-wm/icewm/files/patch-src_aapm.cc (nonexistent) @@ -1,11 +0,0 @@ ---- src/aapm.cc.orig 2006/12/24 15:56:15 1.18.2.3 -+++ src/aapm.cc 2007/04/22 16:38:49 1.18.2.4 -@@ -632,7 +632,7 @@ - - //estimate applet's size - for (i = 0; i < batteryNum; i++) { -- if (acpiBatteries[i]->present == BAT_ABSENT) -+ if (mode == ACPI && acpiBatteries[i]->present == BAT_ABSENT) - continue; - if (taskBarShowApmTime) - strcat(buf, "0:00"); Property changes on: head/x11-wm/icewm/files/patch-src_aapm.cc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/x11-wm/icewm/files/patch-src_yxtray.cc =================================================================== --- head/x11-wm/icewm/files/patch-src_yxtray.cc (nonexistent) +++ head/x11-wm/icewm/files/patch-src_yxtray.cc (revision 198786) @@ -0,0 +1,11 @@ +--- ./src/yxtray.cc.orig Tue Aug 7 02:12:03 2007 ++++ ./src/yxtray.cc Tue Sep 4 23:56:16 2007 +@@ -133,7 +133,7 @@ + + void YXTrayEmbedder::configure(const YRect &r, const bool resized) { + YXEmbed::configure(r, resized); +- fDocked->setGeometry(r); ++ fDocked->setSize(r.width(), r.height()); + } + + void YXTrayEmbedder::handleConfigureRequest(const XConfigureRequestEvent &configureRequest) Property changes on: head/x11-wm/icewm/files/patch-src_yxtray.cc ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property