Date: Mon, 3 May 1999 17:15:08 -0700 (PDT) From: cpiazza@home.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11473: Update: x11-wm/icewm Message-ID: <19990504001508.A70211464@norn.ca.eu.org>
next in thread | raw e-mail | index | archive | help
>Number: 11473
>Category: ports
>Synopsis: Update: x11-wm/icewm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 3 17:20:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Chris Piazza
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
n/a
>Environment:
FreeBSD 4.0-CURRENT i386
>Description:
Updated to 0.9.38.
files added: patch-ag
Fix to support CXXFLAGS/CXX.
A couple of notes:
**
I changed the I18N .if defined(..) to USE_I18N because I was getting
--
norn[~/ports/icewm]> env I18N=yes make
===> Building for icewm-0.9.38
cd src ; gmake LIBDIR=/usr/X11R6/share/icewm ETCDIR=/usr/X11R6/share/icewm PREFIX=/usr/X11R6
gmake[1]: Entering directory `/usr/home/norn/src/icewm/work/icewm-0.9.38/src'
c++ -O -pipe yes -DDEBUG -DLIBDIR='"/usr/X11R6/share/icewm"' -DCONFIGDIR='"/usr/X11R6/share/icewm"' -DVERSION='"0.9.38"' -DEXEEXT='""' -DGNOME -DIMLIB -I/usr/X11R6/include -I/usr/X11R6/include -DSM -DSHAPE -DXPM -DI18N -DX_LOCALE -I/usr/X11R6/include -c wmclient.cc
c++: yes: No such file or directory
gmake[1]: *** Deleting file `wmclient.o'
--
on build.
**
COMMENT/DESCR: A little better description and reflect USE_I18N change.
**
patch-ag: this modifies config, and so does ${FILESDIR}/patch-gnome.
This is bad, yes, but they both apply fine and it builds.
**
testing: I cannot test GNOME support here (sorry) but I presume it works.
Similarly I18N/XLOCALE etc.
**
Made it always DEPEND on Xpm, instead of only if gnome wasn't defined as it
was before, this was most likely an implicit depend anyway.
comments welcome.
>How-To-Repeat:
>Fix:
Index: icewm/Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile 1999/03/28 19:42:21 1.34
+++ Makefile 1999/05/04 00:02:13
@@ -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.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 @@
.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 @@
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
Index: icewm/files/md5
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/files/md5,v
retrieving revision 1.22
diff -u -r1.22 md5
--- md5 1999/03/28 19:42:21 1.22
+++ md5 1999/05/03 22:43:10
@@ -1 +1 @@
-MD5 (icewm-0.9.36.src.tar.gz) = f9e57b77ac749989dee02c65857f4b86
+MD5 (icewm-0.9.38.src.tar.gz) = af0ffb97ccf521bbd353853d505d47a8
Index: icewm/patches/patch-ab
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/patches/patch-ab,v
retrieving revision 1.9
diff -u -r1.9 patch-ab
--- patch-ab 1999/03/17 06:41:25 1.9
+++ patch-ab 1999/05/03 22:45:06
@@ -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
Index: icewm/patches/patch-ag
===================================================================
RCS file: patch-ag
diff -N patch-ag
--- /dev/null Mon May 3 17:08:26 1999
+++ patch-ag Mon May 3 15:56:23 1999
@@ -0,0 +1,30 @@
+--- 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/pkg/COMMENT
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/pkg/COMMENT,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 COMMENT
--- COMMENT 1997/11/14 13:11:28 1.1.1.1
+++ COMMENT 1999/05/04 00:12:22
@@ -1 +1 @@
-cool window manager developped in a very hot day in a winter
+Window Manager designed for speed, usability and consistency.
Index: icewm/pkg/DESCR
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/pkg/DESCR,v
retrieving revision 1.6
diff -u -r1.6 DESCR
--- DESCR 1999/01/17 10:04:48 1.6
+++ DESCR 1999/05/04 00:13:32
@@ -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 @@
% 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/
Index: icewm/pkg/PLIST
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/icewm/pkg/PLIST,v
retrieving revision 1.16
diff -u -r1.16 PLIST
--- PLIST 1999/03/17 06:54:55 1.16
+++ PLIST 1999/05/03 23:29:02
@@ -109,6 +109,8 @@
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/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/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
-Chris
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990504001508.A70211464>