Update to version 0.9.38 and change I18N to USE_I18N to avoid compilation

problems.

PR:		11473
Submitted by:	Chris Piazza <cpiazza@home.net>

6 files changed, 29 insertions, 21 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 0066a5a14448..e43ce5be6a01 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	icewm
-# Version required:	0.9.29
+# Version required:	0.9.38
 # Date created:		10 August 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.33 1999/03/19 04:40:07 nectar Exp $
+# $Id: Makefile,v 1.34 1999/03/28 19:42:21 dirk Exp $
 #
 
-DISTNAME=	icewm-0.9.36
+DISTNAME=	icewm-0.9.38
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.kiss.uni-lj.si/~k4fr0235/icewm/devel/ \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/icewm/
@@ -16,15 +16,14 @@ MAINTAINER=	nacai@iname.com
 
 .if defined(GNOME)
 LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs
-.else
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 .endif
+LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
 ICEOPTION=	--with-shape
-.if defined(I18N)
+.if defined(USE_I18N)
 ICEOPTION+=	--with-i18n
 .endif
 .if defined(XLOCALE)
@@ -36,19 +35,21 @@ ICEOPTION+=	--with-imlib --with-gnome --with-sm
 
 pre-patch:
 .if defined(TITLE_BOTTOM)
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titlebottom
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titlebottom
 .else
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titletop
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titletop
 .endif
 .if defined(GNOME)
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-gnome
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-gnome
 .endif
 
 do-configure:
-	( cd ${WRKSRC}; ${SH} config ${ICEOPTION} )
+	( cd ${WRKSRC}; env  X11BASE="${X11BASE}" CXX="${CXX}" \
+			CXXFLAGS="${CXXFLAGS}" \
+			${SH} config ${ICEOPTION} )
 
 post-install:
-	${CP} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar
+	${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar
 	strip ${PREFIX}/bin/icewm
 	strip ${PREFIX}/bin/icewmbg
 	strip ${PREFIX}/bin/icewmhint
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 7169b6fe6c3b..3d447bda5ec9 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-0.9.36.src.tar.gz) = f9e57b77ac749989dee02c65857f4b86
+MD5 (icewm-0.9.38.src.tar.gz) = af0ffb97ccf521bbd353853d505d47a8
diff --git a/x11-wm/icewm/files/patch-ab b/x11-wm/icewm/files/patch-ab
index c07068aae666..04e01d2b3503 100644
--- a/x11-wm/icewm/files/patch-ab
+++ b/x11-wm/icewm/files/patch-ab
@@ -1,8 +1,7 @@
---- install.inc.orig	Sat Feb 20 10:33:06 1999
-+++ install.inc	Wed Mar 17 00:11:05 1999
-@@ -1,10 +1,10 @@
+--- 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
-+PREFIX      = $(X11BASE)
  BINDIR      = $(PREFIX)/bin
 -LIBDIR      = $(PREFIX)/lib/X11/icewm
 -ETCDIR      = /etc/X11/icewm
diff --git a/x11-wm/icewm/pkg-comment b/x11-wm/icewm/pkg-comment
index 04979eb526f6..8dec17638fd0 100644
--- a/x11-wm/icewm/pkg-comment
+++ b/x11-wm/icewm/pkg-comment
@@ -1 +1 @@
-cool window manager developped in a very hot day in a winter
+Window Manager designed for speed, usability and consistency.
diff --git a/x11-wm/icewm/pkg-descr b/x11-wm/icewm/pkg-descr
index 7dade1254496..02e867d8a6d5 100644
--- a/x11-wm/icewm/pkg-descr
+++ b/x11-wm/icewm/pkg-descr
@@ -1,4 +1,4 @@
-cool window manager developped in a very hot day in a winter
+Window Manager designed for speed, usability and consistency.
 
 When you want titlebars to be bottom ( default is top ),
  % make -DTITLE_BOTTOM install
@@ -7,9 +7,11 @@ When you want gnome option,
  % make -DGNOME install
 
 When you want i18n option,
- % make -DI18N install
+ % make -DUSE_I18N install
 
 When you want to compile with xlocale option,
  % make -DXLOCALE install
 
 'bsd-daemon.xpm' is from Steve Farrell.
+
+WWW: http://www.kiss.uni-lj.si/~k4fr0235/icewm/ 
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 9e795ec32769..522f662f8cf4 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -109,6 +109,8 @@ share/icewm/themes/metal2/frameIR.xpm
 share/icewm/themes/metal2/frameIT.xpm
 share/icewm/themes/metal2/frameITL.xpm
 share/icewm/themes/metal2/frameITR.xpm
+share/icewm/themes/metal2/hideA.xpm
+share/icewm/themes/metal2/hideI.xpm
 share/icewm/themes/metal2/maximizeA.xpm
 share/icewm/themes/metal2/maximizeI.xpm
 share/icewm/themes/metal2/menuButtonA.xpm
@@ -117,6 +119,10 @@ share/icewm/themes/metal2/minimizeA.xpm
 share/icewm/themes/metal2/minimizeI.xpm
 share/icewm/themes/metal2/restoreA.xpm
 share/icewm/themes/metal2/restoreI.xpm
+share/icewm/themes/metal2/rolldownA.xpm
+share/icewm/themes/metal2/rolldownI.xpm
+share/icewm/themes/metal2/rollupA.xpm
+share/icewm/themes/metal2/rollupI.xpm
 share/icewm/themes/metal2/titleAB.xpm
 share/icewm/themes/metal2/titleAL.xpm
 share/icewm/themes/metal2/titleAM.xpm
@@ -136,18 +142,18 @@ share/icewm/themes/motif/restore.xpm
 share/icewm/themes/nice/blue.theme
 share/icewm/themes/nice/close.xpm
 share/icewm/themes/nice/default.theme
+share/icewm/themes/nice/hide.xpm
 share/icewm/themes/nice/maximize.xpm
 share/icewm/themes/nice/minimize.xpm
 share/icewm/themes/nice/restore.xpm
-share/icewm/themes/nice/hide.xpm
 share/icewm/themes/nice/rolldown.xpm
 share/icewm/themes/nice/rollup.xpm
 share/icewm/themes/warp3/close.xpm
 share/icewm/themes/warp3/default.theme
+share/icewm/themes/warp3/hide.xpm
 share/icewm/themes/warp3/maximize.xpm
 share/icewm/themes/warp3/minimize.xpm
 share/icewm/themes/warp3/restore.xpm
-share/icewm/themes/warp3/hide.xpm
 share/icewm/themes/warp3/rolldown.xpm
 share/icewm/themes/warp3/rollup.xpm
 share/icewm/themes/warp4/close.xpm