Date: Wed, 24 Jun 1998 06:26:09 -0700 (PDT) From: Nakai@Technologist.com To: freebsd-gnats-submit@FreeBSD.ORG Subject: ports/7046: Fixed port: icewm Message-ID: <199806241326.GAA02478@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 7046 >Category: ports >Synopsis: Fixed port: 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: Wed Jun 24 06:30:04 PDT 1998 >Last-Modified: >Originator: Yukihiro Nakai >Organization: Apricot Computer, Japan >Release: 3.0 >Environment: 3.0-980622-SNAP >Description: I have fixed the icewm port to follow its lastest version. icewm-0.9.4 ->icewm-0.9.8 It is added some nice themes. Please enjoy! Yukihiro Nakai -------------- diff -ruN icewm.orig/Makefile icewm/Makefile --- icewm.orig/Makefile Thu Jun 4 19:28:39 1998 +++ icewm/Makefile Wed Jun 24 22:00:53 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: icewm -# Version required: 0.9.4 +# Version required: 0.9.8 # Date created: 10 August 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # # $Id: Makefile,v 1.9 1998/06/04 04:28:05 vanilla Exp $ # -DISTNAME= icewm-0.9.4 +DISTNAME= icewm-0.9.8 CATEGORIES= x11 MASTER_SITES= http://ixtas.fri.uni-lj.si/%7Emarkom/icewm/ EXTRACT_SUFX= .src.tar.gz diff -ruN icewm.orig/files/md5 icewm/files/md5 --- icewm.orig/files/md5 Thu Jun 4 19:28:39 1998 +++ icewm/files/md5 Wed Jun 24 22:01:32 1998 @@ -1 +1 @@ -MD5 (icewm-0.9.4.src.tar.gz) = e3b2d55b624cde547d89a74fd4c64e3f +MD5 (icewm-0.9.8.src.tar.gz) = b912ee376d96778712122a215a5e3dd5 diff -ruN icewm.orig/patches/patch-ab icewm/patches/patch-ab --- icewm.orig/patches/patch-ab Sun May 3 07:24:53 1998 +++ icewm/patches/patch-ab Wed Jun 24 22:05:42 1998 @@ -1,33 +1,33 @@ ---- src/Makefile.orig Mon Apr 6 20:30:21 1998 -+++ src/Makefile Fri May 1 08:34:15 1998 -@@ -3,9 +3,9 @@ - # Linux - CXX = g++ - LD = gcc +--- src/Makefile.orig Wed Jun 24 22:03:37 1998 ++++ src/Makefile Wed Jun 24 22:05:27 1998 +@@ -7,9 +7,9 @@ + # alternative (link with g++) + #CXX = g++ + #LD = g++ -CXXOPTS = -pipe $(WARN) -INCSDIR = -I/usr/X11R6/include -LIBSDIR = -L/usr/X11R6/lib -+CXXOPTS = $(CFLAGS) $(WARN) -+INCSDIR = -I$(PREFIX)/include -+LIBSDIR = -L$(PREFIX)/lib ++CXXOPTS = ${CFLAGS} $(WARN) ++INCSDIR = -I${PREFIX}/include ++LIBSDIR = -L${PREFIX}/lib #XPMINCDIR = -I../../include #XPMLIBDIR = -L../../lib -@@ -34,7 +34,7 @@ - SHAPEDEF = -DSHAPE - SHAPELIB = -lXext +@@ -46,7 +46,7 @@ + #if you use linux you need to define X_LOCALE. + #I18N = -DI18N -DX_LOCALE --DEBUG = -DDEBUG -+#DEBUG = -DDEBUG +-DEBUG = -DDEBUG -DAVOID_GRAB ++#DEBUG = -DDEBUG -DAVOID_GRAB # executable extenstion EXEEXT= -@@ -48,7 +48,7 @@ - #OPTIMIZE = -g +@@ -62,7 +62,7 @@ #OPTIMIZE = -O -g #OPTIMIZE = -O -g -pg --OPTIMIZE = -O -+#OPTIMIZE = -O - #OPTIMIZE = -O2 + #OPTIMIZE = -O +-OPTIMIZE = -O2 ++#OPTIMIZE = -O2 #OPTIMIZE = -O -s #OPTIMIZE = -O2 -s + diff -ruN icewm.orig/patches/patch-ac icewm/patches/patch-ac --- icewm.orig/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ icewm/patches/patch-ac Wed Jun 24 22:11:34 1998 @@ -0,0 +1,27 @@ +--- src/config.h.orig Mon Mar 16 02:20:35 1998 ++++ src/config.h Mon May 11 14:09:44 1998 +@@ -17,11 +17,12 @@ + */ + #define SUPPORT_WIN95KBD + +-#define MAIL_SPOOL "/var/spool/mail/" /* '/' terminated ! */ ++#define MAIL_SPOOL "/var/mail/" /* '/' terminated ! */ + +-/** Use Linux 2.0 Penguin as start button */ ++/** Use BSD logo as start button ++ * (freebsd didn't fit properly, plus this is nicer to open/net ppl) */ + #ifndef START_PIXMAP +-#define START_PIXMAP "linux.xpm" ++#define START_PIXMAP "bsd-daemon.xpm" + //#define START_PIXMAP "start.xpm" + //#define START_PIXMAP "xfree86os2.xpm" + #endif +@@ -39,7 +40,7 @@ + #undef NO_WINDOW_OPTIONS + + /* experimental: broadcast various gui events (for icesound) */ +-#undef CONFIG_GUIEVENTS ++#define CONFIG_GUIEVENTS + + /* TODO */ + #define CONFIG_MAILBOX_STATUS diff -ruN icewm.orig/patches/patch-ad icewm/patches/patch-ad --- icewm.orig/patches/patch-ad Sun May 3 06:23:01 1998 +++ icewm/patches/patch-ad Wed Jun 24 22:11:22 1998 @@ -1,18 +1,5 @@ ---- src/option.cc.orig Sun Apr 12 20:12:04 1998 -+++ src/option.cc Fri May 1 08:36:17 1998 -@@ -583,8 +583,10 @@ - void setWinOption(char *class_instance, char *opt, char *arg) { - WindowOption *op = getWindowOption(class_instance, 1); - -+#ifdef DEBUG - if (debug) - fprintf(stderr, "%s-%s-%s\\", class_instance, opt, arg); -+#endif - if (strcmp(opt, "icon") == 0) { - op->icon = strdup(arg); - } else { ---- src/guievent.h.orig Fri May 1 08:40:31 1998 -+++ src/guievent.h Fri May 1 08:41:32 1998 +--- src/guievent.h.orig Sun Apr 12 21:16:24 1998 ++++ src/guievent.h Wed Jun 24 22:11:18 1998 @@ -23,7 +23,8 @@ geWindowRollup, // geWindowMoved, diff -ruN icewm.orig/pkg/PLIST icewm/pkg/PLIST --- icewm.orig/pkg/PLIST Thu Jun 4 19:28:40 1998 +++ icewm/pkg/PLIST Wed Jun 24 22:15:32 1998 @@ -41,14 +41,77 @@ lib/X11/icewm/ledclock/p.xpm lib/X11/icewm/ledclock/slash.xpm lib/X11/icewm/ledclock/space.xpm +lib/X11/icewm/mailbox/mail.xpm +lib/X11/icewm/mailbox/newmail.xpm +lib/X11/icewm/mailbox/unreadmail.xpm lib/X11/icewm/taskbar/bsd-daemon.xpm 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/taskbar/xfreeos2.xpm +lib/X11/icewm/themes/bluegold/closeA.xpm +lib/X11/icewm/themes/bluegold/closeI.xpm +lib/X11/icewm/themes/bluegold/default.theme +lib/X11/icewm/themes/bluegold/dframeAB.xpm +lib/X11/icewm/themes/bluegold/dframeABL.xpm +lib/X11/icewm/themes/bluegold/dframeABR.xpm +lib/X11/icewm/themes/bluegold/dframeAL.xpm +lib/X11/icewm/themes/bluegold/dframeAR.xpm +lib/X11/icewm/themes/bluegold/dframeAT.xpm +lib/X11/icewm/themes/bluegold/dframeATL.xpm +lib/X11/icewm/themes/bluegold/dframeATR.xpm +lib/X11/icewm/themes/bluegold/dframeIB.xpm +lib/X11/icewm/themes/bluegold/dframeIBL.xpm +lib/X11/icewm/themes/bluegold/dframeIBR.xpm +lib/X11/icewm/themes/bluegold/dframeIL.xpm +lib/X11/icewm/themes/bluegold/dframeIR.xpm +lib/X11/icewm/themes/bluegold/dframeIT.xpm +lib/X11/icewm/themes/bluegold/dframeITL.xpm +lib/X11/icewm/themes/bluegold/dframeITR.xpm +lib/X11/icewm/themes/bluegold/frameAB.old.xpm +lib/X11/icewm/themes/bluegold/frameAB.xpm +lib/X11/icewm/themes/bluegold/frameABL.xpm +lib/X11/icewm/themes/bluegold/frameABR.xpm +lib/X11/icewm/themes/bluegold/frameAL.xpm +lib/X11/icewm/themes/bluegold/frameAR.xpm +lib/X11/icewm/themes/bluegold/frameAT.xpm +lib/X11/icewm/themes/bluegold/frameATL.xpm +lib/X11/icewm/themes/bluegold/frameATR.xpm +lib/X11/icewm/themes/bluegold/frameIB.xpm +lib/X11/icewm/themes/bluegold/frameIBL.xpm +lib/X11/icewm/themes/bluegold/frameIBR.xpm +lib/X11/icewm/themes/bluegold/frameIL.xpm +lib/X11/icewm/themes/bluegold/frameIR.xpm +lib/X11/icewm/themes/bluegold/frameIT.xpm +lib/X11/icewm/themes/bluegold/frameITL.xpm +lib/X11/icewm/themes/bluegold/frameITR.xpm +lib/X11/icewm/themes/bluegold/icons/app_16x16.xpm +lib/X11/icewm/themes/bluegold/icons/app_32x32.xpm +lib/X11/icewm/themes/bluegold/mailbox/mail.xpm +lib/X11/icewm/themes/bluegold/mailbox/newmail.xpm +lib/X11/icewm/themes/bluegold/mailbox/unreadmail.xpm +lib/X11/icewm/themes/bluegold/maximizeA.xpm +lib/X11/icewm/themes/bluegold/maximizeI.xpm +lib/X11/icewm/themes/bluegold/menuButtonA.xpm +lib/X11/icewm/themes/bluegold/menuButtonI.xpm +lib/X11/icewm/themes/bluegold/minimizeA.xpm +lib/X11/icewm/themes/bluegold/minimizeI.xpm +lib/X11/icewm/themes/bluegold/restoreA.xpm +lib/X11/icewm/themes/bluegold/restoreI.xpm +lib/X11/icewm/themes/bluegold/taskbar/linux.xpm +lib/X11/icewm/themes/bluegold/taskbar/windows.xpm +lib/X11/icewm/themes/bluegold/titleAB.old.xpm +lib/X11/icewm/themes/bluegold/titleAB.xpm +lib/X11/icewm/themes/bluegold/titleAL.xpm +lib/X11/icewm/themes/bluegold/titleAM.xpm +lib/X11/icewm/themes/bluegold/titleAR.xpm +lib/X11/icewm/themes/bluegold/titleAT.old.xpm +lib/X11/icewm/themes/bluegold/titleAT.xpm +lib/X11/icewm/themes/bluegold/titleIB.xpm +lib/X11/icewm/themes/bluegold/titleIL.xpm +lib/X11/icewm/themes/bluegold/titleIM.xpm +lib/X11/icewm/themes/bluegold/titleIR.xpm +lib/X11/icewm/themes/bluegold/titleIT.xpm lib/X11/icewm/themes/gtk/closeA.xpm lib/X11/icewm/themes/gtk/closeI.xpm lib/X11/icewm/themes/gtk/default.theme @@ -159,6 +222,90 @@ lib/X11/icewm/themes/metal/titleIM.xpm lib/X11/icewm/themes/metal/titleIR.xpm lib/X11/icewm/themes/metal/titleIT.xpm +lib/X11/icewm/themes/metal-big/black.theme +lib/X11/icewm/themes/metal-big/closeA.xpm +lib/X11/icewm/themes/metal-big/closeI.xpm +lib/X11/icewm/themes/metal-big/default.theme +lib/X11/icewm/themes/metal-big/dframeAB.xpm +lib/X11/icewm/themes/metal-big/dframeABL.xpm +lib/X11/icewm/themes/metal-big/dframeABR.xpm +lib/X11/icewm/themes/metal-big/dframeAL.xpm +lib/X11/icewm/themes/metal-big/dframeAR.xpm +lib/X11/icewm/themes/metal-big/dframeAT.xpm +lib/X11/icewm/themes/metal-big/dframeATL.xpm +lib/X11/icewm/themes/metal-big/dframeATR.xpm +lib/X11/icewm/themes/metal-big/dframeIB.xpm +lib/X11/icewm/themes/metal-big/dframeIBL.xpm +lib/X11/icewm/themes/metal-big/dframeIBR.xpm +lib/X11/icewm/themes/metal-big/dframeIL.xpm +lib/X11/icewm/themes/metal-big/dframeIR.xpm +lib/X11/icewm/themes/metal-big/dframeIT.xpm +lib/X11/icewm/themes/metal-big/dframeITL.xpm +lib/X11/icewm/themes/metal-big/dframeITR.xpm +lib/X11/icewm/themes/metal-big/frameAB.xpm +lib/X11/icewm/themes/metal-big/frameABL.xpm +lib/X11/icewm/themes/metal-big/frameABR.xpm +lib/X11/icewm/themes/metal-big/frameAL.xpm +lib/X11/icewm/themes/metal-big/frameAR.xpm +lib/X11/icewm/themes/metal-big/frameAT.xpm +lib/X11/icewm/themes/metal-big/frameATL.xpm +lib/X11/icewm/themes/metal-big/frameATR.xpm +lib/X11/icewm/themes/metal-big/frameIB.xpm +lib/X11/icewm/themes/metal-big/frameIBL.xpm +lib/X11/icewm/themes/metal-big/frameIBR.xpm +lib/X11/icewm/themes/metal-big/frameIL.xpm +lib/X11/icewm/themes/metal-big/frameIR.xpm +lib/X11/icewm/themes/metal-big/frameIT.xpm +lib/X11/icewm/themes/metal-big/frameITL.xpm +lib/X11/icewm/themes/metal-big/frameITR.xpm +lib/X11/icewm/themes/metal-big/maximizeA.xpm +lib/X11/icewm/themes/metal-big/maximizeI.xpm +lib/X11/icewm/themes/metal-big/menuButtonA.xpm +lib/X11/icewm/themes/metal-big/menuButtonAN.xpm +lib/X11/icewm/themes/metal-big/menuButtonAP.xpm +lib/X11/icewm/themes/metal-big/menuButtonI.xpm +lib/X11/icewm/themes/metal-big/minimizeA.xpm +lib/X11/icewm/themes/metal-big/minimizeI.xpm +lib/X11/icewm/themes/metal-big/restoreA.xpm +lib/X11/icewm/themes/metal-big/restoreI.xpm +lib/X11/icewm/themes/metal-big/titleAB.xpm +lib/X11/icewm/themes/metal-big/titleAL.xpm +lib/X11/icewm/themes/metal-big/titleAM.xpm +lib/X11/icewm/themes/metal-big/titleAR.xpm +lib/X11/icewm/themes/metal-big/titleAT.xpm +lib/X11/icewm/themes/metal-big/titleIB.xpm +lib/X11/icewm/themes/metal-big/titleIL.xpm +lib/X11/icewm/themes/metal-big/titleIM.xpm +lib/X11/icewm/themes/metal-big/titleIR.xpm +lib/X11/icewm/themes/metal-big/titleIT.xpm +lib/X11/icewm/themes/monte-carlo/close.xpm +lib/X11/icewm/themes/monte-carlo/default.theme +lib/X11/icewm/themes/monte-carlo/hide.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/a.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/colon.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/dot.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/m.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n0.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n1.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n2.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n3.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n4.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n5.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n6.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n7.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n8.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/n9.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/p.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/slash.xpm +lib/X11/icewm/themes/monte-carlo/ledclock/space.xpm +lib/X11/icewm/themes/monte-carlo/mailbox/mail.xpm +lib/X11/icewm/themes/monte-carlo/mailbox/newmail.xpm +lib/X11/icewm/themes/monte-carlo/mailbox/unreadmail.xpm +lib/X11/icewm/themes/monte-carlo/maximize.xpm +lib/X11/icewm/themes/monte-carlo/minimize.xpm +lib/X11/icewm/themes/monte-carlo/restore.xpm +lib/X11/icewm/themes/monte-carlo/taskbar/linux.xpm +lib/X11/icewm/themes/monte-carlo/taskbar/windows.xpm lib/X11/icewm/themes/motif/close.xpm lib/X11/icewm/themes/motif/default.theme lib/X11/icewm/themes/motif/maximize.xpm @@ -241,9 +388,19 @@ lib/X11/icewm/themes/win95/restore.xpm @dirrm lib/X11/icewm/icons @dirrm lib/X11/icewm/ledclock +@dirrm lib/X11/icewm/mailbox @dirrm lib/X11/icewm/taskbar +@dirrm lib/X11/icewm/themes/bluegold/icons +@dirrm lib/X11/icewm/themes/bluegold/mailbox +@dirrm lib/X11/icewm/themes/bluegold/taskbar +@dirrm lib/X11/icewm/themes/bluegold @dirrm lib/X11/icewm/themes/gtk @dirrm lib/X11/icewm/themes/metal +@dirrm lib/X11/icewm/themes/metal-big +@dirrm lib/X11/icewm/themes/monte-carlo/ledclock +@dirrm lib/X11/icewm/themes/monte-carlo/mailbox +@dirrm lib/X11/icewm/themes/monte-carlo/taskbar +@dirrm lib/X11/icewm/themes/monte-carlo @dirrm lib/X11/icewm/themes/motif @dirrm lib/X11/icewm/themes/nice @dirrm lib/X11/icewm/themes/warp3 >How-To-Repeat: >Fix: >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?199806241326.GAA02478>