From owner-freebsd-ports Fri Jul 5 17:21:27 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8580837B40C for ; Fri, 5 Jul 2002 17:20:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81B7343E4A for ; Fri, 5 Jul 2002 17:20:10 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g660KAJU029782 for ; Fri, 5 Jul 2002 17:20:10 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g660KAdj029779; Fri, 5 Jul 2002 17:20:10 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12AE137B400 for ; Fri, 5 Jul 2002 17:14:36 -0700 (PDT) Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4FB043E3B for ; Fri, 5 Jul 2002 17:14:35 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g660EZOT072599 for ; Fri, 5 Jul 2002 17:14:35 -0700 (PDT) (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.4/8.12.4/Submit) id g660EZX9072598; Fri, 5 Jul 2002 17:14:35 -0700 (PDT) Message-Id: <200207060014.g660EZX9072598@www.freebsd.org> Date: Fri, 5 Jul 2002 17:14:35 -0700 (PDT) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/40248: Update port: x11-wm/icewm to 1.2.0 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40248 >Category: ports >Synopsis: Update port: x11-wm/icewm to 1.2.0 >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 Jul 05 17:20:09 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.2.0 >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile --- /usr/ports/x11-wm/icewm/Makefile Fri May 24 20:39:09 2002 +++ x11-wm/icewm/Makefile Tue Jul 2 20:45:23 2002 @@ -6,22 +6,19 @@ # PORTNAME= icewm -PORTVERSION= 1.0.9.2 +PORTVERSION= 1.2.0 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= nakai@FreeBSD.org BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} -WANT_GNOME= yes -WANT_ESOUND= yes -USE_BZIP2= yes USE_X_PREFIX= yes +WANT_ESOUND= yes +WANT_GNOME= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} @@ -37,14 +34,15 @@ .include .if defined(HAVE_GNOME) +.undef HAVE_ESOUND USE_GNOME= yes -CONFIGURE_ARGS+= --with-imlib --without-xpm --with-gnome-menus +CONFIGURE_ARGS+= --with-imlib --without-xpm --with-gnome-menus \ + --enable-guievents --with-icesound=esound INSTALL_TARGET= install install-gnome +PLIST_SUB+= ESOUND="" .else USE_XPM= yes CONFIGURE_ARGS+= --without-imlib --with-xpm --without-gnome-menus -.endif - .if defined(HAVE_ESOUND) USE_ESOUND= yes CONFIGURE_ARGS+= --enable-guievents --with-icesound=esound @@ -52,8 +50,9 @@ .else PLIST_SUB+= ESOUND="@comment " .endif +.endif -post-patch: +pre-configure: @cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoconf post-install: diff -urN /usr/ports/x11-wm/icewm/distinfo x11-wm/icewm/distinfo --- /usr/ports/x11-wm/icewm/distinfo Fri Feb 22 23:13:36 2002 +++ x11-wm/icewm/distinfo Tue Jul 2 06:35:18 2002 @@ -1 +1 @@ -MD5 (icewm-1.0.9-2.tar.bz2) = b52444c9f2854f364eeee553c0790003 +MD5 (icewm-1.2.0.tar.gz) = 0972000f4f0569c34ff03c8db200d396 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 Jan 16 06:34:59 2001 +++ x11-wm/icewm/files/patch-aa Wed Jun 12 21:48:35 2002 @@ -1,7 +1,7 @@ ---- 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 +--- 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/ @@ -9,3 +9,12 @@ 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-av x11-wm/icewm/files/patch-av --- /usr/ports/x11-wm/icewm/files/patch-av Wed Feb 20 20:38:18 2002 +++ x11-wm/icewm/files/patch-av Tue May 28 04:44:23 2002 @@ -1,18 +1,18 @@ ---- src/default.h.orig Wed Feb 20 20:14:24 2002 -+++ src/default.h Wed Feb 20 20:16:04 2002 +--- src/default.h.orig Thu May 16 14:00:02 2002 ++++ src/default.h Tue May 28 04:44:02 2002 @@ -455,6 +455,7 @@ - XSV(const char *, clrLabelText, "rgb:00/00/00") - XSV(const char *, clrCpuUser, "rgb:00/FF/00") - XSV(const char *, clrCpuSys, "rgb:FF/00/00") -+XSV(const char *, clrCpuIntr, "rgb:FF/FF/00") - XSV(const char *, clrCpuNice, "rgb:00/00/FF") - XSV(const char *, clrCpuIdle, "rgb:00/00/00") - XSV(const char *, clrNetSend, "rgb:FF/FF/00") + XSV(const char *, clrLabelText, "rgb:00/00/00") + XSV(const char *, clrCpuUser, "rgb:00/FF/00") + XSV(const char *, clrCpuSys, "rgb:FF/00/00") ++XSV(const char *, clrCpuIntr, "rgb:FF/FF/00") + XSV(const char *, clrCpuNice, "rgb:00/00/FF") + XSV(const char *, clrCpuIdle, "rgb:00/00/00") + XSV(const char *, clrNetSend, "rgb:FF/FF/00") @@ -837,6 +838,7 @@ #ifdef CONFIG_APPLET_CPU_STATUS - OSV("ColorCPUStatusUser", &clrCpuUser, "User load on the CPU monitor"), - OSV("ColorCPUStatusSystem", &clrCpuSys, "System load on the CPU monitor"), -+ OSV("ColorCPUStatusInterrupts", &clrCpuIntr, "Inturrupts on the CPU monitor"), - OSV("ColorCPUStatusNice", &clrCpuNice, "Nice load on the CPU monitor"), - OSV("ColorCPUStatusIdle", &clrCpuIdle, "Idle (non) load on the CPU monitor, leave empty to force transparency"), + OSV("ColorCPUStatusUser", &clrCpuUser, "User load on the CPU monitor"), + OSV("ColorCPUStatusSystem", &clrCpuSys, "System load on the CPU monitor"), ++ OSV("ColorCPUStatusInterrupts", &clrCpuIntr, "Inturrupts on the CPU monitor"), + OSV("ColorCPUStatusNice", &clrCpuNice, "Nice load on the CPU monitor"), + OSV("ColorCPUStatusIdle", &clrCpuIdle, "Idle (non) load on the CPU monitor, leave empty to force transparency"), #endif 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 Mon May 27 21:35:52 2002 +++ x11-wm/icewm/files/patch-configure.in Tue May 28 04:50:39 2002 @@ -1,15 +1,6 @@ ---- configure.in.orig Tue Oct 9 23:54:02 2001 -+++ configure.in Sat May 25 05:50:23 2002 -@@ -83,7 +83,7 @@ - AC_FUNC_SELECT_ARGTYPES - - dnl Configuring features --TARGETS='base docs' -+TARGETS='base' - APPLICATIONS='genpref icewm icesh icewmhint icewmbg' - - dnl Checking for X11 -@@ -108,27 +108,28 @@ +--- configure.in.orig Thu May 16 14:00:02 2002 ++++ configure.in Tue May 28 04:49:58 2002 +@@ -108,15 +108,15 @@ AC_ARG_ENABLE(i18n, [ --enable-i18n Enable internationalization], [ if test "$enable_i18n" != "no"; then @@ -22,29 +13,27 @@ - - ice_nl_codesets="" - -+dnl AC_CHECK_HEADERS(langinfo.h,, -+dnl [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasnt found. ++dnl AC_CHECK_HEADERS(langinfo.h,, ++dnl [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasnt found. +dnl *** Check your installation.])]) -+dnl AC_CHECK_FUNC(nl_langinfo,, -+dnl [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasnt found. ++dnl AC_CHECK_FUNC(nl_langinfo,, ++dnl [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasnt found. +dnl *** Check your installation.])]) -+dnl -+dnl ice_nl_codesets="" -+dnl ++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, - [ ice_nl_codesets="${ice_nl_codesets} _NL_CTYPE_CODESET_NAME," ]) - ICE_CHECK_NL_ITEM(CODESET, +@@ -125,10 +125,11 @@ [ ice_nl_codesets="${ice_nl_codesets} CODESET," ]) -- -+dnl + 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.]) -+dnl AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't ++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.]) diff -urN /usr/ports/x11-wm/icewm/pkg-plist x11-wm/icewm/pkg-plist --- /usr/ports/x11-wm/icewm/pkg-plist Fri Feb 22 23:13:44 2002 +++ x11-wm/icewm/pkg-plist Tue Jul 2 07:45:48 2002 @@ -283,6 +283,7 @@ share/icewm/toolbar share/icewm/winoptions share/locale/ca/LC_MESSAGES/icewm.mo +share/locale/cs/LC_MESSAGES/icewm.mo share/locale/de/LC_MESSAGES/icewm.mo share/locale/en/LC_MESSAGES/icewm.mo share/locale/es/LC_MESSAGES/icewm.mo @@ -297,6 +298,8 @@ 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/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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message