Date: Wed, 24 Dec 1997 22:18:34 -0800 (PST) From: nakai@technologist.com To: freebsd-gnats-submit@FreeBSD.ORG Subject: ports/5377: Fixed port: icewm Message-ID: <199712250618.WAA24804@hub.freebsd.org> Resent-Message-ID: <199712250620.WAA24909@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 5377
>Category: ports
>Synopsis: Fixed port: icewm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 24 22:20:00 PST 1997
>Last-Modified:
>Originator: Yukihiro Nakai
>Organization:
Apricot computer
>Release: 3.0-current
>Environment:
>Description:
I have fixed the icewm port to follow its latest version.
Thanks.
Yukihiro Nakai
--------------
diff -ruN icewm.orig/Makefile icewm/Makefile
--- icewm.orig/Makefile Fri Nov 14 22:11:28 1997
+++ icewm/Makefile Mon Dec 22 10:31:10 1997
@@ -1,12 +1,12 @@
# New ports collection makefile for: icewm
-# Version required: 0.8.6
+# Version required: 0.8.9
# Date created: 10 August 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.1.1.1 1997/11/14 13:11:28 tg Exp $
#
-DISTNAME= icewm-0.8.6
+DISTNAME= icewm-0.8.9
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/window-managers
diff -ruN icewm.orig/files/md5 icewm/files/md5
--- icewm.orig/files/md5 Fri Nov 14 22:11:28 1997
+++ icewm/files/md5 Mon Dec 22 10:31:34 1997
@@ -1 +1 @@
-MD5 (icewm-0.8.6.src.tar.gz) = f26ac82cd8ddc5ea554a2e6da0a00247
+MD5 (icewm-0.8.9.src.tar.gz) = 19ff01b9ef4b1916e4db354882229d14
diff -ruN icewm.orig/patches/patch-aa icewm/patches/patch-aa
--- icewm.orig/patches/patch-aa Fri Nov 14 22:11:28 1997
+++ icewm/patches/patch-aa Mon Dec 22 10:39:42 1997
@@ -1,18 +1,44 @@
---- Makefile.orig Sun Jul 6 10:32:42 1997
-+++ Makefile Fri Nov 14 14:07:40 1997
-@@ -1,11 +1,11 @@
-
--PREFIX = /usr/local
-+PREFIX = $(X11BASE)
- BINDIR = $(PREFIX)/bin
- LIBDIR = $(PREFIX)/lib/X11/icewm
--ETCDIR = /etc/X11/icewm
-+ETCDIR = ${LIBDIR}
-
--INSTALL = install
--INSTALLDIR = $(INSTALL) -m 755 -d
-+INSTALL = install -c
-+INSTALLDIR = mkdir -p
- INSTALLBIN = $(INSTALL) -m 555
- INSTALLLIB = $(INSTALL) -m 444
- #INSTALLETC = $(INSTALL) -m 644
+*** Makefile.orig Wed Sep 10 15:04:51 1997
+--- Makefile Mon Dec 22 01:39:22 1997
+***************
+*** 1,11 ****
+
+! PREFIX = /usr/local
+ BINDIR = $(PREFIX)/bin
+ LIBDIR = $(PREFIX)/lib/X11/icewm
+! ETCDIR = /etc/X11/icewm
+
+! INSTALL = install
+! INSTALLDIR = $(INSTALL) -m 755 -d
+ INSTALLBIN = $(INSTALL) -m 555
+ INSTALLLIB = $(INSTALL) -m 444
+ #INSTALLETC = $(INSTALL) -m 644
+--- 1,11 ----
+
+! PREFIX = $(X11BASE)
+ BINDIR = $(PREFIX)/bin
+ LIBDIR = $(PREFIX)/lib/X11/icewm
+! ETCDIR = ${LIBDIR}
+
+! INSTALL = install -c
+! INSTALLDIR = mkdir -p
+ INSTALLBIN = $(INSTALL) -m 555
+ INSTALLLIB = $(INSTALL) -m 444
+ #INSTALLETC = $(INSTALL) -m 644
+***************
+*** 17,23 ****
+
+ all:
+ (cd doc ; make)
+! (cd src ; make LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR))
+
+ clean:
+ (cd doc ; make clean)
+--- 17,23 ----
+
+ all:
+ (cd doc ; make)
+! (cd src ; make LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR) PREFIX=$(PREFIX) )
+
+ clean:
+ (cd doc ; make clean)
diff -ruN icewm.orig/pkg/PLIST icewm/pkg/PLIST
--- icewm.orig/pkg/PLIST Fri Nov 14 22:11:28 1997
+++ icewm/pkg/PLIST Mon Dec 22 10:48:07 1997
@@ -15,8 +15,12 @@
lib/X11/icewm/icons/netscape_32x32.xpm
lib/X11/icewm/icons/pdf_16x16.xpm
lib/X11/icewm/icons/pdf_32x32.xpm
+lib/X11/icewm/icons/xload_16x16.xpm
+lib/X11/icewm/icons/xload_32x32.xpm
lib/X11/icewm/icons/xterm_16x16.xpm
lib/X11/icewm/icons/xterm_32x32.xpm
+lib/X11/icewm/icons/xv_16x16.xpm
+lib/X11/icewm/icons/xv_32x32.xpm
lib/X11/icewm/ledclock/cl.xpm
lib/X11/icewm/ledclock/n0.xpm
lib/X11/icewm/ledclock/n1.xpm
@@ -30,39 +34,50 @@
lib/X11/icewm/ledclock/n9.xpm
lib/X11/icewm/ledclock/nc.xpm
lib/X11/icewm/menu
-lib/X11/icewm/motif/close.xpm
-lib/X11/icewm/motif/maximize.xpm
-lib/X11/icewm/motif/menu.xpm
-lib/X11/icewm/motif/minimize.xpm
-lib/X11/icewm/motif/restore.xpm
-lib/X11/icewm/nice/close.xpm
-lib/X11/icewm/nice/maximize.xpm
-lib/X11/icewm/nice/minimize.xpm
-lib/X11/icewm/nice/restore.xpm
lib/X11/icewm/preferences
lib/X11/icewm/taskbar/linux.xpm
+lib/X11/icewm/taskbar/mail.xpm
+lib/X11/icewm/taskbar/newmail.xpm
lib/X11/icewm/taskbar/start.xpm
+lib/X11/icewm/taskbar/unreadmail.xpm
lib/X11/icewm/taskbar/windows.xpm
-lib/X11/icewm/warp3/close.xpm
-lib/X11/icewm/warp3/maximize.xpm
-lib/X11/icewm/warp3/minimize.xpm
-lib/X11/icewm/warp3/restore.xpm
-lib/X11/icewm/warp4/close.xpm
-lib/X11/icewm/warp4/hide.xpm
-lib/X11/icewm/warp4/maximize.xpm
-lib/X11/icewm/warp4/minimize.xpm
-lib/X11/icewm/warp4/restore.xpm
-lib/X11/icewm/win95/close.xpm
-lib/X11/icewm/win95/maximize.xpm
-lib/X11/icewm/win95/minimize.xpm
-lib/X11/icewm/win95/restore.xpm
+lib/X11/icewm/taskbar/xfreeos2.xpm
+lib/X11/icewm/themes/motif/close.xpm
+lib/X11/icewm/themes/motif/default.theme
+lib/X11/icewm/themes/motif/maximize.xpm
+lib/X11/icewm/themes/motif/menu.xpm
+lib/X11/icewm/themes/motif/minimize.xpm
+lib/X11/icewm/themes/motif/restore.xpm
+lib/X11/icewm/themes/nice/blue.theme
+lib/X11/icewm/themes/nice/close.xpm
+lib/X11/icewm/themes/nice/default.theme
+lib/X11/icewm/themes/nice/maximize.xpm
+lib/X11/icewm/themes/nice/minimize.xpm
+lib/X11/icewm/themes/nice/restore.xpm
+lib/X11/icewm/themes/warp3/close.xpm
+lib/X11/icewm/themes/warp3/default.theme
+lib/X11/icewm/themes/warp3/maximize.xpm
+lib/X11/icewm/themes/warp3/minimize.xpm
+lib/X11/icewm/themes/warp3/restore.xpm
+lib/X11/icewm/themes/warp4/close.xpm
+lib/X11/icewm/themes/warp4/default.theme
+lib/X11/icewm/themes/warp4/hide.xpm
+lib/X11/icewm/themes/warp4/maximize.xpm
+lib/X11/icewm/themes/warp4/minimize.xpm
+lib/X11/icewm/themes/warp4/restore.xpm
+lib/X11/icewm/themes/win95/close.xpm
+lib/X11/icewm/themes/win95/default.theme
+lib/X11/icewm/themes/win95/maximize.xpm
+lib/X11/icewm/themes/win95/minimize.xpm
+lib/X11/icewm/themes/win95/restore.xpm
lib/X11/icewm/winoptions
-@dirrm lib/X11/icewm/win95
-@dirrm lib/X11/icewm/warp4
-@dirrm lib/X11/icewm/warp3
-@dirrm lib/X11/icewm/taskbar
-@dirrm lib/X11/icewm/nice
-@dirrm lib/X11/icewm/motif
-@dirrm lib/X11/icewm/ledclock
@dirrm lib/X11/icewm/icons
+@dirrm lib/X11/icewm/ledclock
+@dirrm lib/X11/icewm/taskbar
+@dirrm lib/X11/icewm/themes/motif
+@dirrm lib/X11/icewm/themes/nice
+@dirrm lib/X11/icewm/themes/warp3
+@dirrm lib/X11/icewm/themes/warp4
+@dirrm lib/X11/icewm/themes/win95
+@dirrm lib/X11/icewm/themes
@dirrm lib/X11/icewm
>How-To-Repeat:
>Fix:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199712250618.WAA24804>