Index: Makefile =================================================================== --- Makefile (revision 333538) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= icewm -PORTVERSION= 1.3.7 -PORTREVISION= 3 +PORTVERSION= 1.3.8 CATEGORIES= x11-wm MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}/ @@ -28,10 +27,12 @@ CONFIGURE_ARGS= --enable-shaped-decorations \ --with-mkfontdir=${NONEXISTENT} OPTIONS_DEFINE= GNOME ESOUND XFT XINERAMA ASM BEASTIE NLS LITE MENUFIX -OPTIONS_DEFAULT= XFT XINERAMA ASM BEASTIE NLS MENUFIX +OPTIONS_DEFAULT= XFT XINERAMA ASM BEASTIE NLS BEASTIE_DESC= Use Beastie'fied startup button MENUFIX_DESC= MenuIconSize fix +MAKE_JOBS_UNSAFE= yes + .include .if ${PORT_OPTIONS:MGNOME} @@ -86,6 +87,7 @@ MAKE_ENV+= LITE=1 .endif .if ${PORT_OPTIONS:MMENUFIX} +IGNORE=patch does not apply EXTRA_PATCHES+= ${FILESDIR}/extra-menu-icon-fix.patch .endif Index: distinfo =================================================================== --- distinfo (revision 333538) +++ distinfo (working copy) @@ -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 Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 0) +++ files/patch-Makefile.in (working copy) @@ -0,0 +1,11 @@ +--- ./Makefile.in.orig 2013-11-17 11:54:39.000000000 -0500 ++++ ./Makefile.in 2013-11-20 20:55:13.828716619 -0500 +@@ -4,8 +4,6 @@ + # Please run 'configure' first (generate it with autogen.sh) + ################################################################################ + +-SHELL=/bin/bash +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + Property changes on: files/patch-Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-src__Makefile.in =================================================================== --- files/patch-src__Makefile.in (revision 333538) +++ files/patch-src__Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- ./src/Makefile.in.orig 2011-04-22 23:41:38.690448253 +0200 -+++ ./src/Makefile.in 2011-04-22 23:41:53.522445343 +0200 -@@ -32,7 +32,7 @@ - -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ - -DICESMEXE='"icewm-session$(EXEEXT)"' \ - -DICEHELPEXE='"icehelp$(EXEEXT)"' \ -- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' -+ -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"' - - CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ - @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` Index: files/patch-src__aapm.cc =================================================================== --- files/patch-src__aapm.cc (revision 333538) +++ files/patch-src__aapm.cc (working copy) @@ -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 Index: files/patch-src__apppstatus.cc =================================================================== --- files/patch-src__apppstatus.cc (revision 333538) +++ files/patch-src__apppstatus.cc (working copy) @@ -1,17 +0,0 @@ -Fix clang build errors - -http://icewm.cvs.sourceforge.net/viewvc/icewm/icewm-1.2/src/apppstatus.cc?r1=1.24.2.1.2.4&r2=1.24.2.1.2.5&pathrev=icewm-1-3-BRANCH - ---- src/apppstatus.cc 2009/11/08 19:24:08 1.24.2.1.2.4 -+++ src/apppstatus.cc 2010/12/25 15:29:53 1.24.2.1.2.5 -@@ -82,7 +82,9 @@ - } - - NetStatus::~NetStatus() { -- delete[] color; -+ delete color[0]; -+ delete color[1]; -+ delete color[2]; - delete[] ppp_in; - delete[] ppp_out; - delete fUpdateTimer; Index: files/patch-src__wmapp.h =================================================================== --- files/patch-src__wmapp.h (revision 0) +++ files/patch-src__wmapp.h (working copy) @@ -0,0 +1,12 @@ +--- ./src/wmapp.h.orig 2013-11-20 21:01:23.373692186 -0500 ++++ ./src/wmapp.h 2013-11-20 21:01:25.890691688 -0500 +@@ -78,9 +78,7 @@ + Window managerWindow; + }; + +-#if 0 + extern YWMApp * wmapp; +-#endif + + extern YMenu *windowMenu; + extern YMenu *occupyMenu; Property changes on: files/patch-src__wmapp.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: files/patch-src__yarray.h =================================================================== --- files/patch-src__yarray.h (revision 333538) +++ files/patch-src__yarray.h (working copy) @@ -1,16 +0,0 @@ -Fix build with clang - -http://icewm.cvs.sourceforge.net/viewvc/icewm/icewm-1.2/src/yarray.h?r1=1.5.4.3&r2=1.5.4.4&pathrev=icewm-1-3-BRANCH - ---- src/yarray.h 2009/06/01 17:10:07 1.5.4.3 -+++ src/yarray.h 2010/12/25 15:29:53 1.5.4.4 -@@ -152,7 +152,8 @@ - } - - virtual void remove(const typename YArray::SizeType index) { -- if (index < YArray::getCount()) delete getItem(index); -+ if (index < YArray::getCount()) -+ delete YArray::getItem(index); - YArray::remove(index); - } - Index: files/patch-src_base.h =================================================================== --- files/patch-src_base.h (revision 333538) +++ files/patch-src_base.h (working copy) @@ -1,15 +0,0 @@ ---- src/base.h.orig 2010-10-31 15:09:36.000000000 +0100 -+++ src/base.h 2013-05-25 12:39:49.498390711 +0200 -@@ -1,12 +1,6 @@ - #ifndef __BASE_H - #define __BASE_H - --#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 --#define deprecated __attribute__((deprecated)) --#else --#define deprecated --#endif -- - /*** Atomar Data Types ********************************************************/ - - #ifdef NEED_BOOL