From tkato432@yahoo.com  Sat Aug  7 12:02:15 2004
Return-Path: <tkato432@yahoo.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D89E516A4CE
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  7 Aug 2004 12:02:15 +0000 (GMT)
Received: from hfep02.dion.ne.jp (hfep02.dion.ne.jp [203.181.105.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6E68643D2F
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  7 Aug 2004 12:02:14 +0000 (GMT)
	(envelope-from tkato432@yahoo.com)
Received: from localhost ([219.108.124.67]) by hfep02.dion.ne.jp with SMTP
          id <20040807120210048.EGYU@hfep02.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Sat, 7 Aug 2004 21:02:10 +0900
Message-Id: <20040807210025.4f3a9905.tkato432@yahoo.com>
Date: Sat, 7 Aug 2004 21:00:25 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: x11-wm/icewm

>Number:         70123
>Category:       ports
>Synopsis:       Update port: x11-wm/icewm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    krion
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 07 12:10:29 GMT 2004
>Closed-Date:    Sat Aug 07 19:20:17 GMT 2004
>Last-Modified:  Sat Aug 07 19:20:17 GMT 2004
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on -current after gcc 3.4 import
- Fix pkg-plist

New file:
files/patch-src_icesound.cc
files/patch-src_ycmdline.cc

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
--- /usr/ports/x11-wm/icewm/Makefile	Sat Jul 24 14:49:07 2004
+++ x11-wm/icewm/Makefile	Thu Aug  5 00:19:48 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.14
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -urN /usr/ports/x11-wm/icewm/files/patch-src_icesound.cc x11-wm/icewm/files/patch-src_icesound.cc
--- /usr/ports/x11-wm/icewm/files/patch-src_icesound.cc	Thu Jan  1 09:00:00 1970
+++ x11-wm/icewm/files/patch-src_icesound.cc	Wed Aug  4 23:46:02 2004
@@ -0,0 +1,48 @@
+--- src/icesound.cc.orig	Sun May 23 15:18:19 2004
++++ src/icesound.cc	Wed Aug  4 23:45:45 2004
+@@ -190,7 +190,8 @@
+     virtual int init(int & argc, char **& argv);
+     
+ private:
+-    friend class CommandLine : public YCommandLine {
++    friend class CommandLine;
++    class CommandLine : public YCommandLine {
+     public:
+ 	CommandLine(int & argc, char **& argv, YOSSAudio & oss):
+ 	    YCommandLine(argc, argv), oss(oss) {}
+@@ -226,6 +227,7 @@
+ 	YOSSAudio & oss;
+     };
+ 
++    friend class CommandLine;
+     char const * device;
+ };
+ 
+@@ -326,7 +328,8 @@
+     virtual int init(int & argc, char **& argv);
+ 
+ private:
+-    friend class CommandLine : public YCommandLine {
++    friend class CommandLine;
++    class CommandLine : public YCommandLine {
+     public:
+ 	CommandLine(int & argc, char **& argv, YESDAudio & esd):
+ 	    YCommandLine(argc, argv), esd(esd) {}
+@@ -364,6 +367,7 @@
+     };
+ 
+ protected:
++    friend class CommandLine;
+     char const * speaker;
+     int sample[ACOUNT(gui_events)];	// cache sample ids
+     int socket;				// socket to ESound Daemon
+@@ -502,7 +506,8 @@
+     	      Coefficient lVol = 1.0, Coefficient rVol = 1.0);
+ 
+ private:
+-    friend class CommandLine : public YCommandLine {
++    friend class CommandLine;
++    class CommandLine : public YCommandLine {
+     public:
+ 	CommandLine(int & argc, char **& argv, YY2Audio & yiff):
+ 	    YCommandLine(argc, argv), yiff(yiff) {}
diff -urN /usr/ports/x11-wm/icewm/files/patch-src_ycmdline.cc x11-wm/icewm/files/patch-src_ycmdline.cc
--- /usr/ports/x11-wm/icewm/files/patch-src_ycmdline.cc	Thu Jan  1 09:00:00 1970
+++ x11-wm/icewm/files/patch-src_ycmdline.cc	Wed Aug  4 23:41:41 2004
@@ -0,0 +1,11 @@
+--- src/ycmdline.cc.orig	Sun May 23 15:18:19 2004
++++ src/ycmdline.cc	Wed Aug  4 23:25:42 2004
+@@ -55,7 +55,7 @@
+ 	if (*vptr == '=') ++vptr;
+         while (ASCII::isSpaceOrTab(*vptr)) ++vptr;
+     } else { // ------------------------- value assumed in the next argument ---
+-	int idx(&arg - argv + 1);
++	int idx = &arg - static_cast<char const* const*>(argv) + 1;
+ 
+ 	if (idx < argc) {
+ 	    vptr = argv[idx];
diff -urN /usr/ports/x11-wm/icewm/pkg-plist x11-wm/icewm/pkg-plist
--- /usr/ports/x11-wm/icewm/pkg-plist	Mon May 24 21:08:35 2004
+++ x11-wm/icewm/pkg-plist	Thu Aug  5 00:29:40 2004
@@ -322,6 +322,12 @@
 %%DATADIR%%/themes/win95/maximize.xpm
 %%DATADIR%%/themes/win95/minimize.xpm
 %%DATADIR%%/themes/win95/restore.xpm
+%%DATADIR%%/themes/yellowmotif/close.xpm
+%%DATADIR%%/themes/yellowmotif/default.theme
+%%DATADIR%%/themes/yellowmotif/maximize.xpm
+%%DATADIR%%/themes/yellowmotif/menu.xpm
+%%DATADIR%%/themes/yellowmotif/minimize.xpm
+%%DATADIR%%/themes/yellowmotif/restore.xpm
 %%DATADIR%%/toolbar
 %%DATADIR%%/winoptions
 %%NLS%%share/locale/be/LC_MESSAGES/icewm.mo
@@ -352,6 +358,7 @@
 %%NLS%%share/locale/uk/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
+@dirrm %%DATADIR%%/themes/yellowmotif
 @dirrm %%DATADIR%%/themes/win95
 @dirrm %%DATADIR%%/themes/warp4
 @dirrm %%DATADIR%%/themes/warp3
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->krion 
Responsible-Changed-By: krion 
Responsible-Changed-When: Sat Aug 7 18:47:57 GMT 2004 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70123 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Sat Aug 7 19:20:11 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70123 
>Unformatted:
