Date: Fri, 15 Dec 2000 11:29:24 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/23570: Update port: x11-wm/icewm to 1.0.5 Message-ID: <200012151929.eBFJTOZ44948@freefall.freebsd.org> Resent-Message-ID: <200012151930.eBFJU1J45059@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 23570
>Category: ports
>Synopsis: Update port: x11-wm/icewm to 1.0.5
>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 Dec 15 11:30:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.5
New file:
files/patch-am files/patch-an files/patch-ao files/patch-ap
>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 Sat Dec 16 04:12:48 2000
@@ -6,8 +6,7 @@
#
PORTNAME= icewm
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.5
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
@@ -16,17 +15,36 @@
MAINTAINER= nakai@FreeBSD.org
-.if defined(GNOME)
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_IMLIB= yes
-CONFIGURE_ARGS= --enable-i18n --with-imlib
+WANT_GNOME= yes
+USE_GMAKE= yes
+USE_AUTOCONF= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --enable-i18n --enable-nls
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOMELIBS= yes
+CONFIGURE_ARGS+= --with-imlib --without-xpm --with-gnome-menus
+.else
+USE_XPM= yes
+CONFIGURE_ARGS+= --without-imlib --with-xpm --without-gnome-menus
+.endif
+
+post-extract:
+ @${CP} ${WRKSRC}/po/pt-BR.mo ${WRKSRC}/po/pt_BR.mo
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
+.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 Fri Dec 15 20:38:46 2000
@@ -1 +1 @@
-MD5 (icewm-1.0.4.src.tar.gz) = 31d6fd8b94fd1becab0de15d4a8e4eb4
+MD5 (icewm-1.0.5.src.tar.gz) = 6e80cdecba36ed428a3bc8d663962715
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 Sat Dec 16 02:00:01 2000
@@ -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 Wed Dec 13 06:45:28 2000
++++ Makefile.in Sat Dec 16 01:59:52 2000
+@@ -3,7 +3,7 @@
+ # Please run 'configure' first
+ -include ./install.inc
- all:
-- cd src ; $(MAKE) LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR)
-- cd doc ; $(MAKE)
-+ cd src ; $(MAKE) LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR) PREFIX=$(PREFIX)
-
- docs:
- cd doc ; $(MAKE)
+-BINFILES = src/icewm src/icewmhint src/icewmbg src/icesound
++BINFILES = src/icewm src/icewmhint src/icewmbg
+ LIBFILES = lib/preferences lib/menu lib/toolbar lib/winoptions lib/keys
+ DOCFILES = README TODO CHANGES COPYING FAQ INSTALL VERSION icewm.lsm
+ XPMDIRS = icons ledclock taskbar mailbox
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 Fri Dec 15 21:07:53 2000
@@ -1,12 +1,18 @@
---- install.in.orig Mon Jun 7 20:07:12 1999
-+++ install.in Mon Jun 7 20:08:10 1999
-@@ -3,11 +3,11 @@
+--- install.in.orig Wed Dec 13 06:45:28 2000
++++ install.in Fri Dec 15 21:02:40 2000
+@@ -3,14 +3,14 @@
PREFIX = @prefix@
BINDIR = @bindir@
-LIBDIR = @libdir@/X11/icewm
+-ETCDIR = @sysconfdir@/X11/icewm
+-DOCDIR = @prefix@/doc
+-LOCALEDIR = @datadir@/locale
+LIBDIR = @prefix@/share/icewm
- ETCDIR = @sysconfdir@
++ETCDIR = @prefix@/share/icewm
++DOCDIR = @prefix@/share/doc
++LOCALEDIR = @prefix@/share/locale
+ KDEDATADIR = @datadir@
INSTALL = @INSTALL@
-INSTALLDIR = @INSTALL@ -m 755 -d
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 Fri Dec 15 21:05:31 2000
@@ -1,6 +1,6 @@
---- 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 Wed Dec 13 06:45:30 2000
++++ src/wmtaskbar.cc Fri Dec 15 21:05:13 2000
+@@ -74,9 +74,9 @@
/** Use Linux 2.0 Penguin as start button */
#ifndef START_PIXMAP
@@ -12,7 +12,7 @@
//#define START_PIXMAP "start.xpm"
//#define START_PIXMAP "xfree86os2.xpm"
#endif
-@@ -253,7 +253,11 @@
+@@ -256,7 +256,11 @@
} else
fClock = 0;
#ifdef CONFIG_APM
@@ -21,6 +21,6 @@
+#else
if (taskBarShowApm && access("/proc/apm", 0) == 0) {
+#endif
- fApm = new YApm(this);
- if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
+ fApm = new YApm(this);
+ if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
} else
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 Sat Dec 16 01:19:52 2000
@@ -1,19 +1,26 @@
---- 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@
- 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 @@
+--- src/Makefile.orig Wed Dec 13 06:45:28 2000
++++ src/Makefile Sat Dec 16 01:18:58 2000
+@@ -10,12 +10,12 @@
CXXFLAGS = \
$(I18N) $(DEBUG) $(OS2)\
-DLIBDIR='"$(LIBDIR)"' \
-- -DCONFIGDIR='"/etc/X11/icewm"' \
-+ -DCONFIGDIR='"$(LIBDIR)"' \
+- -DCONFIGDIR='"$(CONFIGDIR)"' \
++ -DCONFIGDIR='"$(ETCDIR)"' \
+ -DKDEDATADIR='"$(KDEDATADIR)"' \
+ -DPACKAGE='"icewm"' \
-DVERSION='"$(VERSION)"' \
-DEXEEXT='"$(EXEEXT)"' \
+- -DICEWMEXE='"icewm"EXEEXT' \
++ -DICEWMEXE='"icewm$(EXEEXT)"' \
$(SYS_CFLAGS) $(SYS_INCDIRS)
+ LFLAGS =
+ LIBS = $(SYS_LIBDIRS) $(SYS_LIBS)
+@@ -98,7 +98,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-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 Sat Dec 16 04:17:07 2000
@@ -0,0 +1,11 @@
+--- sysdep.in.orig Wed Dec 13 06:45:28 2000
++++ sysdep.in Sat Dec 16 04:16:50 2000
+@@ -1,6 +1,6 @@
+ CXX = @CXX@
+ LD = @CXX_LINK@
+-SYS_CFLAGS = @CXXFLAGS@ @DEFS@
++SYS_CFLAGS = @CXXFLAGS@ @CPPFLAGS@ @DEFS@
+ SYS_INCDIRS =
+ SYS_LIBDIRS =
+-SYS_LIBS = @LIBS@
++SYS_LIBS = @LIBS@ -lxpg4
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 Sat Dec 16 03:26:32 2000
@@ -0,0 +1,29 @@
+--- configure.in.orig Wed Dec 13 06:45:28 2000
++++ configure.in Sat Dec 16 03:25:36 2000
+@@ -66,7 +66,7 @@
+ AC_FUNC_SELECT_ARGTYPES
+
+ dnl Configuring features
+-TARGETS='base docs'
++TARGETS='base'
+
+ dnl Checking for X11
+ AC_PATH_XTRA
+@@ -91,7 +91,7 @@
+ [ --enable-nls Enable internationalized message],
+ [ if test "$enable_nls" != "no"; then
+ AC_CHECK_LIB(intl, gettext)
+- AC_DEFINE_DIR(LOCALEDIR, datadir/locale,
++ AC_DEFINE_DIR(LOCALEDIR, prefix/share/locale,
+ [Location of internationalized message])
+ AC_DEFINE(ENABLE_NLS, 1,
+ [Define to enable internationalized message])
+@@ -183,8 +183,6 @@
+ # !!! TARGETS=$TARGETS' gnome'
+
+ AC_DEFINE(GNOME, 1, [Define to make IceWM more GNOME-friendly])
+- else
+- AC_MSG_ERROR([gnome-config can not be found])
+ fi ])
+
+ dnl Checking which image renderer to use
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 Sat Dec 16 01:26:36 2000
@@ -0,0 +1,20 @@
+--- po/Makefile.orig Wed Dec 13 06:45:31 2000
++++ po/Makefile Sat Dec 16 01:26:27 2000
+@@ -3,7 +3,7 @@
+ PACKAGE = icewm
+
+ SOURCES = $(shell grep -l '\<_\>' ../src/*.cc)
+-MOFILES = de.mo ja.mo ru.mo pt-BR.mo
++MOFILES = de.mo ja.mo ru.mo pt_BR.mo
+ POFILES = $(MOFILES:.mo=.po)
+
+ XGETTEXT = xgettext
+@@ -21,7 +21,7 @@
+ MSGDIR="$(LOCALEDIR)/$$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-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 Fri Dec 15 21:14:40 2000
@@ -0,0 +1,20 @@
+--- src/wmprog.cc.orig Wed Dec 13 06:45:30 2000
++++ src/wmprog.cc Fri Dec 15 21:14:26 2000
+@@ -467,7 +467,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);
+
+@@ -540,7 +540,7 @@
+ delete kde_logo;
+ #endif
+
+- 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 Sat Dec 16 04:29:07 2000
@@ -1,6 +1,11 @@
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/icewm/icons/app_16x16.xpm
share/icewm/icons/app_32x32.xpm
share/icewm/icons/bomb_16x16.xpm
@@ -192,16 +197,21 @@
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/ja/LC_MESSAGES/icewm.mo
+share/locale/pt_BR/LC_MESSAGES/icewm.mo
+share/locale/ru/LC_MESSAGES/icewm.mo
@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?200012151929.eBFJTOZ44948>