From owner-freebsd-ports Sun May 10 22:23:22 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA13659 for freebsd-ports-outgoing; Sun, 10 May 1998 22:23:22 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA13644 for ; Sun, 10 May 1998 22:23:19 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id WAA27406; Sun, 10 May 1998 22:20:01 -0700 (PDT) Received: (from nobody@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA13379; Sun, 10 May 1998 22:19:16 -0700 (PDT) (envelope-from nobody) Message-Id: <199805110519.WAA13379@hub.freebsd.org> Date: Sun, 10 May 1998 22:19:16 -0700 (PDT) From: Nakai@technologist.com To: freebsd-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: www-1.0 Subject: ports/6581: Fixed port: icewm Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 6581 >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: Sun May 10 22:20:01 PDT 1998 >Last-Modified: >Originator: Yukihiro Nakai >Organization: Apricot Computer, Japan >Release: 3.0-980504-SNAP >Environment: 3.0-980504-SNAP >Description: Please fix the icewm to optionize the '#define TITLEBAR_BOTTOM' and set '#undef TITLEBAR_BOTTOM' to the default. It is a suggestion of the other user and also I think that should be so. Added file: files/patch-titletop files/patch-titlebottom Delete file: patches/patch-ac Yukihiro Nakai -------------- diff -ruN icewm.orig/Makefile icewm/Makefile --- icewm.orig/Makefile Sun May 3 07:24:52 1998 +++ icewm/Makefile Mon May 11 14:13:45 1998 @@ -17,6 +17,14 @@ USE_X11= yes +pre-patch: +.if defined(TITLE_BOTTOM) + ${CP} ${FILESDIR}/patch-titlebottom ${PATCHDIR}/patch-ac +.else + ${CP} ${FILESDIR}/patch-titletop ${PATCHDIR}/patch-ac +.endif + + post-install: ${CP} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/lib/X11/icewm/taskbar diff -ruN icewm.orig/files/patch-titlebottom icewm/files/patch-titlebottom --- icewm.orig/files/patch-titlebottom Thu Jan 1 09:00:00 1970 +++ icewm/files/patch-titlebottom Mon May 11 14:13:45 1998 @@ -0,0 +1,34 @@ +--- src/config.h.orig Mon Mar 16 01:20:35 1998 ++++ src/config.h Fri May 1 08:40:23 1998 +@@ -17,17 +17,18 @@ + */ + #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 + + /** Show title bars at the bottom of the window */ +-#undef TITLEBAR_BOTTOM ++#define TITLEBAR_BOTTOM + + /** No not include configurability of options */ + #undef NO_CONFIGURE +@@ -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/files/patch-titletop icewm/files/patch-titletop --- icewm.orig/files/patch-titletop Thu Jan 1 09:00:00 1970 +++ icewm/files/patch-titletop Mon May 11 14:13:45 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-ac icewm/patches/patch-ac --- icewm.orig/patches/patch-ac Sun May 3 07:24:53 1998 +++ icewm/patches/patch-ac Mon May 11 14:13:45 1998 @@ -1,6 +1,6 @@ ---- src/config.h.orig Mon Mar 16 01:20:35 1998 -+++ src/config.h Fri May 1 08:40:23 1998 -@@ -17,17 +17,18 @@ +--- 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 @@ -16,13 +16,6 @@ //#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 @@ -39,7 +40,7 @@ #undef NO_WINDOW_OPTIONS diff -ruN icewm.orig/pkg/DESCR icewm/pkg/DESCR --- icewm.orig/pkg/DESCR Wed Feb 25 20:30:56 1998 +++ icewm/pkg/DESCR Mon May 11 14:13:45 1998 @@ -1,3 +1,6 @@ cool window manager developped in a very hot day in a winter +When you want titlebars to be bottom, + % make -DTITLE_BOTTOM install + 'bsd-daemon.xpm' is from Steve Farrell. >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