Bug 6582 - Fixed port: icewm
Summary: Fixed port: icewm
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 1998-05-11 06:20 UTC by Nakai
Modified: 1998-05-25 05:06 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Nakai 1998-05-11 06:20:02 UTC 
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.
Comment 1 Steve Price freebsd_committer freebsd_triage 1998-05-25 05:02:47 UTC 
State Changed
From-To: open->closed

Patch committed, thanks!