Date: Fri, 10 Jan 2003 23:58:52 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46949: Update port: x11-wm/icewm to 1.2.5 (fix ports/42743) Message-ID: <20030110235852.729b693a.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46949
>Category: ports
>Synopsis: Update port: x11-wm/icewm to 1.2.5 (fix ports/42743)
>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: Fri Jan 10 07:10:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.5
New file:
files/patch-po_Makefile.in
files/patch-src_Makefile.in
Remove file:
files/patch-aa
files/patch-ab
files/patch-src_Makefile
Following PRs should be superseded by this one:
[2002/09/13] ports/42743 nakai Update port: x11-wm/icewm to 1.2.2
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
--- /usr/ports/x11-wm/icewm/Makefile Tue Sep 10 20:35:38 2002
+++ x11-wm/icewm/Makefile Mon Jan 6 20:10:02 2003
@@ -6,25 +6,24 @@
#
PORTNAME= icewm
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.5
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
-BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GNOMENG= yes
WANT_GNOME= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-i18n --enable-nls \
+USE_AUTOCONF_VER= 253
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ARGS= --disable-xfreetype \
--with-cfgdir=${PREFIX}/share/icewm \
--with-libdir=${PREFIX}/share/icewm \
--with-kdedatadir=${LOCALBASE}/share \
@@ -40,6 +39,7 @@
--enable-guievents --with-icesound=esound
INSTALL_TARGET= install install-gnome
PLIST_SUB+= ESOUND=""
+PKGNAMESUFFIX= -gnome
.else
USE_XPM= yes
CONFIGURE_ARGS+= --without-imlib --with-xpm --without-gnome-menus
@@ -51,9 +51,6 @@
PLIST_SUB+= ESOUND="@comment "
.endif
.endif
-
-pre-configure:
- @cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoconf
post-install:
${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${DATADIR}/taskbar
diff -urN /usr/ports/x11-wm/icewm/distinfo x11-wm/icewm/distinfo
--- /usr/ports/x11-wm/icewm/distinfo Tue Sep 10 20:35:38 2002
+++ x11-wm/icewm/distinfo Mon Jan 6 19:35:13 2003
@@ -1 +1 @@
-MD5 (icewm-1.2.0.tar.gz) = 0972000f4f0569c34ff03c8db200d396
+MD5 (icewm-1.2.5.tar.gz) = 20aa6e9258b07275fdee5bcc9e40b883
diff -urN /usr/ports/x11-wm/icewm/files/patch-aa x11-wm/icewm/files/patch-aa
--- /usr/ports/x11-wm/icewm/files/patch-aa Tue Sep 10 20:35:38 2002
+++ x11-wm/icewm/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,20 +0,0 @@
---- Makefile.in.orig Wed Jun 12 13:56:52 2002
-+++ Makefile.in Wed Jun 12 21:46:20 2002
-@@ -19,7 +19,7 @@
-
- GNOMEFILES = lib/IceWM.desktop
-
--WMPROPDIR = $(shell gnome-config --datadir)/gnome/wm-properties/
-+WMPROPDIR = $(shell gnome-config --datadir)/wm-properties/
-
- all: @TARGETS@
- install: @TARGETS_INSTALL@
-@@ -111,7 +111,7 @@
- echo " $(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
- echo " You better setup your path to point to mkfontdir or use the"; \
- echo " --with-mkfontdir option of the configure script."; \
-- $(INSTALLLIB) "$(DESTDIR)/lib/themes/$$theme/fonts.dir.default" \
-+ $(INSTALLLIB) "lib/themes/$$theme/fonts.dir.default" \
- "$(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
- fi; \
- fi; \
diff -urN /usr/ports/x11-wm/icewm/files/patch-ab x11-wm/icewm/files/patch-ab
--- /usr/ports/x11-wm/icewm/files/patch-ab Tue Jan 16 06:34:59 2001
+++ x11-wm/icewm/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- 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
-+INSTALLDIR = mkdir -p
- INSTALLBIN = @INSTALL_PROGRAM@
- INSTALLLIB = @INSTALL_DATA@
- #INSTALLETC = @INSTALL_DATA@
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 Feb 20 20:38:18 2002
+++ x11-wm/icewm/files/patch-ai Mon Jan 6 20:11:52 2003
@@ -1,16 +1,21 @@
---- src/wmtaskbar.cc.orig Tue Oct 9 23:54:04 2001
-+++ src/wmtaskbar.cc Wed Feb 20 20:17:52 2002
-@@ -66,7 +66,7 @@
+--- src/wmtaskbar.cc.orig Sat Jan 4 01:25:45 2003
++++ src/wmtaskbar.cc Mon Jan 6 18:56:56 2003
+@@ -66,10 +66,12 @@
#endif
#ifndef START_PIXMAP
-#define START_PIXMAP "linux.xpm"
-+#define START_PIXMAP "bsd-daemon.xpm"
/*
++#define START_PIXMAP "linux.xpm"
#define START_PIXMAP "debian.xpm"
++*/
#define START_PIXMAP "bsd-daemon.xpm"
-@@ -253,7 +253,7 @@
- fAddressBar = 0;
++/*
+ #define START_PIXMAP "start.xpm"
+ #define START_PIXMAP "xfree86os2.xpm"
+ */
+@@ -265,7 +267,7 @@
+
#ifdef CONFIG_APPLET_CPU_STATUS
-#if (defined(linux) || defined(HAVE_KSTAT_H))
@@ -18,16 +23,16 @@
if (taskBarShowCPUStatus)
fCPUStatus = new CPUStatus(this);
else
-@@ -287,7 +287,7 @@
+@@ -299,7 +301,7 @@
} else
fClock = 0;
#ifdef CONFIG_APPLET_APM
-- if (taskBarShowApm && access("/proc/apm", 0) == 0) {
-+ if (taskBarShowApm && access(APMDEV, 0) == 0) {
+- if (taskBarShowApm && (access("/proc/apm", 0) == 0 ||
++ if (taskBarShowApm && (access(APMDEV, 0) == 0 ||
+ access("/proc/acpi", 0) == 0))
+ {
fApm = new YApm(this);
- if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
- } else
-@@ -400,7 +400,7 @@
+@@ -419,7 +421,7 @@
}
#endif
#ifdef CONFIG_APPLET_CPU_STATUS
@@ -36,7 +41,7 @@
if (fCPUStatus) {
fCPUStatus->setPosition(rightX - fCPUStatus->width() - 1,
BASE1 + (ht - ADD1 - fCPUStatus->height()) / 2);
-@@ -497,7 +497,7 @@
+@@ -526,7 +528,7 @@
}
#endif
#ifdef CONFIG_APPLET_CPU_STATUS
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 Feb 20 18:45:10 2002
+++ x11-wm/icewm/files/patch-ak Mon Jan 6 19:01:03 2003
@@ -1,6 +1,6 @@
---- src/aapm.cc.orig Tue Oct 9 23:54:03 2001
-+++ src/aapm.cc Tue Feb 19 14:39:19 2002
-@@ -23,6 +23,13 @@
+--- src/aapm.cc.orig Sat Jan 4 01:25:45 2003
++++ src/aapm.cc Mon Jan 6 19:00:50 2003
+@@ -26,6 +26,13 @@
#include <string.h>
#include <stdio.h>
@@ -11,24 +11,24 @@
+#include <machine/apm_bios.h>
+#endif
+
- #ifdef CONFIG_APPLET_APM
-
YColor *YApm::apmBg = 0;
-@@ -32,8 +39,12 @@
- extern YPixmap *taskbackPixmap;
+ YColor *YApm::apmFg = 0;
+ YFont *YApm::apmFont = 0;
+@@ -47,8 +54,12 @@
+
void ApmStr(char *s, bool Tool) {
+#ifdef __FreeBSD__
+ struct apm_info ai;
+#else
- char buf[45];
+ char buf[80];
- int len, i, fd = open("/proc/apm", O_RDONLY);
+#endif
+ int len, i, fd = open(APMDEV, O_RDONLY);
char driver[16];
char apmver[16];
int apmflags;
-@@ -45,9 +56,27 @@
+@@ -60,9 +71,27 @@
char units[16];
if (fd == -1) {
@@ -57,7 +57,7 @@
len = read(fd, buf, sizeof(buf) - 1);
close(fd);
-@@ -61,10 +90,11 @@
+@@ -76,10 +105,11 @@
static int error = 1;
if (error) {
error = 0;
diff -urN /usr/ports/x11-wm/icewm/files/patch-an x11-wm/icewm/files/patch-an
--- /usr/ports/x11-wm/icewm/files/patch-an Wed Feb 20 18:45:10 2002
+++ x11-wm/icewm/files/patch-an Mon Jan 6 19:01:54 2003
@@ -1,6 +1,6 @@
---- src/aapm.h.orig Tue Feb 19 14:08:56 2002
-+++ src/aapm.h Tue Feb 19 14:09:30 2002
-@@ -2,6 +2,12 @@
+--- src/aapm.h.orig Sat Jan 4 01:25:45 2003
++++ src/aapm.h Mon Jan 6 19:01:40 2003
+@@ -6,6 +6,11 @@
#include "ywindow.h"
#include "ytimer.h"
@@ -9,7 +9,6 @@
+#else
+#define APMDEV "/proc/apm"
+#endif
-+
- #ifdef CONFIG_APPLET_APM
- class YApm: public YWindow, public YTimerListener {
- public:
+
+ #include <dirent.h>
+
diff -urN /usr/ports/x11-wm/icewm/files/patch-configure.in x11-wm/icewm/files/patch-configure.in
--- /usr/ports/x11-wm/icewm/files/patch-configure.in Tue Sep 10 20:35:38 2002
+++ x11-wm/icewm/files/patch-configure.in Mon Jan 6 19:04:10 2003
@@ -1,70 +1,42 @@
---- configure.in.orig Mon Jul 1 01:05:18 2002
-+++ configure.in Tue Jul 30 22:52:43 2002
-@@ -108,15 +108,15 @@
- AC_ARG_ENABLE(i18n,
- [ --enable-i18n Enable internationalization],
- [ if test "$enable_i18n" != "no"; then
-- AC_CHECK_HEADERS(langinfo.h,,
+--- configure.in.orig Sat Jan 4 01:25:44 2003
++++ configure.in Mon Jan 6 19:03:51 2003
+@@ -130,10 +130,10 @@
+ [ --disable-i18n Disable internationalization])
+ if test "$enable_i18n" != "no"; then
+ AC_CHECK_HEADERS(langinfo.h,,
- [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasn__t found.
--*** Check your installation.])])
-- AC_CHECK_FUNC(nl_langinfo,,
++ [ AC_MSG_WARN([I18N support has been requested but langinfo.h wasn__t found.
+ *** Check your system configuration.])])
+ AC_CHECK_FUNC(nl_langinfo,,
- [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasn__t found.
--*** Check your installation.])])
--
-- ice_nl_codesets=""
--
-+dnl AC_CHECK_HEADERS(langinfo.h,,
-+dnl [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasn__t found.
-+dnl *** Check your installation.])])
-+dnl AC_CHECK_FUNC(nl_langinfo,,
-+dnl [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasn__t found.
-+dnl *** Check your installation.])])
-+dnl
-+dnl ice_nl_codesets=""
-+dnl
- ICE_CHECK_NL_ITEM(_NL_MESSAGES_CODESET,
- [ ice_nl_codesets="${ice_nl_codesets} _NL_MESSAGES_CODESET," ])
- ICE_CHECK_NL_ITEM(_NL_CTYPE_CODESET_NAME,
-@@ -124,12 +124,12 @@
- ICE_CHECK_NL_ITEM(CODESET,
++ [ AC_MSG_WARN([I18N support has been requested but nl_langinfo wasn__t found.
+ *** Check your system configuration.])])
+
+ ice_nl_codesets=""
+@@ -146,7 +146,7 @@
[ ice_nl_codesets="${ice_nl_codesets} CODESET," ])
-- if test "${ice_nl_codesets}" = ""; then
+ if test "${ice_nl_codesets}" = ""; then
- AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't
--*** return any information about the locale's codeset. Check your manuals.
--*** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know
--*** the name of the locale-dependent parameter for your platform.])
-- fi
-+dnl if test "${ice_nl_codesets}" = ""; then
-+dnl AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't
-+dnl *** return any information about the locale's codeset. Check your manuals.
-+dnl *** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know
-+dnl *** the name of the locale-dependent parameter for your platform.])
-+dnl fi
-
- ice_nl_codesets="${ice_nl_codesets} 0"
- AC_DEFINE_UNQUOTED(CONFIG_NL_CODESETS, ${ice_nl_codesets})
-@@ -164,7 +164,7 @@
- [ --unicode-set=CODESET your iconv's unicode set in machine endian encoding
- (e.g. WCHAR_T, UCS-4-INTERNAL, UCS-4LE, UCS-4BE)],
- AC_DEFINE_UNQUOTED(CONFIG_UNICODE_SET, "$with_unicode_set"),
-- with_unicode_set=UCS-4//TRANSLIT)
-+ with_unicode_set=ISO-8859-1)
-
- ice_sufficent_iconv=no
- ICE_CHECK_CONVERSION(ISO-8859-1,$with_unicode_set,no,$ice_libiconv,
-@@ -203,7 +203,7 @@
- features="${features} nls"
- TARGETS=$TARGETS' nls'
++ AC_MSG_WARN([I18N support has been requested but nl_langinfo doesn't
+ *** return any information about the locale's codeset. Check your manuals.
+ *** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know
+ *** the name of the locale-dependent parameter for your platform.])
+@@ -277,7 +277,7 @@
+ AC_SUBST(NLS_POXFILES)
+ AC_SUBST(NLS_MOFILES)
- localedir='${datadir}/locale'
+ localedir='${prefix}/share/locale'
fi
- dnl ======================================================= /proc/wm-session ===
-@@ -464,7 +464,7 @@
-
+ dnl ================================================ Features of the XServer ===
+@@ -582,9 +582,9 @@
AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
+
+ APPLICATIONS="${APPLICATIONS} icewm-menu-gnome1"
+- GWMDIR="`${GNOME_CONFIG} --datadir`/gnome/wm-properties/"
++ GWMDIR="`${GNOME_CONFIG} --datadir`/wm-properties/"
else
- AC_MSG_ERROR([gnome-config can not be found.
+ AC_MSG_WARN([gnome-config can not be found.
diff -urN /usr/ports/x11-wm/icewm/files/patch-po_Makefile.in x11-wm/icewm/files/patch-po_Makefile.in
--- /usr/ports/x11-wm/icewm/files/patch-po_Makefile.in Thu Jan 1 09:00:00 1970
+++ x11-wm/icewm/files/patch-po_Makefile.in Thu Sep 12 00:03:16 2002
@@ -0,0 +1,11 @@
+--- po/Makefile.in.orig Sat Sep 7 02:18:07 2002
++++ po/Makefile.in Thu Sep 12 00:03:04 2002
+@@ -29,7 +29,7 @@
+ install: all
+ @echo "Installing message catalogues in $(DESTDIR)$(LOCDIR)"
+ @for catalog in $(MOFILES); do \
+- lang=`echo $${catalog} | sed -e 's/.mo//'` ; \
++ lang=`echo $${catalog} | sed -e 's/.po//'` ; \
+ msgdir="$(DESTDIR)$(LOCDIR)/$${lang}/LC_MESSAGES"; \
+ echo "Installing language: $${lang}" ; \
+ $(INSTALLDIR) "$${msgdir}"; \
diff -urN /usr/ports/x11-wm/icewm/files/patch-src_Makefile x11-wm/icewm/files/patch-src_Makefile
--- /usr/ports/x11-wm/icewm/files/patch-src_Makefile Wed Feb 20 20:38:18 2002
+++ x11-wm/icewm/files/patch-src_Makefile Thu Jan 1 09:00:00 1970
@@ -1,24 +0,0 @@
---- src/Makefile.orig Tue Oct 9 23:54:03 2001
-+++ src/Makefile Wed Feb 20 19:54:01 2002
-@@ -18,9 +18,9 @@
- -DHOSTOS='"$(shell uname -s || echo unknown)"' \
- -DHOSTCPU='"$(shell uname -m || echo unknown)"' \
- -DEXEEXT='"$(EXEEXT)"' \
-- -DICEWMEXE='"icewm"EXEEXT' \
-- -DICEHELPEXE='"icehelp"EXEEXT' \
-- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' \
-+ -DICEWMEXE='"icewm$(EXEEXT)"' \
-+ -DICEHELPEXE='"icehelp$(EXEEXT)"' \
-+ -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"' \
- $(SYS_CFLAGS) $(SYS_INCDIRS)
- LFLAGS = $(SYS_LIBDIRS)
- LIBS = $(SYS_LIBS)
-@@ -37,7 +37,7 @@
- genpref.o
-
- icewm_LIBS = \
-- $(CORE_LIBS) $(IMAGE_LIBS) $(GNOME_LIBS)
-+ $(CORE_LIBS) $(IMAGE_LIBS) $(GNOME_LIBS) -lkvm
- icewm_OBJS = \
- ymsgbox.o ydialog.o yurl.o \
- wmsession.o wmwinlist.o wmtaskbar.o wmwinmenu.o \
diff -urN /usr/ports/x11-wm/icewm/files/patch-src_Makefile.in x11-wm/icewm/files/patch-src_Makefile.in
--- /usr/ports/x11-wm/icewm/files/patch-src_Makefile.in Thu Jan 1 09:00:00 1970
+++ x11-wm/icewm/files/patch-src_Makefile.in Mon Jan 6 19:26:13 2003
@@ -0,0 +1,26 @@
+--- src/Makefile.in.orig Sat Jan 4 01:25:45 2003
++++ src/Makefile.in Mon Jan 6 19:26:05 2003
+@@ -28,11 +28,11 @@
+ -DEXEEXT='"$(EXEEXT)"' \
+ -DICEWMEXE='"icewm$(EXEEXT)"' \
+ -DICEHELPEXE='"icehelp$(EXEEXT)"' \
+- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
++ -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"'
+
+-CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
++CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) @CPPFLAGS@ \
+ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
+-LFLAGS =
++LFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+
+ CORE_LIBS = @CORE_LIBS@ # `fc-config --libs`
+@@ -52,7 +52,7 @@
+ genpref.o
+
+ icewm_LIBS = \
+- $(CORE_LIBS) $(IMAGE_LIBS)
++ $(CORE_LIBS) $(IMAGE_LIBS) -lkvm
+ icewm_OBJS = \
+ ymsgbox.o ydialog.o yurl.o \
+ wmsession.o wmwinlist.o wmtaskbar.o wmwinmenu.o \
diff -urN /usr/ports/x11-wm/icewm/files/patch-src_wmprog.cc x11-wm/icewm/files/patch-src_wmprog.cc
--- /usr/ports/x11-wm/icewm/files/patch-src_wmprog.cc Tue Jan 16 06:34:59 2001
+++ x11-wm/icewm/files/patch-src_wmprog.cc Thu Jan 1 09:00:00 1970
@@ -1,19 +0,0 @@
---- 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/files/patch-sysdep.in x11-wm/icewm/files/patch-sysdep.in
--- /usr/ports/x11-wm/icewm/files/patch-sysdep.in Wed May 22 10:35:16 2002
+++ x11-wm/icewm/files/patch-sysdep.in Thu Jan 1 09:00:00 1970
@@ -1,13 +0,0 @@
---- sysdep.in.orig Tue Oct 9 23:54:02 2001
-+++ sysdep.in Sat Mar 23 15:48:48 2002
-@@ -4,8 +4,8 @@
- SYS_CFLAGS = \
- @DEBUG@ @CXXFLAGS@ @DEFS@ \
- @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ @GNOME_CFLAGS@
--SYS_INCDIRS =
--SYS_LIBDIRS =
-+SYS_INCDIRS = @CPPFLAGS@
-+SYS_LIBDIRS = @LDFLAGS@
- SYS_LIBS = @LIBS@
-
- CORE_LIBS = @CORE_LIBS@
diff -urN /usr/ports/x11-wm/icewm/pkg-plist x11-wm/icewm/pkg-plist
--- /usr/ports/x11-wm/icewm/pkg-plist Tue Sep 10 20:35:40 2002
+++ x11-wm/icewm/pkg-plist Mon Jan 6 20:03:41 2003
@@ -1,8 +1,8 @@
-bin/genpref
bin/icehelp
-%%ESOUND%%bin/icesound
bin/icesh
+%%ESOUND%%bin/icesound
bin/icewm
+%%GNOME:%%bin/icewm-menu-gnome1
bin/icewmbg
bin/icewmhint
%%PORTDOCS%%share/doc/icewm/CHANGES
@@ -18,6 +18,8 @@
%%PORTDOCS%%share/doc/icewm/icewm-14.html
%%PORTDOCS%%share/doc/icewm/icewm-15.html
%%PORTDOCS%%share/doc/icewm/icewm-16.html
+%%PORTDOCS%%share/doc/icewm/icewm-17.html
+%%PORTDOCS%%share/doc/icewm/icewm-18.html
%%PORTDOCS%%share/doc/icewm/icewm-2.html
%%PORTDOCS%%share/doc/icewm/icewm-3.html
%%PORTDOCS%%share/doc/icewm/icewm-4.html
@@ -42,6 +44,8 @@
share/icewm/icons/communicator-discussion_32x32.xpm
share/icewm/icons/communicator-mail_16x16.xpm
share/icewm/icons/communicator-mail_32x32.xpm
+share/icewm/icons/emacs_16x16.xpm
+share/icewm/icons/emacs_32x32.xpm
share/icewm/icons/file_16x16.xpm
share/icewm/icons/file_32x32.xpm
share/icewm/icons/folder_16x16.xpm
@@ -100,6 +104,7 @@
share/icewm/mailbox/unreadmail.xpm
share/icewm/menu
share/icewm/preferences
+share/icewm/programs
share/icewm/taskbar/bsd-daemon.xpm
share/icewm/taskbar/debian.xpm
share/icewm/taskbar/icewm.xpm
@@ -261,6 +266,17 @@
share/icewm/themes/nice/restore.xpm
share/icewm/themes/nice/rolldown.xpm
share/icewm/themes/nice/rollup.xpm
+share/icewm/themes/nice2/closeA.xpm
+share/icewm/themes/nice2/closeI.xpm
+share/icewm/themes/nice2/default.theme
+share/icewm/themes/nice2/menuButtonA.xpm
+share/icewm/themes/nice2/menuButtonI.xpm
+share/icewm/themes/nice2/minimizeA.xpm
+share/icewm/themes/nice2/minimizeI.xpm
+share/icewm/themes/nice2/titleAB.xpm
+share/icewm/themes/nice2/titleAT.xpm
+share/icewm/themes/nice2/titleIB.xpm
+share/icewm/themes/nice2/titleIT.xpm
share/icewm/themes/warp3/close.xpm
share/icewm/themes/warp3/default.theme
share/icewm/themes/warp3/hide.xpm
@@ -294,29 +310,32 @@
share/locale/it/LC_MESSAGES/icewm.mo
share/locale/ja/LC_MESSAGES/icewm.mo
share/locale/lt/LC_MESSAGES/icewm.mo
+share/locale/no/LC_MESSAGES/icewm.mo
share/locale/pl/LC_MESSAGES/icewm.mo
share/locale/pt_BR/LC_MESSAGES/icewm.mo
share/locale/ro/LC_MESSAGES/icewm.mo
share/locale/ru/LC_MESSAGES/icewm.mo
share/locale/sv/LC_MESSAGES/icewm.mo
+share/locale/uk/LC_MESSAGES/icewm.mo
share/locale/zh_CN.gb2312/LC_MESSAGES/icewm.mo
share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
-%%PORTDOCS%%@dirrm share/doc/icewm
-@dirrm share/icewm/icons
-@dirrm share/icewm/ledclock
-@dirrm share/icewm/mailbox
-@dirrm share/icewm/taskbar
-@dirrm share/icewm/themes/Infadel2/cursors
-@dirrm share/icewm/themes/Infadel2/icons
-@dirrm share/icewm/themes/Infadel2/mailbox
+@dirrm share/icewm/themes/win95
+@dirrm share/icewm/themes/warp4
+@dirrm share/icewm/themes/warp3
+@dirrm share/icewm/themes/nice2
+@dirrm share/icewm/themes/nice
+@dirrm share/icewm/themes/motif
+@dirrm share/icewm/themes/metal2
+@dirrm share/icewm/themes/gtk2
@dirrm share/icewm/themes/Infadel2/taskbar
+@dirrm share/icewm/themes/Infadel2/mailbox
+@dirrm share/icewm/themes/Infadel2/icons
+@dirrm share/icewm/themes/Infadel2/cursors
@dirrm share/icewm/themes/Infadel2
-@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
-@dirrm share/icewm/themes/win95
@dirrm share/icewm/themes
+@dirrm share/icewm/taskbar
+@dirrm share/icewm/mailbox
+@dirrm share/icewm/ledclock
+@dirrm share/icewm/icons
@dirrm share/icewm
+%%PORTDOCS%%@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?20030110235852.729b693a.tkato>