Date: Sun, 23 Feb 2014 16:04:52 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345744 - in head/x11-wm/icewm: . files Message-ID: <201402231604.s1NG4qv4008378@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Sun Feb 23 16:04:51 2014 New Revision: 345744 URL: http://svnweb.freebsd.org/changeset/ports/345744 QAT: https://qat.redports.org/buildarchive/r345744/ Log: - Update to 1.3.8 - Convert to USES - Stage support PR: 186738 Submitted by: ports fury Added: head/x11-wm/icewm/files/patch-src__wmapp.cc (contents, props changed) head/x11-wm/icewm/files/patch-src__wmapp.h (contents, props changed) Deleted: head/x11-wm/icewm/files/patch-src__Makefile.in head/x11-wm/icewm/files/patch-src__aapm.cc head/x11-wm/icewm/files/patch-src__apppstatus.cc head/x11-wm/icewm/files/patch-src__yarray.h head/x11-wm/icewm/files/patch-src_base.h head/x11-wm/icewm/pkg-message Modified: head/x11-wm/icewm/Makefile head/x11-wm/icewm/distinfo head/x11-wm/icewm/pkg-plist Modified: head/x11-wm/icewm/Makefile ============================================================================== --- head/x11-wm/icewm/Makefile Sun Feb 23 15:58:40 2014 (r345743) +++ head/x11-wm/icewm/Makefile Sun Feb 23 16:04:51 2014 (r345744) @@ -2,66 +2,58 @@ # $FreeBSD$ PORTNAME= icewm -PORTVERSION= 1.3.7 -PORTREVISION= 3 +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@FreeBSD.org COMMENT= Window Manager designed for speed, usability and consistency LICENSE= GPLv2 -WANT_GNOME= yes -USE_XORG= x11 ice xinerama xext xrandr sm -USE_GNOME= gtk20 # gdkpixbuf really :-) +USES= gmake iconv pkgconfig +USE_XORG= ice sm x11 xext +USE_GNOME= gdkpixbuf2 GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake pkgconfig -CONFIGURE_ARGS= --enable-shaped-decorations \ - --enable-guievents \ +CONFIGURE_ARGS= --enable-guievents \ --with-cfgdir=${DATADIR} \ --with-libdir=${DATADIR} \ --with-kdedatadir=${LOCALBASE}/share \ --with-docdir=${PREFIX}/share/doc \ --with-mkfontdir=${NONEXISTENT} -OPTIONS_DEFINE= GNOME ESOUND XFT XINERAMA ASM BEASTIE NLS LITE MENUFIX -OPTIONS_DEFAULT= XFT XINERAMA ASM BEASTIE NLS MENUFIX -BEASTIE_DESC= Use Beastie'fied startup button -MENUFIX_DESC= MenuIconSize fix - -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MGNOME} -USE_GNOME+= gnomedesktop libgnomeui -CONFIGURE_ARGS+=--enable-menus-gnome2 -INSTALL_TARGET= install -PLIST_SUB+= GNOMEDESKTOP="" -.else -PLIST_SUB+= GNOMEDESKTOP="@comment " -.endif +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -.if ${PORT_OPTIONS:MESOUND} -USE_GNOME+= esound -CONFIGURE_ARGS+=--with-icesound=esound -.else -CONFIGURE_ARGS+=--with-icesound=oss -.endif +OPTIONS_DEFINE= BEASTIE ESOUND GNOME LITE MENUFIX NLS XFT XINERAMA \ + XRANDR +OPTIONS_DEFINE_i386= ASM +OPTIONS_DEFAULT= BEASTIE MENUFIX NLS XFT XINERAMA XRANDR +OPTIONS_DEFAULT_i386= ASM +OPTIONS_SUB= yes + +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 ${PORT_OPTIONS:MXFT} -LIB_DEPENDS+= Xft:${PORTSDIR}/x11-fonts/libXft -CONFIGURE_ARGS+=--enable-gradients -.else -CONFIGURE_ARGS+=--enable-corefonts --disable-xfreetype -.endif +.include <bsd.port.options.mk> -.if empty(PORT_OPTIONS:MXINERAMA) -CONFIGURE_ARGS+=--disable-xinerama -.endif - -.if ${ARCH} == "i386" && ${PORT_OPTIONS:MASM} +.if ${PORT_OPTIONS:MASM} CONFIGURE_ARGS+=--enable-x86-asm .else CONFIGURE_ARGS+=--disable-x86-asm @@ -73,20 +65,10 @@ STARTUP_PIXMAP= ${DATADIR}/taskbar/bsd-d STARTUP_PIXMAP= icewm-logo.xpm .endif -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls --disable-i18n -PLIST_SUB+= NLS="@comment " -.endif - .if ${PORT_OPTIONS:MLITE} -MAKE_ENV+= LITE=1 -.endif - -.if ${PORT_OPTIONS:MMENUFIX} -EXTRA_PATCHES+= ${FILESDIR}/extra-menu-icon-fix.patch +PLIST_SUB+= NOLITE="@comment " +.else +PLIST_SUB+= NOLITE="" .endif post-extract: @@ -102,9 +84,15 @@ post-patch: s|/usr/share/app|${LOCALBASE}/share/app|g ; \ s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \ ${WRKSRC}/src/gnome2.cc - -post-configure: - ${REINPLACE_CMD} -e 's|icewm-set-gnomewm||g' ${WRKSRC}/Makefile + @${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-install: .for dir in taskbar themes/Infadel2/taskbar @@ -116,4 +104,4 @@ post-install: . endfor ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/x11-wm/icewm/distinfo ============================================================================== --- head/x11-wm/icewm/distinfo Sun Feb 23 15:58:40 2014 (r345743) +++ head/x11-wm/icewm/distinfo Sun Feb 23 16:04:51 2014 (r345744) @@ -1,2 +1,2 @@ -SHA256 (icewm-1.3.7.tar.gz) = ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b -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: head/x11-wm/icewm/files/patch-src__wmapp.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/icewm/files/patch-src__wmapp.cc Sun Feb 23 16:04:51 2014 (r345744) @@ -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; Added: head/x11-wm/icewm/files/patch-src__wmapp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/icewm/files/patch-src__wmapp.h Sun Feb 23 16:04:51 2014 (r345744) @@ -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 + Modified: head/x11-wm/icewm/pkg-plist ============================================================================== --- head/x11-wm/icewm/pkg-plist Sun Feb 23 15:58:40 2014 (r345743) +++ head/x11-wm/icewm/pkg-plist Sun Feb 23 16:04:51 2014 (r345744) @@ -1,8 +1,8 @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402231604.s1NG4qv4008378>