diff options
| author | marcus <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
| commit | 194069571a0e4c7bad7bce0f33a042d707e9e171 (patch) | |
| tree | c3c8a6312bab5325147ea9ea2ad87f0cc44a5fec /sysutils | |
| parent | 232533f87b435da7ed2bac7daeae3e90680d9e1d (diff) | |
| download | FreeBSD-ports-194069571a0e4c7bad7bce0f33a042d707e9e171.zip FreeBSD-ports-194069571a0e4c7bad7bce0f33a042d707e9e171.tar.gz | |
Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes
and new features. Don't believe me? Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.
DO NOT USE portupgrade by itself to upgrade to GNOME 2.12. Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh. This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.
In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen. The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>. His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.
The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:
Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn
For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/. The 2.12 documentation will be
posted shortly.
Diffstat (limited to 'sysutils')
60 files changed, 965 insertions, 261 deletions
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index e1eb4d7..df4c462 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -3,14 +3,16 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.41 2005/10/08 19:41:39 marcus Exp $ # PORTNAME= gconf-editor -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,10 +21,10 @@ COMMENT= A gconf database editor for the GNOME 2 environment USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui -USE_LIBTOOL_VER=15 -USE_REINPLACE= yes +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index c8cc016..ac148f0 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gconf-editor-2.10.0.tar.bz2) = 651a18f7eb5af91761521aa4f04ccc07 -SIZE (gnome2/gconf-editor-2.10.0.tar.bz2) = 543405 +MD5 (gnome2/gconf-editor-2.12.0.tar.bz2) = ec8b0d4ee2a460ed31f69e4825fb4e17 +SIZE (gnome2/gconf-editor-2.12.0.tar.bz2) = 531655 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index b24a6c9..c3037e3 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -9,7 +9,17 @@ share/gnome/help/gconf-editor/C/figures/entry-string.png share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/C/gconf-editor.xml share/gnome/help/gconf-editor/C/legal.xml +share/gnome/help/gconf-editor/uk/figures/entry-blank.png +share/gnome/help/gconf-editor/uk/figures/entry-bool.png +share/gnome/help/gconf-editor/uk/figures/entry-list.png +share/gnome/help/gconf-editor/uk/figures/entry-number.png +share/gnome/help/gconf-editor/uk/figures/entry-schema.png +share/gnome/help/gconf-editor/uk/figures/entry-string.png +share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png +share/gnome/help/gconf-editor/uk/gconf-editor.xml +share/gnome/help/gconf-editor/uk/legal.xml share/gnome/omf/gconf-editor/gconf-editor-C.omf +share/gnome/omf/gconf-editor/gconf-editor-uk.omf share/gnome/pixmaps/gconf-editor/entry-blank.png share/gnome/pixmaps/gconf-editor/entry-bool.png share/gnome/pixmaps/gconf-editor/entry-list.png @@ -71,6 +81,7 @@ share/locale/pt/LC_MESSAGES/gconf-editor.mo share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo share/locale/ro/LC_MESSAGES/gconf-editor.mo share/locale/ru/LC_MESSAGES/gconf-editor.mo +share/locale/rw/LC_MESSAGES/gconf-editor.mo share/locale/sk/LC_MESSAGES/gconf-editor.mo share/locale/sl/LC_MESSAGES/gconf-editor.mo share/locale/sq/LC_MESSAGES/gconf-editor.mo @@ -78,14 +89,23 @@ share/locale/sr/LC_MESSAGES/gconf-editor.mo share/locale/sr@Latn/LC_MESSAGES/gconf-editor.mo share/locale/sv/LC_MESSAGES/gconf-editor.mo share/locale/ta/LC_MESSAGES/gconf-editor.mo +share/locale/te/LC_MESSAGES/gconf-editor.mo share/locale/th/LC_MESSAGES/gconf-editor.mo share/locale/tr/LC_MESSAGES/gconf-editor.mo +share/locale/ug/LC_MESSAGES/gconf-editor.mo share/locale/uk/LC_MESSAGES/gconf-editor.mo share/locale/vi/LC_MESSAGES/gconf-editor.mo +share/locale/xh/LC_MESSAGES/gconf-editor.mo share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/te 2> /dev/null || true @dirrm share/gnome/pixmaps/gconf-editor @dirrm share/gnome/omf/gconf-editor +@dirrm share/gnome/help/gconf-editor/uk/figures +@dirrm share/gnome/help/gconf-editor/uk @dirrm share/gnome/help/gconf-editor/C/figures @dirrm share/gnome/help/gconf-editor/C @dirrm share/gnome/help/gconf-editor diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 10c3078..f11fdb3 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.10 +MASTER_SITE_SUBDIR= sources/control-center/2.12 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,9 +25,11 @@ USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GSTREAMER= yes +WANT_GNOME= yes USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ gnomemenus desktopfileutils -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +INSTALLS_OMF= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -38,9 +41,27 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ desktop_gnome_peripherals_keyboard_xkb.schemas \ fontilus.schemas themus.schemas +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mevolutiondataserver}!="" +USE_GNOME+= evolutiondataserver +CONFIGURE_ARGS+=--enable-aboutme +PLIST_SUB+= ABOUTME="" +.else +CONFIGURE_ARGS+=--disable-aboutme +PLIST_SUB+= ABOUTME="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' + @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \ + ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c @${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \ s|/bin/gzip|/usr/bin/gzip|g' \ ${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c @@ -48,4 +69,4 @@ post-patch: post-install: @-update-desktop-database -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index b834f27..550ff98 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.10.2.tar.bz2) = 36022dcd340dac004903f5dadc8af589 -SIZE (gnome2/control-center-2.10.2.tar.bz2) = 2833639 +MD5 (gnome2/control-center-2.12.1.tar.bz2) = f3d8520b8544e1f910600ba889e02523 +SIZE (gnome2/control-center-2.12.1.tar.bz2) = 1771524 diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c new file mode 100644 index 0000000..7ea6bb0 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c @@ -0,0 +1,16 @@ +--- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005 ++++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005 +@@ -35,7 +35,13 @@ + #include <sys/wait.h> + #include <sys/poll.h> + #include <termios.h> ++#include <signal.h> ++#ifndef __FreeBSD__ + #include <pty.h> ++#else ++#include <sys/types.h> ++#include <libutil.h> ++#endif + + #include "capplet-util.h" + #include "eel-alert-dialog.h" diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c new file mode 100644 index 0000000..0d1f85f --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c @@ -0,0 +1,34 @@ +--- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005 ++++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005 +@@ -258,12 +258,10 @@ + static char * + get_user_login (void) + { +- char buf[LINE_MAX * 4]; +- struct passwd pwd, *err; ++ struct passwd *pwd; + +- int i; +- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err); +- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL; ++ pwd = getpwuid(getuid()); ++ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL; + } + + /* +@@ -664,6 +662,7 @@ + struct passwd *pwent; + char *user = NULL; + gchar *str; ++ gchar **tok; + + me = g_new0 (GnomeAboutMe, 1); + +@@ -733,7 +732,6 @@ + _("Unknown login ID, the user database might be corrupted")); + return ; + } +- gchar **tok; + tok = g_strsplit (pwent->pw_gecos, ",", 0); + + /************************************************/ diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c new file mode 100644 index 0000000..ab7180f --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c @@ -0,0 +1,17 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jul 27 13:48:58 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Jul 27 13:49:37 2005 +@@ -265,11 +265,12 @@ + GladeXML * dialog) + { + GtkWidget *expander, *align, *vbox; ++ gchar *utfGroupName, *titlemarkup; + + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + +- gchar *utfGroupName = xci_desc_to_utf8 (configItem); +- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); ++ utfGroupName = xci_desc_to_utf8 (configItem); ++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); + + expander = gtk_expander_new (titlemarkup); + g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c new file mode 100644 index 0000000..32c81df --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -0,0 +1,21 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Mon Sep 5 17:05:46 2005 ++++ capplets/mouse/gnome-mouse-properties.c Mon Sep 5 17:06:23 2005 +@@ -658,7 +658,8 @@ + + gchar **iterator = NULL; + gchar **paths = NULL; +- ++ const gchar *xpaths; ++ + GConfClient* client = gconf_client_get_default(); + GtkListStore* store = GTK_LIST_STORE(gtk_tree_model_sort_get_model(model)); + gchar* current_theme = gconf_client_get_string(client, CURSOR_THEME_KEY, NULL); +@@ -666,7 +667,7 @@ + g_object_unref(client); + client = NULL; + +- const gchar *xpaths = g_getenv ("XCURSOR_PATH"); ++ xpaths = g_getenv ("XCURSOR_PATH"); + + if (xpaths != NULL) { + paths = g_strsplit (xpaths, ":", 0); diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in deleted file mode 100644 index 52a627f..0000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-settings-daemon/actions/Makefile.in.orig Mon Dec 20 19:19:31 2004 -+++ gnome-settings-daemon/actions/Makefile.in Mon Dec 20 19:20:45 2004 -@@ -296,7 +296,7 @@ - Datadir = $(datadir)/control-center-2.0/interfaces/ - Data_DATA = acme.glade - --pixmapsdir = $(GNOMECC_PIXMAPS_DIR) -+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps - pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png - - EXTRA_DIST = \ diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c index f66b82c..ed30cdd 100644 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c +++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c @@ -1,6 +1,6 @@ ---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Thu Oct 14 15:44:21 2004 -+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Thu Oct 14 15:44:38 2004 -@@ -813,7 +813,7 @@ +--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Wed Jul 27 13:52:13 2005 ++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Wed Jul 27 13:52:32 2005 +@@ -828,7 +828,7 @@ do_mail_action (acme); break; case SLEEP_KEY: @@ -8,4 +8,4 @@ + do_sleep_action ("zzz", "xset dpms force off"); break; case SCREENSAVER_KEY: - execute ("xscreensaver-command -lock", FALSE); + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c deleted file mode 100644 index 149d59a..0000000 --- a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libwindow-settings/wm-list.c.orig Tue Oct 8 17:43:12 2002 -+++ libwindow-settings/wm-list.c Tue Oct 8 17:43:25 2002 -@@ -251,7 +251,7 @@ - gchar *name; - GConfClient *client; - -- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); -+ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); - wm_list_read_dir (tempdir, FALSE); - g_free (tempdir); - diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 9bf38dd..b43391f 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -1,3 +1,4 @@ +%%ABOUTME%%bin/gnome-about-me bin/gnome-accessibility-keyboard-properties bin/gnome-at-properties bin/gnome-background-properties @@ -40,6 +41,7 @@ share/gnome/applications/background.desktop share/gnome/applications/default-applications.desktop share/gnome/applications/display-properties.desktop share/gnome/applications/font-properties.desktop +%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop share/gnome/applications/gnome-font-viewer.desktop share/gnome/applications/gnome-network-preferences.desktop share/gnome/applications/gnome-settings-mouse.desktop @@ -51,12 +53,12 @@ share/gnome/applications/keybinding.desktop share/gnome/applications/keyboard.desktop share/gnome/applications/themus-theme-applier.desktop share/gnome/applications/window-properties.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/interfaces/acme.glade share/gnome/control-center-2.0/interfaces/apply-font.glade share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade share/gnome/control-center-2.0/interfaces/font-properties.glade +%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade @@ -84,6 +86,12 @@ share/gnome/control-center-2.0/pixmaps/bar.png share/gnome/control-center-2.0/pixmaps/double-click-maybe.png share/gnome/control-center-2.0/pixmaps/double-click-off.png share/gnome/control-center-2.0/pixmaps/double-click-on.png +%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png +%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png +share/gnome/control-center-2.0/pixmaps/acme-brightness.png +share/gnome/control-center-2.0/pixmaps/acme-eject.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png share/gnome/control-center-2.0/pixmaps/keyboard-bell.png share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png @@ -111,15 +119,27 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf +share/gnome/help/control-center/C/config-accessibility-keyboard.xml +share/gnome/help/control-center/C/config-background.xml +share/gnome/help/control-center/C/config-behavior.xml +share/gnome/help/control-center/C/config-cds.xml +share/gnome/help/control-center/C/config-default-apps.xml +share/gnome/help/control-center/C/config-file-type.xml +share/gnome/help/control-center/C/config-hints.xml +share/gnome/help/control-center/C/config-html.xml +share/gnome/help/control-center/C/config-kbd.xml +share/gnome/help/control-center/C/config-keybindings.xml +share/gnome/help/control-center/C/config-mouse.xml +share/gnome/help/control-center/C/config-screensaver.xml +share/gnome/help/control-center/C/config-sound.xml +share/gnome/help/control-center/C/config-themes.xml +share/gnome/help/control-center/C/control-center.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl +share/gnome/omf/control-center/control-center-C.omf share/gnome/pixmaps/display-capplet.png share/gnome/vfolders/font-method.directory share/gnome/vfolders/theme-method.directory -share/icons/gnome/48x48/apps/acme-brightness.png -share/icons/gnome/48x48/apps/acme-eject.png -share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png -share/icons/gnome/48x48/apps/gnome-speakernotes.png share/icons/hicolor/48x48/apps/gnome-control-center.png share/locale/af/LC_MESSAGES/control-center-2.0.mo share/locale/am/LC_MESSAGES/control-center-2.0.mo @@ -155,6 +175,7 @@ share/locale/is/LC_MESSAGES/control-center-2.0.mo share/locale/it/LC_MESSAGES/control-center-2.0.mo share/locale/ja/LC_MESSAGES/control-center-2.0.mo share/locale/ko/LC_MESSAGES/control-center-2.0.mo +share/locale/ku/LC_MESSAGES/control-center-2.0.mo share/locale/lt/LC_MESSAGES/control-center-2.0.mo share/locale/lv/LC_MESSAGES/control-center-2.0.mo share/locale/mk/LC_MESSAGES/control-center-2.0.mo @@ -181,6 +202,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo share/locale/sv/LC_MESSAGES/control-center-2.0.mo share/locale/ta/LC_MESSAGES/control-center-2.0.mo +share/locale/te/LC_MESSAGES/control-center-2.0.mo share/locale/th/LC_MESSAGES/control-center-2.0.mo share/locale/tr/LC_MESSAGES/control-center-2.0.mo share/locale/uk/LC_MESSAGES/control-center-2.0.mo @@ -190,9 +212,18 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo +@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/zu 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true -@dirrm share/gnome/gnome-background-properties +@dirrm share/gnome/omf/control-center +@dirrm share/gnome/help/control-center/C +@dirrm share/gnome/help/control-center +@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @@ -200,4 +231,5 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo @unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 0638e56..9c5ce11 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.51 2005/10/04 03:07:41 ahze Exp $ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.10 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.12 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,7 +25,7 @@ INSTALLS_OMF= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index dfde097..04fc6c3 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.10.1.tar.bz2) = 22acb1699193f8bd2ced656d44f57377 -SIZE (gnome2/gnome-system-monitor-2.10.1.tar.bz2) = 766187 +MD5 (gnome2/gnome-system-monitor-2.12.1.tar.bz2) = 31924d02786622151c0fb30314d1f85d +SIZE (gnome2/gnome-system-monitor-2.12.1.tar.bz2) = 785235 diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c index 49a6996..70b2f9e 100644 --- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c +++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c @@ -1,7 +1,7 @@ ---- src/proctable.c.orig Tue Nov 30 01:28:31 2004 -+++ src/proctable.c Wed Dec 1 13:25:55 2004 -@@ -772,6 +772,12 @@ - +--- src/proctable.c.orig Fri Jul 22 18:58:42 2005 ++++ src/proctable.c Mon Jul 25 22:25:58 2005 +@@ -853,6 +853,12 @@ static void cb_exclude(ProcInfo* info, G + } +static int @@ -13,7 +13,7 @@ static void refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) { -@@ -863,10 +869,15 @@ +@@ -945,10 +951,15 @@ proctable_update_list (ProcData * const pid_list = glibtop_get_proclist (&proclist, which, arg); @@ -22,7 +22,7 @@ /* FIXME: total cpu time elapsed should be calculated on an individual basis here ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); - total_time = cpu.total - total_time_last; + total_time = MAX(cpu.total - total_time_last, 1); + if (cpu.frequency) { + total_time /= (cpu.frequency/100); + } diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index 6f9dcfc..e7455e4 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -75,10 +75,13 @@ share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo share/locale/th/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm share/gnome/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 1dca8a6..005b91a 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -3,14 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $ # PORTNAME= gnomesystemtools -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.2 +MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.4 DISTNAME= gnome-system-tools-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,8 +26,9 @@ USE_GMAKE= yes USE_X_PREFIX= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes +CONFIGURE_ARGS= --enable-services CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -34,11 +36,8 @@ GCONF_SCHEMAS= gnome-system-tools.schemas .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 -CONFIGURE_ARGS+= --enable-services -PLIST_SUB+= SERVICES="" -.else -PLIST_SUB+= SERVICES="@comment " +.if ${OSVERSION} < 500000 +IGNORE= Uses symbols not present in 4.X .endif .include <bsd.port.post.mk> diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index 6eb37fa..e0cb6d3 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-tools-1.2.0.tar.bz2) = fbcf8866ecea8b330cbe53cf8b0df55e -SIZE (gnome2/gnome-system-tools-1.2.0.tar.bz2) = 1780677 +MD5 (gnome2/gnome-system-tools-1.4.0.tar.bz2) = bbc13f526025c4da1607fa640499b6ee +SIZE (gnome2/gnome-system-tools-1.4.0.tar.bz2) = 1959280 diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c index 9272d91..f73b28a 100644 --- a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c +++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c @@ -1,13 +1,105 @@ ---- src/common/gst-auth.c.orig Thu Mar 10 14:39:18 2005 -+++ src/common/gst-auth.c Thu Mar 10 14:39:50 2005 -@@ -142,12 +142,12 @@ gst_auth_run_term (GstTool *tool, gchar +--- src/common/gst-auth.c.orig Mon Aug 8 15:00:01 2005 ++++ src/common/gst-auth.c Sat Sep 10 01:47:35 2005 +@@ -55,6 +55,82 @@ + static int root; /* if we are root, no password is + required */ + ++#ifdef __FreeBSD__ ++static int ++_forkpty (int *amaster, char *name, ++ struct termios *termp, struct winsize *winp) ++{ ++ int master, slave; ++ char *line; ++ pid_t pid; ++ ++ master = posix_openpt (O_RDWR); ++ if (master == -1) ++ return (-1); ++ ++ if (grantpt (master) == -1) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ if (unlockpt (master) == -1) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ line = ptsname (master); ++ if (line == NULL) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ slave = open (line, O_RDWR); ++ if (slave < 0) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ if (amaster) ++ *amaster = master; ++ ++ if (name) ++ strcpy (name, line); ++ ++ if (termp) ++ (void) tcsetattr(slave, TCSAFLUSH, termp); ++ ++ if (winp) ++ (void) ioctl(slave, TIOCSWINSZ, (char *) winp); ++ ++ pid = fork (); ++ switch (pid) ++ { ++ case -1: ++ (void) close (slave); ++ (void) close (master); ++ return (-1); ++ case 0: ++ (void) close (master); ++ dup2 (slave, STDIN_FILENO); ++ dup2 (slave, STDOUT_FILENO); ++ dup2 (slave, STDERR_FILENO); ++ return (0); ++ default: ++ (void) close (slave); ++ return (pid); ++ } ++ ++ (void) close (master); ++ return (-1); ++} ++#else ++#define _forkpty forkpty ++#endif ++ + static void + gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text) + { +@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar + int p[2]; + + pipe (p); +- tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL); ++ tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL); + + if (tool->backend_pid < 0) { + gst_auth_display_error_message (tool, +@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar unsetenv("LANG"); unsetenv("LANGUAGE"); - dup2 (p[1], 1); - dup2 (p[1], 2); + dup2 (p[1], STDOUT_FILENO); -+ /*dup2 (p[1], 2);*/ ++ dup2 (p[1], STDERR_FILENO); close (p[0]); execv (args[0], args); diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c index 5134f30..9aaef15 100644 --- a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c +++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c @@ -1,6 +1,21 @@ ---- src/common/gst-tool.c.orig Thu Mar 10 14:39:54 2005 -+++ src/common/gst-tool.c Thu Mar 10 14:40:00 2005 -@@ -1653,7 +1653,7 @@ poll_backend (GstTool *tool) +--- src/common/gst-tool.c.orig Tue Jun 21 15:07:05 2005 ++++ src/common/gst-tool.c Wed Jul 6 01:28:22 2005 +@@ -598,7 +598,14 @@ gst_tool_kill_backend_cb (GstDirectiveEn + if (tool->root_access == ROOT_ACCESS_SIMULATED_DISABLED) + tool->root_access = ROOT_ACCESS_SIMULATED; + ++#if 0 ++ /* ++ * We do not need to wait for the tool, ++ * as it will get SIGPIPE anyway. ++ * This waitpid causes problems on FreeBSD. ++ */ + waitpid (tool->backend_pid, NULL, 0); ++#endif + } + } + +@@ -1655,7 +1662,7 @@ poll_backend (GstTool *tool) struct pollfd fd; fd.fd = tool->read_fd; diff --git a/sysutils/gnome-system-tools/files/patch-src_network_location.c b/sysutils/gnome-system-tools/files/patch-src_network_location.c deleted file mode 100644 index e2577a6..0000000 --- a/sysutils/gnome-system-tools/files/patch-src_network_location.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/network/location.c.orig Thu Dec 23 13:16:33 2004 -+++ src/network/location.c Thu Dec 23 13:16:40 2004 -@@ -687,7 +687,7 @@ - static void - copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[]) - { -- gchar **string = (gchar **) list;; -+ gchar **string = (gchar **) list; - gchar *value; - - while (*string) diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index a52125a..4880080 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -1,5 +1,5 @@ bin/network-admin -%%SERVICES%%bin/services-admin +bin/services-admin bin/shares-admin bin/time-admin bin/users-admin @@ -58,12 +58,13 @@ share/gnome-system-tools/pixmaps/turbolinux.png share/gnome-system-tools/pixmaps/unsupported-distro.png share/gnome-system-tools/pixmaps/users-groups.png share/gnome-system-tools/pixmaps/users.png +share/gnome-system-tools/pixmaps/vidalinux.png share/gnome-system-tools/pixmaps/vine.png share/gnome-system-tools/pixmaps/wavelan-16.png share/gnome-system-tools/pixmaps/wavelan-48.png share/gnome-system-tools/pixmaps/world_map-960.png share/gnome/applications/network.desktop -%%SERVICES%%share/gnome/applications/services.desktop +share/gnome/applications/services.desktop share/gnome/applications/shares.desktop share/gnome/applications/time.desktop share/gnome/applications/users.desktop @@ -77,18 +78,29 @@ share/gnome/help/services-admin/C/figures/service-properties.png share/gnome/help/services-admin/C/figures/services-tool.png share/gnome/help/services-admin/C/legal.xml share/gnome/help/services-admin/C/services-admin.xml +share/gnome/help/services-admin/nl/figures/service-properties.png +share/gnome/help/services-admin/nl/figures/services-tool.png +share/gnome/help/services-admin/nl/legal.xml +share/gnome/help/services-admin/nl/services-admin.xml share/gnome/help/time-admin/C/figures/time-map.png share/gnome/help/time-admin/C/figures/time-servers.png share/gnome/help/time-admin/C/figures/time-tool.png share/gnome/help/time-admin/C/legal.xml share/gnome/help/time-admin/C/time-admin.xml +share/gnome/help/time-admin/nl/figures/time-map.png +share/gnome/help/time-admin/nl/figures/time-servers.png +share/gnome/help/time-admin/nl/figures/time-tool.png +share/gnome/help/time-admin/nl/legal.xml +share/gnome/help/time-admin/nl/time-admin.xml share/gnome/help/users-admin/C/figures/users-tool.png share/gnome/help/users-admin/C/legal.xml share/gnome/help/users-admin/C/users-admin.xml share/gnome/omf/gnome-system-tools/boot-admin-C.omf share/gnome/omf/gnome-system-tools/network-admin-C.omf share/gnome/omf/gnome-system-tools/services-admin-C.omf +share/gnome/omf/gnome-system-tools/services-admin-nl.omf share/gnome/omf/gnome-system-tools/time-admin-C.omf +share/gnome/omf/gnome-system-tools/time-admin-nl.omf share/gnome/omf/gnome-system-tools/users-admin-C.omf share/locale/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo @@ -110,6 +122,7 @@ share/locale/fr/LC_MESSAGES/gnome-system-tools.mo share/locale/ga/LC_MESSAGES/gnome-system-tools.mo share/locale/gl/LC_MESSAGES/gnome-system-tools.mo share/locale/gu/LC_MESSAGES/gnome-system-tools.mo +share/locale/he/LC_MESSAGES/gnome-system-tools.mo share/locale/hi/LC_MESSAGES/gnome-system-tools.mo share/locale/hr/LC_MESSAGES/gnome-system-tools.mo share/locale/hu/LC_MESSAGES/gnome-system-tools.mo @@ -123,6 +136,8 @@ share/locale/mk/LC_MESSAGES/gnome-system-tools.mo share/locale/ml/LC_MESSAGES/gnome-system-tools.mo share/locale/mn/LC_MESSAGES/gnome-system-tools.mo share/locale/ms/LC_MESSAGES/gnome-system-tools.mo +share/locale/nb/LC_MESSAGES/gnome-system-tools.mo +share/locale/ne/LC_MESSAGES/gnome-system-tools.mo share/locale/nl/LC_MESSAGES/gnome-system-tools.mo share/locale/nn/LC_MESSAGES/gnome-system-tools.mo share/locale/no/LC_MESSAGES/gnome-system-tools.mo @@ -132,6 +147,7 @@ share/locale/pt/LC_MESSAGES/gnome-system-tools.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo share/locale/ro/LC_MESSAGES/gnome-system-tools.mo share/locale/ru/LC_MESSAGES/gnome-system-tools.mo +share/locale/rw/LC_MESSAGES/gnome-system-tools.mo share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo share/locale/sr/LC_MESSAGES/gnome-system-tools.mo @@ -143,15 +159,20 @@ share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo share/locale/vi/LC_MESSAGES/gnome-system-tools.mo share/locale/wa/LC_MESSAGES/gnome-system-tools.mo +share/locale/xh/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C @dirrm share/gnome/help/users-admin +@dirrm share/gnome/help/time-admin/nl/figures +@dirrm share/gnome/help/time-admin/nl @dirrm share/gnome/help/time-admin/C/figures @dirrm share/gnome/help/time-admin/C @dirrm share/gnome/help/time-admin +@dirrm share/gnome/help/services-admin/nl/figures +@dirrm share/gnome/help/services-admin/nl @dirrm share/gnome/help/services-admin/C/figures @dirrm share/gnome/help/services-admin/C @dirrm share/gnome/help/services-admin diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 10c3078..f11fdb3 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.10 +MASTER_SITE_SUBDIR= sources/control-center/2.12 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,9 +25,11 @@ USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GSTREAMER= yes +WANT_GNOME= yes USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ gnomemenus desktopfileutils -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +INSTALLS_OMF= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -38,9 +41,27 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ desktop_gnome_peripherals_keyboard_xkb.schemas \ fontilus.schemas themus.schemas +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mevolutiondataserver}!="" +USE_GNOME+= evolutiondataserver +CONFIGURE_ARGS+=--enable-aboutme +PLIST_SUB+= ABOUTME="" +.else +CONFIGURE_ARGS+=--disable-aboutme +PLIST_SUB+= ABOUTME="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' + @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \ + ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c @${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \ s|/bin/gzip|/usr/bin/gzip|g' \ ${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c @@ -48,4 +69,4 @@ post-patch: post-install: @-update-desktop-database -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index b834f27..550ff98 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.10.2.tar.bz2) = 36022dcd340dac004903f5dadc8af589 -SIZE (gnome2/control-center-2.10.2.tar.bz2) = 2833639 +MD5 (gnome2/control-center-2.12.1.tar.bz2) = f3d8520b8544e1f910600ba889e02523 +SIZE (gnome2/control-center-2.12.1.tar.bz2) = 1771524 diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c new file mode 100644 index 0000000..7ea6bb0 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c @@ -0,0 +1,16 @@ +--- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005 ++++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005 +@@ -35,7 +35,13 @@ + #include <sys/wait.h> + #include <sys/poll.h> + #include <termios.h> ++#include <signal.h> ++#ifndef __FreeBSD__ + #include <pty.h> ++#else ++#include <sys/types.h> ++#include <libutil.h> ++#endif + + #include "capplet-util.h" + #include "eel-alert-dialog.h" diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c new file mode 100644 index 0000000..0d1f85f --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c @@ -0,0 +1,34 @@ +--- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005 ++++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005 +@@ -258,12 +258,10 @@ + static char * + get_user_login (void) + { +- char buf[LINE_MAX * 4]; +- struct passwd pwd, *err; ++ struct passwd *pwd; + +- int i; +- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err); +- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL; ++ pwd = getpwuid(getuid()); ++ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL; + } + + /* +@@ -664,6 +662,7 @@ + struct passwd *pwent; + char *user = NULL; + gchar *str; ++ gchar **tok; + + me = g_new0 (GnomeAboutMe, 1); + +@@ -733,7 +732,6 @@ + _("Unknown login ID, the user database might be corrupted")); + return ; + } +- gchar **tok; + tok = g_strsplit (pwent->pw_gecos, ",", 0); + + /************************************************/ diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c new file mode 100644 index 0000000..ab7180f --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c @@ -0,0 +1,17 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jul 27 13:48:58 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Jul 27 13:49:37 2005 +@@ -265,11 +265,12 @@ + GladeXML * dialog) + { + GtkWidget *expander, *align, *vbox; ++ gchar *utfGroupName, *titlemarkup; + + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + +- gchar *utfGroupName = xci_desc_to_utf8 (configItem); +- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); ++ utfGroupName = xci_desc_to_utf8 (configItem); ++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); + + expander = gtk_expander_new (titlemarkup); + g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c new file mode 100644 index 0000000..32c81df --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -0,0 +1,21 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Mon Sep 5 17:05:46 2005 ++++ capplets/mouse/gnome-mouse-properties.c Mon Sep 5 17:06:23 2005 +@@ -658,7 +658,8 @@ + + gchar **iterator = NULL; + gchar **paths = NULL; +- ++ const gchar *xpaths; ++ + GConfClient* client = gconf_client_get_default(); + GtkListStore* store = GTK_LIST_STORE(gtk_tree_model_sort_get_model(model)); + gchar* current_theme = gconf_client_get_string(client, CURSOR_THEME_KEY, NULL); +@@ -666,7 +667,7 @@ + g_object_unref(client); + client = NULL; + +- const gchar *xpaths = g_getenv ("XCURSOR_PATH"); ++ xpaths = g_getenv ("XCURSOR_PATH"); + + if (xpaths != NULL) { + paths = g_strsplit (xpaths, ":", 0); diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in deleted file mode 100644 index 52a627f..0000000 --- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-settings-daemon/actions/Makefile.in.orig Mon Dec 20 19:19:31 2004 -+++ gnome-settings-daemon/actions/Makefile.in Mon Dec 20 19:20:45 2004 -@@ -296,7 +296,7 @@ - Datadir = $(datadir)/control-center-2.0/interfaces/ - Data_DATA = acme.glade - --pixmapsdir = $(GNOMECC_PIXMAPS_DIR) -+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps - pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png - - EXTRA_DIST = \ diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c index f66b82c..ed30cdd 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c +++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c @@ -1,6 +1,6 @@ ---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Thu Oct 14 15:44:21 2004 -+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Thu Oct 14 15:44:38 2004 -@@ -813,7 +813,7 @@ +--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Wed Jul 27 13:52:13 2005 ++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Wed Jul 27 13:52:32 2005 +@@ -828,7 +828,7 @@ do_mail_action (acme); break; case SLEEP_KEY: @@ -8,4 +8,4 @@ + do_sleep_action ("zzz", "xset dpms force off"); break; case SCREENSAVER_KEY: - execute ("xscreensaver-command -lock", FALSE); + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c deleted file mode 100644 index 149d59a..0000000 --- a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libwindow-settings/wm-list.c.orig Tue Oct 8 17:43:12 2002 -+++ libwindow-settings/wm-list.c Tue Oct 8 17:43:25 2002 -@@ -251,7 +251,7 @@ - gchar *name; - GConfClient *client; - -- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); -+ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); - wm_list_read_dir (tempdir, FALSE); - g_free (tempdir); - diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index 9bf38dd..b43391f 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -1,3 +1,4 @@ +%%ABOUTME%%bin/gnome-about-me bin/gnome-accessibility-keyboard-properties bin/gnome-at-properties bin/gnome-background-properties @@ -40,6 +41,7 @@ share/gnome/applications/background.desktop share/gnome/applications/default-applications.desktop share/gnome/applications/display-properties.desktop share/gnome/applications/font-properties.desktop +%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop share/gnome/applications/gnome-font-viewer.desktop share/gnome/applications/gnome-network-preferences.desktop share/gnome/applications/gnome-settings-mouse.desktop @@ -51,12 +53,12 @@ share/gnome/applications/keybinding.desktop share/gnome/applications/keyboard.desktop share/gnome/applications/themus-theme-applier.desktop share/gnome/applications/window-properties.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/interfaces/acme.glade share/gnome/control-center-2.0/interfaces/apply-font.glade share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade share/gnome/control-center-2.0/interfaces/font-properties.glade +%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade @@ -84,6 +86,12 @@ share/gnome/control-center-2.0/pixmaps/bar.png share/gnome/control-center-2.0/pixmaps/double-click-maybe.png share/gnome/control-center-2.0/pixmaps/double-click-off.png share/gnome/control-center-2.0/pixmaps/double-click-on.png +%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png +%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png +share/gnome/control-center-2.0/pixmaps/acme-brightness.png +share/gnome/control-center-2.0/pixmaps/acme-eject.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png +share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png share/gnome/control-center-2.0/pixmaps/keyboard-bell.png share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png @@ -111,15 +119,27 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf +share/gnome/help/control-center/C/config-accessibility-keyboard.xml +share/gnome/help/control-center/C/config-background.xml +share/gnome/help/control-center/C/config-behavior.xml +share/gnome/help/control-center/C/config-cds.xml +share/gnome/help/control-center/C/config-default-apps.xml +share/gnome/help/control-center/C/config-file-type.xml +share/gnome/help/control-center/C/config-hints.xml +share/gnome/help/control-center/C/config-html.xml +share/gnome/help/control-center/C/config-kbd.xml +share/gnome/help/control-center/C/config-keybindings.xml +share/gnome/help/control-center/C/config-mouse.xml +share/gnome/help/control-center/C/config-screensaver.xml +share/gnome/help/control-center/C/config-sound.xml +share/gnome/help/control-center/C/config-themes.xml +share/gnome/help/control-center/C/control-center.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl +share/gnome/omf/control-center/control-center-C.omf share/gnome/pixmaps/display-capplet.png share/gnome/vfolders/font-method.directory share/gnome/vfolders/theme-method.directory -share/icons/gnome/48x48/apps/acme-brightness.png -share/icons/gnome/48x48/apps/acme-eject.png -share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png -share/icons/gnome/48x48/apps/gnome-speakernotes.png share/icons/hicolor/48x48/apps/gnome-control-center.png share/locale/af/LC_MESSAGES/control-center-2.0.mo share/locale/am/LC_MESSAGES/control-center-2.0.mo @@ -155,6 +175,7 @@ share/locale/is/LC_MESSAGES/control-center-2.0.mo share/locale/it/LC_MESSAGES/control-center-2.0.mo share/locale/ja/LC_MESSAGES/control-center-2.0.mo share/locale/ko/LC_MESSAGES/control-center-2.0.mo +share/locale/ku/LC_MESSAGES/control-center-2.0.mo share/locale/lt/LC_MESSAGES/control-center-2.0.mo share/locale/lv/LC_MESSAGES/control-center-2.0.mo share/locale/mk/LC_MESSAGES/control-center-2.0.mo @@ -181,6 +202,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo share/locale/sv/LC_MESSAGES/control-center-2.0.mo share/locale/ta/LC_MESSAGES/control-center-2.0.mo +share/locale/te/LC_MESSAGES/control-center-2.0.mo share/locale/th/LC_MESSAGES/control-center-2.0.mo share/locale/tr/LC_MESSAGES/control-center-2.0.mo share/locale/uk/LC_MESSAGES/control-center-2.0.mo @@ -190,9 +212,18 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo +@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/zu 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true -@dirrm share/gnome/gnome-background-properties +@dirrm share/gnome/omf/control-center +@dirrm share/gnome/help/control-center/C +@dirrm share/gnome/help/control-center +@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @@ -200,4 +231,5 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo @unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 0638e56..9c5ce11 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.51 2005/10/04 03:07:41 ahze Exp $ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.10 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.12 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,7 +25,7 @@ INSTALLS_OMF= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index dfde097..04fc6c3 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.10.1.tar.bz2) = 22acb1699193f8bd2ced656d44f57377 -SIZE (gnome2/gnome-system-monitor-2.10.1.tar.bz2) = 766187 +MD5 (gnome2/gnome-system-monitor-2.12.1.tar.bz2) = 31924d02786622151c0fb30314d1f85d +SIZE (gnome2/gnome-system-monitor-2.12.1.tar.bz2) = 785235 diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c index 49a6996..70b2f9e 100644 --- a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c +++ b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c @@ -1,7 +1,7 @@ ---- src/proctable.c.orig Tue Nov 30 01:28:31 2004 -+++ src/proctable.c Wed Dec 1 13:25:55 2004 -@@ -772,6 +772,12 @@ - +--- src/proctable.c.orig Fri Jul 22 18:58:42 2005 ++++ src/proctable.c Mon Jul 25 22:25:58 2005 +@@ -853,6 +853,12 @@ static void cb_exclude(ProcInfo* info, G + } +static int @@ -13,7 +13,7 @@ static void refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) { -@@ -863,10 +869,15 @@ +@@ -945,10 +951,15 @@ proctable_update_list (ProcData * const pid_list = glibtop_get_proclist (&proclist, which, arg); @@ -22,7 +22,7 @@ /* FIXME: total cpu time elapsed should be calculated on an individual basis here ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); - total_time = cpu.total - total_time_last; + total_time = MAX(cpu.total - total_time_last, 1); + if (cpu.frequency) { + total_time /= (cpu.frequency/100); + } diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index 6f9dcfc..e7455e4 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -75,10 +75,13 @@ share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo share/locale/th/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm share/gnome/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile index 1dca8a6..005b91a 100644 --- a/sysutils/gnomesystemtools/Makefile +++ b/sysutils/gnomesystemtools/Makefile @@ -3,14 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $ # PORTNAME= gnomesystemtools -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.2 +MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.4 DISTNAME= gnome-system-tools-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,8 +26,9 @@ USE_GMAKE= yes USE_X_PREFIX= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes +CONFIGURE_ARGS= --enable-services CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -34,11 +36,8 @@ GCONF_SCHEMAS= gnome-system-tools.schemas .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 -CONFIGURE_ARGS+= --enable-services -PLIST_SUB+= SERVICES="" -.else -PLIST_SUB+= SERVICES="@comment " +.if ${OSVERSION} < 500000 +IGNORE= Uses symbols not present in 4.X .endif .include <bsd.port.post.mk> diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo index 6eb37fa..e0cb6d3 100644 --- a/sysutils/gnomesystemtools/distinfo +++ b/sysutils/gnomesystemtools/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-tools-1.2.0.tar.bz2) = fbcf8866ecea8b330cbe53cf8b0df55e -SIZE (gnome2/gnome-system-tools-1.2.0.tar.bz2) = 1780677 +MD5 (gnome2/gnome-system-tools-1.4.0.tar.bz2) = bbc13f526025c4da1607fa640499b6ee +SIZE (gnome2/gnome-system-tools-1.4.0.tar.bz2) = 1959280 diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c index 9272d91..f73b28a 100644 --- a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c +++ b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c @@ -1,13 +1,105 @@ ---- src/common/gst-auth.c.orig Thu Mar 10 14:39:18 2005 -+++ src/common/gst-auth.c Thu Mar 10 14:39:50 2005 -@@ -142,12 +142,12 @@ gst_auth_run_term (GstTool *tool, gchar +--- src/common/gst-auth.c.orig Mon Aug 8 15:00:01 2005 ++++ src/common/gst-auth.c Sat Sep 10 01:47:35 2005 +@@ -55,6 +55,82 @@ + static int root; /* if we are root, no password is + required */ + ++#ifdef __FreeBSD__ ++static int ++_forkpty (int *amaster, char *name, ++ struct termios *termp, struct winsize *winp) ++{ ++ int master, slave; ++ char *line; ++ pid_t pid; ++ ++ master = posix_openpt (O_RDWR); ++ if (master == -1) ++ return (-1); ++ ++ if (grantpt (master) == -1) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ if (unlockpt (master) == -1) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ line = ptsname (master); ++ if (line == NULL) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ slave = open (line, O_RDWR); ++ if (slave < 0) ++ { ++ (void) close (master); ++ return (-1); ++ } ++ ++ if (amaster) ++ *amaster = master; ++ ++ if (name) ++ strcpy (name, line); ++ ++ if (termp) ++ (void) tcsetattr(slave, TCSAFLUSH, termp); ++ ++ if (winp) ++ (void) ioctl(slave, TIOCSWINSZ, (char *) winp); ++ ++ pid = fork (); ++ switch (pid) ++ { ++ case -1: ++ (void) close (slave); ++ (void) close (master); ++ return (-1); ++ case 0: ++ (void) close (master); ++ dup2 (slave, STDIN_FILENO); ++ dup2 (slave, STDOUT_FILENO); ++ dup2 (slave, STDERR_FILENO); ++ return (0); ++ default: ++ (void) close (slave); ++ return (pid); ++ } ++ ++ (void) close (master); ++ return (-1); ++} ++#else ++#define _forkpty forkpty ++#endif ++ + static void + gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text) + { +@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar + int p[2]; + + pipe (p); +- tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL); ++ tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL); + + if (tool->backend_pid < 0) { + gst_auth_display_error_message (tool, +@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar unsetenv("LANG"); unsetenv("LANGUAGE"); - dup2 (p[1], 1); - dup2 (p[1], 2); + dup2 (p[1], STDOUT_FILENO); -+ /*dup2 (p[1], 2);*/ ++ dup2 (p[1], STDERR_FILENO); close (p[0]); execv (args[0], args); diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c index 5134f30..9aaef15 100644 --- a/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c +++ b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c @@ -1,6 +1,21 @@ ---- src/common/gst-tool.c.orig Thu Mar 10 14:39:54 2005 -+++ src/common/gst-tool.c Thu Mar 10 14:40:00 2005 -@@ -1653,7 +1653,7 @@ poll_backend (GstTool *tool) +--- src/common/gst-tool.c.orig Tue Jun 21 15:07:05 2005 ++++ src/common/gst-tool.c Wed Jul 6 01:28:22 2005 +@@ -598,7 +598,14 @@ gst_tool_kill_backend_cb (GstDirectiveEn + if (tool->root_access == ROOT_ACCESS_SIMULATED_DISABLED) + tool->root_access = ROOT_ACCESS_SIMULATED; + ++#if 0 ++ /* ++ * We do not need to wait for the tool, ++ * as it will get SIGPIPE anyway. ++ * This waitpid causes problems on FreeBSD. ++ */ + waitpid (tool->backend_pid, NULL, 0); ++#endif + } + } + +@@ -1655,7 +1662,7 @@ poll_backend (GstTool *tool) struct pollfd fd; fd.fd = tool->read_fd; diff --git a/sysutils/gnomesystemtools/files/patch-src_network_location.c b/sysutils/gnomesystemtools/files/patch-src_network_location.c deleted file mode 100644 index e2577a6..0000000 --- a/sysutils/gnomesystemtools/files/patch-src_network_location.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/network/location.c.orig Thu Dec 23 13:16:33 2004 -+++ src/network/location.c Thu Dec 23 13:16:40 2004 -@@ -687,7 +687,7 @@ - static void - copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[]) - { -- gchar **string = (gchar **) list;; -+ gchar **string = (gchar **) list; - gchar *value; - - while (*string) diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist index a52125a..4880080 100644 --- a/sysutils/gnomesystemtools/pkg-plist +++ b/sysutils/gnomesystemtools/pkg-plist @@ -1,5 +1,5 @@ bin/network-admin -%%SERVICES%%bin/services-admin +bin/services-admin bin/shares-admin bin/time-admin bin/users-admin @@ -58,12 +58,13 @@ share/gnome-system-tools/pixmaps/turbolinux.png share/gnome-system-tools/pixmaps/unsupported-distro.png share/gnome-system-tools/pixmaps/users-groups.png share/gnome-system-tools/pixmaps/users.png +share/gnome-system-tools/pixmaps/vidalinux.png share/gnome-system-tools/pixmaps/vine.png share/gnome-system-tools/pixmaps/wavelan-16.png share/gnome-system-tools/pixmaps/wavelan-48.png share/gnome-system-tools/pixmaps/world_map-960.png share/gnome/applications/network.desktop -%%SERVICES%%share/gnome/applications/services.desktop +share/gnome/applications/services.desktop share/gnome/applications/shares.desktop share/gnome/applications/time.desktop share/gnome/applications/users.desktop @@ -77,18 +78,29 @@ share/gnome/help/services-admin/C/figures/service-properties.png share/gnome/help/services-admin/C/figures/services-tool.png share/gnome/help/services-admin/C/legal.xml share/gnome/help/services-admin/C/services-admin.xml +share/gnome/help/services-admin/nl/figures/service-properties.png +share/gnome/help/services-admin/nl/figures/services-tool.png +share/gnome/help/services-admin/nl/legal.xml +share/gnome/help/services-admin/nl/services-admin.xml share/gnome/help/time-admin/C/figures/time-map.png share/gnome/help/time-admin/C/figures/time-servers.png share/gnome/help/time-admin/C/figures/time-tool.png share/gnome/help/time-admin/C/legal.xml share/gnome/help/time-admin/C/time-admin.xml +share/gnome/help/time-admin/nl/figures/time-map.png +share/gnome/help/time-admin/nl/figures/time-servers.png +share/gnome/help/time-admin/nl/figures/time-tool.png +share/gnome/help/time-admin/nl/legal.xml +share/gnome/help/time-admin/nl/time-admin.xml share/gnome/help/users-admin/C/figures/users-tool.png share/gnome/help/users-admin/C/legal.xml share/gnome/help/users-admin/C/users-admin.xml share/gnome/omf/gnome-system-tools/boot-admin-C.omf share/gnome/omf/gnome-system-tools/network-admin-C.omf share/gnome/omf/gnome-system-tools/services-admin-C.omf +share/gnome/omf/gnome-system-tools/services-admin-nl.omf share/gnome/omf/gnome-system-tools/time-admin-C.omf +share/gnome/omf/gnome-system-tools/time-admin-nl.omf share/gnome/omf/gnome-system-tools/users-admin-C.omf share/locale/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo @@ -110,6 +122,7 @@ share/locale/fr/LC_MESSAGES/gnome-system-tools.mo share/locale/ga/LC_MESSAGES/gnome-system-tools.mo share/locale/gl/LC_MESSAGES/gnome-system-tools.mo share/locale/gu/LC_MESSAGES/gnome-system-tools.mo +share/locale/he/LC_MESSAGES/gnome-system-tools.mo share/locale/hi/LC_MESSAGES/gnome-system-tools.mo share/locale/hr/LC_MESSAGES/gnome-system-tools.mo share/locale/hu/LC_MESSAGES/gnome-system-tools.mo @@ -123,6 +136,8 @@ share/locale/mk/LC_MESSAGES/gnome-system-tools.mo share/locale/ml/LC_MESSAGES/gnome-system-tools.mo share/locale/mn/LC_MESSAGES/gnome-system-tools.mo share/locale/ms/LC_MESSAGES/gnome-system-tools.mo +share/locale/nb/LC_MESSAGES/gnome-system-tools.mo +share/locale/ne/LC_MESSAGES/gnome-system-tools.mo share/locale/nl/LC_MESSAGES/gnome-system-tools.mo share/locale/nn/LC_MESSAGES/gnome-system-tools.mo share/locale/no/LC_MESSAGES/gnome-system-tools.mo @@ -132,6 +147,7 @@ share/locale/pt/LC_MESSAGES/gnome-system-tools.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo share/locale/ro/LC_MESSAGES/gnome-system-tools.mo share/locale/ru/LC_MESSAGES/gnome-system-tools.mo +share/locale/rw/LC_MESSAGES/gnome-system-tools.mo share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo share/locale/sr/LC_MESSAGES/gnome-system-tools.mo @@ -143,15 +159,20 @@ share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo share/locale/vi/LC_MESSAGES/gnome-system-tools.mo share/locale/wa/LC_MESSAGES/gnome-system-tools.mo +share/locale/xh/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C @dirrm share/gnome/help/users-admin +@dirrm share/gnome/help/time-admin/nl/figures +@dirrm share/gnome/help/time-admin/nl @dirrm share/gnome/help/time-admin/C/figures @dirrm share/gnome/help/time-admin/C @dirrm share/gnome/help/time-admin +@dirrm share/gnome/help/services-admin/nl/figures +@dirrm share/gnome/help/services-admin/nl @dirrm share/gnome/help/services-admin/C/figures @dirrm share/gnome/help/services-admin/C @dirrm share/gnome/help/services-admin diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index a9af98d..0ed17b7 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,49 +3,48 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.77 2005/10/03 23:36:08 marcus Exp $ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= CD burner view for Nautilus -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk - USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= ncb.schemas +OPTIONS= DVD "Enable DVD support" on \ + CJK "Use cdrtools-cjk instead of cdrtools" off + .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/bin/growisofs) -WITH_DVD= yes +.if defined(WITH_CJK) +RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk +WITHOUT_DVD= yes +.else +RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools .endif -.if defined(WITH_DVD) +.if !defined(WITHOUT_DVD) RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools .endif -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "${PORTNAME} has the following configurable option(s):" - @${ECHO_MSG} " WITH_DVD Enable DVD burning support" - @${ECHO_MSG} "" - post-install: @${CAT} ${PKGMESSAGE} diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 30c8c2d..8903df2 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-cd-burner-2.10.2.tar.bz2) = ed87311d620041d118d408072341343b -SIZE (gnome2/nautilus-cd-burner-2.10.2.tar.bz2) = 544237 +MD5 (gnome2/nautilus-cd-burner-2.12.1.tar.bz2) = 6fb90feb52340627d4b93a1127654a00 +SIZE (gnome2/nautilus-cd-burner-2.12.1.tar.bz2) = 614118 diff --git a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c new file mode 100644 index 0000000..aab64aa --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c @@ -0,0 +1,11 @@ +--- mapping-protocol.c.orig Tue May 17 17:14:35 2005 ++++ mapping-protocol.c Tue May 17 17:15:24 2005 +@@ -24,6 +24,8 @@ + * William Jon McCann <mccann@jhu.edu> + */ + ++#include <sys/types.h> ++#include <sys/time.h> + #include <unistd.h> + #include <string.h> + #include <fcntl.h> diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c new file mode 100644 index 0000000..e836eb9 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c @@ -0,0 +1,30 @@ +--- nautilus-burn-drive.c.orig Tue Aug 23 11:55:56 2005 ++++ nautilus-burn-drive.c Sat Sep 10 20:32:26 2005 +@@ -471,7 +471,6 @@ get_disc_type (const char *dev_path) + struct cd_toc_entry entry; + int i; + #endif +- int type; + #ifndef CDROM_DATA_TRACK + #define CDROM_DATA_TRACK 4 + #endif +@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path) + + if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) { + close (fd); ++ if (errno == EINVAL) ++ /* If you try to read the TOC header of a blank disc ++ * on FreeBSD, you get EINVAL. */ ++ return CDS_NO_INFO; + return -1; + } + +@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_ + *is_blank = mmc_profile & 0x10000; + + disc_type = get_disc_type (device); +- disc_type_get_info (disc_type, is_blank, has_data, has_audio); ++ disc_type_get_info (disc_type, NULL, has_data, has_audio); + + switch (mmc_profile & 0xFFFF) { + case -1: diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c index c545be7..9d286fd 100644 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c @@ -1,20 +1,18 @@ ---- nautilus-cd-burner.c.orig Mon Feb 28 19:40:05 2005 -+++ nautilus-cd-burner.c Mon Feb 28 20:05:56 2005 -@@ -23,6 +23,8 @@ - * Bastien Nocera <hadess@hadess.net> +--- nautilus-cd-burner.c.orig Wed May 11 18:56:59 2005 ++++ nautilus-cd-burner.c Tue May 17 17:11:49 2005 +@@ -25,6 +25,8 @@ + * William Jon McCann <mccann@jhu.edu> */ +#include <sys/types.h> +#include <sys/stat.h> - #include <gtk/gtk.h> - #include <gtk/gtkfilesel.h> - #include <gtk/gtkseparatormenuitem.h> -@@ -843,8 +845,19 @@ + #include <time.h> + #include <stdio.h> + #include <stdlib.h> +@@ -1103,10 +1105,20 @@ burn_cd (const NautilusBurnDrive *drive, } if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) { -- g_free (filename); -- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); + gchar *path1; + + path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir()); @@ -23,11 +21,13 @@ + mkdir (path1, 0700); + } + -+ if (filename != NULL) { -+ g_free (filename); -+ } + g_free (toc_filename); + g_free (filename); + +- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); + filename = g_build_filename (path1, "image.iso.XXXXXX", NULL); + g_free (path1); - fd = g_mkstemp(filename); ++ + fd = g_mkstemp (filename); close (fd); diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index b368003..f58bdd6 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -6,7 +6,7 @@ include/libnautilus-burn/nautilus-burn-recorder.h lib/gnome-vfs-2.0/modules/libmapping.so lib/libnautilus-burn.a lib/libnautilus-burn.so -lib/libnautilus-burn.so.1 +lib/libnautilus-burn.so.2 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so libdata/pkgconfig/libnautilus-burn.pc libexec/mapping-daemon @@ -58,6 +58,7 @@ share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo @@ -78,10 +79,13 @@ share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo share/locale/th/LC_MESSAGES/nautilus-cd-burner.mo share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/ug/LC_MESSAGES/nautilus-cd-burner.mo share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm share/gnome/nautilus-cd-burner @dirrm include/libnautilus-burn diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 1e2e453..54bde9d 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.12 2005/09/04 18:51:49 marcus Exp $ # PORTNAME= system-tools-backends -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo index 1fd2888..da6f030 100644 --- a/sysutils/system-tools-backends/distinfo +++ b/sysutils/system-tools-backends/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/system-tools-backends-1.2.0.tar.bz2) = 96b00eb0f800c1b5346be2f71d4dc3b2 -SIZE (gnome2/system-tools-backends-1.2.0.tar.bz2) = 532611 +MD5 (gnome2/system-tools-backends-1.4.0.tar.bz2) = 71c9f6fc393ff05d29c7e6883e83c1b4 +SIZE (gnome2/system-tools-backends-1.4.0.tar.bz2) = 706880 diff --git a/sysutils/system-tools-backends/files/patch-network-conf.in b/sysutils/system-tools-backends/files/patch-network-conf.in new file mode 100644 index 0000000..e23863c --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-network-conf.in @@ -0,0 +1,11 @@ +--- network-conf.in.orig Fri Aug 26 00:54:38 2005 ++++ network-conf.in Fri Aug 26 00:55:10 2005 +@@ -75,7 +75,7 @@ + "conectiva-9", "conectiva-10", + "vine-3.0", "vine-3.1", + "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", +- "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6"); ++ "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7"); + + $description =<<"end_of_description;"; + Configures all network parameters and interfaces. diff --git a/sysutils/system-tools-backends/files/patch-network.pl.in b/sysutils/system-tools-backends/files/patch-network.pl.in index 29bde7d..22a06fb 100644 --- a/sysutils/system-tools-backends/files/patch-network.pl.in +++ b/sysutils/system-tools-backends/files/patch-network.pl.in @@ -1,20 +1,67 @@ ---- network.pl.in.orig Mon Mar 7 17:33:59 2005 -+++ network.pl.in Sun Apr 24 02:36:51 2005 -@@ -777,7 +777,7 @@ +--- network.pl.in.orig Tue Aug 23 05:58:01 2005 ++++ network.pl.in Fri Aug 26 00:56:03 2005 +@@ -522,6 +522,7 @@ + "vlos-1.2" => "debian-2.2", + "freebsd-5" => "debian-2.2", + "freebsd-6" => "debian-2.2", ++ "freebsd-7" => "debian-2.2", + ); + + return $cmd_map{$dist_map{$gst_dist}}; +@@ -791,7 +792,7 @@ $types_cache{$dev} = "modem"; } } -- elsif ($dev =~ /(eth|dc|ed|bfe)[0-9]/) +- elsif ($dev =~ /^(eth|dc|ed|bfe|em|fxp|bge|de|xl|ixgb|txp|vx|lge|nge|pcn|re|rl|sf|sis|sk|ste|ti|tl|tx|vge|vr|wb|cs|ex|ep|fe|ie|lnc|sn|xe|le|an|awi|wi|ndis|wlaue|axe|cue|kue|rue|fwe|nve)[0-9]/) + elsif ($dev =~ /(eth|dc|ed|bfe|em|fxp|bge|de|xl|ixgb|txp|vx|lge|nge|pcn|re|rl|sf|sis|sk|ste|ti|tl|tx|vge|vr|wb|cs|ex|ep|fe|ie|lnc|sn|xe|le|an|awi|wi|ndis|wl|aue|axe|cue|kue|rue|fwe|nve|hme|ath|iwi|ipw|ral|ural|my)[0-9]/) { $types_cache{$dev} = "ethernet"; } -@@ -4285,7 +4285,7 @@ - table => - [ - [ "hostname", \&gst_parse_sh_re, RC_CONF, hostname, "^([^\.]*)\." ], -- [ "domain", \&gst_parse_sh_re, RC_CONF, hostname, "\.([^\.]*)\$" ], -+ [ "domain", \&gst_parse_split_first_str, RESOLV_CONF, "domain", "[ \t]+" ], - [ "nameserver", \&gst_parse_split_all_unique_hash_comment, RESOLV_CONF, "nameserver", "[ \t]+" ], - [ "searchdomain", \&gst_parse_split_first_array_unique, RESOLV_CONF, "search", "[ \t]+", "[ \t]+" ], - [ "statichost", \&gst_parse_split_hash, HOSTS, "[ \t]+", "[ \t]+" ], +@@ -1803,6 +1804,7 @@ + "gentoo" => \&gst_network_deb22_get_file, + "freebsd-5" => \&gst_network_deb22_get_file, + "freebsd-6" => \&gst_network_deb22_get_file, ++ "freebsd-7" => \&gst_network_deb22_get_file, + ); + + $proc = $dist_map{$gst_dist}; +@@ -3906,6 +3908,7 @@ + "vlos-1.2" => "", + "freebsd-5" => "", + "freebsd-6" => "", ++ "freebsd-7" => "", + ); + + $dev = $dist_map {$gst_dist}; +@@ -4034,6 +4037,7 @@ + "vlos-1.2" => "vlos-1.2", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = +@@ -4478,6 +4482,7 @@ + "vlos-1.2" => "vlos-1.2", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = +@@ -5352,6 +5357,7 @@ + "vlos-1.2" => "vlos-1.2", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = +@@ -5782,6 +5788,7 @@ + "vlos-1.2" => "vlos-1.2", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = diff --git a/sysutils/system-tools-backends/files/patch-platform.pl.in b/sysutils/system-tools-backends/files/patch-platform.pl.in new file mode 100644 index 0000000..81ad3b2 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-platform.pl.in @@ -0,0 +1,10 @@ +--- platform.pl.in.orig Fri Aug 26 00:56:21 2005 ++++ platform.pl.in Fri Aug 26 00:56:36 2005 +@@ -77,6 +77,7 @@ + "freebsd-4" => "FreeBSD 4", + "freebsd-5" => "FreeBSD 5", + "freebsd-6" => "FreeBSD 6", ++ "freebsd-7" => "FreeBSD 7", + "gentoo" => "Gentoo Linux", + "vlos-1.2" => "Vida Linux OS 1.2", + "archlinux-0.7" => "Arch Linux 0.7", diff --git a/sysutils/system-tools-backends/files/patch-service.pl.in b/sysutils/system-tools-backends/files/patch-service.pl.in new file mode 100644 index 0000000..1162f27 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-service.pl.in @@ -0,0 +1,18 @@ +--- service.pl.in.orig Fri Aug 26 00:57:01 2005 ++++ service.pl.in Fri Aug 26 00:57:13 2005 +@@ -227,6 +227,7 @@ + + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + %runlevels= +@@ -1571,6 +1572,7 @@ + + "freebsd-5" => \&gst_service_rcng_get_status, + "freebsd-6" => \&gst_service_rcng_get_status, ++ "freebsd-7" => \&gst_service_rcng_get_status, + ); + my $proc; + diff --git a/sysutils/system-tools-backends/files/patch-services-conf.in b/sysutils/system-tools-backends/files/patch-services-conf.in new file mode 100644 index 0000000..5a05ce2 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-services-conf.in @@ -0,0 +1,11 @@ +--- services-conf.in.orig Fri Aug 26 00:57:28 2005 ++++ services-conf.in Fri Aug 26 00:57:37 2005 +@@ -55,7 +55,7 @@ + "pld-1.0", "pld-1.1", "pld-1.99", + "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", + "vine-3.0", "vine-3.1", +- "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "suse-9.0", "suse-9.1"); ++ "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7", "suse-9.0", "suse-9.1"); + + $description =<<"end_of_description;"; + Configures which services are to be started or stopped at which runlevels diff --git a/sysutils/system-tools-backends/files/patch-shares-conf.in b/sysutils/system-tools-backends/files/patch-shares-conf.in new file mode 100644 index 0000000..5fa1e78 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-shares-conf.in @@ -0,0 +1,10 @@ +--- shares-conf.in.orig Fri Aug 26 00:57:50 2005 ++++ shares-conf.in Fri Aug 26 00:57:57 2005 +@@ -557,6 +557,7 @@ + "vlos-1.2" => "gentoo", + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_table = diff --git a/sysutils/system-tools-backends/files/patch-time-conf.in b/sysutils/system-tools-backends/files/patch-time-conf.in new file mode 100644 index 0000000..1fe69aa --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-time-conf.in @@ -0,0 +1,27 @@ +--- time-conf.in.orig Fri Aug 26 00:58:10 2005 ++++ time-conf.in Fri Aug 26 00:58:28 2005 +@@ -71,7 +71,7 @@ + "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", + "gentoo", "vlos-1.2", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "specifix", + "vine-3.0", "vine-3.1", +- "freebsd-5", "freebsd-6"); ++ "freebsd-5", "freebsd-6", "freebsd-7"); + + $description =<<"end_of_description;"; + Configures your system clock, timezone and time server list. +@@ -551,6 +551,7 @@ + + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = +@@ -782,6 +783,7 @@ + + "freebsd-5" => "freebsd-5", + "freebsd-6" => "freebsd-5", ++ "freebsd-7" => "freebsd-5", + ); + + my %dist_tables = diff --git a/sysutils/system-tools-backends/files/patch-users-conf.in b/sysutils/system-tools-backends/files/patch-users-conf.in new file mode 100644 index 0000000..11f7015 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-users-conf.in @@ -0,0 +1,19 @@ +--- users-conf.in.orig Fri Aug 26 00:58:40 2005 ++++ users-conf.in Fri Aug 26 00:58:54 2005 +@@ -76,7 +76,7 @@ + "debian-2.2", "debian-3.0", "debian-sarge", + "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0", + "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", +- "freebsd-4", "freebsd-5", "freebsd-6", ++ "freebsd-4", "freebsd-5", "freebsd-6", "freebsd-7", + "gentoo", "vlos-1.2", + "archlinux-0.7", + "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "specifix", "vine-3.0", "vine-3.1"); +@@ -373,6 +373,7 @@ + 'freebsd-4' => $freebsd_logindefs_defaults, + 'freebsd-5' => $freebsd_logindefs_defaults, + 'freebsd-6' => $freebsd_logindefs_defaults, ++ 'freebsd-7' => $freebsd_logindefs_defaults, + 'suse-7.0' => $gentoo_logindefs_defaults, + 'suse-9.0' => $gentoo_logindefs_defaults, + 'suse-9.1' => $gentoo_logindefs_defaults, diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index da943e8..02ed2d8 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -1,51 +1,54 @@ libdata/pkgconfig/system-tools-backends.pc share/aclocal/system-tools-backends.m4 -share/locale/ar/LC_MESSAGES/setup-tools-backends.mo -share/locale/az/LC_MESSAGES/setup-tools-backends.mo -share/locale/bg/LC_MESSAGES/setup-tools-backends.mo -share/locale/bn/LC_MESSAGES/setup-tools-backends.mo -share/locale/bs/LC_MESSAGES/setup-tools-backends.mo -share/locale/ca/LC_MESSAGES/setup-tools-backends.mo -share/locale/cs/LC_MESSAGES/setup-tools-backends.mo -share/locale/da/LC_MESSAGES/setup-tools-backends.mo -share/locale/de/LC_MESSAGES/setup-tools-backends.mo -share/locale/el/LC_MESSAGES/setup-tools-backends.mo -share/locale/en_CA/LC_MESSAGES/setup-tools-backends.mo -share/locale/en_GB/LC_MESSAGES/setup-tools-backends.mo -share/locale/es/LC_MESSAGES/setup-tools-backends.mo -share/locale/eu/LC_MESSAGES/setup-tools-backends.mo -share/locale/fi/LC_MESSAGES/setup-tools-backends.mo -share/locale/fr/LC_MESSAGES/setup-tools-backends.mo -share/locale/gu/LC_MESSAGES/setup-tools-backends.mo -share/locale/hi/LC_MESSAGES/setup-tools-backends.mo -share/locale/hr/LC_MESSAGES/setup-tools-backends.mo -share/locale/hu/LC_MESSAGES/setup-tools-backends.mo -share/locale/id/LC_MESSAGES/setup-tools-backends.mo -share/locale/it/LC_MESSAGES/setup-tools-backends.mo -share/locale/ja/LC_MESSAGES/setup-tools-backends.mo -share/locale/ko/LC_MESSAGES/setup-tools-backends.mo -share/locale/lt/LC_MESSAGES/setup-tools-backends.mo -share/locale/ms/LC_MESSAGES/setup-tools-backends.mo -share/locale/nb/LC_MESSAGES/setup-tools-backends.mo -share/locale/nl/LC_MESSAGES/setup-tools-backends.mo -share/locale/no/LC_MESSAGES/setup-tools-backends.mo -share/locale/pa/LC_MESSAGES/setup-tools-backends.mo -share/locale/pl/LC_MESSAGES/setup-tools-backends.mo -share/locale/pt/LC_MESSAGES/setup-tools-backends.mo -share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo -share/locale/ro/LC_MESSAGES/setup-tools-backends.mo -share/locale/sk/LC_MESSAGES/setup-tools-backends.mo -share/locale/sq/LC_MESSAGES/setup-tools-backends.mo -share/locale/sr/LC_MESSAGES/setup-tools-backends.mo -share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo -share/locale/sv/LC_MESSAGES/setup-tools-backends.mo -share/locale/ta/LC_MESSAGES/setup-tools-backends.mo -share/locale/th/LC_MESSAGES/setup-tools-backends.mo -share/locale/tr/LC_MESSAGES/setup-tools-backends.mo -share/locale/uk/LC_MESSAGES/setup-tools-backends.mo -share/locale/vi/LC_MESSAGES/setup-tools-backends.mo -share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo -share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo +share/locale/ar/LC_MESSAGES/system-tools-backends.mo +share/locale/az/LC_MESSAGES/system-tools-backends.mo +share/locale/bg/LC_MESSAGES/system-tools-backends.mo +share/locale/bn/LC_MESSAGES/system-tools-backends.mo +share/locale/bs/LC_MESSAGES/system-tools-backends.mo +share/locale/ca/LC_MESSAGES/system-tools-backends.mo +share/locale/cs/LC_MESSAGES/system-tools-backends.mo +share/locale/da/LC_MESSAGES/system-tools-backends.mo +share/locale/de/LC_MESSAGES/system-tools-backends.mo +share/locale/el/LC_MESSAGES/system-tools-backends.mo +share/locale/en_CA/LC_MESSAGES/system-tools-backends.mo +share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo +share/locale/es/LC_MESSAGES/system-tools-backends.mo +share/locale/eu/LC_MESSAGES/system-tools-backends.mo +share/locale/fi/LC_MESSAGES/system-tools-backends.mo +share/locale/fr/LC_MESSAGES/system-tools-backends.mo +share/locale/gu/LC_MESSAGES/system-tools-backends.mo +share/locale/hi/LC_MESSAGES/system-tools-backends.mo +share/locale/hr/LC_MESSAGES/system-tools-backends.mo +share/locale/hu/LC_MESSAGES/system-tools-backends.mo +share/locale/id/LC_MESSAGES/system-tools-backends.mo +share/locale/it/LC_MESSAGES/system-tools-backends.mo +share/locale/ja/LC_MESSAGES/system-tools-backends.mo +share/locale/ko/LC_MESSAGES/system-tools-backends.mo +share/locale/lt/LC_MESSAGES/system-tools-backends.mo +share/locale/ms/LC_MESSAGES/system-tools-backends.mo +share/locale/nb/LC_MESSAGES/system-tools-backends.mo +share/locale/ne/LC_MESSAGES/system-tools-backends.mo +share/locale/nl/LC_MESSAGES/system-tools-backends.mo +share/locale/no/LC_MESSAGES/system-tools-backends.mo +share/locale/pa/LC_MESSAGES/system-tools-backends.mo +share/locale/pl/LC_MESSAGES/system-tools-backends.mo +share/locale/pt/LC_MESSAGES/system-tools-backends.mo +share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo +share/locale/ro/LC_MESSAGES/system-tools-backends.mo +share/locale/rw/LC_MESSAGES/system-tools-backends.mo +share/locale/sk/LC_MESSAGES/system-tools-backends.mo +share/locale/sq/LC_MESSAGES/system-tools-backends.mo +share/locale/sr/LC_MESSAGES/system-tools-backends.mo +share/locale/sr@Latn/LC_MESSAGES/system-tools-backends.mo +share/locale/sv/LC_MESSAGES/system-tools-backends.mo +share/locale/ta/LC_MESSAGES/system-tools-backends.mo +share/locale/th/LC_MESSAGES/system-tools-backends.mo +share/locale/tr/LC_MESSAGES/system-tools-backends.mo +share/locale/uk/LC_MESSAGES/system-tools-backends.mo +share/locale/vi/LC_MESSAGES/system-tools-backends.mo +share/locale/xh/LC_MESSAGES/system-tools-backends.mo +share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo +share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo share/setup-tool-backends/files/general_isdn_ppp_options share/setup-tool-backends/scripts/boot-conf share/setup-tool-backends/scripts/boot-grub.pl @@ -94,3 +97,7 @@ share/setup-tool-backends/scripts/xml.pl @dirrm share/setup-tool-backends/scripts @dirrm share/setup-tool-backends/files @dirrm share/setup-tool-backends +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true |
