Date: Mon, 15 Jan 2001 12:05:10 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/24356: Update port: x11-wm/icewm to 1.0.6 (fix ports/23570) Message-ID: <200101152005.f0FK5AI04440@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 24356
>Category: ports
>Synopsis: Update port: x11-wm/icewm to 1.0.6 (fix ports/23570)
>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: Mon Jan 15 12:10:03 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.6
New file:
files/patch-am files/patch-an files/patch-ao files/patch-ap
Remove file:
files/patch-af
This PR supersedes ports/23570.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
--- /usr/ports/x11-wm/icewm/Makefile Thu Oct 26 00:25:59 2000
+++ x11-wm/icewm/Makefile Tue Jan 16 02:14:16 2001
@@ -6,27 +6,46 @@
#
PORTNAME= icewm
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.6
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-EXTRACT_SUFX= .src.tar.gz
+DISTNAME= ${PORTNAME}-${PORTVERSION}-4
MAINTAINER= nakai@FreeBSD.org
-.if defined(GNOME)
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
+WANT_GNOME= yes
+USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_IMLIB= yes
-CONFIGURE_ARGS= --enable-i18n --with-imlib
+USE_GMAKE= yes
+USE_AUTOCONF= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --enable-i18n --enable-nls \
+ --with-cfgdir=${PREFIX}/share/icewm \
+ --with-libdir=${PREFIX}/share/icewm
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME= yes
+CONFIGURE_ARGS+= --with-imlib --without-xpm --with-gnome-menus
+INSTALL_TARGET= install install-gnome
+.else
+USE_XPM= yes
+CONFIGURE_ARGS+= --without-imlib --with-xpm --without-gnome-menus
+.endif
post-install:
${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${PREFIX}/share/doc/icewm
+.for file in CHANGES FAQ INSTALL README TODO
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/icewm
+.endfor
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/icewm
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/x11-wm/icewm/distinfo x11-wm/icewm/distinfo
--- /usr/ports/x11-wm/icewm/distinfo Mon Jun 19 20:40:12 2000
+++ x11-wm/icewm/distinfo Mon Jan 15 21:42:04 2001
@@ -1 +1 @@
-MD5 (icewm-1.0.4.src.tar.gz) = 31d6fd8b94fd1becab0de15d4a8e4eb4
+MD5 (icewm-1.0.6-4.tar.bz2) = 9231eca07f8aa39b06f3a94e400676e4
diff -urN /usr/ports/x11-wm/icewm/files/patch-aa x11-wm/icewm/files/patch-aa
--- /usr/ports/x11-wm/icewm/files/patch-aa Mon May 17 08:20:23 1999
+++ x11-wm/icewm/files/patch-aa Mon Jan 15 23:07:21 2001
@@ -1,12 +1,11 @@
---- Makefile.orig Sat May 1 23:20:32 1999
-+++ Makefile Sun May 16 09:33:07 1999
-@@ -12,8 +12,7 @@
- GNOMEFILES = src/icewm-gnome
+--- Makefile.in.orig Mon Jan 15 06:49:38 2001
++++ Makefile.in Mon Jan 15 23:07:09 2001
+@@ -14,7 +14,7 @@
+ GUIEVENTSFILES = src/icesound
+ GNOMEFILES = lib/IceWM.desktop
- all:
-- cd src ; $(MAKE) LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR)
-- cd doc ; $(MAKE)
-+ cd src ; $(MAKE) LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR) PREFIX=$(PREFIX)
+-WMPROPDIR = $(shell gnome-config --datadir)/gnome/wm-properties/
++WMPROPDIR = $(shell gnome-config --datadir)/wm-properties/
- docs:
- cd doc ; $(MAKE)
+ all: @TARGETS@
+ install: @TARGETS_INSTALL@
diff -urN /usr/ports/x11-wm/icewm/files/patch-ab x11-wm/icewm/files/patch-ab
--- /usr/ports/x11-wm/icewm/files/patch-ab Wed Jun 9 08:58:56 1999
+++ x11-wm/icewm/files/patch-ab Mon Jan 15 22:18:50 2001
@@ -1,12 +1,7 @@
---- install.in.orig Mon Jun 7 20:07:12 1999
-+++ install.in Mon Jun 7 20:08:10 1999
-@@ -3,11 +3,11 @@
-
- PREFIX = @prefix@
- BINDIR = @bindir@
--LIBDIR = @libdir@/X11/icewm
-+LIBDIR = @prefix@/share/icewm
- ETCDIR = @sysconfdir@
+--- install.in.orig Mon Jan 15 06:49:39 2001
++++ install.in Mon Jan 15 22:18:04 2001
+@@ -13,7 +13,7 @@
+ DOCDIR = @docdir@
INSTALL = @INSTALL@
-INSTALLDIR = @INSTALL@ -m 755 -d
diff -urN /usr/ports/x11-wm/icewm/files/patch-af x11-wm/icewm/files/patch-af
--- /usr/ports/x11-wm/icewm/files/patch-af Wed Mar 17 15:55:01 1999
+++ x11-wm/icewm/files/patch-af Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- icewm.spec.in.orig Wed Mar 17 00:12:01 1999
-+++ icewm.spec.in Wed Mar 17 00:12:22 1999
-@@ -36,7 +36,7 @@
- %files
- %defattr(-,root,root)
- %doc README COPYING CHANGES TODO BUGS icewm.lsm FAQ doc/*.html doc/icewm.sgml
--%{prefix}/lib/X11/icewm/
-+%{prefix}/share/icewm/
- %{prefix}/bin/icewm
- %{prefix}/bin/icewmhint
- %{prefix}/bin/icewmbg
diff -urN /usr/ports/x11-wm/icewm/files/patch-ai x11-wm/icewm/files/patch-ai
--- /usr/ports/x11-wm/icewm/files/patch-ai Wed Dec 1 16:58:12 1999
+++ x11-wm/icewm/files/patch-ai Mon Jan 15 22:20:10 2001
@@ -1,6 +1,19 @@
---- src/wmtaskbar.cc.orig Wed Dec 1 16:46:05 1999
-+++ src/wmtaskbar.cc Wed Dec 1 16:46:15 1999
-@@ -72,9 +72,9 @@
+--- src/wmtaskbar.cc.orig Mon Jan 15 06:49:41 2001
++++ src/wmtaskbar.cc Mon Jan 15 22:18:04 2001
+@@ -47,6 +47,12 @@
+ YPixmap *windowsPixmap = 0;
+ YPixmap *taskbackPixmap = 0;
+
++#ifdef __FreeBSD__
++#define APMDEV "/dev/apm"
++#else
++#define APMDEV "/proc/apm"
++#endif
++
+ static void initPixmaps() {
+ static const char *home = getenv("HOME");
+ const char *base = 0;
+@@ -74,9 +80,9 @@
/** Use Linux 2.0 Penguin as start button */
#ifndef START_PIXMAP
@@ -12,15 +25,12 @@
//#define START_PIXMAP "start.xpm"
//#define START_PIXMAP "xfree86os2.xpm"
#endif
-@@ -253,7 +253,11 @@
+@@ -256,7 +262,7 @@
} else
fClock = 0;
- #ifdef CONFIG_APM
-+#ifdef __FreeBSD__
-+ if (taskBarShowApm && access("/dev/apm", 0) == 0) {
-+#else
- if (taskBarShowApm && access("/proc/apm", 0) == 0) {
-+#endif
- fApm = new YApm(this);
- if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
+ #ifdef CONFIG_APPLET_APM
+- if (taskBarShowApm && access("/proc/apm", 0) == 0) {
++ if (taskBarShowApm && access(APMDEV, 0) == 0) {
+ fApm = new YApm(this);
+ if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
} else
diff -urN /usr/ports/x11-wm/icewm/files/patch-aj x11-wm/icewm/files/patch-aj
--- /usr/ports/x11-wm/icewm/files/patch-aj Wed Nov 24 16:02:18 1999
+++ x11-wm/icewm/files/patch-aj Mon Jan 15 22:20:30 2001
@@ -1,5 +1,5 @@
---- src/ysocket.h.orig Tue Nov 23 01:37:11 1999
-+++ src/ysocket.h Wed Nov 24 15:56:28 1999
+--- src/ysocket.h.orig Mon Jan 15 06:49:41 2001
++++ src/ysocket.h Mon Jan 15 22:18:05 2001
@@ -2,6 +2,9 @@
#define YSOCKET_H_
diff -urN /usr/ports/x11-wm/icewm/files/patch-ak x11-wm/icewm/files/patch-ak
--- /usr/ports/x11-wm/icewm/files/patch-ak Wed Dec 1 16:58:13 1999
+++ x11-wm/icewm/files/patch-ak Mon Jan 15 22:38:18 2001
@@ -1,6 +1,6 @@
---- src/aapm.cc.orig Mon Nov 8 20:45:52 1999
-+++ src/aapm.cc Wed Dec 1 16:42:31 1999
-@@ -20,15 +20,32 @@
+--- src/aapm.cc.orig Mon Jan 15 06:49:39 2001
++++ src/aapm.cc Mon Jan 15 22:18:05 2001
+@@ -21,15 +21,32 @@
#include <string.h>
#include <stdio.h>
@@ -11,7 +11,7 @@
+#include <machine/apm_bios.h>
+#endif
+
- #ifdef CONFIG_APM
+ #ifdef CONFIG_APPLET_APM
YColor *YApm::apmBg = 0;
YColor *YApm::apmFg = 0;
@@ -34,26 +34,26 @@
char driver[16];
char apmver[16];
int apmflags;
-@@ -40,9 +57,27 @@
+@@ -41,9 +58,27 @@
char units[16];
if (fd == -1) {
-+ static int error = 0;
-+ if (!error)
-+ perror("Can't open the apm device");
-+ error = 1;
++ static int error = 0;
++ if (!error)
++ perror("Can't open the apm device");
++ error = 1;
return ;
}
-
+#ifdef __FreeBSD__
+ if (ioctl(fd,APMIO_GETINFO, &ai) == -1)
+ {
-+ static int error = 0;
-+ if (!error)
-+ perror("Can't ioctl the apm device");
-+ error = 1;
-+ close(fd);
-+ return;
++ static int error = 0;
++ if (!error)
++ perror("Can't ioctl the apm device");
++ error = 1;
++ close(fd);
++ return;
+ }
+ close(fd);
+ BATlife = ai.ai_batt_life;
@@ -63,7 +63,7 @@
len = read(fd, buf, sizeof(buf) - 1);
close(fd);
-@@ -60,6 +95,7 @@
+@@ -61,6 +96,7 @@
}
return ;
}
diff -urN /usr/ports/x11-wm/icewm/files/patch-al x11-wm/icewm/files/patch-al
--- /usr/ports/x11-wm/icewm/files/patch-al Sat Jan 1 18:45:25 2000
+++ x11-wm/icewm/files/patch-al Mon Jan 15 22:20:41 2001
@@ -1,19 +1,12 @@
---- sysdep.in.orig Sat Jan 1 17:26:22 2000
-+++ sysdep.in Sat Jan 1 17:26:32 2000
-@@ -3,4 +3,4 @@
- SYS_CFLAGS = @CXXFLAGS@ @DEFS@
+--- sysdep.in.orig Mon Jan 15 06:49:39 2001
++++ sysdep.in Mon Jan 15 22:18:06 2001
+@@ -1,7 +1,7 @@
+ CXX = @CXX@
+ LD = @CXX_LINK@
+ DEBUG = @debug_flags@
+-SYS_CFLAGS = @CXXFLAGS@ @DEFS@
++SYS_CFLAGS = @CXXFLAGS@ @CPPFLAGS@ @DEFS@
SYS_INCDIRS =
SYS_LIBDIRS =
-SYS_LIBS = @LIBS@
+SYS_LIBS = @LIBS@ -lxpg4
---- src/Makefile.orig Sat Jan 1 17:29:50 2000
-+++ src/Makefile Sat Jan 1 17:30:04 2000
-@@ -10,7 +10,7 @@
- CXXFLAGS = \
- $(I18N) $(DEBUG) $(OS2)\
- -DLIBDIR='"$(LIBDIR)"' \
-- -DCONFIGDIR='"/etc/X11/icewm"' \
-+ -DCONFIGDIR='"$(LIBDIR)"' \
- -DVERSION='"$(VERSION)"' \
- -DEXEEXT='"$(EXEEXT)"' \
- $(SYS_CFLAGS) $(SYS_INCDIRS)
diff -urN /usr/ports/x11-wm/icewm/files/patch-am x11-wm/icewm/files/patch-am
--- /usr/ports/x11-wm/icewm/files/patch-am Thu Jan 1 09:00:00 1970
+++ x11-wm/icewm/files/patch-am Mon Jan 15 22:18:34 2001
@@ -0,0 +1,29 @@
+--- configure.in.orig Mon Jan 15 06:49:39 2001
++++ configure.in Mon Jan 15 22:18:06 2001
+@@ -66,7 +66,7 @@
+ AC_FUNC_SELECT_ARGTYPES
+
+ dnl Configuring features
+-TARGETS='base docs'
++TARGETS='base'
+
+ dnl Checking for X11
+ AC_PATH_XTRA
+@@ -94,7 +94,7 @@
+ [ --enable-nls Enable internationalized message],
+ [ if test "$enable_nls" != "no"; then
+ AC_CHECK_LIB(intl, gettext)
+- localedir='${datadir}/locale'
++ localedir='${prefix}/share/locale'
+ AC_DEFINE(ENABLE_NLS, 1,
+ [Define to enable internationalized message])
+ TARGETS=$TARGETS' nls'
+@@ -190,7 +190,7 @@
+
+ AC_DEFINE(GNOME, 1, [Define to make IceWM more GNOME-friendly])
+ else
+- AC_MSG_ERROR([gnome-config can not be found])
++ AC_MSG_WARN([gnome-config can not be found])
+ fi
+ fi ])
+
diff -urN /usr/ports/x11-wm/icewm/files/patch-an x11-wm/icewm/files/patch-an
--- /usr/ports/x11-wm/icewm/files/patch-an Thu Jan 1 09:00:00 1970
+++ x11-wm/icewm/files/patch-an Mon Jan 15 22:19:12 2001
@@ -0,0 +1,11 @@
+--- po/Makefile.orig Mon Jan 15 06:49:39 2001
++++ po/Makefile Mon Jan 15 22:18:06 2001
+@@ -24,7 +24,7 @@
+ MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
+ echo Installing language: $$LANG ; \
+ $(INSTALLDIR) $$MSGDIR; \
+- $(INSTALLBIN) $$c $$MSGDIR/$(PACKAGE).mo; \
++ $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
+ done
+
+ clean:
diff -urN /usr/ports/x11-wm/icewm/files/patch-ao x11-wm/icewm/files/patch-ao
--- /usr/ports/x11-wm/icewm/files/patch-ao Thu Jan 1 09:00:00 1970
+++ x11-wm/icewm/files/patch-ao Mon Jan 15 22:40:37 2001
@@ -0,0 +1,20 @@
+--- src/Makefile.orig Mon Jan 15 06:49:39 2001
++++ src/Makefile Mon Jan 15 22:40:24 2001
+@@ -14,7 +14,7 @@
+ -DPACKAGE='"icewm"' \
+ -DVERSION='"$(VERSION)"' \
+ -DEXEEXT='"$(EXEEXT)"' \
+- -DICEWMEXE='"icewm"EXEEXT' \
++ -DICEWMEXE='"icewm$(EXEEXT)"' \
+ $(SYS_CFLAGS) $(SYS_INCDIRS)
+ LFLAGS =
+ LIBS = $(SYS_LIBDIRS) $(SYS_LIBS)
+@@ -97,7 +97,7 @@
+
+ genpref$(EXEEXT): $(GENPREFOBJS)
+ -@rm -f $@
+- $(LD) -o $@ $(LFLAGS) $(GENPREFOBJS)
++ $(LD) -o $@ $(LFLAGS) $(GENPREFOBJS) $(LIBS)
+
+ icewmhint$(EXEEXT): $(ICEWMHINTOBJS)
+ -@rm -f $@
diff -urN /usr/ports/x11-wm/icewm/files/patch-ap x11-wm/icewm/files/patch-ap
--- /usr/ports/x11-wm/icewm/files/patch-ap Thu Jan 1 09:00:00 1970
+++ x11-wm/icewm/files/patch-ap Mon Jan 15 22:19:56 2001
@@ -0,0 +1,20 @@
+--- src/wmprog.cc.orig Mon Jan 15 06:49:41 2001
++++ src/wmprog.cc Mon Jan 15 22:18:07 2001
+@@ -474,7 +474,7 @@
+
+ #ifdef GNOME
+ if (autoReloadMenus) {
+- char *gnomeAppsMenu = gnome_datadir_file("gnome/apps/");
++ char *gnomeAppsMenu = gnome_datadir_file("apps/");
+ char *gnomeUserMenu = gnome_util_home_file("apps/");
+ const char *kdeMenu = strJoin(kdeDataDir, "/applnk", 0);
+
+@@ -535,7 +535,7 @@
+ YIcon *gnomeicon = 0;
+ YIcon *kdeicon = 0;
+
+- char *gnomeAppsMenu = gnome_datadir_file("gnome/apps/");
++ char *gnomeAppsMenu = gnome_datadir_file("apps/");
+ char *gnomeUserMenu = gnome_util_home_file("apps/");
+ const char *kdeMenu = strJoin(kdeDataDir, "/applnk", 0);
+
diff -urN /usr/ports/x11-wm/icewm/pkg-plist x11-wm/icewm/pkg-plist
--- /usr/ports/x11-wm/icewm/pkg-plist Mon Dec 27 15:45:53 1999
+++ x11-wm/icewm/pkg-plist Mon Jan 15 23:35:55 2001
@@ -1,6 +1,27 @@
bin/icewm
bin/icewmbg
bin/icewmhint
+share/doc/icewm/CHANGES
+share/doc/icewm/FAQ
+share/doc/icewm/INSTALL
+share/doc/icewm/README
+share/doc/icewm/TODO
+share/doc/icewm/icewm-1.html
+share/doc/icewm/icewm-10.html
+share/doc/icewm/icewm-11.html
+share/doc/icewm/icewm-12.html
+share/doc/icewm/icewm-13.html
+share/doc/icewm/icewm-14.html
+share/doc/icewm/icewm-15.html
+share/doc/icewm/icewm-2.html
+share/doc/icewm/icewm-3.html
+share/doc/icewm/icewm-4.html
+share/doc/icewm/icewm-5.html
+share/doc/icewm/icewm-6.html
+share/doc/icewm/icewm-7.html
+share/doc/icewm/icewm-8.html
+share/doc/icewm/icewm-9.html
+share/doc/icewm/icewm.html
share/icewm/icons/app_16x16.xpm
share/icewm/icons/app_32x32.xpm
share/icewm/icons/bomb_16x16.xpm
@@ -25,8 +46,10 @@
share/icewm/icons/gimp_32x32.xpm
share/icewm/icons/gimp_hi_16x16.xpm
share/icewm/icons/gimp_hi_32x32.xpm
+share/icewm/icons/gnome_16x16.xpm
share/icewm/icons/java_16x16.xpm
share/icewm/icons/java_32x32.xpm
+share/icewm/icons/kde_16x16.xpm
share/icewm/icons/koules_16x16.xpm
share/icewm/icons/koules_32x32.xpm
share/icewm/icons/navigator_16x16.xpm
@@ -192,16 +215,26 @@
share/icewm/themes/win95/restore.xpm
share/icewm/toolbar
share/icewm/winoptions
-@dirrm share/icewm/icons
-@dirrm share/icewm/ledclock
-@dirrm share/icewm/mailbox
-@dirrm share/icewm/taskbar
-@dirrm share/icewm/themes/gtk2
-@dirrm share/icewm/themes/metal2
-@dirrm share/icewm/themes/motif
-@dirrm share/icewm/themes/nice
-@dirrm share/icewm/themes/warp3
-@dirrm share/icewm/themes/warp4
+share/locale/de/LC_MESSAGES/icewm.mo
+share/locale/es/LC_MESSAGES/icewm.mo
+share/locale/fi/LC_MESSAGES/icewm.mo
+share/locale/fr/LC_MESSAGES/icewm.mo
+share/locale/ja/LC_MESSAGES/icewm.mo
+share/locale/pt_BR/LC_MESSAGES/icewm.mo
+share/locale/ru/LC_MESSAGES/icewm.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
+%%GNOME:%%share/gnome/wm-properties/IceWM.desktop
@dirrm share/icewm/themes/win95
+@dirrm share/icewm/themes/warp4
+@dirrm share/icewm/themes/warp3
+@dirrm share/icewm/themes/nice
+@dirrm share/icewm/themes/motif
+@dirrm share/icewm/themes/metal2
+@dirrm share/icewm/themes/gtk2
@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
>Release-Note:
>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?200101152005.f0FK5AI04440>