pkg/25195: wm/icewm feature not quite working right

[Iain Hibbert <plunky%rya-online.net@localhost>]

>Number:         25195
>Category:       pkg
>Synopsis:       Feature of supplying a bsd daemon as the 'start' menu icon 
>doesnt quite work
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Apr 15 22:19:01 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Iain Hibbert
>Release:        NetBSD 1.6.1
>Organization:
None
        
>Environment:
        
        
System: NetBSD galant 1.6.1 NetBSD 1.6.1 (GALANT) #7: Fri Feb 20 08:56:20 UTC 
2004 plunky@galant:/usr/home/plunky/src/sys/arch/i386/compile/GALANT i386
Architecture: i386
Machine: i386
>Description:
        Well, it seems that somebody has tried to supply a bsd-daemon icon to 
icewm to feature as the 'start'
        menu icon when built on a BSD system but it doesnt work.. the makefile 
says;

.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
CPPFLAGS+=              -DSTART_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\"
.endif

        but for some reason this definition never makes it to the compiler at 
the right time. I think this
        is either because gmake is used, or more likely because the source 
files are C++.  If instead of
        CPPFLAGS we use CXXFLAGS then it does get passed but still doesnt work 
and I think that is the problem
        of icewm (wmtaskbar.cc) but my C++ is not good and I'm finding it a bit 
confusing as to why not. 
        However, if instead of START_PIXMAP we use ICEWM_PIXMAP (which is only 
used in this place) then
        it does work as expected.
>How-To-Repeat:
        just build the package.
>Fix:
--- Makefile.common.orig        Thu Apr 15 23:13:08 2004
+++ Makefile.common     Thu Apr 15 23:13:20 2004
@@ -30,7 +30,7 @@
 PKG_SYSCONFSUBDIR=     icewm
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-CPPFLAGS+=             -DSTART_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\"
+CXXFLAGS+=             -DICEWM_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\"
 .endif
 #.if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+= --with-unicode-set=utf-32
>Release-Note:
>Audit-Trail:
>Unformatted:
                (Mar 27 pkgsrc tarball)