diff options
author | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-07-11 18:45:17 +0000 |
---|---|---|
committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-07-11 18:45:17 +0000 |
commit | f0e428c448cb5220cbb62c6a8a789806f2770e57 (patch) | |
tree | 78a8286ed81d61a1833dddcc4cf941747805ae3f /x11-wm | |
parent | d4fdb44e8981b0b9b6b7fb7a41a334396196f88f (diff) | |
download | ports-f0e428c448cb5220cbb62c6a8a789806f2770e57.tar.gz ports-f0e428c448cb5220cbb62c6a8a789806f2770e57.zip |
Notes
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/icewm/Makefile | 15 | ||||
-rw-r--r-- | x11-wm/icewm/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/icewm/files/patch-configure.in | 48 | ||||
-rw-r--r-- | x11-wm/icewm/files/patch-po_Makefile.in | 11 | ||||
-rw-r--r-- | x11-wm/icewm/files/patch-src_Makefile.in | 13 | ||||
-rw-r--r-- | x11-wm/icewm/pkg-plist | 5 |
6 files changed, 32 insertions, 62 deletions
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index 92ab54c48d69..8c8b448a1a8d 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -6,27 +6,26 @@ # PORTNAME= icewm -PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTVERSION= 1.2.8 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= nakai@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Window Manager designed for speed, usability and consistency LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes WANT_GNOME= yes +USE_GNOME= gnometarget USE_GMAKE= yes 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-cfgdir=${DATADIR} \ + --with-libdir=${DATADIR} \ --with-kdedatadir=${LOCALBASE}/share \ --with-docdir=${PREFIX}/share/doc \ --with-mkfontdir=${NONEXISTENT} @@ -36,14 +35,14 @@ CONFIGURE_ARGS= --disable-xfreetype \ .if ${HAVE_GNOME:Mgnomelibs}!="" .undef HAVE_ESOUND USE_GNOME+= gnomelibs -CONFIGURE_ARGS+= --with-imlib --without-xpm --with-gnome-menus \ +CONFIGURE_ARGS+= --with-imlib --without-xpm --enable-menus-gnome1 \ --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 +CONFIGURE_ARGS+= --without-imlib --with-xpm .if ${HAVE_GNOME:Mesound}!="" USE_GNOME+= esound CONFIGURE_ARGS+= --enable-guievents --with-icesound=esound diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo index 9d7ccbeb4aca..b45a81c9a3df 100644 --- a/x11-wm/icewm/distinfo +++ b/x11-wm/icewm/distinfo @@ -1 +1 @@ -MD5 (icewm-1.2.7.tar.gz) = b2423bdcf841a552d8c60a03858a1116 +MD5 (icewm-1.2.8.tar.gz) = 8f4e57c875cfe3d612e4ee068a1c2d83 diff --git a/x11-wm/icewm/files/patch-configure.in b/x11-wm/icewm/files/patch-configure.in index d5e97b5b37eb..6af641b046f8 100644 --- a/x11-wm/icewm/files/patch-configure.in +++ b/x11-wm/icewm/files/patch-configure.in @@ -1,28 +1,6 @@ ---- 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. -+ [ 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. -+ [ 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 -- AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't -+ 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 @@ +--- configure.in.orig Mon May 19 03:28:57 2003 ++++ configure.in Fri May 23 00:59:03 2003 +@@ -276,7 +276,7 @@ AC_SUBST(NLS_POXFILES) AC_SUBST(NLS_MOFILES) @@ -31,15 +9,21 @@ fi dnl ================================================ Features of the XServer === -@@ -582,9 +582,9 @@ +@@ -712,7 +712,7 @@ 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/" +- GWMDIR="`${GNOME_CONFIG} --datadir`/gnome/wm-properties/" ++ GWMDIR="`${GNOME_CONFIG} --datadir`/wm-properties/" + CONFIG_GNOME_MENU_DIR="`${GNOME_CONFIG} --prefix`/share/gnome/apps/" else -- AC_MSG_ERROR([gnome-config can not be found. -+ AC_MSG_WARN([gnome-config can not be found. - *** Install the GNOME´s development packages or use the argument of the - *** --with-gnome-menus switch to pass gnome-config´s location.]) + AC_PATH_PROG(PKG_CONFIG, pkg-config) +@@ -724,7 +724,7 @@ + APPLICATIONS="${APPLICATIONS} icewm-menu-gnome1" + GNOME_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0` + GWMDIR="${GNOME_PREFIX}/share/gnome/wm-properties/" +- CONFIG_GNOME_MENU_DIR="${GNOME_PREFIX}/share/applications/" ++ CONFIG_GNOME_MENU_DIR="${GNOME_PREFIX}/share/gnome/applications/" fi + + if test "${GNOME_CFLAGS}" = ""; then diff --git a/x11-wm/icewm/files/patch-po_Makefile.in b/x11-wm/icewm/files/patch-po_Makefile.in deleted file mode 100644 index 5b13994cae0e..000000000000 --- a/x11-wm/icewm/files/patch-po_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 --git a/x11-wm/icewm/files/patch-src_Makefile.in b/x11-wm/icewm/files/patch-src_Makefile.in index e46bebd09f9b..a3349e7980bb 100644 --- a/x11-wm/icewm/files/patch-src_Makefile.in +++ b/x11-wm/icewm/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/Makefile.in.orig Mon May 19 03:28:57 2003 ++++ src/Makefile.in Fri May 23 01:02:05 2003 +@@ -28,9 +28,9 @@ -DEXEEXT='"$(EXEEXT)"' \ -DICEWMEXE='"icewm$(EXEEXT)"' \ -DICEHELPEXE='"icehelp$(EXEEXT)"' \ @@ -10,12 +10,9 @@ -CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \ +CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) @CPPFLAGS@ \ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` --LFLAGS = -+LFLAGS = @LDFLAGS@ + LFLAGS = @LDFLAGS@ LIBS = @LIBS@ - - CORE_LIBS = @CORE_LIBS@ # `fc-config --libs` -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ genpref.o icewm_LIBS = \ diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist index 857e64e478f2..91b3292ff92f 100644 --- a/x11-wm/icewm/pkg-plist +++ b/x11-wm/icewm/pkg-plist @@ -5,6 +5,7 @@ bin/icewm %%GNOME:%%bin/icewm-menu-gnome1 bin/icewmbg bin/icewmhint +bin/icewmtray %%PORTDOCS%%share/doc/icewm/CHANGES %%PORTDOCS%%share/doc/icewm/FAQ %%PORTDOCS%%share/doc/icewm/INSTALL @@ -103,7 +104,6 @@ share/icewm/mailbox/nomail.xpm 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 @@ -328,6 +328,7 @@ share/locale/hr/LC_MESSAGES/icewm.mo share/locale/hu/LC_MESSAGES/icewm.mo share/locale/it/LC_MESSAGES/icewm.mo share/locale/ja/LC_MESSAGES/icewm.mo +share/locale/ko/LC_MESSAGES/icewm.mo share/locale/lt/LC_MESSAGES/icewm.mo share/locale/nl/LC_MESSAGES/icewm.mo share/locale/no/LC_MESSAGES/icewm.mo @@ -338,7 +339,7 @@ share/locale/ru/LC_MESSAGES/icewm.mo share/locale/sl/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_CN/LC_MESSAGES/icewm.mo share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo @dirrm share/icewm/themes/win95 @dirrm share/icewm/themes/warp4 |