From norn@norn.ca.eu.org Sun May 23 01:18:55 1999
Return-Path: <norn@norn.ca.eu.org>
Received: from norn.ca.eu.org (cr965240-b.abtsfd1.bc.wave.home.com [24.113.19.137])
	by hub.freebsd.org (Postfix) with ESMTP id 99EF214C81
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 May 1999 01:18:50 -0700 (PDT)
	(envelope-from norn@norn.ca.eu.org)
Received: by norn.ca.eu.org (Postfix, from userid 1000)
	id C8F89142F; Sun, 23 May 1999 01:18:45 -0700 (PDT)
Message-Id: <19990523081845.C8F89142F@norn.ca.eu.org>
Date: Sun, 23 May 1999 01:18:45 -0700 (PDT)
From: cpiazza@home.net
Sender: norn@norn.ca.eu.org
Reply-To: cpiazza@home.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update: x11-wm/icewm
X-Send-Pr-Version: 3.2

>Number:         11861
>Category:       ports
>Synopsis:       Update: x11-wm/icewm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 23 01:20:01 PDT 1999
>Closed-Date:    Tue Jun 8 16:57:46 PDT 1999
>Last-Modified:  Tue Jun  8 16:59:13 PDT 1999
>Originator:     Chris Piazza
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
n/a
>Environment:

FreeBSD norn.ca.eu.org 4.0-CURRENT FreeBSD 4.0-CURRENT #213: Wed May 19 09:07:23
 PDT 1999     norn@norn.ca.eu.org:/usr/src/sys/compile/NORN  i386

>Description:
A pretty big change in the build process for icewm; it now uses GNU configure.
	*There appears to be no XLOCALE support any more, so that was removed.
	*GNOME support is automatically enabled if it finds gnome-config now
	 so all defining GNOME does is make sure it depends on gnome.
	*the TITLE_BOTTOM stuff doesn't seem to be configurable any more,
	 though there are some #ifdef's.
Files removed: files/
		patch-gnome
		patch-titlebottom
		patch-titletop
	       patches/
		patch-ag
Files added:   patches/
		patch-ah
		patch-ai 

>How-To-Repeat:

>Fix:
	
Index: icewm/Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile	1999/05/16 23:20:18	1.36
+++ Makefile	1999/05/23 08:13:48
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	icewm
-# Version required:	0.9.39
+# Version required:	0.9.40
 # Date created:		10 August 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $Id: Makefile,v 1.36 1999/05/16 23:20:18 mharo Exp $
 #
 
-DISTNAME=	icewm-0.9.39
+DISTNAME=	icewm-0.9.40
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.kiss.uni-lj.si/~k4fr0235/icewm/devel/ \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/icewm/
@@ -19,39 +19,18 @@
 .endif
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
-ICEOPTION=	--with-shape
 .if defined(USE_I18N)
-ICEOPTION+=	--with-i18n
+CONFIGURE_ARGS+=	--enable-i18n
 .endif
-.if defined(XLOCALE)
-ICEOPTION+=	--with-xlocale
-.endif
-.if defined(GNOME)
-ICEOPTION+=	--with-imlib --with-gnome --with-sm
-.endif
-
-pre-patch:
-.if defined(TITLE_BOTTOM)
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titlebottom
-.else
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titletop
-.endif
 .if defined(GNOME)
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-gnome
+CONFIGURE_ARGS+=	--with-imlib --with-gnome
 .endif
 
-do-configure:
-	( cd ${WRKSRC}; env  X11BASE="${X11BASE}" CXX="${CXX}" \
-			CXXFLAGS="${CXXFLAGS}" \
-			${SH} config ${ICEOPTION} )
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar
-	strip ${PREFIX}/bin/icewm
-	strip ${PREFIX}/bin/icewmbg
-	strip ${PREFIX}/bin/icewmhint
 
 .include <bsd.port.mk>
Index: icewm/files/md5
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/files/md5,v
retrieving revision 1.24
diff -u -r1.24 md5
--- md5	1999/05/16 23:20:20	1.24
+++ md5	1999/05/23 03:53:58
@@ -1 +1 @@
-MD5 (icewm-0.9.39.src.tar.gz) = 1a4d7bc60d6f6235d04a1c43bd739043
+MD5 (icewm-0.9.40.src.tar.gz) = 851f45c99f42ad885361897be39f9350
Index: icewm/files/patch-gnome
===================================================================
RCS file: patch-gnome
diff -N patch-gnome
--- /tmp/cvsC86735	Sun May 23 01:17:46 1999
+++ /dev/null	Sun May 23 01:12:48 1999
@@ -1,8 +0,0 @@
---- config.orig	Wed Oct  7 19:44:31 1998
-+++ config	Wed Oct  7 19:46:05 1998
-@@ -206,4 +206,4 @@
- echo $CFLAGS >>sysdep.inc
- echo $INCDIRS >>sysdep.inc
- echo $LIBDIRS >>sysdep.inc
--echo $LIBS >>sysdep.inc
-+echo $LIBS -lxpg4 -lintl -L/usr/local/lib >>sysdep.inc
Index: icewm/files/patch-titlebottom
===================================================================
RCS file: patch-titlebottom
diff -N patch-titlebottom
--- /tmp/cvsl86735	Sun May 23 01:17:46 1999
+++ /dev/null	Sun May 23 01:12:48 1999
@@ -1,26 +0,0 @@
---- src/config.h.orig	Sat Dec 26 01:08:54 1998
-+++ src/config.h	Mon Jan  4 20:54:27 1999
-@@ -15,19 +15,19 @@
-  * EOF
-  *
-  */
--#define MAIL_SPOOL "/var/spool/mail/"       /* '/' terminated ! */
-+#define MAIL_SPOOL "/var/mail/"       /* '/' terminated ! */
- 
- /** Use Linux 2.0 Penguin as start button */
- #ifndef START_PIXMAP
--#define START_PIXMAP "linux.xpm"
-+//#define START_PIXMAP "linux.xpm"
- //#define START_PIXMAP "debian.xpm"
--//#define START_PIXMAP "bsd-daemon.xpm"
-+#define START_PIXMAP "bsd-daemon.xpm"
- //#define START_PIXMAP "start.xpm"
- //#define START_PIXMAP "xfree86os2.xpm"
- #endif
- 
- /** Show title bars at the bottom of the window */
--#undef TITLEBAR_BOTTOM
-+#define TITLEBAR_BOTTOM
- 
- /** No not include configurability of options */
- #undef NO_CONFIGURE
Index: icewm/files/patch-titletop
===================================================================
RCS file: patch-titletop
diff -N patch-titletop
--- /tmp/cvsO86735	Sun May 23 01:17:46 1999
+++ /dev/null	Sun May 23 01:12:48 1999
@@ -1,19 +0,0 @@
---- src/config.h.orig	Sat Dec 26 01:08:54 1998
-+++ src/config.h	Mon Jan  4 20:55:37 1999
-@@ -15,13 +15,13 @@
-  * EOF
-  *
-  */
--#define MAIL_SPOOL "/var/spool/mail/"       /* '/' terminated ! */
-+#define MAIL_SPOOL "/var/mail/"       /* '/' terminated ! */
- 
- /** Use Linux 2.0 Penguin as start button */
- #ifndef START_PIXMAP
--#define START_PIXMAP "linux.xpm"
-+//#define START_PIXMAP "linux.xpm"
- //#define START_PIXMAP "debian.xpm"
--//#define START_PIXMAP "bsd-daemon.xpm"
-+#define START_PIXMAP "bsd-daemon.xpm"
- //#define START_PIXMAP "start.xpm"
- //#define START_PIXMAP "xfree86os2.xpm"
- #endif
Index: icewm/patches/patch-ab
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/patches/patch-ab,v
retrieving revision 1.10
diff -u -r1.10 patch-ab
--- patch-ab	1999/05/09 16:32:31	1.10
+++ patch-ab	1999/05/23 07:55:46
@@ -1,17 +1,16 @@
---- install.inc.orig	Sat Feb 20 08:33:06 1999
-+++ install.inc	Mon May  3 15:44:56 1999
-@@ -1,10 +1,9 @@
--PREFIX      = /usr/local
- BINDIR      = $(PREFIX)/bin
--LIBDIR      = $(PREFIX)/lib/X11/icewm
--ETCDIR      = /etc/X11/icewm
-+LIBDIR      = $(PREFIX)/share/icewm
-+ETCDIR      = $(LIBDIR)
+--- install.in.orig	Sat May 22 06:58:12 1999
++++ install.in	Sun May 23 00:54:26 1999
+@@ -3,11 +3,11 @@
  
- INSTALL     = install -c
--INSTALLDIR  = $(INSTALL) -m 755 -d
--INSTALLBIN  = $(INSTALL) -m 555
-+INSTALLDIR  = mkdir -p
-+INSTALLBIN  = $(INSTALL) $(STRIP) -m 555
- INSTALLLIB  = $(INSTALL) -m 444
- #INSTALLETC  = $(INSTALL) -m 644
+ PREFIX      = @prefix@
+ BINDIR      = @bindir@
+-LIBDIR      = @libdir@/X11/icewm
++LIBDIR      = @prefix@/share/icewm
+ ETCDIR      = @sysconfdir@
+ 
+ INSTALL     = @INSTALL@
+-INSTALLDIR  = @INSTALL@ -m 755 -d
++INSTALLDIR  = mkdir -p 
+ INSTALLBIN  = @INSTALL_PROGRAM@
+ INSTALLLIB  = @INSTALL_DATA@
+ #INSTALLETC  = @INSTALL_DATA@
Index: icewm/patches/patch-ag
===================================================================
RCS file: patch-ag
diff -N patch-ag
--- /tmp/cvsC86735	Sun May 23 01:17:46 1999
+++ /dev/null	Sun May 23 01:12:48 1999
@@ -1,30 +0,0 @@
---- config.orig	Sun Apr 25 04:01:46 1999
-+++ config	Mon May  3 15:56:15 1999
-@@ -36,9 +36,9 @@
- }
- 
- with_x11=1
--x11_incdir='/usr/X11R6/include'
-+x11_incdir="${X11BASE}/include"
- x11_inc='X11/X.h'
--x11_libdir='/usr/X11R6/lib'
-+x11_libdir="${X11BASE}/lib"
- x11_libs='X11'
- 
- with_xpm=1
-@@ -69,11 +69,11 @@
- -Wmissing-prototypes -Wmissing-declarations \
- -Winline -Woverloaded-virtual"
- 
--cxx="g++"
--cxxopts=""
--link="g++"
-+cxx="${CXX}"
-+cxxopts="${CXXFLAGS}"
-+link="${CXX}"
- linkopts=""
--optimize="-O2"
-+optimize=""
- 
- use() {
-     dep="$1"
Index: icewm/patches/patch-ah
===================================================================
RCS file: patch-ah
diff -N patch-ah
--- /dev/null	Sun May 23 01:12:48 1999
+++ patch-ah	Sun May 23 00:48:46 1999
@@ -0,0 +1,11 @@
+--- src/amailbox.cc.orig	Sun May 23 00:48:01 1999
++++ src/amailbox.cc	Sun May 23 00:48:13 1999
+@@ -19,7 +19,7 @@
+ 
+ // !!! autoconf option for this (or just get rid of it completely)
+ #ifndef MAIL_SPOOL
+-#define MAIL_SPOOL "/var/spool/mail/"       /* '/' terminated ! */
++#define MAIL_SPOOL "/var/mail/"       /* '/' terminated ! */
+ #endif
+ 
+ extern YColor *taskBarBg;
Index: icewm/patches/patch-ai
===================================================================
RCS file: patch-ai
diff -N patch-ai
--- /dev/null	Sun May 23 01:12:48 1999
+++ patch-ai	Sun May 23 00:57:41 1999
@@ -0,0 +1,14 @@
+--- src/wmtaskbar.cc.orig	Sun May 23 00:57:11 1999
++++ src/wmtaskbar.cc	Sun May 23 00:57:25 1999
+@@ -331,9 +331,9 @@
+ 
+ /** Use Linux 2.0 Penguin as start button */
+ #ifndef START_PIXMAP
+-#define START_PIXMAP "linux.xpm"
++//#define START_PIXMAP "linux.xpm"
+ //#define START_PIXMAP "debian.xpm"
+-//#define START_PIXMAP "bsd-daemon.xpm"
++#define START_PIXMAP "bsd-daemon.xpm"
+ //#define START_PIXMAP "start.xpm"
+ //#define START_PIXMAP "xfree86os2.xpm"
+ #endif
Index: icewm/pkg/DESCR
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/pkg/DESCR,v
retrieving revision 1.7
diff -u -r1.7 DESCR
--- DESCR	1999/05/09 16:32:38	1.7
+++ DESCR	1999/05/23 08:11:02
@@ -1,16 +1,10 @@
 Window Manager designed for speed, usability and consistency.
 
-When you want titlebars to be bottom ( default is top ),
- % make -DTITLE_BOTTOM install
-
 When you want gnome option,
  % make -DGNOME install
 
 When you want i18n option,
  % make -DUSE_I18N install
-
-When you want to compile with xlocale option,
- % make -DXLOCALE install
 
 'bsd-daemon.xpm' is from Steve Farrell.
 
-Chris

>Release-Note:
>Audit-Trail:

From: Chris Piazza <cpiazza@home.net>
To: cpiazza@home.net
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: RE: ports/11861: Update: x11-wm/icewm
Date: Mon, 24 May 1999 10:22:45 -0700 (PDT)

 Icewm was updated again, so here's an updated patch:
 
 Files removed: files/
                patch-gnome
                patch-titlebottom
                patch-titletop
               patches/
                patch-ag
 Files added:   patches/
                patch-ah
                patch-ai 
 
 
 Index: icewm/Makefile
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/Makefile,v
 retrieving revision 1.36
 diff -u -r1.36 Makefile
 --- Makefile    1999/05/16 23:20:18     1.36
 +++ Makefile    1999/05/24 16:13:46
 @@ -1,12 +1,12 @@
  # New ports collection makefile for:   icewm
 -# Version required:    0.9.39
 +# Version required:    0.9.41
  # Date created:                10 August 1997
  # Whom:                        Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
  #
  # $Id: Makefile,v 1.36 1999/05/16 23:20:18 mharo Exp $
  #
  
 -DISTNAME=      icewm-0.9.39
 +DISTNAME=      icewm-0.9.41
  CATEGORIES=    x11-wm
  MASTER_SITES=  http://www.kiss.uni-lj.si/~k4fr0235/icewm/devel/ \
                 http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/icewm/
 @@ -19,39 +19,18 @@
  .endif
  LIB_DEPENDS+=  Xpm.4:${PORTSDIR}/graphics/xpm
  
 +GNU_CONFIGURE= yes
  USE_GMAKE=     yes
  USE_X_PREFIX=  yes
  
 -ICEOPTION=     --with-shape
  .if defined(USE_I18N)
 -ICEOPTION+=    --with-i18n
 +CONFIGURE_ARGS+=       --enable-i18n
  .endif
 -.if defined(XLOCALE)
 -ICEOPTION+=    --with-xlocale
 -.endif
 -.if defined(GNOME)
 -ICEOPTION+=    --with-imlib --with-gnome --with-sm
 -.endif
 -
 -pre-patch:
 -.if defined(TITLE_BOTTOM)
 -       @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titlebottom
 -.else
 -       @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titletop
 -.endif
  .if defined(GNOME)
 -       @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-gnome
 +CONFIGURE_ARGS+=       --with-imlib --with-gnome
  .endif
  
 -do-configure:
 -       ( cd ${WRKSRC}; env  X11BASE="${X11BASE}" CXX="${CXX}" \
 -                       CXXFLAGS="${CXXFLAGS}" \
 -                       ${SH} config ${ICEOPTION} )
 -
  post-install:
         ${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar
 -       strip ${PREFIX}/bin/icewm
 -       strip ${PREFIX}/bin/icewmbg
 -       strip ${PREFIX}/bin/icewmhint
  
  .include <bsd.port.mk>
 Index: icewm/files/md5
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/files/md5,v
 retrieving revision 1.24
 diff -u -r1.24 md5
 --- md5 1999/05/16 23:20:20     1.24
 +++ md5 1999/05/24 16:14:55
 @@ -1 +1 @@
 -MD5 (icewm-0.9.39.src.tar.gz) = 1a4d7bc60d6f6235d04a1c43bd739043
 +MD5 (icewm-0.9.41.src.tar.gz) = 05eccadc612fe3bb8d2d769c89da8771
 Index: icewm/files/patch-gnome
 ===================================================================
 RCS file: patch-gnome
 diff -N patch-gnome
 --- /tmp/cvsE23177      Mon May 24 09:36:57 1999
 +++ /dev/null   Mon May 24 09:33:38 1999
 @@ -1,8 +0,0 @@
 ---- config.orig        Wed Oct  7 19:44:31 1998
 -+++ config     Wed Oct  7 19:46:05 1998
 -@@ -206,4 +206,4 @@
 - echo $CFLAGS >>sysdep.inc
 - echo $INCDIRS >>sysdep.inc
 - echo $LIBDIRS >>sysdep.inc
 --echo $LIBS >>sysdep.inc
 -+echo $LIBS -lxpg4 -lintl -L/usr/local/lib >>sysdep.inc
 Index: icewm/files/patch-titlebottom
 ===================================================================
 RCS file: patch-titlebottom
 diff -N patch-titlebottom
 --- /tmp/cvsM23177      Mon May 24 09:36:57 1999
 +++ /dev/null   Mon May 24 09:33:38 1999
 @@ -1,26 +0,0 @@
 ---- src/config.h.orig  Sat Dec 26 01:08:54 1998
 -+++ src/config.h       Mon Jan  4 20:54:27 1999
 -@@ -15,19 +15,19 @@
 -  * EOF
 -  *
 -  */
 --#define MAIL_SPOOL "/var/spool/mail/"       /* '/' terminated ! */
 -+#define MAIL_SPOOL "/var/mail/"       /* '/' terminated ! */
 - 
 - /** Use Linux 2.0 Penguin as start button */
 - #ifndef START_PIXMAP
 --#define START_PIXMAP "linux.xpm"
 -+//#define START_PIXMAP "linux.xpm"
 - //#define START_PIXMAP "debian.xpm"
 --//#define START_PIXMAP "bsd-daemon.xpm"
 -+#define START_PIXMAP "bsd-daemon.xpm"
 - //#define START_PIXMAP "start.xpm"
 - //#define START_PIXMAP "xfree86os2.xpm"
 - #endif
 - 
 - /** Show title bars at the bottom of the window */
 --#undef TITLEBAR_BOTTOM
 -+#define TITLEBAR_BOTTOM
 - 
 - /** No not include configurability of options */
 - #undef NO_CONFIGURE
 Index: icewm/files/patch-titletop
 ===================================================================
 RCS file: patch-titletop
 diff -N patch-titletop
 --- /tmp/cvsm23177      Mon May 24 09:36:57 1999
 +++ /dev/null   Mon May 24 09:33:38 1999
 @@ -1,19 +0,0 @@
 ---- src/config.h.orig  Sat Dec 26 01:08:54 1998
 -+++ src/config.h       Mon Jan  4 20:55:37 1999
 -@@ -15,13 +15,13 @@
 -  * EOF
 -  *
 -  */
 --#define MAIL_SPOOL "/var/spool/mail/"       /* '/' terminated ! */
 -+#define MAIL_SPOOL "/var/mail/"       /* '/' terminated ! */
 - 
 - /** Use Linux 2.0 Penguin as start button */
 - #ifndef START_PIXMAP
 --#define START_PIXMAP "linux.xpm"
 -+//#define START_PIXMAP "linux.xpm"
 - //#define START_PIXMAP "debian.xpm"
 --//#define START_PIXMAP "bsd-daemon.xpm"
 -+#define START_PIXMAP "bsd-daemon.xpm"
 - //#define START_PIXMAP "start.xpm"
 - //#define START_PIXMAP "xfree86os2.xpm"
 - #endif
 Index: icewm/patches/patch-ab
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/patches/patch-ab,v
 retrieving revision 1.10
 diff -u -r1.10 patch-ab
 --- patch-ab    1999/05/09 16:32:31     1.10
 +++ patch-ab    1999/05/24 16:13:01
 @@ -1,17 +1,16 @@
 ---- install.inc.orig   Sat Feb 20 08:33:06 1999
 -+++ install.inc        Mon May  3 15:44:56 1999
 -@@ -1,10 +1,9 @@
 --PREFIX      = /usr/local
 - BINDIR      = $(PREFIX)/bin
 --LIBDIR      = $(PREFIX)/lib/X11/icewm
 --ETCDIR      = /etc/X11/icewm
 -+LIBDIR      = $(PREFIX)/share/icewm
 -+ETCDIR      = $(LIBDIR)
 +--- install.in.orig    Sat May 22 06:58:12 1999
 ++++ install.in Sun May 23 00:54:26 1999
 +@@ -3,11 +3,11 @@
   
 - INSTALL     = install -c
 --INSTALLDIR  = $(INSTALL) -m 755 -d
 --INSTALLBIN  = $(INSTALL) -m 555
 -+INSTALLDIR  = mkdir -p
 -+INSTALLBIN  = $(INSTALL) $(STRIP) -m 555
 - INSTALLLIB  = $(INSTALL) -m 444
 - #INSTALLETC  = $(INSTALL) -m 644
 + PREFIX      = @prefix@
 + BINDIR      = @bindir@
 +-LIBDIR      = @libdir@/X11/icewm
 ++LIBDIR      = @prefix@/share/icewm
 + ETCDIR      = @sysconfdir@
 + 
 + INSTALL     = @INSTALL@
 +-INSTALLDIR  = @INSTALL@ -m 755 -d
 ++INSTALLDIR  = mkdir -p 
 + INSTALLBIN  = @INSTALL_PROGRAM@
 + INSTALLLIB  = @INSTALL_DATA@
 + #INSTALLETC  = @INSTALL_DATA@
 Index: icewm/patches/patch-ag
 ===================================================================
 RCS file: patch-ag
 diff -N patch-ag
 --- /tmp/cvsO23177      Mon May 24 09:36:57 1999
 +++ /dev/null   Mon May 24 09:33:38 1999
 @@ -1,30 +0,0 @@
 ---- config.orig        Sun Apr 25 04:01:46 1999
 -+++ config     Mon May  3 15:56:15 1999
 -@@ -36,9 +36,9 @@
 - }
 - 
 - with_x11=1
 --x11_incdir='/usr/X11R6/include'
 -+x11_incdir="${X11BASE}/include"
 - x11_inc='X11/X.h'
 --x11_libdir='/usr/X11R6/lib'
 -+x11_libdir="${X11BASE}/lib"
 - x11_libs='X11'
 - 
 - with_xpm=1
 -@@ -69,11 +69,11 @@
 - -Wmissing-prototypes -Wmissing-declarations \
 - -Winline -Woverloaded-virtual"
 - 
 --cxx="g++"
 --cxxopts=""
 --link="g++"
 -+cxx="${CXX}"
 -+cxxopts="${CXXFLAGS}"
 -+link="${CXX}"
 - linkopts=""
 --optimize="-O2"
 -+optimize=""
 - 
 - use() {
 -     dep="$1"
 Index: icewm/patches/patch-ah
 ===================================================================
 RCS file: patch-ah
 diff -N patch-ah
 --- /dev/null   Mon May 24 09:33:38 1999
 +++ patch-ah    Mon May 24 09:13:01 1999
 @@ -0,0 +1,11 @@
 +--- src/amailbox.cc.orig       Sun May 23 00:48:01 1999
 ++++ src/amailbox.cc    Sun May 23 00:48:13 1999
 +@@ -19,7 +19,7 @@
 + 
 + // !!! autoconf option for this (or just get rid of it completely)
 + #ifndef MAIL_SPOOL
 +-#define MAIL_SPOOL "/var/spool/mail/"       /* '/' terminated ! */
 ++#define MAIL_SPOOL "/var/mail/"       /* '/' terminated ! */
 + #endif
 + 
 + extern YColor *taskBarBg;
 Index: icewm/patches/patch-ai
 ===================================================================
 RCS file: patch-ai
 diff -N patch-ai
 --- /dev/null   Mon May 24 09:33:38 1999
 +++ patch-ai    Mon May 24 09:13:01 1999
 @@ -0,0 +1,14 @@
 +--- src/wmtaskbar.cc.orig      Sun May 23 00:57:11 1999
 ++++ src/wmtaskbar.cc   Sun May 23 00:57:25 1999
 +@@ -331,9 +331,9 @@
 + 
 + /** Use Linux 2.0 Penguin as start button */
 + #ifndef START_PIXMAP
 +-#define START_PIXMAP "linux.xpm"
 ++//#define START_PIXMAP "linux.xpm"
 + //#define START_PIXMAP "debian.xpm"
 +-//#define START_PIXMAP "bsd-daemon.xpm"
 ++#define START_PIXMAP "bsd-daemon.xpm"
 + //#define START_PIXMAP "start.xpm"
 + //#define START_PIXMAP "xfree86os2.xpm"
 + #endif
 Index: icewm/pkg/DESCR
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/pkg/DESCR,v
 retrieving revision 1.7
 diff -u -r1.7 DESCR
 --- DESCR       1999/05/09 16:32:38     1.7
 +++ DESCR       1999/05/24 16:13:01
 @@ -1,16 +1,10 @@
  Window Manager designed for speed, usability and consistency.
  
 -When you want titlebars to be bottom ( default is top ),
 - % make -DTITLE_BOTTOM install
 -
  When you want gnome option,
   % make -DGNOME install
  
  When you want i18n option,
   % make -DUSE_I18N install
 -
 -When you want to compile with xlocale option,
 - % make -DXLOCALE install
  
  'bsd-daemon.xpm' is from Steve Farrell.
  
  
 ---
 Chris Piazza    Abbotsford, BC, Canada
            cpiazza@home.net
 finger norn@norn.ca.eu.org for PGP key
 
 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Tue Jun 8 16:57:46 PDT 1999 
State-Changed-Why:  
Update committed, thanks! 
>Unformatted:
