update to 1.2.14; from new maintainer Peter Williams <peterbw@citi.umich.edu>

This commit is contained in:
naddy 2004-05-25 16:36:35 +00:00
parent bba36daf03
commit fb4bdf38be
10 changed files with 88 additions and 80 deletions

View File

@ -1,12 +1,14 @@
# $OpenBSD: Makefile,v 1.15 2004/05/21 17:00:08 naddy Exp $
# $OpenBSD: Makefile,v 1.16 2004/05/25 16:36:35 naddy Exp $
COMMENT= "small, fast window manager"
DISTNAME= icewm-1.2.13
DISTNAME= icewm-1.2.14
CATEGORIES= x11
HOMEPAGE= http://www.icewm.org/
MAINTAINER= Peter Williams <peterbw@citi.umich.edu>
# LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

View File

@ -1,3 +1,3 @@
MD5 (icewm-1.2.13.tar.gz) = d189afcf15f2386a0a0397c376e297c6
RMD160 (icewm-1.2.13.tar.gz) = 81810eb4975c7d1d3a55482b4387c0dbf0f0ff6c
SHA1 (icewm-1.2.13.tar.gz) = ebfe807cbe3a9d931386833033eb9cb1792ea485
MD5 (icewm-1.2.14.tar.gz) = 1a5670fd074731766a64d5905bad773f
RMD160 (icewm-1.2.14.tar.gz) = 6ba6ead1d1221a7f2a6ac847f1bc27f2c8d7841e
SHA1 (icewm-1.2.14.tar.gz) = 72cf06de5817d7383bd151961c2e24d3490e1826

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2004/05/21 17:00:09 naddy Exp $
--- Makefile.in.orig 2003-09-27 02:54:45.000000000 -0500
+++ Makefile.in 2004-02-15 16:12:50.000000000 -0600
@@ -112,12 +112,9 @@ install-base: base
$OpenBSD: patch-Makefile_in,v 1.5 2004/05/25 16:36:35 naddy Exp $
--- Makefile.in.orig Sun May 23 16:19:47 2004
+++ Makefile.in Sun May 23 16:19:35 2004
@@ -116,12 +116,9 @@
install-docs: docs
@echo ------------------------------------------

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2004/05/21 17:00:09 naddy Exp $
--- configure.orig 2003-09-27 09:54:49.000000000 +0200
+++ configure 2004-05-21 17:38:49.000000000 +0200
@@ -1439,7 +1439,7 @@ test -n "$target_alias" &&
$OpenBSD: patch-configure,v 1.2 2004/05/25 16:36:35 naddy Exp $
--- configure.orig Sun May 23 16:22:32 2004
+++ configure Sun May 23 16:23:04 2004
@@ -1438,7 +1438,7 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
@ -10,13 +10,3 @@ $OpenBSD: patch-configure,v 1.1 2004/05/21 17:00:09 naddy Exp $
APPLICATIONS='icewm icewm-session icesh icewmhint icewmbg icewmtray'
TESTCASES=`echo src/test*.cc | sed 's%src/\([^ ]*\)\.cc%\1%g'`
TESTCASES="$TESTCASES iceview icesame iceicon icerun icelist" # iceclock
@@ -3331,9 +3331,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- if test x"$ac_cv_c_compiler_gnu" != x; then
- CXX_LINK=${CC}
- fi

View File

@ -1,25 +1,25 @@
$OpenBSD: patch-doc_icewm-7_html,v 1.3 2004/05/21 17:00:09 naddy Exp $
--- doc/icewm-7.html.orig 2003-09-27 02:54:58.000000000 -0500
+++ doc/icewm-7.html 2004-02-15 16:12:50.000000000 -0600
@@ -25,17 +25,16 @@ directories:</P>
$OpenBSD: patch-doc_icewm-7_html,v 1.4 2004/05/25 16:36:35 naddy Exp $
--- doc/icewm-7.html.orig Sun May 23 16:39:41 2004
+++ doc/icewm-7.html Sun May 23 16:46:26 2004
@@ -25,8 +25,8 @@
<DL>
<DT><B>$HOME/.icewm</B><DD><P>user's personal customization. This location can
be customized by setting the $ICEWM_PRIVCFG environment variable.</P>
-<DT><B>/etc/X11/icewm</B><DD><P>system-wide customized defaults</P>
-<DT><B>/usr/local/share/icewm</B><DD><P>compiled-in default directory with default files
-(for .rpm packages the default is /usr/share/icewm)</P>
-<DT><B>/usr/share/icewm OR /usr/local/share/icewm</B><DD><P>compiled-in default directory
+<DT><B>%%SYSCONFDIR%%/icewm</B><DD><P>system-wide customized defaults</P>
+<DT><B>%%PREFIX%%/share/icewm</B><DD><P>compiled-in default directory with default files</P>
+<DT><B>%%PREFIX%%/share/icewm</B><DD><P>compiled-in default directory
with default files</P>
</DL>
</P>
<P>The directories are searched in the above order, so any file located
@@ -34,8 +34,8 @@
in the system/install directory can be overridden by the user by creating
the same directory hierarchy under <CODE>$HOME/.icewm</CODE>.</P>
<P>To customize icewm yourself, you should create the $HOME/.icewm directory and copy
-the files that you wish to modify (preferences, winoptions),from /etc/X11/icewm,
-/usr/share/icewm or /usr/local/share/icewm and then modify as you like.</P>
+the files that you wish to modify (preferences, winoptions, etc.) from %%SYSCONFDIR%%/icewm
+or %%PREFIX%%/share/icewm and then modify them as you like.</P>
+the files that you wish to modify (preferences, winoptions),from %%SYSCONFDIR%%/icewm,
+or %%PREFIX%%/share/icewm and then modify as you like.</P>
<P>To customize the default themes, you should create the $HOME/.icewm/themes directory
and copy all the theme files there and then modify as necessary.</P>

View File

@ -1,24 +1,24 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2004/05/21 17:00:09 naddy Exp $
--- src/Makefile.in.orig 2003-09-27 02:54:45.000000000 -0500
+++ src/Makefile.in 2004-02-15 16:12:51.000000000 -0600
@@ -29,7 +29,7 @@ DEFS = @DEFS@ \
-DICEWMEXE='"icewm$(EXEEXT)"' \
$OpenBSD: patch-src_Makefile_in,v 1.2 2004/05/25 16:36:35 naddy Exp $
--- src/Makefile.in.orig Sun May 23 16:29:48 2004
+++ src/Makefile.in Sun May 23 16:31:56 2004
@@ -31,7 +31,7 @@
-DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
-DICESMEXE='"icewm-session$(EXEEXT)"' \
-DICEHELPEXE='"icehelp$(EXEEXT)"' \
- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+ -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"'
CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
@@ -202,11 +202,11 @@ clean:
@@ -205,11 +205,11 @@
%.o: %.cc
@echo Compiling $@...
@echo " CXX " $@
- @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
+ $(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
genpref $(BINARIES):
@echo Linking $@...
@echo " LD " $@
- @$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
+ $(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)

View File

@ -1,16 +1,7 @@
$OpenBSD: patch-src_wmapp_cc,v 1.2 2004/05/21 17:00:09 naddy Exp $
--- src/wmapp.cc.orig 2003-09-27 09:54:45.000000000 +0200
+++ src/wmapp.cc 2004-05-21 17:36:57.000000000 +0200
@@ -681,7 +681,7 @@ static void initMenus() {
logoutMenu->addItem(_("Lock _Workstation"), -2, "", actionLock);
logoutMenu->addItem(_("Re_boot"), -2, "", actionReboot);
- logoutMenu->addItem(_("Shut_down"), -2, "", actionReboot);
+ logoutMenu->addItem(_("Shut_down"), -2, "", actionShutdown);
logoutMenu->addSeparator();
DProgram *restartIcewm =
@@ -909,11 +909,11 @@ void runRestart(const char *path, char *
$OpenBSD: patch-src_wmapp_cc,v 1.3 2004/05/25 16:36:35 naddy Exp $
--- src/wmapp.cc.orig Sun May 23 16:58:43 2004
+++ src/wmapp.cc Sun May 23 17:03:11 2004
@@ -923,11 +923,11 @@
if (args) {
execvp(path, args);
} else {
@ -23,22 +14,22 @@ $OpenBSD: patch-src_wmapp_cc,v 1.2 2004/05/21 17:00:09 naddy Exp $
+ execlp(ICEWMEXE, ICEWMEXE, "--restart", c, configArg, (void *)NULL);
}
app->alert();
@@ -1507,6 +1507,8 @@ static void print_usage(const char *argv
xapp->alert();
@@ -1452,6 +1452,8 @@
int main(int argc, char **argv) {
YLocale locale;
+
+ const char *bg[] = { "icewmbg", 0 };
+ const char *bg[] = { "icewmbg", 0 };
+
for (char ** arg = argv + 1; arg < argv + argc; ++arg) {
if (**arg == '-') {
@@ -1549,6 +1551,8 @@ int main(int argc, char **argv) {
#ifdef DEBUG
@@ -1492,6 +1494,8 @@
themeName = newstr(overrideTheme);
#endif
YWMApp app(&argc, &argv);
+ app.runProgram(bg[0], bg);
+
+ app.runProgram(bg[0], bg);
#ifdef CONFIG_GUIEVENTS
app.signalGuiEvent(geStartup);
#endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_yapp_cc,v 1.2 2004/05/21 17:00:09 naddy Exp $
--- src/yapp.cc.orig 2003-09-27 02:54:45.000000000 -0500
+++ src/yapp.cc 2004-02-15 16:12:51.000000000 -0600
@@ -1304,7 +1304,7 @@ int YApplication::runProgram(const char
$OpenBSD: patch-src_yapp_cc,v 1.3 2004/05/25 16:36:35 naddy Exp $
--- src/yapp.cc.orig Sun May 23 17:28:05 2004
+++ src/yapp.cc Sun May 23 17:28:55 2004
@@ -428,7 +428,7 @@
if (args)
execvp(path, (char **)args);
else

View File

@ -1,12 +1,4 @@
IceWM is a window manager for the X11 Window System. It has been
coded from scratch in C++ for performance and size and attempts to
achieve the following goals:
Feel good and fast to use, be simple and don't get in the way
Default configuration should be fully usable without tweaking
Mouse is optional
Combine the best features of other window managers and GUIs
IceWM allows reasonably configurable look using themes and is fully
GNOME and partially KDE compliant, but can also be used as a full
featured standalone environment.
A lightweight window manager for the X Window System. Optimized for
"feel" and speed, not looks. Features multiple workspaces, opaque
move/resize, task bar, window list, clock, mailbox, CPU, Network,
APM status.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2004/05/21 17:00:09 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2004/05/25 16:36:35 naddy Exp $
bin/icehelp
bin/icesh
bin/icewm
@ -64,6 +64,7 @@ share/icewm/icons/pdf_16x16.xpm
share/icewm/icons/pdf_32x32.xpm
share/icewm/icons/vim_16x16.xpm
share/icewm/icons/vim_32x32.xpm
share/icewm/icons/vim_48x48.xpm
share/icewm/icons/xisp_16x16.xpm
share/icewm/icons/xisp_32x32.xpm
share/icewm/icons/xload_16x16.xpm
@ -98,8 +99,16 @@ share/icewm/mailbox/nomail.xpm
share/icewm/mailbox/unreadmail.xpm
share/icewm/menu
share/icewm/preferences
share/icewm/taskbar/debian.xpm
share/icewm/taskbar/desktop.xpm
share/icewm/taskbar/icewm.xpm
share/icewm/taskbar/linux.xpm
share/icewm/taskbar/linux1.xpm
share/icewm/taskbar/linux2.xpm
share/icewm/taskbar/linux20.xpm
share/icewm/taskbar/start.xpm
share/icewm/taskbar/windows.xpm
share/icewm/taskbar/xfreeos2.xpm
share/icewm/themes/Infadel2/Ergonomic.theme
share/icewm/themes/Infadel2/Overloaded.theme
share/icewm/themes/Infadel2/closeA.xpm
@ -173,15 +182,20 @@ share/icewm/themes/gtk2/restoreA.xpm
share/icewm/themes/gtk2/restoreI.xpm
share/icewm/themes/icedesert/closeA.xpm
share/icewm/themes/icedesert/closeI.xpm
share/icewm/themes/icedesert/closeO.xpm
share/icewm/themes/icedesert/default.theme
share/icewm/themes/icedesert/maximizeA.xpm
share/icewm/themes/icedesert/maximizeI.xpm
share/icewm/themes/icedesert/maximizeO.xpm
share/icewm/themes/icedesert/menuButtonA.xpm
share/icewm/themes/icedesert/menuButtonI.xpm
share/icewm/themes/icedesert/menuButtonO.xpm
share/icewm/themes/icedesert/minimizeA.xpm
share/icewm/themes/icedesert/minimizeI.xpm
share/icewm/themes/icedesert/minimizeO.xpm
share/icewm/themes/icedesert/restoreA.xpm
share/icewm/themes/icedesert/restoreI.xpm
share/icewm/themes/icedesert/restoreO.xpm
share/icewm/themes/icedesert/titleAB.xpm
share/icewm/themes/icedesert/titleAT.xpm
share/icewm/themes/icedesert/titleIB.xpm
@ -300,6 +314,12 @@ share/icewm/themes/win95/default.theme
share/icewm/themes/win95/maximize.xpm
share/icewm/themes/win95/minimize.xpm
share/icewm/themes/win95/restore.xpm
share/icewm/themes/yellowmotif/close.xpm
share/icewm/themes/yellowmotif/default.theme
share/icewm/themes/yellowmotif/maximize.xpm
share/icewm/themes/yellowmotif/menu.xpm
share/icewm/themes/yellowmotif/minimize.xpm
share/icewm/themes/yellowmotif/restore.xpm
share/icewm/toolbar
share/icewm/winoptions
share/locale/be/LC_MESSAGES/icewm.mo
@ -307,6 +327,7 @@ share/locale/bg/LC_MESSAGES/icewm.mo
share/locale/ca/LC_MESSAGES/icewm.mo
share/locale/cs/LC_MESSAGES/icewm.mo
share/locale/de/LC_MESSAGES/icewm.mo
share/locale/el/LC_MESSAGES/icewm.mo
share/locale/en/LC_MESSAGES/icewm.mo
share/locale/es/LC_MESSAGES/icewm.mo
share/locale/fi/LC_MESSAGES/icewm.mo
@ -325,9 +346,19 @@ share/locale/ro/LC_MESSAGES/icewm.mo
share/locale/ru/LC_MESSAGES/icewm.mo
share/locale/sl/LC_MESSAGES/icewm.mo
share/locale/sv/LC_MESSAGES/icewm.mo
share/locale/tr/LC_MESSAGES/icewm.mo
share/locale/uk/LC_MESSAGES/icewm.mo
share/locale/zh_CN/LC_MESSAGES/icewm.mo
share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
@dirrm share/locale/zh_CN/LC_MESSAGES
@dirrm share/locale/zh_CN
@dirrm share/locale/en/LC_MESSAGES
@dirrm share/locale/en
@dirrm share/locale/bg/LC_MESSAGES
@dirrm share/locale/bg
@dirrm share/locale/be/LC_MESSAGES
@dirrm share/locale/be
@dirrm share/icewm/themes/yellowmotif
@dirrm share/icewm/themes/win95
@dirrm share/icewm/themes/warp4
@dirrm share/icewm/themes/warp3
@ -342,8 +373,10 @@ share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
@dirrm share/icewm/themes/Infadel2/icons
@dirrm share/icewm/themes/Infadel2/cursors
@dirrm share/icewm/themes/Infadel2
@dirrm share/icewm/themes
@dirrm share/icewm/taskbar
@dirrm share/icewm/mailbox
@dirrm share/icewm/ledclock
@dirrm share/icewm/icons
@dirrm share/icewm
@dirrm share/doc/icewm