pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/wm/wmakerconf Changes 2.11:
details: https://anonhg.NetBSD.org/pkgsrc/rev/b34acdac9a30
branches: trunk
changeset: 494506:b34acdac9a30
user: adam <adam%pkgsrc.org@localhost>
date: Wed May 25 09:57:14 2005 +0000
description:
Changes 2.11:
* Ported to GTK+2
* Now understands new font name format used by WindowMaker 0.90
* Bug fixes
diffstat:
wm/wmakerconf/Makefile | 9 ++---
wm/wmakerconf/PLIST | 57 +++++++++++++++++++++--------------------
wm/wmakerconf/distinfo | 16 +++++-----
wm/wmakerconf/patches/patch-aa | 6 ++--
wm/wmakerconf/patches/patch-ab | 32 ++++++++--------------
wm/wmakerconf/patches/patch-ac | 6 ++--
wm/wmakerconf/patches/patch-ad | 14 +++++-----
7 files changed, 66 insertions(+), 74 deletions(-)
diffs (229 lines):
diff -r 9d524e172109 -r b34acdac9a30 wm/wmakerconf/Makefile
--- a/wm/wmakerconf/Makefile Wed May 25 09:27:39 2005 +0000
+++ b/wm/wmakerconf/Makefile Wed May 25 09:57:14 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/25 09:57:14 adam Exp $
-DISTNAME= wmakerconf-2.9.2
-PKGREVISION= 1
+DISTNAME= wmakerconf-2.11
CATEGORIES= x11 wm windowmaker
MASTER_SITES= http://starplot.org/wmakerconf/
@@ -27,8 +26,8 @@
> ${WRKSRC}/data/WMWmakerconf
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/imlib/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
.include "../../wm/windowmaker/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9d524e172109 -r b34acdac9a30 wm/wmakerconf/PLIST
--- a/wm/wmakerconf/PLIST Wed May 25 09:27:39 2005 +0000
+++ b/wm/wmakerconf/PLIST Wed May 25 09:57:14 2005 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/08 10:14:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/05/25 09:57:14 adam Exp $
bin/mkpreview
bin/wmakerconf
+man/man1/mkpreview.1
man/man1/wmakerconf.1
-man/man1/mkpreview.1
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/wmakerconf.mo
${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wmakerconf.mo
${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wmakerconf-data.mo
@@ -14,6 +14,7 @@
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/wmakerconf.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/wmakerconf.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/wmakerconf.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/wmakerconf-data.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wmakerconf.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wmakerconf-data.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/wmakerconf.mo
@@ -27,37 +28,37 @@
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/wmakerconf-data.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/wmakerconf.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/wmakerconf.mo
+share/wmakerconf/ABOUT-NLS
+share/wmakerconf/AUTHORS
+share/wmakerconf/COPYING
+share/wmakerconf/ChangeLog
+share/wmakerconf/MANUAL
+share/wmakerconf/NEWS
+share/wmakerconf/NLS-TEAM1
+share/wmakerconf/NLS-TEAM2
+share/wmakerconf/README
+share/wmakerconf/WMWmakerconf
+share/wmakerconf/appearance.xpm
share/wmakerconf/black.xpm
-share/wmakerconf/appearance.xpm
+share/wmakerconf/desktop.xpm
share/wmakerconf/effects.xpm
-share/wmakerconf/menu.xpm
-share/wmakerconf/misc.xpm
-share/wmakerconf/paths.xpm
-share/wmakerconf/shortcuts.xpm
-share/wmakerconf/tiles.xpm
-share/wmakerconf/titlebar.xpm
-share/wmakerconf/menustyle.xpm
-share/wmakerconf/wmakerconf.xpm
-share/wmakerconf/workspace.xpm
-share/wmakerconf/themes.xpm
-share/wmakerconf/windows.xpm
-share/wmakerconf/desktop.xpm
-share/wmakerconf/mouse.xpm
-share/wmakerconf/wm-oldmenu2new.sh
-share/wmakerconf/upgrade.pl
share/wmakerconf/getfile.pl
share/wmakerconf/libwww.pl
share/wmakerconf/lynx.pl
+share/wmakerconf/menu.xpm
+share/wmakerconf/menustyle.xpm
+share/wmakerconf/misc.xpm
+share/wmakerconf/mouse.xpm
+share/wmakerconf/paths.xpm
+share/wmakerconf/shortcuts.xpm
+share/wmakerconf/themes.xpm
+share/wmakerconf/tiles.xpm
+share/wmakerconf/titlebar.xpm
+share/wmakerconf/upgrade.pl
share/wmakerconf/wget.pl
-share/wmakerconf/WMWmakerconf
+share/wmakerconf/windows.xpm
+share/wmakerconf/wm-oldmenu2new.sh
share/wmakerconf/wmaker-version
-share/wmakerconf/NLS-TEAM2
-share/wmakerconf/AUTHORS
-share/wmakerconf/README
-share/wmakerconf/COPYING
-share/wmakerconf/NEWS
-share/wmakerconf/MANUAL
-share/wmakerconf/ABOUT-NLS
-share/wmakerconf/NLS-TEAM1
-share/wmakerconf/ChangeLog
+share/wmakerconf/wmakerconf.xpm
+share/wmakerconf/workspace.xpm
@dirrm share/wmakerconf
diff -r 9d524e172109 -r b34acdac9a30 wm/wmakerconf/distinfo
--- a/wm/wmakerconf/distinfo Wed May 25 09:27:39 2005 +0000
+++ b/wm/wmakerconf/distinfo Wed May 25 09:57:14 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 18:43:55 wiz Exp $
+$NetBSD: distinfo,v 1.7 2005/05/25 09:57:14 adam Exp $
-SHA1 (wmakerconf-2.9.2.tar.gz) = 78240647a93c6dddf1db838a810ec48ce7646b32
-RMD160 (wmakerconf-2.9.2.tar.gz) = 4f288a73ca05a70c9192e9ca7b5affb28f48292d
-Size (wmakerconf-2.9.2.tar.gz) = 766440 bytes
-SHA1 (patch-aa) = 49ea35c55dba4e42ceaca8eeb39fdac9d4680530
-SHA1 (patch-ab) = db537545899839e6132ad0c0c2e9db26c7a83dc4
-SHA1 (patch-ac) = a1a5295ec8250db09b4b702bc60c8976d0e53d21
-SHA1 (patch-ad) = 8bd56bee7f7493c4ef0c555daadc90640aafeb9f
+SHA1 (wmakerconf-2.11.tar.gz) = 2c2409aad8b0348c2801c4350047a5468a800e48
+RMD160 (wmakerconf-2.11.tar.gz) = 18d661836272ae21f9d79398359b37b97b0a396a
+Size (wmakerconf-2.11.tar.gz) = 791166 bytes
+SHA1 (patch-aa) = d26fdc359404796ea7bf6791014e3b8b3abc4cbc
+SHA1 (patch-ab) = 3e5f5f8cad200a6b09001572336920685d5e2a82
+SHA1 (patch-ac) = 89f7cba515367182c6ad257b43d76256ed7be609
+SHA1 (patch-ad) = ebcd4d319c9f0cd995f6b43b30bf4446daf24934
diff -r 9d524e172109 -r b34acdac9a30 wm/wmakerconf/patches/patch-aa
--- a/wm/wmakerconf/patches/patch-aa Wed May 25 09:27:39 2005 +0000
+++ b/wm/wmakerconf/patches/patch-aa Wed May 25 09:57:14 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/11/08 10:14:33 adam Exp $
+$NetBSD: patch-aa,v 1.5 2005/05/25 09:57:14 adam Exp $
---- configure.orig 2004-07-22 03:43:52.000000000 +0000
+--- configure.orig 2005-03-02 18:36:35.000000000 +0000
+++ configure
-@@ -3284,8 +3284,8 @@ if test "$x_libraries" != "NONE"; then
+@@ -3230,8 +3230,8 @@ if test "$x_libraries" != "NONE"; then
fi
# Add some common include and library path's
diff -r 9d524e172109 -r b34acdac9a30 wm/wmakerconf/patches/patch-ab
--- a/wm/wmakerconf/patches/patch-ab Wed May 25 09:27:39 2005 +0000
+++ b/wm/wmakerconf/patches/patch-ab Wed May 25 09:57:14 2005 +0000
@@ -1,23 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2004/11/08 10:14:33 adam Exp $
+$NetBSD: patch-ab,v 1.3 2005/05/25 09:57:14 adam Exp $
---- Makefile.in.orig 2004-07-22 03:44:05.000000000 +0000
+--- Makefile.in.orig 2005-05-25 11:47:13.000000000 +0000
+++ Makefile.in
-@@ -112,7 +112,7 @@ GENCAT = @GENCAT@
- GETSCRIPT = @GETSCRIPT@
- GLIBC21 = @GLIBC21@
- GMSGFMT = @GMSGFMT@
--GNOMEAPP = @GNOMEAPP@
-+GNOMEAPP =
- GNOMEAPPS = @GNOMEAPPS@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_CONFIG = @GTK_CONFIG@
-@@ -229,7 +229,8 @@ DISTCLEANFILES = intl/libintl.h
- pkgdata_DATA = AUTHORS README COPYING NEWS MANUAL ABOUT-NLS NLS-TEAM1 ChangeLog
- dist_man_MANS = man/wmakerconf.1 man/mkpreview.1
- EXTRA_DIST = MANUAL wmakerconf.spec NLS-TEAM1 wmakerconf.desktop.in
--GNOMEDIR = @GNOMEAPPS@
-+# to avoid installing the gnome support file
-+GNOMEDIR =
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -717,10 +717,6 @@ uninstall-man: uninstall-man1
+
+ install-data-local: $(srcdir)/$(DESKTOP)
+- $(mkinstalldirs) $(DESTDIR)$(DESKTOPDIR)
+- chmod 0755 $(DESTDIR)$(DESKTOPDIR)
+- $(INSTALL_DATA) $< $(DESTDIR)$(DESKTOPDIR)/$(DESKTOP)
+- chmod 0644 $(DESTDIR)$(DESKTOPDIR)/$(DESKTOP)
+
+ uninstall-local:
+ rm -f $(DESTDIR)$(DESKTOPDIR)/$(DESKTOP)
diff -r 9d524e172109 -r b34acdac9a30 wm/wmakerconf/patches/patch-ac
--- a/wm/wmakerconf/patches/patch-ac Wed May 25 09:27:39 2005 +0000
+++ b/wm/wmakerconf/patches/patch-ac Wed May 25 09:57:14 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/11/08 10:14:33 adam Exp $
+$NetBSD: patch-ac,v 1.3 2005/05/25 09:57:14 adam Exp $
---- src/rootmenu.c.orig 2004-01-25 22:20:31.000000000 +0000
+--- src/rootmenu.c.orig 2005-02-26 14:31:26.000000000 +0000
+++ src/rootmenu.c
-@@ -470,7 +470,7 @@ real_rootmenu (GtkTooltips *tooltips, pr
+@@ -477,7 +477,7 @@ real_rootmenu (GtkTooltips *tooltips, pr
if (!file)
{
diff -r 9d524e172109 -r b34acdac9a30 wm/wmakerconf/patches/patch-ad
--- a/wm/wmakerconf/patches/patch-ad Wed May 25 09:27:39 2005 +0000
+++ b/wm/wmakerconf/patches/patch-ad Wed May 25 09:57:14 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2004/11/08 10:14:33 adam Exp $
+$NetBSD: patch-ad,v 1.3 2005/05/25 09:57:14 adam Exp $
---- data/WMWmakerconf.in.orig 2004-02-20 15:59:21.000000000 +0000
+--- data/WMWmakerconf.in.orig 2005-01-30 12:52:33.000000000 +0000
+++ data/WMWmakerconf.in
@@ -564,6 +564,8 @@
Default = (
@@ -20,11 +20,11 @@
"/usr/share/WindowMaker/Icons",
"/usr/share/WindowMaker/Pixmaps",
"/usr/local/share/WindowMaker/Icons",
-@@ -598,6 +602,7 @@
- Info = "Wmakerconf searches each of these paths in order for the list of available themes.";
+@@ -599,6 +603,7 @@
Title = "Theme search paths";
Default = (
-+ "@PREFIX@/share/WindowMaker/Themes",
+ "~/GNUstep/Library/WindowMaker/Themes",
++ "@PREFIX@/WindowMaker/Themes",
"/usr/share/WindowMaker/Themes",
- "/usr/local/share/WindowMaker/Themes",
- "~/GNUstep/Library/WindowMaker/Themes"
+ "/usr/local/share/WindowMaker/Themes"
+ );
Home |
Main Index |
Thread Index |
Old Index