summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--emulators/gxmame/Makefile2
-rw-r--r--french/mozilla-flp/Makefile26
-rw-r--r--french/mozilla-flp/distinfo.seamonkey3
-rw-r--r--french/mozilla-flp/pkg-descr4
-rw-r--r--french/mozilla-flp/pkg-plist1
-rw-r--r--java/jdk15/Makefile2
-rw-r--r--java/jdk15/files/patch-j2se::io::io_util.h21
-rw-r--r--mail/moztraybiff/Makefile2
-rw-r--r--net/liferea/Makefile2
-rw-r--r--net/liferea/distinfo6
-rw-r--r--polish/gnugadu2/Makefile52
-rw-r--r--polish/gnugadu2/distinfo6
-rw-r--r--polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c21
-rw-r--r--polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c30
-rw-r--r--polish/gnugadu2/files/patch-src_plugins_GUI_gui__userview.c24
-rw-r--r--polish/gnugadu2/files/patch-src_plugins_aaway_aaway.c14
-rw-r--r--polish/gnugadu2/files/patch-src_plugins_jabber_jabber__login.c37
-rw-r--r--polish/gnugadu2/files/patch-src_plugins_jabber_jabber__plugin.c20
-rw-r--r--polish/gnugadu2/pkg-plist3
-rw-r--r--www/bugmenot/Makefile14
-rw-r--r--www/bugmenot/pkg-descr4
-rw-r--r--www/bugmenot/pkg-plist2
-rw-r--r--www/mozex/Makefile19
-rw-r--r--www/mozex/Makefile.xpi52
-rw-r--r--www/mozex/files/pkg-message.in (renamed from www/mozex/pkg-message)2
-rw-r--r--www/mozex/pkg-descr2
-rw-r--r--www/mozex/pkg-install.xpi19
-rw-r--r--www/mozex/pkg-plist2
-rw-r--r--www/mplayer-plugin/Makefile6
-rw-r--r--www/mplayer-plugin/distinfo6
-rw-r--r--www/mplayer-plugin/files/patch-configure10
-rw-r--r--www/mplayer-plugin/pkg-plist2
-rw-r--r--www/swfdec-plugin/Makefile2
-rw-r--r--x11-themes/clearlooks-themes-extras/Makefile2
-rw-r--r--x11-themes/gnome-icons/Makefile5
-rw-r--r--x11-themes/gnome-icons/bsd.gnome-icons.mk15
-rw-r--r--x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile2
-rw-r--r--x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-descr2
-rw-r--r--x11-themes/gtk-aquaextremesunken-theme/Makefile2
-rw-r--r--x11-themes/gtk-aquaextremesunken-theme/pkg-descr2
-rw-r--r--x11-themes/gtk-longhorninspirat-theme/Makefile9
-rw-r--r--x11-themes/gtk-longhorninspirat-theme/pkg-descr2
-rw-r--r--x11-themes/gtk-longhorninspirat-theme/pkg-plist1
-rw-r--r--x11-themes/gtk-milk-theme/Makefile15
-rw-r--r--x11-themes/gtk-milk-theme/distinfo6
-rw-r--r--x11-themes/gtk-milk-theme/pkg-descr2
-rw-r--r--x11-themes/gtk-milk-theme/pkg-plist526
-rw-r--r--x11-themes/gtk-qnxtheme/Makefile2
-rw-r--r--x11-themes/gtk-qt-engine/Makefile2
-rw-r--r--x11-themes/kdeartwork3/distinfo6
-rw-r--r--x11-themes/kdeartwork3/pkg-plist2
-rw-r--r--x11-wm/icewm/Makefile15
-rw-r--r--x11-wm/icewm/distinfo6
-rw-r--r--x11-wm/icewm/pkg-plist39
-rw-r--r--x11/gcursor/Makefile2
55 files changed, 451 insertions, 632 deletions
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 6064e3a97..97f40f044 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${DISTVERSION}
-MAINTAINER= flynn@energyhq.es.eu.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= GXmame is a GTK frontend for xmame
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
diff --git a/french/mozilla-flp/Makefile b/french/mozilla-flp/Makefile
index 10426d057..45706edce 100644
--- a/french/mozilla-flp/Makefile
+++ b/french/mozilla-flp/Makefile
@@ -5,23 +5,21 @@
# $FreeBSD$
#
-PORTNAME= mozilla-flp
-PORTVERSION= 1.7.13
+PORTNAME= ${GECKO}-flp
+PORTVERSION= ${MOZVERSION}
PORTREVISION= 1
+PORTEPOCH= 1
CATEGORIES= french www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- http://frenchmozilla.sourceforge.net/FTP/${PORTVERSION}/
+ http://frenchmozilla.sourceforge.net/FTP/${PORTVERSION}${DISTURL}/
MASTER_SITE_SUBDIR= frenchmozilla
-DISTNAME= mozilla-${PORTVERSION}.fr-FR.langpack
+DISTNAME= ${GECKO}-${PORTVERSION}.fr-FR.langpack
MAINTAINER= thierry@FreeBSD.org
-COMMENT= Mozilla French Language Pack (FLP)
+COMMENT= ${GECKO} French Language Pack (FLP)
WRKSRC= ${WRKDIR}/bin
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozex/Makefile.xpi"
-
REPS= defaults/profile/FR/chrome defaults/messenger/FR defaults/isp/FR
FICHIERS= chrome/FR.jar chrome/fr-FR.jar chrome/fr-unix.jar \
components/myspell/fr-FR.aff components/myspell/fr-FR.dic \
@@ -35,6 +33,18 @@ FICHIERS= chrome/FR.jar chrome/fr-FR.jar chrome/fr-unix.jar \
searchplugins/dmoz.src searchplugins/google.gif searchplugins/google.src\
searchplugins/googlefr.gif searchplugins/googlefr.src
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/mozex/Makefile.xpi"
+
+.if ${GECKO} == seamonkey
+MOZVERSION= 1.0.4
+DISTURL= /SeaMonkey
+MD5_FILE= ${MASTERDIR}/distinfo.seamonkey
+.else
+MOZVERSION= 1.7.13
+DISTURL= # No subdir
+.endif
+
do-install:
.for rep in ${REPS}
@${MKDIR} ${MOZDIR}/${rep}
diff --git a/french/mozilla-flp/distinfo.seamonkey b/french/mozilla-flp/distinfo.seamonkey
new file mode 100644
index 000000000..6776300a6
--- /dev/null
+++ b/french/mozilla-flp/distinfo.seamonkey
@@ -0,0 +1,3 @@
+MD5 (seamonkey-1.0.4.fr-FR.langpack.xpi) = 2a116d5dd47a0478ed2ad16d1113c698
+SHA256 (seamonkey-1.0.4.fr-FR.langpack.xpi) = f9db1bfc90ab271e4e19c84aa50ef10aab87c4de22f59d3a3c80564f4902b5b5
+SIZE (seamonkey-1.0.4.fr-FR.langpack.xpi) = 1040061
diff --git a/french/mozilla-flp/pkg-descr b/french/mozilla-flp/pkg-descr
index dae9a0bbb..a3af24a7d 100644
--- a/french/mozilla-flp/pkg-descr
+++ b/french/mozilla-flp/pkg-descr
@@ -1,3 +1,3 @@
-Module de francisation de Mozilla.
+Module de francisation de Mozilla / SeaMonkey.
-WWW: http://frenchmozilla.org/
+WWW: http://frenchmozilla.sourceforge.net/
diff --git a/french/mozilla-flp/pkg-plist b/french/mozilla-flp/pkg-plist
index 08705364c..f5a386f95 100644
--- a/french/mozilla-flp/pkg-plist
+++ b/french/mozilla-flp/pkg-plist
@@ -18,3 +18,4 @@
@dirrm %%MOZDIR%%/defaults/profile/FR
@dirrm %%MOZDIR%%/defaults/messenger/FR
@dirrm %%MOZDIR%%/defaults/isp/FR
+@unexec rmdir %D/%%MOZDIR%%/defaults/isp 2>/dev/null || true
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 6fed8d386..948ad8bf8 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
diff --git a/java/jdk15/files/patch-j2se::io::io_util.h b/java/jdk15/files/patch-j2se::io::io_util.h
new file mode 100644
index 000000000..7a57b60c1
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::io::io_util.h
@@ -0,0 +1,21 @@
+$FreeBSD: ports/java/jdk15/files/patch-j2se::io::io_util.h,v 1.1 2006/09/09 02:10:02 glewis Exp $
+
+--- ../../j2se/src/share/native/java/io/io_util.h 8 Nov 2004 22:27:35 -0000 1.1.1.1
++++ ../../j2se/src/share/native/java/io/io_util.h 7 Sep 2006 19:40:19 -0000
+@@ -11,7 +11,15 @@
+ extern jfieldID IO_fd_fdID;
+ extern jfieldID IO_handle_fdID;
+
+-#if !defined(O_DSYNC) || !defined(O_SYNC)
++#ifdef _ALLBSD_SOURCE
++#include <fcntl.h>
++#ifndef O_SYNC
++#define O_SYNC O_FSYNC
++#endif
++#ifndef O_DSYNC
++#define O_DSYNC O_FSYNC
++#endif
++#elif !defined(O_DSYNC) || !defined(O_SYNC)
+ #define O_SYNC (0x0800)
+ #define O_DSYNC (0x2000)
+ #endif
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile
index dd119b4bd..1a61081fd 100644
--- a/mail/moztraybiff/Makefile
+++ b/mail/moztraybiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= moztraybiff
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_MOZDEV}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 3d805c225..09d8ec249 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= liferea
-PORTVERSION= 1.0.22
+PORTVERSION= 1.0.23
PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index 610eaead2..b19457fca 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,3 +1,3 @@
-MD5 (liferea-1.0.22.tar.gz) = dd252e0833ad745d6f7ee3a0b2114bff
-SHA256 (liferea-1.0.22.tar.gz) = 30b54efb7da7863f5363014cc17c9b4b583fc4835c78e1b5540f50612f4362b8
-SIZE (liferea-1.0.22.tar.gz) = 1571378
+MD5 (liferea-1.0.23.tar.gz) = f3f5499e4b8a032cdb595eb47255829a
+SHA256 (liferea-1.0.23.tar.gz) = b94caa271f4ff7fd7254d30a255b1c54b03c4bb2fbe795979967eec16c38b432
+SIZE (liferea-1.0.23.tar.gz) = 1571355
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 4189f87a5..a64db60e0 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= gnugadu2
-PORTVERSION= 2.2.8
-PORTREVISION= 3
+PORTVERSION= 2.2.9
+PORTREVISION= 1
CATEGORIES= polish net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ggadu
@@ -16,21 +16,21 @@ DISTNAME= gg2-${PORTVERSION}
MAINTAINER= smyru@heron.pl
COMMENT= GTK2 based Gadu-Gadu client for X11
-LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/ekg \
+LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu \
audiofile.0:${PORTSDIR}/audio/libaudiofile
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_PERL5= yes
+USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gtk20
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
WANT_GNOME= yes
CONFLICTS= qhacc-[0-9]*
-CONFIGURE_ARGS= \
- --disable-esdtest \
+CONFIGURE_ARGS= --disable-esdtest \
--with-external-libgadu \
--with-static=no \
--with-aaway \
@@ -41,35 +41,36 @@ CONFIGURE_ARGS= \
--with-oss \
--with-sms \
--with-update \
- --without-dbus \
--without-gnutls \
--without-perl \
--without-remote
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ CPPFLAGS="-I${X11BASE}/include"
-OPTIONS= TLEN "Enable Tlen.pl network plugin" off \
+OPTIONS= TLEN "Enable Tlen.pl network plugin" off \
JABBER "Enable Jabber loudmouth plugin" off \
- DOCKLET "Enable fd.o docklet plugin" on \
+ DBUS "Enable D-Bus plugin" off \
+ DOCKLET "Enable fd.o docklet plugin" on \
DOCKAPP "Enable WindowMaker dockapp plugin" off \
GTKSPELL "Enable GTKSpell checker" off \
XOSD "Enable On-Screen-Display messages" off \
- ARTS "Build with aRts sound server" off \
+ ARTS "Build with aRts sound server" off \
ESOUND "Build with esound sound server" off
.include <bsd.port.pre.mk>
-.if (${HAVE_GNOME:Mesound}!="")
+.if (${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND)
WITH_ESOUND= yes
.endif
# does not work with newer dbus versions
-#.if exists(${LOCALBASE}/lib/libdbus-1.so)
-#WITH_DBUS= yes
-#.endif
+.if exists(${LOCALBASE}/lib/libdbus-1.so) && !defined(WITHOUT_DBUS)
+WITH_DBUS= yes
+.endif
-.if exists(${LOCALBASE}/lib/libgtkspell.so)
+.if exists(${LOCALBASE}/lib/libgtkspell.so) && !defined(WITHOUT_GTKSPELL)
WITH_GTKSPELL= yes
.endif
@@ -114,15 +115,15 @@ CONFIGURE_ARGS+= --with-gtkspell
CONFIGURE_ARGS+= --without-gtkspell
.endif
-#.if defined(WITH_DBUS)
-#LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
-#CONFIGURE_ARGS+= --with-dbus \
-# --with-dbus-dir=${LOCALBASE}/share/dbus-1/services
-#PLIST_SUB+= DBUS:=""
-#.else
-#CONFIGURE_ARGS+= --without-dbus
-#PLIST_SUB+= DBUS:="@comment "
-#.endif
+.if defined(WITH_DBUS)
+LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+= --with-dbus \
+ --with-dbus-dir=${PREFIX}/share/dbus-1/services
+PLIST_SUB+= DBUS:=""
+.else
+CONFIGURE_ARGS+= --without-dbus
+PLIST_SUB+= DBUS:="@comment "
+.endif
.if defined(WITH_ESOUND)
PKGNAMESUFFIX= -esound
@@ -179,4 +180,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applnk/Internet
.endif
+# vim: set ts=8 sw=8:
.include <bsd.port.post.mk>
diff --git a/polish/gnugadu2/distinfo b/polish/gnugadu2/distinfo
index 713b62e14..0ebf34eec 100644
--- a/polish/gnugadu2/distinfo
+++ b/polish/gnugadu2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gg2-2.2.8.tar.bz2) = 6896f8b5d18004976952c8e5358d60ee
-SHA256 (gg2-2.2.8.tar.bz2) = a5d62ee48c1b3f40aca2cf0c6ab0458ff4a7b18b1e34ad4c090b9ad233084fba
-SIZE (gg2-2.2.8.tar.bz2) = 1091976
+MD5 (gg2-2.2.9.tar.bz2) = a30f5f6e3d32193323669df66804cb90
+SHA256 (gg2-2.2.9.tar.bz2) = a64fec539ad379da9209aaefff12c503fa4caebf6b7d65ed80e635f506ceb956
+SIZE (gg2-2.2.9.tar.bz2) = 1139419
diff --git a/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c b/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c
deleted file mode 100644
index a46cd84e3..000000000
--- a/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD: ports/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c,v 1.1 2005/04/11 09:03:22 flz Exp $
-
---- src/plugins/GUI/gui_chat.c.orig
-+++ src/plugins/GUI/gui_chat.c
-@@ -851,6 +851,7 @@
- gint percent = 0;
- gint number_of_workspaces = 0;
- GtkWidget *chat_notebook_paned_size = NULL;
-+ PangoFontDescription *font_desc;
-
- if (!session || !plugin_name || !id)
- return NULL;
-@@ -1117,7 +1118,6 @@
-
- /* set font of the message editing text_view */
-
-- PangoFontDescription *font_desc;
- fontstr = ggadu_config_var_get(gui_handler, "msg_out_edit_font");
- font_desc = pango_font_description_from_string (fontstr);
- gtk_widget_modify_font (input, font_desc);
diff --git a/polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c b/polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c
deleted file mode 100644
index 40f7bd7b0..000000000
--- a/polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/plugins/GUI/gui_preferences.c.orig Fri Aug 12 10:21:26 2005
-+++ src/plugins/GUI/gui_preferences.c Fri Oct 7 12:38:50 2005
-@@ -1329,6 +1329,9 @@
- {
- GSList *combo_theme_slist;
- GSList *combo_icons_slist;
-+ GSList *combo_skins_slist;
-+ GSList *dict_slist;
-+
- if (plugins_updated)
- {
- GIOChannel *ch = g_io_channel_new_file(g_build_filename(config->configdir, "modules.load", NULL), "w",
-@@ -1362,7 +1365,7 @@
- ggadu_config_var_set(gui_handler, "use_spell", (gpointer) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(entry)));
-
- entry = g_object_get_data(G_OBJECT(chat_vbox), "combo_spell");
-- GSList *dict_slist = g_object_get_data(G_OBJECT(entry), "dictionary_slist");
-+ dict_slist = g_object_get_data(G_OBJECT(entry), "dictionary_slist");
-
- g_return_if_fail(entry != NULL);
-
-@@ -1448,7 +1451,7 @@
- entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_skins");
- g_return_if_fail(entry != NULL);
-
-- GSList *combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist");
-+ combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist");
-
- if (gtk_combo_box_get_active(GTK_COMBO_BOX(entry))) {
- ggadu_config_var_set(gui_handler, "skin", (gpointer) g_strdup(g_slist_nth_data(combo_skins_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
diff --git a/polish/gnugadu2/files/patch-src_plugins_GUI_gui__userview.c b/polish/gnugadu2/files/patch-src_plugins_GUI_gui__userview.c
deleted file mode 100644
index ac00a5729..000000000
--- a/polish/gnugadu2/files/patch-src_plugins_GUI_gui__userview.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/plugins/GUI/gui_userview.c.orig Fri Oct 7 12:31:16 2005
-+++ src/plugins/GUI/gui_userview.c Fri Oct 7 12:34:25 2005
-@@ -88,6 +88,8 @@
- GtkTreeIter * iter, gpointer data)
- {
- GGaduContact *k = NULL;
-+ gchar *markup_descr;
-+ gchar *markup;
-
- gtk_tree_model_get(model, iter, 2, &k, -1);
-
-@@ -165,10 +167,10 @@
- }
- }
-
-- gchar *markup_descr = ggadu_config_var_get(gui_handler, "wrap_descr") ?
-+ markup_descr = ggadu_config_var_get(gui_handler, "wrap_descr") ?
- g_markup_escape_text(descr, strlen(descr)) :
- g_markup_escape_text(k->status_descr, strlen(k->status_descr));
-- gchar *markup = g_strdup_printf("%s\n<small>%s</small>", k->nick, markup_descr);
-+ markup = g_strdup_printf("%s\n<small>%s</small>", k->nick, markup_descr);
- g_object_set(G_OBJECT(renderer), "text", NULL, "markup", markup, NULL);
- g_free(markup_descr);
- g_free(markup);
diff --git a/polish/gnugadu2/files/patch-src_plugins_aaway_aaway.c b/polish/gnugadu2/files/patch-src_plugins_aaway_aaway.c
deleted file mode 100644
index 112a5c442..000000000
--- a/polish/gnugadu2/files/patch-src_plugins_aaway_aaway.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/aaway/aaway.c.orig Fri Oct 7 13:04:11 2005
-+++ src/plugins/aaway/aaway.c Fri Oct 7 13:06:34 2005
-@@ -250,8 +250,10 @@
- static gpointer aaway_preferences(gpointer user_data)
- {
- GGaduDialog *d = ggadu_dialog_new(GGADU_DIALOG_CONFIG, _("Auto-Away Preferences"), "update config");
-+ gchar *utf;
-+
- print_debug("%s: Preferences\n", "aaway");
-- gchar *utf = NULL;
-+ utf = NULL;
- ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_ENABLE_AUTOAWAY, _("Enable auto-away"), VAR_BOOL, (gpointer) ggadu_config_var_get(handler, "enable"), VAR_FLAG_ADVANCED);
- ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_INTERVAL, _("Auto away after time (minutes)"), VAR_INT, (gpointer) ggadu_config_var_get(handler, "interval"), VAR_FLAG_NONE);
- ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_ENABLE_AWAY_MSG, _("Enable away message"), VAR_BOOL,
diff --git a/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__login.c b/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__login.c
deleted file mode 100644
index cef565be9..000000000
--- a/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__login.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/plugins/jabber/jabber_login.c.orig Fri Oct 7 12:45:32 2005
-+++ src/plugins/jabber/jabber_login.c Fri Oct 7 13:08:49 2005
-@@ -42,6 +42,13 @@
- gchar *jid = g_strdup(ggadu_config_var_get(jabber_handler, "jid"));
- gchar *server = NULL;
- gchar *portstr = NULL;
-+ gchar **proxy_userpass;
-+ gchar **proxy_hostport;
-+ gchar **auth;
-+ /* proxy setting taken from EKG project */
-+ gint jabber_proxy_enabled;
-+ gchar jabber_proxy_host;
-+ gint jabber_proxy_port;
-
- g_static_mutex_lock(&connect_mutex);
-
-@@ -98,15 +105,14 @@
- lm_connection_set_keep_alive_rate(jabber_data.connection,30);
-
- /* proxy setting taken from EKG project */
-- gint jabber_proxy_enabled = 0;
-- gchar *jabber_proxy_host = NULL;
-- gint jabber_proxy_port;
-+ jabber_proxy_enabled = 0;
-+ jabber_proxy_host = NULL;
-
- if (ggadu_config_var_check(jabber_handler, "proxy"))
- {
-- gchar **auth = array_make((gchar *) ggadu_config_var_get(jabber_handler, "proxy"), "@", 0, 0, 0);
-- gchar **proxy_userpass = NULL;
-- gchar **proxy_hostport = NULL;
-+ auth = array_make((gchar *) ggadu_config_var_get(jabber_handler, "proxy"), "@", 0, 0, 0);
-+ proxy_userpass = NULL;
-+ proxy_hostport = NULL;
-
- jabber_proxy_enabled = 1;
-
diff --git a/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__plugin.c b/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__plugin.c
deleted file mode 100644
index bb810098b..000000000
--- a/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__plugin.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/plugins/jabber/jabber_plugin.c.orig Fri Oct 7 12:41:09 2005
-+++ src/plugins/jabber/jabber_plugin.c Fri Oct 7 12:44:32 2005
-@@ -1458,6 +1458,8 @@
-
- void start_plugin()
- {
-+ GGaduStatusPrototype *sp;
-+
- p = g_new0(GGaduProtocol, 1);
- p->display_name = g_strdup("Jabber");
- p->protocol_uri = g_strdup("xmpp:");
-@@ -1505,7 +1507,7 @@
- {
- gint auto_status = (gint) ggadu_config_var_get(jabber_handler, "auto_status");
- print_debug("jabber: autoconneting");
-- GGaduStatusPrototype *sp = ggadu_find_status_prototype(p, auto_status ? auto_status : JABBER_STATUS_AVAILABLE);
-+ sp = ggadu_find_status_prototype(p, auto_status ? auto_status : JABBER_STATUS_AVAILABLE);
- jabber_change_status(sp, FALSE);
- GGaduStatusPrototype_free(sp);
- }
diff --git a/polish/gnugadu2/pkg-plist b/polish/gnugadu2/pkg-plist
index 41b34d037..276b1c9d8 100644
--- a/polish/gnugadu2/pkg-plist
+++ b/polish/gnugadu2/pkg-plist
@@ -5,6 +5,8 @@ lib/gg2/libGUI_plugin.la
lib/gg2/libGUI_plugin.so
lib/gg2/libaaway_plugin.la
lib/gg2/libaaway_plugin.so
+%%DBUS:%%lib/gg2/libdbus_plugin.la
+%%DBUS:%%lib/gg2/libdbus_plugin.so
%%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.la
%%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.so
%%DOCKLET:%%lib/gg2/libdocklet_system_tray_plugin.la
@@ -37,6 +39,7 @@ lib/libgg2_core.la
lib/libgg2_core.so
lib/libgg2_core.so.2
libdata/pkgconfig/gg2_core.pc
+%%DBUS:%%share/dbus-1/services/org.freedesktop.im.GG.service
share/gg2/pixmaps/arrow.png
share/gg2/pixmaps/away.png
share/gg2/pixmaps/emoticon.gif
diff --git a/www/bugmenot/Makefile b/www/bugmenot/Makefile
index a004390f8..a17416969 100644
--- a/www/bugmenot/Makefile
+++ b/www/bugmenot/Makefile
@@ -5,20 +5,26 @@
# $FreeBSD$
#
-PORTNAME?= bugmenot
+PORTNAME= bugmenot
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://extensions.roachfiend.com/
DISTNAME= ${PORTNAME}
-DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}_${PORTREVISION}
+DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}_1
MAINTAINER= thierry@FreeBSD.org
-COMMENT?= Mozilla extension to bypass compulsory web registration
+COMMENT= ${GECKO} extension to bypass compulsory web registration
+
+PLIST_FILES= %%MOZDIR%%/chrome/bugmenot.jar
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/mozex/Makefile.xpi"
+.if ${GECKO} == mozilla
+PLIST_FILES+= %%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
+.endif
+
do-install:
@${INSTALL_DATA} ${WRKDIR}/chrome/bugmenot.jar ${MOZDIR}/chrome
diff --git a/www/bugmenot/pkg-descr b/www/bugmenot/pkg-descr
index 643bdfb54..367d4be7c 100644
--- a/www/bugmenot/pkg-descr
+++ b/www/bugmenot/pkg-descr
@@ -1,5 +1,5 @@
-Bypass compulsory web registration via Firefox's right-click context menu.
-Compatibile with Mozilla and current Firefox releases.
+Bypass compulsory web registration via Mozilla's right-click context menu.
+Compatibile with Mozilla and current Seamonkey releases.
Visit bugmenot.com for full details of their service.
diff --git a/www/bugmenot/pkg-plist b/www/bugmenot/pkg-plist
deleted file mode 100644
index 0b390fcc4..000000000
--- a/www/bugmenot/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%MOZDIR%%/chrome/bugmenot.jar
-%%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
diff --git a/www/mozex/Makefile b/www/mozex/Makefile
index cb44dcba5..94dc57764 100644
--- a/www/mozex/Makefile
+++ b/www/mozex/Makefile
@@ -4,20 +4,31 @@
#
# $FreeBSD$
# $MCom$
+#
-PORTNAME?= mozex
+PORTNAME= mozex
PORTVERSION= 1.07
-PORTREVISION?= 3
+PORTREVISION= 5
CATEGORIES= www mail news ftp
MASTER_SITES= ${MASTER_SITE_MOZDEV}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER?= ports@FreeBSD.org
-COMMENT?= Mozex allows Mozilla's users to use external programs for mail, news, etc.
+MAINTAINER= ports@FreeBSD.org
+COMMENT= Mozex allows users of ${GEKO} to use external programs for mail, news, etc.
+
+SUB_FILES= pkg-message
+SUB_LIST= GECKO=${GECKO}
+PKGMESSAGE= ${WRKDIR}/pkg-message
+
+PLIST_FILES= %%MOZDIR%%/chrome/mozex.jar
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/mozex/Makefile.xpi"
+.if ${GECKO} == mozilla
+PLIST_FILES+= %%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
+.endif
+
do-install:
@${INSTALL_DATA} ${WRKDIR}/mozex.jar ${MOZDIR}/chrome
diff --git a/www/mozex/Makefile.xpi b/www/mozex/Makefile.xpi
index 99bc252fe..34b4e176d 100644
--- a/www/mozex/Makefile.xpi
+++ b/www/mozex/Makefile.xpi
@@ -1,57 +1,29 @@
# Date created: Sun Oct 26, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
#
-# $FreeBSD$
-# $MCom$
+# $FreeBSD: ports/www/mozex/Makefile.xpi,v 1.6 2006/09/06 06:45:01 thierry Exp $
+#
-EXTRACT_SUFX= .xpi
+USE_GECKO= seamonkey mozilla
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-BUILD_DEPENDS+= ${MOZDIR}/regxpcom:${PORTSDIR}/www/${MOZPORT}
-RUN_DEPENDS+= ${MOZDIR}:${PORTSDIR}/www/${MOZPORT}
+EXTRACT_SUFX= .xpi
NO_BUILD= yes
USE_ZIP= yes
-PKGINSTALL= ${PORTSDIR}/www/mozex/pkg-install.xpi
+PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${PKGINSTALL}
-.if !defined(WITH_FIREFOX)
-# "Regular" mozillas
-. if exists(${LOCALBASE}/lib)
-MOZDIR!= ${FIND} ${LOCALBASE}/lib -name mozilla-bin -exec dirname {} \; | ${HEAD} -n 1
-. else
-MOZDIR=
-. endif
-. if empty(MOZDIR)
-MOZPORT= mozilla
-MOZDIR= ${LOCALBASE}/lib/${MOZPORT}
-. else
-MOZPORT!= ${BASENAME} ${MOZDIR}
-. endif
-MOZLDIR= lib/${MOZPORT}
-.else
-# Firefox
-DEPRECATED= "must be converted to include www/xpi-adblock/Makefile.xpi"
-PKGNAMESUFFIX= -firefox
-. if exists(${LOCALBASE}/lib)
-MOZDIR!= ${FIND} ${LOCALBASE}/lib -name firefox-bin -exec dirname {} \; | ${HEAD} -n 1
-. else
-MOZDIR=
-. endif
-. if empty(MOZDIR)
-MOZVER= firefox
-. else
-MOZVER!= ${BASENAME} ${MOZDIR}
-. endif
-MOZPORT= firefox
-MOZLDIR= lib/firefox
-.endif
-.if empty(MOZDIR)
+MOZLDIR= lib/${GECKO}
MOZDIR= ${LOCALBASE}/${MOZLDIR}
-.endif
-
PLIST_SUB= MOZDIR=${MOZLDIR}
+pre-configure:
+ ${SED} -e 's|%%GECKO%%|${GECKO}|g' \
+ < ${.CURDIR}/../../www/mozex/pkg-install.xpi \
+ > ${PKGINSTALL}
+
pre-install:
.if ${PREFIX} != ${LOCALBASE}
@${ECHO_MSG} ""
diff --git a/www/mozex/pkg-message b/www/mozex/files/pkg-message.in
index 54740e0ef..ff22ac4a2 100644
--- a/www/mozex/pkg-message
+++ b/www/mozex/files/pkg-message.in
@@ -1,5 +1,5 @@
**************************************************************************
-Mozex has been installed. If Mozilla is running, restart it.
+Mozex has been installed. If %%GECKO%% is running, restart it.
A new "mozex" entry is present in page context menu (right click somewhere
on the page), and you have to edit preferences (for every profile).
diff --git a/www/mozex/pkg-descr b/www/mozex/pkg-descr
index fe15d0df1..14fad01f6 100644
--- a/www/mozex/pkg-descr
+++ b/www/mozex/pkg-descr
@@ -1,4 +1,4 @@
-Mozex is an extension to Mozilla or Firefox which allows the user to use
+Mozex is an extension to Mozilla or Seamonkey which allows the user to use
external programs for these actions:
* view page source
diff --git a/www/mozex/pkg-install.xpi b/www/mozex/pkg-install.xpi
index 27aa2afd6..511847138 100644
--- a/www/mozex/pkg-install.xpi
+++ b/www/mozex/pkg-install.xpi
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $FreeBSD: ports/www/mozex/pkg-install.xpi,v 1.2 2005/01/20 22:23:18 thierry Exp $
+# $FreeBSD$
#
# Date created: Mon Oct 27, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Register the extension $1 in the chrome registry.
+# Register the extension $1 in the chrome registry for the browser %%GECKO%%.
umask 022
PATH=/bin:/usr/bin
@@ -15,27 +15,20 @@ PATH=/bin:/usr/bin
PREFIX=${PKG_PREFIX:-/usr/local}
-# If this is an extension for firefox, PKGNAMESUFFIX has been set
PKG_NAME=${1%%-[0-9._]*}
-PKG_ROOT=$(echo $PKG_NAME | sed 's/-firefox$//')
-if [ $PKG_NAME = $PKG_ROOT ]; then
-MOZBIN=mozilla-bin
-else
-MOZBIN=firefox-bin
-fi
-MOZDIR=`find $PREFIX/lib -name $MOZBIN -exec dirname {} \; | head -n 1`
+MOZDIR=$PREFIX/lib/%%GECKO%%
REGXPCOM=$MOZDIR/regxpcom
REGCHROME=$MOZDIR/regchrome
if [ "x$2" = "xPOST-DEINSTALL" ]; then
- case $PKG_ROOT in
- fr-mozilla-flp|fr-firefox-flp)
+ case $PKG_NAME in
+ fr-mozilla-flp)
MODEXT="FR.jar fr-unix.jar"
;;
*)
- MODEXT=$PKG_ROOT
+ MODEXT=$PKG_NAME
;;
esac
# Removing definition of extension $MODEXT
diff --git a/www/mozex/pkg-plist b/www/mozex/pkg-plist
deleted file mode 100644
index c604d6193..000000000
--- a/www/mozex/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%MOZDIR%%/chrome/mozex.jar
-%%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf
diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile
index 5609f00f1..43ff04711 100644
--- a/www/mplayer-plugin/Makefile
+++ b/www/mplayer-plugin/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mplayerplug-in
-PORTVERSION= 3.25
+PORTVERSION= 3.31
PORTREVISION= 1
CATEGORIES= www multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -25,8 +25,10 @@ PLUGINSFILES= mplayerplug-in.so mplayerplug-in.xpt mplayerplug-in-wmp.so \
mplayerplug-in-qt.so mplayerplug-in-rm.so \
mplayerplug-in-gmp.so mplayerplug-in-wmp.xpt \
mplayerplug-in-qt.xpt mplayerplug-in-rm.xpt \
- mplayerplug-in-gmp.xpt
+ mplayerplug-in-gmp.xpt mplayerplug-in-dvx.so \
+ mplayerplug-in-dvx.xpt
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-gmp
USE_GNOME= gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -DBSD" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
diff --git a/www/mplayer-plugin/distinfo b/www/mplayer-plugin/distinfo
index ad322766a..b5c43eb3c 100644
--- a/www/mplayer-plugin/distinfo
+++ b/www/mplayer-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (mplayerplug-in-3.25.tar.gz) = fb99a2efeacd5aed8b92ae0bb33c708a
-SHA256 (mplayerplug-in-3.25.tar.gz) = ce8304c3cab3ffc10888f3648d9470ab7db7609c5178ef3a6cb3163fc7b901c8
-SIZE (mplayerplug-in-3.25.tar.gz) = 209554
+MD5 (mplayerplug-in-3.31.tar.gz) = be26b17cde385c7a34fc634d2c88c5c9
+SHA256 (mplayerplug-in-3.31.tar.gz) = 359b33927eb2837a544592afc00b55671e02694a8c54d3e7af3c81600bc38885
+SIZE (mplayerplug-in-3.31.tar.gz) = 211714
diff --git a/www/mplayer-plugin/files/patch-configure b/www/mplayer-plugin/files/patch-configure
deleted file mode 100644
index ded52dd57..000000000
--- a/www/mplayer-plugin/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Mon Oct 11 19:30:39 2004
-+++ configure Mon Oct 11 19:32:12 2004
-@@ -2854,6 +2854,7 @@
- echo "$as_me:$LINENO: checking MOZPLUG_CFLAGS" >&5
- echo $ECHO_N "checking MOZPLUG_CFLAGS... $ECHO_C" >&6
- MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin"`
-+ MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I"`$PKG_CONFIG --variable=includedir "mozilla-plugin"`
- echo "$as_me:$LINENO: result: $MOZPLUG_CFLAGS" >&5
- echo "${ECHO_T}$MOZPLUG_CFLAGS" >&6
-
diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist
index a57bec344..6622d496f 100644
--- a/www/mplayer-plugin/pkg-plist
+++ b/www/mplayer-plugin/pkg-plist
@@ -2,6 +2,8 @@
etc/mplayerplug-in.conf.dist
@unexec if cmp -s %D/etc/mplayerplug-in.types %D/etc/mplayerplug-in.types.dist; then rm -f %D/etc/mplayerplug-in.types; fi
etc/mplayerplug-in.types.dist
+lib/browser_plugins/mplayerplug-in-dvx.so
+lib/browser_plugins/mplayerplug-in-dvx.xpt
lib/browser_plugins/mplayerplug-in-gmp.so
lib/browser_plugins/mplayerplug-in-gmp.xpt
lib/browser_plugins/mplayerplug-in-qt.so
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 78e58c7a8..c96f33368 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= swfdec-plugin
PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.schleef.org/swfdec/download/
DISTNAME= swfdec-${PORTVERSION}
diff --git a/x11-themes/clearlooks-themes-extras/Makefile b/x11-themes/clearlooks-themes-extras/Makefile
index 328be100b..088a96436 100644
--- a/x11-themes/clearlooks-themes-extras/Makefile
+++ b/x11-themes/clearlooks-themes-extras/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-themes
MASTER_SITES= http://www.kernow-webhosting.com/~bvc/theme/gtk/clearlooks/
DISTNAME= Clearlooks-Big_Pack-${PORTVERSION}.x
-MAINTAINER= mezz@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Extras colour schemes for Clearlooks engine theme
NO_BUILD= yes
diff --git a/x11-themes/gnome-icons/Makefile b/x11-themes/gnome-icons/Makefile
index a347e0351..416f5b336 100644
--- a/x11-themes/gnome-icons/Makefile
+++ b/x11-themes/gnome-icons/Makefile
@@ -10,7 +10,7 @@
# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
PORTNAME= gnome-icons
-PORTVERSION= 20040229
+PORTVERSION= 20060914
CATEGORIES= x11-themes gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -22,13 +22,16 @@ COMMENT= Meta-port for Gnome iconsets
RUN_DEPENDS= ${LOCALBASE}/share/icons/AquaFusion/index.theme:${PORTSDIR}/x11-themes/gnome-icons-aqua-fusion \
${LOCALBASE}/share/icons/CoolGorilla-ICONS/index.theme:${PORTSDIR}/x11-themes/gnome-icons-cool-gorilla \
${LOCALBASE}/share/icons/CfG-Crystal-SVG-1.2.0/index.theme:${PORTSDIR}/x11-themes/gnome-icons-crystal \
+ ${LOCALBASE}/share/icons/Edge-Icons-0.6/index.theme:${PORTSDIR}/x11-themes/gnome-icons-edge \
${LOCALBASE}/share/icons/Gentoo-test/index.theme:${PORTSDIR}/x11-themes/gnome-icons-gentoo-test \
${LOCALBASE}/share/icons/Iris/index.theme:${PORTSDIR}/x11-themes/gnome-icons-iris \
+ ${LOCALBASE}/share/icons/Lila/index.theme:${PORTSDIR}/x11-themes/gnome-icons-lila \
${LOCALBASE}/share/icons/Noia/index.theme:${PORTSDIR}/x11-themes/gnome-icons-noia-full \
${LOCALBASE}/share/icons/NoiaWarm/index.theme:${PORTSDIR}/x11-themes/gnome-icons-noia-warm \
${LOCALBASE}/share/icons/gnome-rh8/index.theme:${PORTSDIR}/x11-themes/gnome-icons-refined \
${LOCALBASE}/share/icons/Slick/index.theme:${PORTSDIR}/x11-themes/gnome-icons-slick \
${LOCALBASE}/share/icons/Snow-Apple/index.theme:${PORTSDIR}/x11-themes/gnome-icons-snow-apple \
+ ${LOCALBASE}/share/icons/SnowIsh-1.0_PNG/index.theme:${PORTSDIR}/x11-themes/gnome-icons-snowish \
${LOCALBASE}/share/icons/stylish/index.theme:${PORTSDIR}/x11-themes/gnome-icons-stylish \
${LOCALBASE}/share/icons/ximian-south/index.theme:${PORTSDIR}/x11-themes/gnome-icons-ximian-south \
${LOCALBASE}/share/icons/Lila/index.theme:${PORTSDIR}/x11-themes/gnome-icons-lila
diff --git a/x11-themes/gnome-icons/bsd.gnome-icons.mk b/x11-themes/gnome-icons/bsd.gnome-icons.mk
index 5b5102645..60576a0f7 100644
--- a/x11-themes/gnome-icons/bsd.gnome-icons.mk
+++ b/x11-themes/gnome-icons/bsd.gnome-icons.mk
@@ -15,23 +15,12 @@ NO_BUILD= yes
REASON= Themes may contain artwork not done by the author. \
Keep FreeBSD safe if theme author violated copyrights.
-PLIST= ${WRKDIR}/plist
-
WANT_GNOME= yes
INSTALLS_ICONS= yes
-pre-install:
- @${RM} -rf ${PLIST}
-
- @cd ${WRKDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
- ${SED} -i "" -e "s:^:share/icons/:" ${PLIST}; \
- ${FIND} * -type d ! -empty | ${SORT} -r | \
- ${SED} -e "s:^:@dirrm share/icons/:" | \
- ${GREP} / >> ${PLIST}; \
- ${ECHO} "@unexec /bin/rmdir %D/share/icons 2> /dev/null || \
- /usr/bin/true" >> ${PLIST}
+do-install: icon-do-install
-do-install:
+icon-do-install:
cd ${WRKDIR} && ${FIND} * -type d ! -empty \
-exec ${MKDIR} -m 0755 \
${PREFIX}/share/icons/"{}" \;
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
index 65f1ecce1..4a8e73868 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aluminumalloy
PORTVERSION?= 2004.01.04
PORTREVISION?= 1
CATEGORIES= x11-themes gnome
-MASTER_SITES= http://www.users.monornet.hu/linux/files/
+MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX?= ${TYPE}-
PKGNAMESUFFIX?= -${FLAVOR}-theme
DISTNAME= aa_${FLAVOR}
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-descr b/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-descr
index fdc783de7..67bce23e3 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-descr
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-descr
@@ -3,4 +3,4 @@ Max Rudberg (http://www.maxthemes.com).
Theme comes in several flavors: volcanic, smog, cryogenic, toxic.
-WWW: http://www.users.monornet.hu/linux/index2.html
+WWW: http://www.users.monornet.hu/linux/
diff --git a/x11-themes/gtk-aquaextremesunken-theme/Makefile b/x11-themes/gtk-aquaextremesunken-theme/Makefile
index e79080c57..7e80ebeff 100644
--- a/x11-themes/gtk-aquaextremesunken-theme/Makefile
+++ b/x11-themes/gtk-aquaextremesunken-theme/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aquaextremesunken
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= x11-themes gnome
-MASTER_SITES= http://www.users.monornet.hu/linux/files/
+MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX?= ${TYPE}-
PKGNAMESUFFIX= -theme
DISTNAME= AquaExtremeSunken
diff --git a/x11-themes/gtk-aquaextremesunken-theme/pkg-descr b/x11-themes/gtk-aquaextremesunken-theme/pkg-descr
index 42c230eec..af96ae4e1 100644
--- a/x11-themes/gtk-aquaextremesunken-theme/pkg-descr
+++ b/x11-themes/gtk-aquaextremesunken-theme/pkg-descr
@@ -1,4 +1,4 @@
Port of AquaExtreme Sunken theme. Original work by Max Rudberg
(http://www.maxthemes.com).
-WWW: http://www.users.monornet.hu/linux/index2.html
+WWW: http://www.users.monornet.hu/linux/
diff --git a/x11-themes/gtk-longhorninspirat-theme/Makefile b/x11-themes/gtk-longhorninspirat-theme/Makefile
index e38b3b3e4..cd00cc59f 100644
--- a/x11-themes/gtk-longhorninspirat-theme/Makefile
+++ b/x11-themes/gtk-longhorninspirat-theme/Makefile
@@ -7,9 +7,9 @@
PORTNAME= longhorninspirat
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes gnome
-MASTER_SITES= http://www.users.monornet.hu/linux/files/
+MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX= ${TYPE}-
PKGNAMESUFFIX= -theme
DISTNAME= Longhorn_Inspirat
@@ -36,14 +36,15 @@ USE_GNOME= gnomehier
.endif
post-extract:
- ${RM} -r ${WRKSRC}/gtk-2.0/.Trash-roberto
+ @${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+ @${RM} -r ${WRKSRC}/gtk-2.0/.Trash-roberto
do-install:
@${MKDIR} ${THEME_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/index.theme ${THEME_DIR}
.if ${TYPE} == "gtk"
cd ${WRKSRC} && ${FIND} gtk-2.0 | \
${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${THEME_DIR}
- ${INSTALL_DATA} ${WRKSRC}/index.theme ${THEME_DIR}
.else
cd ${WRKSRC} && ${FIND} metacity-1 | \
${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${THEME_DIR}
diff --git a/x11-themes/gtk-longhorninspirat-theme/pkg-descr b/x11-themes/gtk-longhorninspirat-theme/pkg-descr
index 9ce6b9c05..ae2aeba3d 100644
--- a/x11-themes/gtk-longhorninspirat-theme/pkg-descr
+++ b/x11-themes/gtk-longhorninspirat-theme/pkg-descr
@@ -1,4 +1,4 @@
Port of Longhorn Inspirat theme, originally created by Stefanka for
Windows XP.
-WWW: http://www.users.monornet.hu/linux/index2.html
+WWW: http://www.users.monornet.hu/linux/
diff --git a/x11-themes/gtk-longhorninspirat-theme/pkg-plist b/x11-themes/gtk-longhorninspirat-theme/pkg-plist
index 8fa6b30f5..cc39ab3c9 100644
--- a/x11-themes/gtk-longhorninspirat-theme/pkg-plist
+++ b/x11-themes/gtk-longhorninspirat-theme/pkg-plist
@@ -217,4 +217,5 @@
%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-left-shaded-unfocused.png
%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/frame-bottom-mid-focused.png
%%METACITY%%@dirrm share/gnome/themes/Longhorn Inspirat/metacity-1
+%%METACITY%%share/gnome/themes/Longhorn Inspirat/index.theme
%%METACITY%%@dirrm share/gnome/themes/Longhorn Inspirat
diff --git a/x11-themes/gtk-milk-theme/Makefile b/x11-themes/gtk-milk-theme/Makefile
index b0d433603..46c9cd701 100644
--- a/x11-themes/gtk-milk-theme/Makefile
+++ b/x11-themes/gtk-milk-theme/Makefile
@@ -4,12 +4,13 @@
#
# $FreeBSD$
# $MCom$
+#
PORTNAME= milk
-PORTVERSION= 2.0
+PORTVERSION= 2.1
PORTREVISION= 1
CATEGORIES= x11-themes gnome
-MASTER_SITES= http://www.users.monornet.hu/linux/files/
+MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX?= ${TYPE}-
PKGNAMESUFFIX= -theme
DISTNAME= Milk-${PORTVERSION}
@@ -20,7 +21,6 @@ COMMENT= A port of Milk, Mac OS X theme
TYPE?= gtk
THEME_NAME= Milk
-WRKSRC= "${WRKDIR}/${DISTNAME:S/-/ /}"
USE_BZIP2= yes
NO_BUILD= yes
@@ -35,14 +35,17 @@ PLIST_SUB+= GTK20="@comment " METACITY=""
USE_GNOME= gnomehier
.endif
+post-extract:
+ @${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+
do-install:
@${MKDIR} ${THEME_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/index.theme ${THEME_DIR}
.if ${TYPE} == "gtk"
- cd ${WRKSRC} && ${FIND} gtk-2.0 -name '*[^~]' | \
+ cd ${WRKSRC} && ${FIND} gtk-2.0 | \
${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${THEME_DIR}
- ${INSTALL_DATA} ${WRKSRC}/index.theme ${THEME_DIR}
.else
- cd ${WRKSRC} && ${FIND} metacity-1 -name '*[^~]' | \
+ cd ${WRKSRC} && ${FIND} metacity-1 | \
${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${THEME_DIR}
.endif
diff --git a/x11-themes/gtk-milk-theme/distinfo b/x11-themes/gtk-milk-theme/distinfo
index 2525944cf..e47c48eb4 100644
--- a/x11-themes/gtk-milk-theme/distinfo
+++ b/x11-themes/gtk-milk-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (Milk-2.0.tar.bz2) = f1d6aff893c16cf2a578973d69bbc031
-SHA256 (Milk-2.0.tar.bz2) = 634f07f7d5cc2ae50ecf29f546dc8b2f1d0842254eb80c4d85f095f4cd5e169e
-SIZE (Milk-2.0.tar.bz2) = 278283
+MD5 (Milk-2.1.tar.bz2) = dfc402047a3d0e68f9281c1d4bf62832
+SHA256 (Milk-2.1.tar.bz2) = 0ac391bd7d0b28baa79918f10e56b8d85cb557c11a6a20caec97f4c250cc5faf
+SIZE (Milk-2.1.tar.bz2) = 70560
diff --git a/x11-themes/gtk-milk-theme/pkg-descr b/x11-themes/gtk-milk-theme/pkg-descr
index 5d8b07287..9a539f729 100644
--- a/x11-themes/gtk-milk-theme/pkg-descr
+++ b/x11-themes/gtk-milk-theme/pkg-descr
@@ -1,4 +1,4 @@
Port of a Milk, Mac OS X theme originally made by Max Rudberg
(http://www.maxthemes.com).
-WWW: http://www.users.monornet.hu/linux/index2.html
+WWW: http://www.users.monornet.hu/linux/
diff --git a/x11-themes/gtk-milk-theme/pkg-plist b/x11-themes/gtk-milk-theme/pkg-plist
index 9399b0daa..2d29f4c6d 100644
--- a/x11-themes/gtk-milk-theme/pkg-plist
+++ b/x11-themes/gtk-milk-theme/pkg-plist
@@ -1,279 +1,261 @@
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/green-gnome-logo.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/volume-zero.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/volume-mute.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/volume-min.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/volume-med.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/volume-max.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/v4.tif
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/v4.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/v3.tif
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/v3.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/v2.tif
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/v2.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/v1.tif
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/v1.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/printer-workgroup-laser.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/printer-personal-laser.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/printer-inkjet.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/printer-default.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/printer-broken.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-utility.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-run.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-searchtool.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-screenshot.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-multimedia.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-logout.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-lockscreen.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-launcher.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-internet.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-drawer.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-amusements.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/panel-accessories.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/null_button.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/mouse-dblclck-on.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/mouse-dblclck-off.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/mouse-dblclck-maybe.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/media-forward.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/media-backward.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/iconrc
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-zoom-out.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-zoom-in.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-zoom-fit.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-zoom-100.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-yes.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-undo.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-underline.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-undelete.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-strikethrough.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-stop.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-spell-check.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-sort-descending.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-sort-ascending.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-select-font.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-select-color.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-save.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-save-as.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-revert-to-saved.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-remove.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-refresh.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-redo.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-quit.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-properties.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-print.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-print-preview.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-preferences.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-paste.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-open.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-ok.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-no.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-new.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-missing-image.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-justify-right.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-justify-left.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-justify-fill.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-justify-center.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-jump-to.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-italic.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-index.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-home.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-help.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-goto-top.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-goto-last.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-goto-first.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-goto-bottom.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-up.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-forward.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-down.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-back.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-floppy.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-find.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-find-and-replace.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-execute.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-dnd.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-dnd-multiple.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-dialog-warning.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-dialog-question.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-dialog-info.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-dialog-error.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-delete.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-cut.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-copy.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-convert.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-close.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-clear.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-cdrom.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-cancel.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-bold.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-apply.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Arrows/arrow-down.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Arrows/arrow-left.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Arrows/arrow-right-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Arrows/arrow-right.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Arrows/arrow-up.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Arrows
+%%GTK20%%share/themes/Milk/gtk-2.0/Bgs/appbg.gif
+%%GTK20%%share/themes/Milk/gtk-2.0/Bgs/appbg.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Bgs
+%%GTK20%%share/themes/Milk/gtk-2.0/Buttons/button-default.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Buttons/button-insensitive.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Buttons/button-normal.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Buttons/button-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Buttons/button-pressed.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Buttons
+%%GTK20%%share/themes/Milk/gtk-2.0/Frames/frame-gap-end.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Frames/frame-gap-start.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Frames/frame1.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Frames/frame2.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Frames
+%%GTK20%%share/themes/Milk/gtk-2.0/Handles/handle-h.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Handles/handle-v.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Handles/handle.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Handles
+%%GTK20%%share/themes/Milk/gtk-2.0/Lines/line-h.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Lines/line-v.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Lines
+%%GTK20%%share/themes/Milk/gtk-2.0/Listheaders/list-header-pressed.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Listheaders/list-header.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Listheaders/list_header-pressed.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Listheaders/list_header.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Listheaders
+%%GTK20%%share/themes/Milk/gtk-2.0/Menubar/menubar.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Menubar
+%%GTK20%%share/themes/Milk/gtk-2.0/Menus/menu-noxorg.gif
+%%GTK20%%share/themes/Milk/gtk-2.0/Menus/menu-overlay.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Menus/menu.gif
+%%GTK20%%share/themes/Milk/gtk-2.0/Menus/menu.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Menus/menuitem.gif
+%%GTK20%%share/themes/Milk/gtk-2.0/Menus/menuline.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Menus
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/check1.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/check2.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/check3.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option-button-active.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option-button-insens.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option-button-normal.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option-button-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option-menu-arrow.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option-menu.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option1.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option2.png
+%%GTK20%%share/themes/Milk/gtk-2.0/OptionCheck/option3.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/OptionCheck
+%%GTK20%%share/themes/Milk/gtk-2.0/Others/focus.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Others/highlight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Others/null.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Others/ruler.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Others
+%%GTK20%%share/themes/Milk/gtk-2.0/Panel/panel-bg.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Panel/panelbutton1.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Panel/panelbutton2.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Panel/panelbutton3.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Panel
+%%GTK20%%share/themes/Milk/gtk-2.0/Progress/progressbar-vert.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Progress/progressbar.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Progress/trough-progressbar-vert.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Progress/trough-progressbar.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Progress
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/horizontal_trough.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/horizontal_trough_insens.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/null.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_down.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_down_prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_down_push.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_left.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_left_prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_left_push.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_right.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_right_prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_right_push.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_up.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_up_prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scroll_arrow_up_push.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scrollbar_horizontal.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scrollbar_horizontal_insens.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scrollbar_horizontal_prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scrollbar_vertical.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scrollbar_vertical_insens.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/scrollbar_vertical_prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/vertical_trough.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Scroll2/vertical_trough_insens.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Scroll2
+%%GTK20%%share/themes/Milk/gtk-2.0/Shadows/entry-shadow-in.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Shadows/shadow-in.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Shadows/shadow-none.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Shadows/shadow-out.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Shadows/shadow-up.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Shadows/text-entry.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Shadows
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/slider-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/slider.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/thumb-grip-h-insens.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/thumb-grip-h-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/thumb-grip-h.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/thumb-grip-v-insens.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/thumb-grip-v-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/thumb-grip-v.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/trough-range-horiz-insensitive.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/trough-range-horiz.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/trough-range-vert-insensitive.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/trough-range-vert.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Sliders/trough-range.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Sliders
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-arrow-down-insensitive.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-arrow-down.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-arrow-up-insensitive.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-arrow-up.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-down-active.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-down-insensitive.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-down-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-down.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-up-active.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-up-insensitive.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-up-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spin-up.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Spinbuttons/spins.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Spinbuttons
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/notebook.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/null.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/tab-bottom-active.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/tab-bottom.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/tab-left-active.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/tab-left.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/tab-right-active.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/tab-right.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/tab-top-active.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Tabs2/tab-top.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Tabs2
+%%GTK20%%share/themes/Milk/gtk-2.0/Toolbar/toolbar-bg.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Toolbar/toolbutton_normal.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Toolbar/toolbutton_prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/Toolbar/toolbutton_togle.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Toolbar
+%%GTK20%%share/themes/Milk/gtk-2.0/Tooltips/tooltips.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/Tooltips
+%%GTK20%%share/themes/Milk/gtk-2.0/combo/combo-button-insens.png
+%%GTK20%%share/themes/Milk/gtk-2.0/combo/combo-button-normal.png
+%%GTK20%%share/themes/Milk/gtk-2.0/combo/combo-button-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/combo/combo-menu-arrow.png
+%%GTK20%%share/themes/Milk/gtk-2.0/combo/line.png
+%%GTK20%%share/themes/Milk/gtk-2.0/combo/null.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/combo
+%%GTK20%%share/themes/Milk/gtk-2.0/font/font-button-insens.png
+%%GTK20%%share/themes/Milk/gtk-2.0/font/font-button-normal.png
+%%GTK20%%share/themes/Milk/gtk-2.0/font/font-button-prelight.png
+%%GTK20%%share/themes/Milk/gtk-2.0/font/font-menu-arrow.png
+%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/font
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/epiphany-bookmark.png
%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-add.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-volume.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-mic.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-lockscreen.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-line-in.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-import.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-insert-table.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-insert-object.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-insert-image.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-gnome-searchtool.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-gnome-run.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-export.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-empty.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-edit.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-disconnect.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-connect.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-book-blue.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-attach.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-stock-about.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/gnome-logo.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/cdplayer-stop.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/cdplayer-record.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/cdplayer-prev.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/cdplayer-play.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/cdplayer-pause.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/cdplayer-next.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/cdplayer-eject.png
-%%GTK20%%share/themes/Milk/gtk-2.0/icons/apple-gnome-logo.png
-%%GTK20%%share/themes/Milk/gtk-2.0/panelbg.png
-%%GTK20%%share/themes/Milk/gtk-2.0/vline.png
-%%GTK20%%share/themes/Milk/gtk-2.0/vertical_trough_no_secondary.png
-%%GTK20%%share/themes/Milk/gtk-2.0/vertical_trough_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/vertical_trough.png
-%%GTK20%%share/themes/Milk/gtk-2.0/vertical_paned_handle.png
-%%GTK20%%share/themes/Milk/gtk-2.0/vertical_handle.png
-%%GTK20%%share/themes/Milk/gtk-2.0/trough.png
-%%GTK20%%share/themes/Milk/gtk-2.0/transparent.png
-%%GTK20%%share/themes/Milk/gtk-2.0/tooltip.png
-%%GTK20%%share/themes/Milk/gtk-2.0/text_entry.png
-%%GTK20%%share/themes/Milk/gtk-2.0/text.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_up_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_up_pre.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_up_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_up.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_down_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_down.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_down_pre.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_down_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_button_up_arrow.png
-%%GTK20%%share/themes/Milk/gtk-2.0/spin_button_down_arrow.png
-%%GTK20%%share/themes/Milk/gtk-2.0/slider_vert_bg_new.png
-%%GTK20%%share/themes/Milk/gtk-2.0/slider_horiz_bg_new.png
-%%GTK20%%share/themes/Milk/gtk-2.0/slider_button_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/slider_button_norm.png
-%%GTK20%%share/themes/Milk/gtk-2.0/slider_button_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/shadow_out.png
-%%GTK20%%share/themes/Milk/gtk-2.0/shadow_in.png
-%%GTK20%%share/themes/Milk/gtk-2.0/shadow_etched_out.png
-%%GTK20%%share/themes/Milk/gtk-2.0/shadow_etched_in.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scrollbar_vertical_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scrollbar_vertical_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/out_sel.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scrollbar_vertical.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scrollbar_horizontal_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scrollbar_horizontal_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scrollbar_horizontal.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_up_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_up_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_up.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_right_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_right_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_right.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_left_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_left_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_left.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_down_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_down_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/scroll_arrow_down.png
-%%GTK20%%share/themes/Milk/gtk-2.0/resize_grip.png
-%%GTK20%%share/themes/Milk/gtk-2.0/progressbar.png
-%%GTK20%%share/themes/Milk/gtk-2.0/progressbar (copy).png
-%%GTK20%%share/themes/Milk/gtk-2.0/plain_background.png
-%%GTK20%%share/themes/Milk/gtk-2.0/panel_background_1.png
-%%GTK20%%share/themes/Milk/gtk-2.0/pane_splitter.png
-%%GTK20%%share/themes/Milk/gtk-2.0/option_out_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/option_out_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/option_out_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/option_out.png
-%%GTK20%%share/themes/Milk/gtk-2.0/option_in_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/option_in_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/option_in_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/option_in.png
-%%GTK20%%share/themes/Milk/gtk-2.0/null.png
-%%GTK20%%share/themes/Milk/gtk-2.0/gtkrc
-%%GTK20%%share/themes/Milk/gtk-2.0/notebook_border.png
-%%GTK20%%share/themes/Milk/gtk-2.0/notebook-well.png
-%%GTK20%%share/themes/Milk/gtk-2.0/new_tab_top_inactive.png
-%%GTK20%%share/themes/Milk/gtk-2.0/new_tab_top_active.png
-%%GTK20%%share/themes/Milk/gtk-2.0/new_tab_right_inactive.png
-%%GTK20%%share/themes/Milk/gtk-2.0/new_tab_right_active.png
-%%GTK20%%share/themes/Milk/gtk-2.0/new_tab_left_inactive.png
-%%GTK20%%share/themes/Milk/gtk-2.0/new_tab_left_active.png
-%%GTK20%%share/themes/Milk/gtk-2.0/new_tab_bottom_inactive.png
-%%GTK20%%share/themes/Milk/gtk-2.0/new_tab_bottom_active.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menubg.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menubar_option_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menubar_option_arrow_insensitive.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menubar_option_arrow.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menubar_option.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menubar.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menu_hi-light.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menu_border_milk.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menu_border.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menu_background_overlay.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menu_background.png
-%%GTK20%%share/themes/Milk/gtk-2.0/menu_back_1024.png
-%%GTK20%%share/themes/Milk/gtk-2.0/list_header_pre.png
-%%GTK20%%share/themes/Milk/gtk-2.0/list_header.png
-%%GTK20%%share/themes/Milk/gtk-2.0/horizontal_trough_no_secondary.png
-%%GTK20%%share/themes/Milk/gtk-2.0/horizontal_trough_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/horizontal_trough.png
-%%GTK20%%share/themes/Milk/gtk-2.0/horizontal_paned_handle.png
-%%GTK20%%share/themes/Milk/gtk-2.0/horizontal_handle.png
-%%GTK20%%share/themes/Milk/gtk-2.0/hline_milk.png
-%%GTK20%%share/themes/Milk/gtk-2.0/hline_245.png
-%%GTK20%%share/themes/Milk/gtk-2.0/hline.png
-%%GTK20%%share/themes/Milk/gtk-2.0/greybg.png
-%%GTK20%%share/themes/Milk/gtk-2.0/focus_entry.png
-%%GTK20%%share/themes/Milk/gtk-2.0/entry.png
-%%GTK20%%share/themes/Milk/gtk-2.0/checklight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/check_out_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/check_out_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/check_out_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/check_out.png
-%%GTK20%%share/themes/Milk/gtk-2.0/check_in_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/check_in_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/check_in_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/check_in.png
-%%GTK20%%share/themes/Milk/gtk-2.0/button_push.png
-%%GTK20%%share/themes/Milk/gtk-2.0/button_prelight.png
-%%GTK20%%share/themes/Milk/gtk-2.0/button_normal.png
-%%GTK20%%share/themes/Milk/gtk-2.0/button_insens.png
-%%GTK20%%share/themes/Milk/gtk-2.0/button_flat.png
-%%GTK20%%share/themes/Milk/gtk-2.0/blue_focus.png
-%%GTK20%%share/themes/Milk/gtk-2.0/bg_light.png
-%%GTK20%%share/themes/Milk/index.theme
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-apply.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-bookmark.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-bookmarks.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-cancel.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-close.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-copy.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-cut.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-delete.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-find-and-replace.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-find.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-back.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-bottom.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-down.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-first.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-forward.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-last.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-top.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-go-up.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-help.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-home.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-jump-to.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-new.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-ok.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-open.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-paste.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-preferences.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-print-preview.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-print.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-redo.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-refresh.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-revert.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-save-as.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-save.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-stop.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/gtk-undo.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/iconrc
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/my-button-template.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/stock_zoom-100.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/stock_zoom-fit.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/stock_zoom-in.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/stock_zoom-out.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/v1.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/v2.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/v3.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/v4.png
+%%GTK20%%share/themes/Milk/gtk-2.0/icons/volume-mute.png
%%GTK20%%@dirrm share/themes/Milk/gtk-2.0/icons
+%%GTK20%%share/themes/Milk/gtk-2.0/gtkrc
+%%GTK20%%share/themes/Milk/gtk-2.0/iconrc
+%%GTK20%%share/themes/Milk/gtk-2.0/menu-noxorg.rc
+%%GTK20%%share/themes/Milk/gtk-2.0/menu.rc
+%%GTK20%%share/themes/Milk/gtk-2.0/panel.rc
+%%GTK20%%share/themes/Milk/gtk-2.0/toolbar.rc
%%GTK20%%@dirrm share/themes/Milk/gtk-2.0
+%%GTK20%%share/themes/Milk/index.theme
%%GTK20%%@dirrm share/themes/Milk
-%%METACITY%%share/gnome/themes/Milk/metacity-1/title-bar.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/title-bar-inactive.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/right-side.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/right-side-inactive.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/Milk/metacity-1/menu-button.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/menu-button-push.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/menu-button-inactive.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/left-side.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/left-side-inactive.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/close-button-inactive.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-min.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-min-push.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-min-focus.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-max.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-max-push.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-max-focus.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-focused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-prelight.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-pressed.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-unfocused.png
%%METACITY%%share/gnome/themes/Milk/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-push.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-focus.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-maximize-focused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-maximize-prelight.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-maximize-pressed.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-maximize-unfocused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-menu-focused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-menu-prelight.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-menu-pressed.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-menu-unfocused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-minimize-focused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-minimize-prelight.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-minimize-pressed.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/button-minimize-unfocused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-left-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-left-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-mid-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-mid-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-right-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-right-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-left-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-left-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-right-focused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-right-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-right-unfocused.png
+%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-right-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-left-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-left-shaded-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-left-shaded-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-left-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-mid-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-mid-shaded-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-mid-shaded-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-mid-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-right-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-right-shaded-focused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-right-shaded-unfocused.xpm
+%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-right-unfocused.xpm
%%METACITY%%@dirrm share/gnome/themes/Milk/metacity-1
+%%METACITY%%share/gnome/themes/Milk/index.theme
%%METACITY%%@dirrm share/gnome/themes/Milk
diff --git a/x11-themes/gtk-qnxtheme/Makefile b/x11-themes/gtk-qnxtheme/Makefile
index 79c7ff867..095eae51e 100644
--- a/x11-themes/gtk-qnxtheme/Makefile
+++ b/x11-themes/gtk-qnxtheme/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= qnxtheme
DISTNAME= qnxtheme-default-${PORTVERSION}
-MAINTAINER= flynn@energyhq.es.eu.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= QNX-inspired theme for GTK1 and GTK2
WANT_GNOME= yes
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 422080da8..6e042621c 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-themes
MASTER_SITES= http://people.freedesktop.org/~davidsansome/ \
http://freebsd.ricin.com/ports/distfiles/
-MAINTAINER= danny@ricin.com
+MAINTAINER= ports@FreeBSD.org
COMMENT= GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
LIB_DEPENDS= kdecore:${PORTSDIR}/x11/kdelibs3
diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo
index a3cc92b73..02d405956 100644
--- a/x11-themes/kdeartwork3/distinfo
+++ b/x11-themes/kdeartwork3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeartwork-3.5.3.tar.bz2) = e0fc78bee18d81b4595c98964227a06c
-SHA256 (KDE/kdeartwork-3.5.3.tar.bz2) = 92d78c09e960f99a6c0f6b026470e096b88357fd7c5646494f3beced6ac22d53
-SIZE (KDE/kdeartwork-3.5.3.tar.bz2) = 16599096
+MD5 (KDE/kdeartwork-3.5.4.tar.bz2) = c7ff9048b9b68c976de08ed418598e40
+SHA256 (KDE/kdeartwork-3.5.4.tar.bz2) = b4c9347fc515d9ff9d15465a8c5d2c8535181d7e47d2b5713010517bffba826d
+SIZE (KDE/kdeartwork-3.5.4.tar.bz2) = 16575390
diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/pkg-plist
index 9c1561ab7..e881e5595 100644
--- a/x11-themes/kdeartwork3/pkg-plist
+++ b/x11-themes/kdeartwork3/pkg-plist
@@ -3028,6 +3028,7 @@ share/icons/kdeclassic/22x22/actions/kalarm_disabled.png
share/icons/kdeclassic/22x22/actions/kalarmdgui.png
share/icons/kdeclassic/22x22/actions/kalarmdgui_disabled.png
share/icons/kdeclassic/22x22/actions/kanjidic.png
+share/icons/kdeclassic/22x22/actions/kde.png
share/icons/kdeclassic/22x22/actions/kdeprint_addprinter.png
share/icons/kdeclassic/22x22/actions/kdeprint_addpseudo.png
share/icons/kdeclassic/22x22/actions/kdeprint_configmgr.png
@@ -3571,6 +3572,7 @@ share/icons/kdeclassic/32x32/actions/insert_table_col.png
share/icons/kdeclassic/32x32/actions/insert_table_row.png
share/icons/kdeclassic/32x32/actions/int.png
share/icons/kdeclassic/32x32/actions/jail_pay.png
+share/icons/kdeclassic/32x32/actions/kde.png
share/icons/kdeclassic/32x32/actions/kdeprint_inklevel.png
share/icons/kdeclassic/32x32/actions/krec_record.png
share/icons/kdeclassic/32x32/actions/ktip.png
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 675eccaca..caf2bb68e 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= icewm
-PORTVERSION= 1.2.27
+PORTVERSION= 1.2.28
PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -83,10 +83,14 @@ CONFIGURE_ARGS+= --disable-x86-asm
.if defined(WITH_BEASTIE)
STARTUP_PIXMAP= bsd-daemon.xpm
+THEMES_START_XPM_SFX= -suppressed
.else
STARTUP_PIXMAP= icewm-logo.xpm
+THEMES_START_XPM_SFX=
.endif
+PLIST_SUB+= THEMES_START_XPM_SFX=${THEMES_START_XPM_SFX}
+
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls --disable-i18n
PLIST_SUB+= NLS="@comment "
@@ -96,8 +100,13 @@ PLIST_SUB+= NLS=""
.endif
post-extract:
- @cd ${WRKSRC}/lib/taskbar && ${MV} icewm.xpm icewm-logo.xpm
+ @cd ${WRKSRC}/lib/taskbar && ${MV} start.xpm icewm-logo.xpm
@${CP} -f ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
+.if defined(WITH_BEASTIE)
+ @for icon in ${WRKSRC}/lib/themes/*/taskbar/start.xpm ; do \
+ ${MV} "$${icon}" "$${icon%.xpm}${THEMES_START_XPM_SFX}.xpm" ; \
+ done
+.endif
post-patch:
.for file in configure
@@ -111,7 +120,7 @@ post-patch:
.endfor
post-install:
- @${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/taskbar/icewm.xpm
+ @${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/taskbar/start.xpm
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for file in CHANGES INSTALL README TODO
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 1253e2e5d..1b62b8707 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,3 +1,3 @@
-MD5 (icewm-1.2.27.tar.gz) = 777ba54008cba6e9a1efbb051119c511
-SHA256 (icewm-1.2.27.tar.gz) = 4943e90952be2bcb8913c27d8dbbc6bf526d999db9345bc7752330c9eef6bf9a
-SIZE (icewm-1.2.27.tar.gz) = 1065165
+MD5 (icewm-1.2.28.tar.gz) = 357d399235c4efaf8c4b19acc7db37fd
+SHA256 (icewm-1.2.28.tar.gz) = 81fa280588541d221fd5eeffa6a711be88a9285885f65ab989f2ee0e2385117f
+SIZE (icewm-1.2.28.tar.gz) = 1054568
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 84df26203..c0c10b0aa 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -36,18 +36,6 @@ bin/icewmtray
%%GNOMEDESKTOP%%share/gnome/wm-properties/IceWM.desktop
%%DATADIR%%/icons/app_16x16.xpm
%%DATADIR%%/icons/app_32x32.xpm
-%%DATADIR%%/icons/bomb_16x16.xpm
-%%DATADIR%%/icons/bomb_32x32.xpm
-%%DATADIR%%/icons/communicator-abook_16x16.xpm
-%%DATADIR%%/icons/communicator-abook_32x32.xpm
-%%DATADIR%%/icons/communicator-browser_16x16.xpm
-%%DATADIR%%/icons/communicator-browser_32x32.xpm
-%%DATADIR%%/icons/communicator-composer_16x16.xpm
-%%DATADIR%%/icons/communicator-composer_32x32.xpm
-%%DATADIR%%/icons/communicator-discussion_16x16.xpm
-%%DATADIR%%/icons/communicator-discussion_32x32.xpm
-%%DATADIR%%/icons/communicator-mail_16x16.xpm
-%%DATADIR%%/icons/communicator-mail_32x32.xpm
%%DATADIR%%/icons/emacs_16x16.xpm
%%DATADIR%%/icons/emacs_32x32.xpm
%%DATADIR%%/icons/file_16x16.xpm
@@ -56,31 +44,13 @@ bin/icewmtray
%%DATADIR%%/icons/folder_32x32.xpm
%%DATADIR%%/icons/fte_16x16.xpm
%%DATADIR%%/icons/fte_32x32.xpm
-%%DATADIR%%/icons/gimp_16x16.xpm
-%%DATADIR%%/icons/gimp_32x32.xpm
-%%DATADIR%%/icons/gnome_16x16.xpm
%%DATADIR%%/icons/java_16x16.xpm
%%DATADIR%%/icons/java_32x32.xpm
-%%DATADIR%%/icons/kde_16x16.xpm
-%%DATADIR%%/icons/koules_16x16.xpm
-%%DATADIR%%/icons/koules_32x32.xpm
-%%DATADIR%%/icons/navigator_16x16.xpm
-%%DATADIR%%/icons/navigator_32x32.xpm
-%%DATADIR%%/icons/netscape_16x16.xpm
-%%DATADIR%%/icons/netscape_32x32.xpm
-%%DATADIR%%/icons/pdf_16x16.xpm
-%%DATADIR%%/icons/pdf_32x32.xpm
%%DATADIR%%/icons/vim_16x16.xpm
%%DATADIR%%/icons/vim_32x32.xpm
%%DATADIR%%/icons/vim_48x48.xpm
-%%DATADIR%%/icons/xisp_16x16.xpm
-%%DATADIR%%/icons/xisp_32x32.xpm
-%%DATADIR%%/icons/xload_16x16.xpm
-%%DATADIR%%/icons/xload_32x32.xpm
%%DATADIR%%/icons/xterm_16x16.xpm
%%DATADIR%%/icons/xterm_32x32.xpm
-%%DATADIR%%/icons/xv_16x16.xpm
-%%DATADIR%%/icons/xv_32x32.xpm
%%DATADIR%%/keys
%%DATADIR%%/ledclock/a.xpm
%%DATADIR%%/ledclock/colon.xpm
@@ -109,18 +79,11 @@ bin/icewmtray
%%DATADIR%%/preferences
%%DATADIR%%/taskbar/bsd-daemon.xpm
%%DATADIR%%/taskbar/collapse.xpm
-%%DATADIR%%/taskbar/debian.xpm
%%DATADIR%%/taskbar/desktop.xpm
%%DATADIR%%/taskbar/expand.xpm
%%DATADIR%%/taskbar/icewm-logo.xpm
-%%DATADIR%%/taskbar/icewm.xpm
-%%DATADIR%%/taskbar/linux.xpm
-%%DATADIR%%/taskbar/linux1.xpm
-%%DATADIR%%/taskbar/linux2.xpm
-%%DATADIR%%/taskbar/linux20.xpm
%%DATADIR%%/taskbar/start.xpm
%%DATADIR%%/taskbar/windows.xpm
-%%DATADIR%%/taskbar/xfreeos2.xpm
%%DATADIR%%/themes/Infadel2/Ergonomic.theme
%%DATADIR%%/themes/Infadel2/Overloaded.theme
%%DATADIR%%/themes/Infadel2/closeA.xpm
@@ -163,7 +126,7 @@ bin/icewmtray
%%DATADIR%%/themes/Infadel2/rollupA.xpm
%%DATADIR%%/themes/Infadel2/rollupI.xpm
%%DATADIR%%/themes/Infadel2/snap.pcf
-%%DATADIR%%/themes/Infadel2/taskbar/linux.xpm
+%%DATADIR%%/themes/Infadel2/taskbar/start%%THEMES_START_XPM_SFX%%.xpm
%%DATADIR%%/themes/Infadel2/taskbar/windows.xpm
%%DATADIR%%/themes/Infadel2/titleAB.xpm
%%DATADIR%%/themes/Infadel2/titleAJ.xpm
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index dc4cab0f0..b535b53a2 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= http://download.qballcow.nl/programs/gcursor/
-MAINTAINER= mezz@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= A mouse cursor theme selector for GNOME
RUN_DEPENDS= file-roller:${PORTSDIR}/archivers/file-roller