diff options
Diffstat (limited to 'sysutils/gnomecontrolcenter2')
6 files changed, 63 insertions, 64 deletions
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 94b63a0febd0..10adbe119774 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -3,15 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $ +# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.109 2006/04/18 02:28:56 marcus Exp $ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.12.3 -PORTREVISION= 1 +PORTVERSION= 2.14.1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.12 +MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,16 +21,20 @@ COMMENT= Control center for GNOME 2 project LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier USE_BZIP2= yes +USE_GETTEXT= yes USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GSTREAMER= yes +USE_GSTREAMER= good WANT_GNOME= yes USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ - gnomemenus desktopfileutils + gnomemenus desktopfileutils nautilus2 GNU_CONFIGURE= yes INSTALLS_OMF= yes +INSTALLS_ICONS= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --enable-gstreamer=0.10 \ + --disable-hal CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -48,10 +52,6 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= Does not build on 4.X -.endif - .if ${HAVE_GNOME:Mevolutiondataserver}!="" USE_GNOME+= evolutiondataserver CONFIGURE_ARGS+=--enable-aboutme @@ -64,8 +64,6 @@ PLIST_SUB+= ABOUTME="@comment " 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 diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index 7e03447ea0e1..02add5cb6a2f 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/control-center-2.12.3.tar.bz2) = e8f57ec1852d08d421016732b605a615 -SHA256 (gnome2/control-center-2.12.3.tar.bz2) = c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8 -SIZE (gnome2/control-center-2.12.3.tar.bz2) = 1787009 +MD5 (gnome2/control-center-2.14.1.tar.bz2) = d673df12692ee08b9fc3d69739f8779e +SHA256 (gnome2/control-center-2.14.1.tar.bz2) = c55cc800a6d636b8a98885a68685eff32db158fe1b638ff02ff89394ee6e6163 +SIZE (gnome2/control-center-2.14.1.tar.bz2) = 1869223 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 index 7ea6bb0dd359..49727c882a89 100644 --- 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 @@ -1,16 +1,25 @@ ---- 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> +--- capplets/about-me/gnome-about-me-password.c.orig Mon Nov 28 10:02:57 2005 ++++ capplets/about-me/gnome-about-me-password.c Wed Dec 14 13:56:42 2005 +@@ -25,7 +25,9 @@ + # include <config.h> + #endif + +#ifndef __FreeBSD__ - #include <pty.h> -+#else + #include <stropts.h> ++#endif + #include <gnome.h> + #include <pwd.h> + #include <stdlib.h> +@@ -45,6 +47,12 @@ + + #if __sun + #include <sys/types.h> ++#include <signal.h> ++#endif ++ ++#if __FreeBSD__ +#include <sys/types.h> +#include <libutil.h> -+#endif + #include <signal.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 deleted file mode 100644 index 0d1f85f32c7f..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c +++ /dev/null @@ -1,34 +0,0 @@ ---- 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-gnome-settings-daemon_actions_acme-volume-gstreamer.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c new file mode 100644 index 000000000000..3362406ddcc0 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c @@ -0,0 +1,10 @@ +--- gnome-settings-daemon/actions/acme-volume-gstreamer.c.orig Mon Apr 17 22:23:18 2006 ++++ gnome-settings-daemon/actions/acme-volume-gstreamer.c Mon Apr 17 22:25:17 2006 +@@ -29,6 +29,7 @@ + + #ifdef HAVE_GST10 + #include <gst/gst.h> ++#include <gst/audio/mixerutils.h> + #include <gst/interfaces/mixer.h> + #include <gst/interfaces/propertyprobe.h> + #else diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index 99756d3136ad..faafe835eab5 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -129,6 +129,9 @@ 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/desktop-directories/font-method.directory +share/gnome/desktop-directories/theme-method.directory +share/gnome/gnome-default-applications/gnome-default-applications.xml 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 @@ -144,12 +147,12 @@ 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/help/control-center/es/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/omf/control-center/control-center-es.omf share/gnome/pixmaps/display-capplet.png -share/gnome/vfolders/font-method.directory -share/gnome/vfolders/theme-method.directory 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 @@ -158,12 +161,14 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo share/locale/be/LC_MESSAGES/control-center-2.0.mo share/locale/bg/LC_MESSAGES/control-center-2.0.mo share/locale/bn/LC_MESSAGES/control-center-2.0.mo +share/locale/br/LC_MESSAGES/control-center-2.0.mo share/locale/bs/LC_MESSAGES/control-center-2.0.mo share/locale/ca/LC_MESSAGES/control-center-2.0.mo share/locale/cs/LC_MESSAGES/control-center-2.0.mo share/locale/cy/LC_MESSAGES/control-center-2.0.mo share/locale/da/LC_MESSAGES/control-center-2.0.mo share/locale/de/LC_MESSAGES/control-center-2.0.mo +share/locale/dz/LC_MESSAGES/control-center-2.0.mo share/locale/el/LC_MESSAGES/control-center-2.0.mo share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo @@ -184,6 +189,7 @@ share/locale/id/LC_MESSAGES/control-center-2.0.mo 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/ka/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 @@ -220,20 +226,30 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo share/locale/wa/LC_MESSAGES/control-center-2.0.mo share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo +share/locale/zh_HK/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 @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br @dirrm share/gnome/omf/control-center +@dirrm share/gnome/help/control-center/es @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center -@dirrmtry share/gnome/gnome-background-properties +@dirrm share/gnome/gnome-default-applications +@dirrm share/gnome/gnome-background-properties +@dirrm share/gnome/desktop-directories @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps |