cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to icewm 1.2.17

Browse Source 
from maintainer Peter Benjamin Williams <peter at pbw.us>
This commit is contained in:
sturm 2004-12-04 17:25:19 +00:00
parent 57216fda46
commit 0754d71eac
13 changed files with 46 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/icewm/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2004/05/30 10:59:16 naddy Exp $
# $OpenBSD: Makefile,v 1.18 2004/12/04 17:25:19 sturm Exp $
COMMENT= "small, fast window manager"
DISTNAME= icewm-1.2.14
DISTNAME= icewm-1.2.17
CATEGORIES= x11
HOMEPAGE= http://www.icewm.org/
@ -15,6 +15,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE Imlib SM X11 Xext Xft Xinerama Xrandr Xrender \
c fontconfig freetype iconv intl jpeg m png stdc++ \
tiff ungif z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/}
LIB_DEPENDS= Imlib.19::graphics/imlib

6
x11/icewm/distinfo
View File

@ -1,3 +1,3 @@
MD5 (icewm-1.2.14.tar.gz) = 1a5670fd074731766a64d5905bad773f
RMD160 (icewm-1.2.14.tar.gz) = 6ba6ead1d1221a7f2a6ac847f1bc27f2c8d7841e
SHA1 (icewm-1.2.14.tar.gz) = 72cf06de5817d7383bd151961c2e24d3490e1826
MD5 (icewm-1.2.17.tar.gz) = 8fbbbffcc14f8c2de7e9c3069b46d6c1
RMD160 (icewm-1.2.17.tar.gz) = 3c083f3b093851e750182c0eb8bdf7a75821d5a5
SHA1 (icewm-1.2.17.tar.gz) = 66c0d9b0e3ae4579997396a691f002bd0f0ed812

10
x11/icewm/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.6 2004/06/13 12:25:08 sturm Exp $
--- Makefile.in.orig 2004-05-23 08:18:18.000000000 +0200
+++ Makefile.in 2004-06-13 13:38:31.000000000 +0200
@@ -116,12 +116,9 @@ install-base: base
$OpenBSD: patch-Makefile_in,v 1.7 2004/12/04 17:25:19 sturm Exp $
--- Makefile.in.orig Tue Nov 23 10:43:24 2004
+++ Makefile.in Tue Nov 23 10:46:27 2004
@@ -116,12 +116,9 @@
install-docs: docs
@echo ------------------------------------------
@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2004/06/13 12:25:08 sturm Exp $
- @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
- @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
- @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+ ${BSD_INSTALL_DATA} "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm"
+ $(BSD_INSTALL_DATA) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm"
@echo ------------------------------------------
install-nls: nls

22
x11/icewm/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2004/08/11 22:48:26 naddy Exp $
--- configure.orig Sun May 23 08:18:27 2004
+++ configure Thu Aug 12 00:15:48 2004
@@ -1438,7 +1438,7 @@ test -n "$target_alias" &&
$OpenBSD: patch-configure,v 1.5 2004/12/04 17:25:19 sturm Exp $
--- configure.orig Wed Nov 24 11:37:14 2004
+++ configure Wed Nov 24 11:38:55 2004
@@ -1461,7 +1461,7 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
@ -10,24 +10,16 @@ $OpenBSD: patch-configure,v 1.4 2004/08/11 22:48:26 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
@@ -2330,7 +2330,6 @@ if { ac_try='rm conftest; $CC -o conftes
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } >/dev/null 2>&1; then
ice_prog_gxx=yes
- CXX=$CC
else
ice_prog_gxx=no
fi
@@ -10077,7 +10076,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
@@ -9796,7 +9796,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -10126,7 +10125,7 @@ fi
_ACEOF
@@ -9855,7 +9855,7 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
if test $ac_cv_lib_intl_bindtextdomain = yes; then

10
x11/icewm/patches/patch-doc_icewm-7_html
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_icewm-7_html,v 1.5 2004/06/13 12:25:08 sturm Exp $
--- doc/icewm-7.html.orig 2004-05-23 08:18:42.000000000 +0200
+++ doc/icewm-7.html 2004-06-13 13:38:31.000000000 +0200
@@ -25,8 +25,8 @@ directories:</P>
$OpenBSD: patch-doc_icewm-7_html,v 1.6 2004/12/04 17:25:19 sturm Exp $
--- doc/icewm-7.html.orig Tue Nov 23 15:34:32 2004
+++ doc/icewm-7.html Tue Nov 23 15:33:15 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>
@ -12,7 +12,7 @@ $OpenBSD: patch-doc_icewm-7_html,v 1.5 2004/06/13 12:25:08 sturm Exp $
with default files</P>
</DL>
</P>
@@ -34,8 +34,8 @@ with default files</P>
@@ -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

128
x11/icewm/patches/patch-lib_menu_in
View File

@ -1,128 +0,0 @@
$OpenBSD: patch-lib_menu_in,v 1.2 2004/05/21 17:00:09 naddy Exp $
--- lib/menu.in.orig Sat Sep 27 03:54:45 2003
+++ lib/menu.in Fri Feb 20 20:39:04 2004
@@ -5,15 +5,114 @@
# (re)install icewm.
#
prog xterm xterm xterm
+prog Eterm Eterm Eterm
+prog aterm aterm aterm
prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
-prog fte fte fte
-prog NEdit nedit nedit
-prog Mozilla mozilla mozilla
-prog XChat xchat xchat
-prog Gimp gimp gimp
separator
-menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@
-menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@
-menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@
-menufile Programs folder programs
-menufile Tool_bar folder toolbar
+#menufile Programs folder programs
+#menufile Tool_bar folder toolbar
+menu Applications folder {
+ menu Editors folder {
+ prog NEdit nedit nedit
+ prog fte fte fte
+ prog vim vim gvim
+ prog xemacs xemacs xemacs
+ prog emacs emacs emacs
+ prog xed_it xedit xedit
+ prog Lyx emacs lyx
+ prog Anj_uta anjuta anjuta
+ prog Abiword abiword abiword
+ prog Xc_oral xcoral xcoral
+ }
+ menu "WWW Browsers" folder {
+ prog Netscape netscape netscape
+ prog Konqueror konqueror konqueror
+ prog Mozilla mozilla mozilla
+ prog Firefox firefox firefox
+ prog Galeon galeon galeon
+ prog Opera opera opera
+ prog Dillo dillo dillo
+ prog Amaya amaya amaya
+ prog Lynx lynx xterm -T Lynx -e lynx
+ }
+ menu "Mail and News" folder {
+ prog Kmail kmail kmail
+ prog Sylpheed sylpheed sylpheed
+ prog Tk_Rat tkrat tkrat
+ prog Thunderbird thunderbird thunderbird
+ prog Elm elm xterm -T Elm -e elm
+ prog Mutt mutt xterm -T Mutt -e mutt
+ prog Pine pine xterm -T Pine -e pine
+ }
+ menu "Internet Utilities" folder {
+ prog XChat xchat xchat
+ prog GTK-Gnutella gtk-gnutella gtk-gnutella
+ }
+ menu Graphics folder {
+ prog Dia dia dia
+ prog Blender blender blender
+ prog gtksee gtksee gtksee
+ prog ImageMagic display display
+ prog PornView pornview pornview
+ prog Gimp gimp gimp
+ prog XV xv xv
+ prog XPaint xpaint xpaint
+ prog XFig xfig xfig
+ }
+ menu Multimedia folder {
+ prog XPlay_CD xplaycd xplaycd
+ prog XM_ixer xmixer xmixer
+ prog XMMS xmms xmms
+ prog Mplayer gmplayer gmplayer
+ }
+ menu "System Utilities" folder {
+ prog xosview xosview xosview
+ prog HexCalc hexcalc hexcalc
+ prog "Northern Captain" xnc xnc
+ prog xfm xfm xfm
+ prog "Acrobat Reader" pdf acroread
+ prog Xpdf pdf xpdf
+ prog "DVI Previewer" xdvi xdvi
+ prog Ghostview ghostview gv
+ }
+}
+menu Games folder {
+ prog "Koules for X" koules xkoules -f
+ prog Xboing xboing xboing
+ prog Xboard xboard xboard
+ prog XGalaga xgalaga xgal
+ prog XDemineur xdemineur xdemineur
+ prog "X Scavenger" scavenger scavenger
+ prog Xkobo xkobo xkobo -doublesize
+ prog "Eboard (chess)" eboard eboard
+ prog Quake-2 quake2 quake2
+}
+menu Utilities folder {
+ prog top top xterm -e top
+ prog xload xload xload
+ prog Xman xman xman
+ prog "Font Selector" xfontsel xfontsel
+ prog Clock xclock xclock
+ prog Magnify xmag xmag
+ prog Calculator xcalc xcalc
+ prog Colormap xcolormap xcmap
+ prog Clip_board xclip xclipboard
+ prog xkill bomb xkill
+ separator
+ prog "Screen Saver" xlock xlock -nolock
+ prog "Screen _Lock" xlock xlock
+}
+menu "Window _Managers" folder {
+ restart icewm - icewm
+ restart wmaker - wmaker
+ restart enlightenment - enlightenment
+ restart blackbox - blackbox
+ restart fl_uxbox - fluxbox
+ restart fvwm_2 - fvwm2
+ restart fvwm - fvwm
+ restart w_m2 - wm2
+ restart pwm - pwm
+ restart twm - twm
+ restart KDE - startkde
+ restart Gnome - gnome-session
+}

8
x11/icewm/patches/patch-po_bg_po
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-po_bg_po,v 1.1 2004/05/21 17:00:09 naddy Exp $
--- po/bg.po.orig 2004-05-21 17:39:06.000000000 +0200
+++ po/bg.po 2004-05-21 17:39:15.000000000 +0200
@@ -11,7 +11,7 @@ msgstr "Project-Id-Version: IceWM 1.2.1
$OpenBSD: patch-po_bg_po,v 1.2 2004/12/04 17:25:19 sturm Exp $
--- po/bg.po.orig Tue Nov 23 14:54:30 2004
+++ po/bg.po Tue Nov 23 14:55:51 2004
@@ -11,7 +11,7 @@
"Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
"Language-Team: Bulgarian\n"
"MIME-Version: 1.0\n"

11
x11/icewm/patches/patch-src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2004/06/13 12:25:08 sturm Exp $
--- src/Makefile.in.orig 2004-05-23 08:18:19.000000000 +0200
+++ src/Makefile.in 2004-06-13 13:38:32.000000000 +0200
@@ -31,7 +31,7 @@ DEFS = @DEFS@ \
$OpenBSD: patch-src_Makefile_in,v 1.4 2004/12/04 17:25:19 sturm Exp $
--- src/Makefile.in.orig Tue Nov 23 15:19:18 2004
+++ src/Makefile.in Tue Nov 23 15:21:41 2004
@@ -31,7 +31,7 @@
-DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
-DICESMEXE='"icewm-session$(EXEEXT)"' \
-DICEHELPEXE='"icehelp$(EXEEXT)"' \
@ -10,7 +10,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2004/06/13 12:25:08 sturm Exp $
CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
@@ -205,11 +205,11 @@ clean:
@@ -205,11 +205,11 @@
%.o: %.cc
@echo " CXX " $@
@ -24,3 +24,4 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2004/06/13 12:25:08 sturm Exp $
################################################################################
$OpenBSD: patch-src_Makefile_in,v 1.4 2004/12/04 17:25:19 sturm Exp $

10
x11/icewm/patches/patch-src_default_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_default_h,v 1.3 2004/06/13 12:25:08 sturm Exp $
--- src/default.h.orig 2004-05-23 08:18:19.000000000 +0200
+++ src/default.h 2004-06-13 13:38:32.000000000 +0200
@@ -129,8 +129,8 @@ XSV(const char *, acpiIgnoreBatteries,
$OpenBSD: patch-src_default_h,v 1.4 2004/12/04 17:25:19 sturm Exp $
--- src/default.h.orig Tue Nov 23 15:07:54 2004
+++ src/default.h Tue Nov 23 15:10:22 2004
@@ -131,8 +131,8 @@
#endif
XSV(const char *, kdeDataDir, KDEDIR)
XSV(const char *, mailBoxPath, 0)
-XSV(const char *, mailCommand, "xterm -name pine -title PINE -e pine")
-XSV(const char *, mailClassHint, "pine.XTerm")

13
x11/icewm/patches/patch-src_themes_cc
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_themes_cc,v 1.2 2004/06/13 12:25:08 sturm Exp $
--- src/themes.cc.orig 2004-05-23 08:18:19.000000000 +0200
+++ src/themes.cc 2004-06-13 13:38:32.000000000 +0200
@@ -83,9 +83,6 @@ void DTheme::open() {
setDefaultTheme(fTheme);
- const char *bg[] = { ICEWMBGEXE, "-r", 0 };
- int pid = app->runProgram(bg[0], bg);
- app->waitProgram(pid);
YStringArray args(4);

35
x11/icewm/patches/patch-src_wmapp_cc
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-src_wmapp_cc,v 1.5 2004/08/11 22:48:26 naddy Exp $
--- src/wmapp.cc.orig Sun May 23 08:18:19 2004
+++ src/wmapp.cc Thu Aug 12 00:13:20 2004
@@ -923,11 +923,11 @@ void runRestart(const char *path, char *
if (args) {
execvp(path, args);
} else {
- execlp(path, path, 0);
+ execlp(path, path, (void *)NULL);
}
} else {
const char *c = configArg ? "-c" : NULL;
- execlp(ICEWMEXE, ICEWMEXE, "--restart", c, configArg, 0);
+ execlp(ICEWMEXE, ICEWMEXE, "--restart", c, configArg, (void *)NULL);
}
xapp->alert();
@@ -1452,6 +1452,8 @@ static void print_usage(const char *argv
int main(int argc, char **argv) {
YLocale locale;
+ const char *bg[] = { "icewmbg", 0 };
+
for (char ** arg = argv + 1; arg < argv + argc; ++arg) {
if (**arg == '-') {
#ifdef DEBUG
@@ -1492,6 +1494,8 @@ int main(int argc, char **argv) {
themeName = newstr(overrideTheme);
#endif
YWMApp app(&argc, &argv);
+
+ app.runProgram(bg[0], bg);
#ifdef CONFIG_GUIEVENTS
app.signalGuiEvent(geStartup);

12
x11/icewm/patches/patch-src_yapp_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_yapp_cc,v 1.4 2004/06/13 12:25:08 sturm Exp $
--- src/yapp.cc.orig 2004-05-23 08:18:19.000000000 +0200
+++ src/yapp.cc 2004-06-13 13:38:32.000000000 +0200
@@ -428,7 +428,7 @@ int YApplication::runProgram(const char
if (args)
execvp(path, (char **)args);
else
- execlp(path, path, 0);
+ execlp(path, path, (void *)NULL);
_exit(99);
}

6
x11/icewm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2004/09/15 19:26:29 espie Exp $
@comment $OpenBSD: PLIST,v 1.9 2004/12/04 17:25:19 sturm Exp $
bin/icehelp
bin/icesh
bin/icewm
@ -19,6 +19,7 @@ share/doc/icewm/icewm-17.html
share/doc/icewm/icewm-18.html
share/doc/icewm/icewm-19.html
share/doc/icewm/icewm-2.html
share/doc/icewm/icewm-20.html
share/doc/icewm/icewm-3.html
share/doc/icewm/icewm-4.html
share/doc/icewm/icewm-5.html
@ -411,6 +412,9 @@ share/locale/ro/LC_MESSAGES/icewm.mo
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/icewm.mo
share/locale/sk/
share/locale/sk/LC_MESSAGES/
share/locale/sk/LC_MESSAGES/icewm.mo
share/locale/sl/
share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/icewm.mo