diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
| commit | 190418a078b1eb7ea3c5d38a08bdab3cbd422086 (patch) | |
| tree | bb336ccecde7052d26d3d8d8c97238744a373aad /devel | |
| parent | 6b0c40606cac591d75b88d05c7276bd16c369035 (diff) | |
Notes
Diffstat (limited to 'devel')
63 files changed, 292 insertions, 1100 deletions
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index f06ccc438678..ae4b62d0e793 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -6,32 +6,36 @@ # PORTNAME= bugbuddy -PORTVERSION= 2.8.0 -PORTREVISION= 3 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.8 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.10 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils + USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ + desktopfileutils GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .include <bsd.port.mk> diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index 0b776637feb8..d7003e3d31ca 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea -SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303 +MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac +SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182 diff --git a/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf b/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf deleted file mode 100644 index 1388788efaf5..000000000000 --- a/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf +++ /dev/null @@ -1,12 +0,0 @@ ---- docs/C/bug-buddy-C.omf.orig Tue Nov 9 21:19:52 2004 -+++ docs/C/bug-buddy-C.omf Tue Nov 9 21:19:57 2004 -@@ -3,8 +3,8 @@ - <resource> - <creator>baudais@kkpsi.org (Eric Baudais)</creator> - <creator>telsa@linuxchix.org (Telsa Gwynne)</creator> -- <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor> - <maintainer>docs@gnome.org (GNOME Documentation Project)</maintainer> -+ <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor> - <title>Bug Buddy Manual</title> - <date>September 11, 2004</date> - <version identifier="2.8" date="2004-09-11" description="Updated to bug buddy 2.8"/> diff --git a/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in new file mode 100644 index 000000000000..1074dd7520d2 --- /dev/null +++ b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in @@ -0,0 +1,12 @@ +--- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005 ++++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005 +@@ -0,0 +1,9 @@ ++<?xml version="1.0" standalone="no"?> ++<omf> ++ <resource> ++ <subject category="GNOME|Development"/> ++ <type>user's guide</type> ++ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/> ++ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/> ++ </resource> ++</omf> diff --git a/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c new file mode 100644 index 000000000000..bc0a6ba22c2f --- /dev/null +++ b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c @@ -0,0 +1,10 @@ +--- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004 ++++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004 +@@ -36,6 +36,7 @@ + #include <sys/types.h> + #include <sysexits.h> + #include <sys/wait.h> ++#include <signal.h> + + #if 0 + static char *help_pages[] = { diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index cd4e2b3e301c..16d22f537467 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -1,8 +1,8 @@ bin/bug-buddy share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy-core.desktop -share/gnome/applications/bug-buddy.desktop @exec update-desktop-database > /dev/null || /usr/bin/true +share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png share/gnome/bug-buddy/bugzilla/gnome.bugzilla @@ -61,6 +61,7 @@ share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nb/LC_MESSAGES/bug-buddy.mo +share/locale/ne/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo share/locale/no/LC_MESSAGES/bug-buddy.mo diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index f06ccc438678..ae4b62d0e793 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -6,32 +6,36 @@ # PORTNAME= bugbuddy -PORTVERSION= 2.8.0 -PORTREVISION= 3 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.8 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.10 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils + USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ + desktopfileutils GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .include <bsd.port.mk> diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo index 0b776637feb8..d7003e3d31ca 100644 --- a/devel/bugbuddy/distinfo +++ b/devel/bugbuddy/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea -SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303 +MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac +SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182 diff --git a/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf b/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf deleted file mode 100644 index 1388788efaf5..000000000000 --- a/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf +++ /dev/null @@ -1,12 +0,0 @@ ---- docs/C/bug-buddy-C.omf.orig Tue Nov 9 21:19:52 2004 -+++ docs/C/bug-buddy-C.omf Tue Nov 9 21:19:57 2004 -@@ -3,8 +3,8 @@ - <resource> - <creator>baudais@kkpsi.org (Eric Baudais)</creator> - <creator>telsa@linuxchix.org (Telsa Gwynne)</creator> -- <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor> - <maintainer>docs@gnome.org (GNOME Documentation Project)</maintainer> -+ <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor> - <title>Bug Buddy Manual</title> - <date>September 11, 2004</date> - <version identifier="2.8" date="2004-09-11" description="Updated to bug buddy 2.8"/> diff --git a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in new file mode 100644 index 000000000000..1074dd7520d2 --- /dev/null +++ b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in @@ -0,0 +1,12 @@ +--- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005 ++++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005 +@@ -0,0 +1,9 @@ ++<?xml version="1.0" standalone="no"?> ++<omf> ++ <resource> ++ <subject category="GNOME|Development"/> ++ <type>user's guide</type> ++ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/> ++ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/> ++ </resource> ++</omf> diff --git a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c new file mode 100644 index 000000000000..bc0a6ba22c2f --- /dev/null +++ b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c @@ -0,0 +1,10 @@ +--- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004 ++++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004 +@@ -36,6 +36,7 @@ + #include <sys/types.h> + #include <sysexits.h> + #include <sys/wait.h> ++#include <signal.h> + + #if 0 + static char *help_pages[] = { diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist index cd4e2b3e301c..16d22f537467 100644 --- a/devel/bugbuddy/pkg-plist +++ b/devel/bugbuddy/pkg-plist @@ -1,8 +1,8 @@ bin/bug-buddy share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy-core.desktop -share/gnome/applications/bug-buddy.desktop @exec update-desktop-database > /dev/null || /usr/bin/true +share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png share/gnome/bug-buddy/bugzilla/gnome.bugzilla @@ -61,6 +61,7 @@ share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nb/LC_MESSAGES/bug-buddy.mo +share/locale/ne/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo share/locale/no/LC_MESSAGES/bug-buddy.mo diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index de9618dd1fcd..95438dda0a76 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gconf2 -PORTVERSION= 2.8.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.8 +MASTER_SITE_SUBDIR= sources/GConf/2.10 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,7 +19,7 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomehier orbit2 gtk20 libxml2 linc +USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index aca3f01b6deb..cea5ecfa28cf 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/GConf-2.8.1.tar.bz2) = b1173cbe33404bcbcc15710ce2a28f67 -SIZE (gnome2/GConf-2.8.1.tar.bz2) = 1730812 +MD5 (gnome2/GConf-2.10.0.tar.bz2) = a7cd37be4e317195a6668a086fc72033 +SIZE (gnome2/GConf-2.10.0.tar.bz2) = 1734260 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index eb4b1a71a6a9..279911c02104 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -56,6 +56,7 @@ share/locale/el/LC_MESSAGES/GConf2.mo share/locale/en_CA/LC_MESSAGES/GConf2.mo share/locale/en_GB/LC_MESSAGES/GConf2.mo share/locale/es/LC_MESSAGES/GConf2.mo +share/locale/et/LC_MESSAGES/GConf2.mo share/locale/eu/LC_MESSAGES/GConf2.mo share/locale/fa/LC_MESSAGES/GConf2.mo share/locale/fi/LC_MESSAGES/GConf2.mo @@ -97,6 +98,7 @@ share/locale/ta/LC_MESSAGES/GConf2.mo share/locale/tr/LC_MESSAGES/GConf2.mo share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo +share/locale/xh/LC_MESSAGES/GConf2.mo share/locale/yi/LC_MESSAGES/GConf2.mo share/locale/zh_CN/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 1b2a139341b9..a6d5ad9a05f5 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -6,10 +6,11 @@ # PORTNAME= glib -PORTVERSION= 2.4.8 +PORTVERSION= 2.6.3 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.4,} \ - ftp://ftp.gtk.org/pub/gtk/v2.4/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.6,} \ + ftp://ftp.gtk.org/pub/gtk/v2.6/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -38,4 +39,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 600012 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ + s|%%X11BASE%%|${X11BASE}|g' \ + ${WRKSRC}/glib/gutils.c + +.include <bsd.port.post.mk> diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index da94272ac8f6..0d5183d695b5 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/glib-2.4.8.tar.bz2) = e160a5feecf46e0fbb36db09c356953c -SIZE (gnome2/glib-2.4.8.tar.bz2) = 2152755 +MD5 (gnome2/glib-2.6.3.tar.bz2) = 8f69ad5387197114b356efc64ce88d77 +SIZE (gnome2/glib-2.6.3.tar.bz2) = 2300144 diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c new file mode 100644 index 000000000000..8796dd629960 --- /dev/null +++ b/devel/glib20/files/extra-patch-gthread_gthread-posix.c @@ -0,0 +1,32 @@ +--- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004 ++++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005 +@@ -115,7 +115,11 @@ + # define PRIORITY_NORMAL_VALUE priority_normal_value + #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ + ++#define G_THREAD_STACK_SIZE32 (1*1024*1024) ++#define G_THREAD_STACK_SIZE64 (2*1024*1024) ++ + static gulong g_thread_min_stack_size = 0; ++static gulong g_thread_default_stack_size = 0; + + #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) + +@@ -307,8 +312,16 @@ + if (stack_size) + { + stack_size = MAX (g_thread_min_stack_size, stack_size); +- posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); + } ++ else ++ { ++ if (sizeof(void *) == 8) ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; ++ else ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; ++ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); ++ } ++ posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); + #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */ + + #ifdef PTHREAD_SCOPE_SYSTEM diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c new file mode 100644 index 000000000000..d32b910ad8ca --- /dev/null +++ b/devel/glib20/files/patch-glib_gutils.c @@ -0,0 +1,20 @@ +--- glib/gutils.c.orig Sat Sep 4 15:49:27 2004 ++++ glib/gutils.c Sat Sep 4 15:55:24 2004 +@@ -1466,7 +1466,7 @@ + data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); + + if (!data_dirs || !data_dirs[0]) +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + #endif + data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); + +@@ -1509,7 +1509,7 @@ + conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); + + if (!conf_dirs || !conf_dirs[0]) +- conf_dirs = "/etc/xdg"; ++ conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg"; + #endif + conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); + } diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c index bdf24590d4cc..47c5ab8f1591 100644 --- a/devel/glib20/files/patch-gthread_gthread-posix.c +++ b/devel/glib20/files/patch-gthread_gthread-posix.c @@ -1,15 +1,7 @@ ---- gthread/gthread-posix.c.orig Tue Sep 7 17:57:53 2004 -+++ gthread/gthread-posix.c Tue Sep 7 17:58:30 2004 -@@ -116,6 +116,7 @@ - #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ - - static gulong g_thread_min_stack_size = 0; -+static gulong g_thread_default_stack_size = 0x100000; - - #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) - -@@ -125,7 +126,8 @@ - g_thread_impl_init() +--- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004 ++++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005 +@@ -125,7 +129,8 @@ + g_thread_impl_init(void) { #ifdef _SC_THREAD_STACK_MIN - g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0); @@ -18,7 +10,7 @@ #endif /* _SC_THREAD_STACK_MIN */ #ifdef HAVE_PRIORITIES # ifdef G_THREADS_IMPL_POSIX -@@ -176,7 +178,7 @@ +@@ -176,7 +181,7 @@ result = pthread_mutex_trylock ((pthread_mutex_t *) mutex); #ifdef G_THREADS_IMPL_POSIX @@ -27,17 +19,3 @@ return FALSE; #else /* G_THREADS_IMPL_DCE */ if (result == 0) -@@ -307,8 +309,12 @@ - if (stack_size) - { - stack_size = MAX (g_thread_min_stack_size, stack_size); -- posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); - } -+ else -+ { -+ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); -+ } -+ posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); - #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */ - - #ifdef PTHREAD_SCOPE_SYSTEM diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 5a7533881bfe..5bebbaa72a30 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -22,6 +22,7 @@ include/glib-2.0/glib/ghook.h include/glib-2.0/glib/gi18n-lib.h include/glib-2.0/glib/gi18n.h include/glib-2.0/glib/giochannel.h +include/glib-2.0/glib/gkeyfile.h include/glib-2.0/glib/glist.h include/glib-2.0/glib/gmacros.h include/glib-2.0/glib/gmain.h @@ -29,6 +30,7 @@ include/glib-2.0/glib/gmarkup.h include/glib-2.0/glib/gmem.h include/glib-2.0/glib/gmessages.h include/glib-2.0/glib/gnode.h +include/glib-2.0/glib/goption.h include/glib-2.0/glib/gpattern.h include/glib-2.0/glib/gprimes.h include/glib-2.0/glib/gprintf.h @@ -41,6 +43,7 @@ include/glib-2.0/glib/gscanner.h include/glib-2.0/glib/gshell.h include/glib-2.0/glib/gslist.h include/glib-2.0/glib/gspawn.h +include/glib-2.0/glib/gstdio.h include/glib-2.0/glib/gstrfuncs.h include/glib-2.0/glib/gstring.h include/glib-2.0/glib/gthread.h @@ -72,18 +75,19 @@ include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h lib/libglib-2.0.a lib/libglib-2.0.so -lib/libglib-2.0.so.400 +lib/libglib-2.0.so.600 lib/libgmodule-2.0.a lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.400 +lib/libgmodule-2.0.so.600 lib/libgobject-2.0.a lib/libgobject-2.0.so -lib/libgobject-2.0.so.400 +lib/libgobject-2.0.so.600 lib/libgthread-2.0.a lib/libgthread-2.0.so -lib/libgthread-2.0.so.400 +lib/libgthread-2.0.so.600 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc +libdata/pkgconfig/gmodule-no-export-2.0.pc libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 @@ -148,10 +152,12 @@ share/locale/sr@Latn/LC_MESSAGES/glib20.mo share/locale/sr@ije/LC_MESSAGES/glib20.mo share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo +share/locale/tl/LC_MESSAGES/glib20.mo share/locale/tr/LC_MESSAGES/glib20.mo share/locale/uk/LC_MESSAGES/glib20.mo share/locale/vi/LC_MESSAGES/glib20.mo share/locale/wa/LC_MESSAGES/glib20.mo +share/locale/xh/LC_MESSAGES/glib20.mo share/locale/yi/LC_MESSAGES/glib20.mo share/locale/zh_CN/LC_MESSAGES/glib20.mo share/locale/zh_TW/LC_MESSAGES/glib20.mo @@ -159,6 +165,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @unexec rmdir %D/share/locale/ne 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true +@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/tl 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/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true @dirrm share/glib-2.0/gettext/po diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index a562cf3b8fe9..d5535b85750e 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.8.4 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ +USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo USE_REINPLACE= yes USE_LIBTOOL_VER=15 @@ -39,8 +39,6 @@ GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ system_http_proxy.schemas system_smb.schemas -OPTIONS= KDE_MENUS "Integrated KDE menu picks" on - .include <bsd.port.pre.mk> .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) @@ -52,13 +50,6 @@ WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif -.if !defined(WITHOUT_KDE_MENUS) -EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in -PLIST_SUB+= KDEMENUS="" -.else -PLIST_SUB+= KDEMENUS="@comment " -.endif - .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA= yes .endif @@ -98,22 +89,12 @@ LIB_DEPENDS+= howl:${PORTSDIR}/net/howl .endif post-patch: - @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/libgnomevfs/Makefile.in \ - ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in + ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/eggdirfuncs.c \ ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c -.if !defined(WITHOUT_KDE_MENUS) - @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ - < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory -.endif - @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ - ${WRKSRC}/Makefile.in @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ @@ -127,9 +108,5 @@ pre-configure: post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(WITHOUT_KDE_MENUS) - @${MKDIR} ${PREFIX}/share/gnome/vfolders - @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders -.endif .include <bsd.port.post.mk> diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 505711b7dcbe..3bb839cef2ec 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.8.4.tar.bz2) = 42d3505e9ef9c26a7aae4e511b9b4c34 -SIZE (gnome2/gnome-vfs-2.8.4.tar.bz2) = 1892413 +MD5 (gnome2/gnome-vfs-2.10.0.tar.bz2) = bb9df65d6a77414bbde9f1bc429c9d97 +SIZE (gnome2/gnome-vfs-2.10.0.tar.bz2) = 1901027 diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory deleted file mode 100644 index 032126bb99db..000000000000 --- a/devel/gnome-vfs/files/KDE.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=KDE -Comment=Some comment about KDE menu -Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png -Type=Directory diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in deleted file mode 100644 index 120a8906411f..000000000000 --- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in +++ /dev/null @@ -1,285 +0,0 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004 -@@ -19,7 +19,14 @@ - <MergeDir>/usr/share/gnome/apps/</MergeDir> - - <!-- Merge dirs optional --> -- <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> - - <!-- Root folder --> - <Folder> -@@ -34,10 +41,12 @@ - <Query> - <And> - <Keyword>Core</Keyword> -- <!-- FIXME: Seth, why would this be wanted? --> -- <!--<Not> -- <Keyword>Merged</Keyword> -- </Not>--> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - </And> - </Query> - -@@ -47,6 +56,12 @@ - <Desktop>Accessories.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Utility</Keyword> - <Not> -@@ -63,6 +78,12 @@ - <Desktop>Accessibility.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Accessibility</Keyword> - <Not> -@@ -80,6 +101,12 @@ - <OnlyUnallocated/> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Not> - <Keyword>Settings</Keyword> -@@ -101,6 +128,12 @@ - <Desktop>Development.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Development</Keyword> - </And> -@@ -114,6 +147,12 @@ - <Desktop>Games.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Game</Keyword> - </And> -@@ -127,6 +166,12 @@ - <Desktop>Graphics.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Graphics</Keyword> - </And> -@@ -140,6 +185,12 @@ - <Desktop>Internet.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Network</Keyword> - </And> -@@ -153,6 +204,12 @@ - <Desktop>Multimedia.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>AudioVideo</Keyword> - </And> -@@ -170,6 +227,12 @@ - <Desktop>Office.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Or> - <Keyword>Office</Keyword> -@@ -195,6 +258,12 @@ - <Desktop>System.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Not> - <Keyword>Settings</Keyword> -@@ -204,6 +273,118 @@ - </Query> - <DontShowIfEmpty/> - </Folder> -- -+ -+ <!-- KDE --> -+ <Folder> -+ <Name>KDE</Name> -+ <Desktop>KDE.directory</Desktop> -+ -+ <!-- KAccessories --> -+ <Folder> -+ <Name>Accessories</Name> -+ <Desktop>Accessories.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Utility</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KDevelopment Tools --> -+ <Folder> -+ <Name>Programming</Name> -+ <Desktop>Development.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Development</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KGraphics --> -+ <Folder> -+ <Name>Graphics</Name> -+ <Desktop>Graphics.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Graphics</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KInternet --> -+ <Folder> -+ <Name>Internet</Name> -+ <Desktop>Internet.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Network</Keyword> -+ </And> -+ </Query> -+ -+ <Include>/usr/local/share/applnk/konqueror.desktop</Include> -+ -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KMultimedia --> -+ <Folder> -+ <Name>Multimedia</Name> -+ <Desktop>Multimedia.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>AudioVideo</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KOffice --> -+ <Folder> -+ <Name>Office</Name> -+ <Desktop>Office.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Or> -+ <Keyword>Office</Keyword> -+ <Keyword>Spreadsheet</Keyword> -+ <Keyword>WordProcessor</Keyword> -+ <Keyword>Calendar</Keyword> -+ <Keyword>ProjectManagement</Keyword> -+ </Or> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ <DontShowIfEmpty/> -+ </Folder> <!-- KDE --> -+ - </Folder> - </VFolderInfo> diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in new file mode 100644 index 000000000000..8c0d2a13160c --- /dev/null +++ b/devel/gnome-vfs/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Tue Nov 30 02:05:26 2004 ++++ Makefile.in Tue Nov 30 02:05:34 2004 +@@ -230,7 +230,6 @@ + devel-docs \ + doc \ + programs \ +- test \ + monikers \ + po + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c deleted file mode 100644 index 82e0e5f61891..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 -+++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 -@@ -106,7 +106,7 @@ - data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); - - if (!data_dirs || !data_dirs[0]) -- data_dirs = "/usr/local/share/:/usr/share/"; -+ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; - - data_dir_vector = g_strsplit (data_dirs, ":", 0); - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c deleted file mode 100644 index 5d37cc768ddb..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 -@@ -43,6 +43,7 @@ - #include <errno.h> - #include <string.h> - #include <signal.h> -+#include <poll.h> - #include <libgnomevfs/gnome-vfs.h> - - #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnome-vfs/files/patch-modules_smb-method.c b/devel/gnome-vfs/files/patch-modules_smb-method.c new file mode 100644 index 000000000000..9c7cb9232cab --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_smb-method.c @@ -0,0 +1,11 @@ +--- modules/smb-method.c.orig Tue Jan 11 18:24:53 2005 ++++ modules/smb-method.c Tue Jan 11 18:25:03 2005 +@@ -1345,7 +1345,7 @@ + GnomeVFSContext *context) + { + FileHandle *handle = (FileHandle *)method_handle; +- GnomeVFSResult res = GNOME_VFS_OK;; ++ GnomeVFSResult res = GNOME_VFS_OK; + SmbAuthContext actx; + ssize_t n = 0; + diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c deleted file mode 100644 index a07d0bc81b39..000000000000 --- a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002 -+++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002 -@@ -1721,7 +1721,7 @@ - - for (i = 0; ppath[i] != NULL; i++) { - dir = g_build_filename (ppath[i], -- "/share/applications/", -+ "/share/gnome/applications/", - NULL); - id = itemdir_new (info, - dir, diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index c594e7a9483b..2540d81f57e7 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -3,18 +3,12 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-mv bin/gnomevfs-rm %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/modules/ssl-modules.conf -etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info -etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info -etc/gnome-vfs-2.0/vfolders/network.vfolder-info -etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info -etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info -etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info -etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info include/gnome-vfs-2.0/include/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h @@ -31,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h @@ -75,13 +70,12 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfolder-desktop.so lib/gnome-vfs-2.0/modules/libvfs-pipe.so lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.800 +lib/libgnomevfs-2.so.1000 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc @@ -110,6 +104,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html @@ -143,9 +138,9 @@ share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html share/doc/gnome-vfs-2.0/networking.html share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/style.css share/doc/gnome-vfs-2.0/up.png share/doc/gnome-vfs-2.0/volumes.html -%%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo @@ -214,18 +209,18 @@ share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zu/LC_MESSAGES/gnome-vfs-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/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true @dirrm share/doc/gnome-vfs-2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs @dirrm include/gnome-vfs-2.0/include @dirrm include/gnome-vfs-2.0 -@dirrm etc/gnome-vfs-2.0/vfolders +@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 diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile index 6986ce0c5971..36a002449cfa 100644 --- a/devel/gnome-vfsmm/Makefile +++ b/devel/gnome-vfsmm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome-vfsmm -PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -23,8 +22,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GCC= 3.4 USE_GMAKE= yes -USE_GNOME= gnomehack lthack gnomevfs2 -USE_INC_LIBTOOL_VER=13 +USE_GNOME= gnomehack gnomevfs2 +USE_INC_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static @@ -34,4 +33,13 @@ post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \ ${WRKSRC}/Makefile.in +patch-autotools: + @(cd ${PATCH_WRKSRC}; \ + for file in ${LIBTOOLFILES}; do \ + ${CP} $$file $$file.tmp; \ + ${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \ + $$file.tmp > $$file; \ + ${RM} $$file.tmp; \ + done); + .include <bsd.port.mk> diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo index 821085698be8..00edc798d38f 100644 --- a/devel/gnome-vfsmm/distinfo +++ b/devel/gnome-vfsmm/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfsmm-2.6.1.tar.bz2) = a0f8006f7336b211f160224fddaf86e1 -SIZE (gnome2/gnome-vfsmm-2.6.1.tar.bz2) = 290073 +MD5 (gnome2/gnome-vfsmm-2.10.0.tar.bz2) = 0d5751f1c0074289c3e6a858357f9c4d +SIZE (gnome2/gnome-vfsmm-2.10.0.tar.bz2) = 317394 diff --git a/devel/gnome-vfsmm/pkg-plist b/devel/gnome-vfsmm/pkg-plist index 39b64f3674b2..4fee1a3e7c83 100644 --- a/devel/gnome-vfsmm/pkg-plist +++ b/devel/gnome-vfsmm/pkg-plist @@ -1,8 +1,10 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/address.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/application-registry.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/directory-handle.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/dns-sd.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/drive.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/enums.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/exception.h @@ -15,6 +17,7 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-handlers.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-monitor.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/monitor-handle.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/address_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/drive_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/enums_p.h @@ -22,10 +25,12 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/file-info_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-action_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-application_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-monitor_p.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/resolve-handle_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/uri_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume-monitor_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume_p.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/resolve-handle.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/types.h diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index c42039ec40a4..cc87b3cc7f94 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-hacker-tools -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index a562cf3b8fe9..d5535b85750e 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.8.4 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ +USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo USE_REINPLACE= yes USE_LIBTOOL_VER=15 @@ -39,8 +39,6 @@ GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ system_http_proxy.schemas system_smb.schemas -OPTIONS= KDE_MENUS "Integrated KDE menu picks" on - .include <bsd.port.pre.mk> .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) @@ -52,13 +50,6 @@ WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif -.if !defined(WITHOUT_KDE_MENUS) -EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in -PLIST_SUB+= KDEMENUS="" -.else -PLIST_SUB+= KDEMENUS="@comment " -.endif - .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA= yes .endif @@ -98,22 +89,12 @@ LIB_DEPENDS+= howl:${PORTSDIR}/net/howl .endif post-patch: - @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/libgnomevfs/Makefile.in \ - ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in + ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/eggdirfuncs.c \ ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c -.if !defined(WITHOUT_KDE_MENUS) - @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ - < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory -.endif - @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ - ${WRKSRC}/Makefile.in @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ @@ -127,9 +108,5 @@ pre-configure: post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(WITHOUT_KDE_MENUS) - @${MKDIR} ${PREFIX}/share/gnome/vfolders - @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders -.endif .include <bsd.port.post.mk> diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 505711b7dcbe..3bb839cef2ec 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.8.4.tar.bz2) = 42d3505e9ef9c26a7aae4e511b9b4c34 -SIZE (gnome2/gnome-vfs-2.8.4.tar.bz2) = 1892413 +MD5 (gnome2/gnome-vfs-2.10.0.tar.bz2) = bb9df65d6a77414bbde9f1bc429c9d97 +SIZE (gnome2/gnome-vfs-2.10.0.tar.bz2) = 1901027 diff --git a/devel/gnomevfs2/files/KDE.directory b/devel/gnomevfs2/files/KDE.directory deleted file mode 100644 index 032126bb99db..000000000000 --- a/devel/gnomevfs2/files/KDE.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=KDE -Comment=Some comment about KDE menu -Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png -Type=Directory diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in deleted file mode 100644 index 120a8906411f..000000000000 --- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in +++ /dev/null @@ -1,285 +0,0 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004 -@@ -19,7 +19,14 @@ - <MergeDir>/usr/share/gnome/apps/</MergeDir> - - <!-- Merge dirs optional --> -- <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> - - <!-- Root folder --> - <Folder> -@@ -34,10 +41,12 @@ - <Query> - <And> - <Keyword>Core</Keyword> -- <!-- FIXME: Seth, why would this be wanted? --> -- <!--<Not> -- <Keyword>Merged</Keyword> -- </Not>--> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - </And> - </Query> - -@@ -47,6 +56,12 @@ - <Desktop>Accessories.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Utility</Keyword> - <Not> -@@ -63,6 +78,12 @@ - <Desktop>Accessibility.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Accessibility</Keyword> - <Not> -@@ -80,6 +101,12 @@ - <OnlyUnallocated/> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Not> - <Keyword>Settings</Keyword> -@@ -101,6 +128,12 @@ - <Desktop>Development.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Development</Keyword> - </And> -@@ -114,6 +147,12 @@ - <Desktop>Games.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Game</Keyword> - </And> -@@ -127,6 +166,12 @@ - <Desktop>Graphics.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Graphics</Keyword> - </And> -@@ -140,6 +185,12 @@ - <Desktop>Internet.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Network</Keyword> - </And> -@@ -153,6 +204,12 @@ - <Desktop>Multimedia.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>AudioVideo</Keyword> - </And> -@@ -170,6 +227,12 @@ - <Desktop>Office.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Or> - <Keyword>Office</Keyword> -@@ -195,6 +258,12 @@ - <Desktop>System.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Not> - <Keyword>Settings</Keyword> -@@ -204,6 +273,118 @@ - </Query> - <DontShowIfEmpty/> - </Folder> -- -+ -+ <!-- KDE --> -+ <Folder> -+ <Name>KDE</Name> -+ <Desktop>KDE.directory</Desktop> -+ -+ <!-- KAccessories --> -+ <Folder> -+ <Name>Accessories</Name> -+ <Desktop>Accessories.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Utility</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KDevelopment Tools --> -+ <Folder> -+ <Name>Programming</Name> -+ <Desktop>Development.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Development</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KGraphics --> -+ <Folder> -+ <Name>Graphics</Name> -+ <Desktop>Graphics.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Graphics</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KInternet --> -+ <Folder> -+ <Name>Internet</Name> -+ <Desktop>Internet.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Network</Keyword> -+ </And> -+ </Query> -+ -+ <Include>/usr/local/share/applnk/konqueror.desktop</Include> -+ -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KMultimedia --> -+ <Folder> -+ <Name>Multimedia</Name> -+ <Desktop>Multimedia.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>AudioVideo</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KOffice --> -+ <Folder> -+ <Name>Office</Name> -+ <Desktop>Office.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Or> -+ <Keyword>Office</Keyword> -+ <Keyword>Spreadsheet</Keyword> -+ <Keyword>WordProcessor</Keyword> -+ <Keyword>Calendar</Keyword> -+ <Keyword>ProjectManagement</Keyword> -+ </Or> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ <DontShowIfEmpty/> -+ </Folder> <!-- KDE --> -+ - </Folder> - </VFolderInfo> diff --git a/devel/gnomevfs2/files/patch-Makefile.in b/devel/gnomevfs2/files/patch-Makefile.in new file mode 100644 index 000000000000..8c0d2a13160c --- /dev/null +++ b/devel/gnomevfs2/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Tue Nov 30 02:05:26 2004 ++++ Makefile.in Tue Nov 30 02:05:34 2004 +@@ -230,7 +230,6 @@ + devel-docs \ + doc \ + programs \ +- test \ + monikers \ + po + diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c deleted file mode 100644 index 82e0e5f61891..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 -+++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 -@@ -106,7 +106,7 @@ - data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); - - if (!data_dirs || !data_dirs[0]) -- data_dirs = "/usr/local/share/:/usr/share/"; -+ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; - - data_dir_vector = g_strsplit (data_dirs, ":", 0); - diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c deleted file mode 100644 index 5d37cc768ddb..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 -@@ -43,6 +43,7 @@ - #include <errno.h> - #include <string.h> - #include <signal.h> -+#include <poll.h> - #include <libgnomevfs/gnome-vfs.h> - - #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnomevfs2/files/patch-modules_smb-method.c b/devel/gnomevfs2/files/patch-modules_smb-method.c new file mode 100644 index 000000000000..9c7cb9232cab --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_smb-method.c @@ -0,0 +1,11 @@ +--- modules/smb-method.c.orig Tue Jan 11 18:24:53 2005 ++++ modules/smb-method.c Tue Jan 11 18:25:03 2005 +@@ -1345,7 +1345,7 @@ + GnomeVFSContext *context) + { + FileHandle *handle = (FileHandle *)method_handle; +- GnomeVFSResult res = GNOME_VFS_OK;; ++ GnomeVFSResult res = GNOME_VFS_OK; + SmbAuthContext actx; + ssize_t n = 0; + diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c deleted file mode 100644 index a07d0bc81b39..000000000000 --- a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002 -+++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002 -@@ -1721,7 +1721,7 @@ - - for (i = 0; ppath[i] != NULL; i++) { - dir = g_build_filename (ppath[i], -- "/share/applications/", -+ "/share/gnome/applications/", - NULL); - id = itemdir_new (info, - dir, diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index c594e7a9483b..2540d81f57e7 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -3,18 +3,12 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-mv bin/gnomevfs-rm %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/modules/ssl-modules.conf -etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info -etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info -etc/gnome-vfs-2.0/vfolders/network.vfolder-info -etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info -etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info -etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info -etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info include/gnome-vfs-2.0/include/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h @@ -31,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h @@ -75,13 +70,12 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfolder-desktop.so lib/gnome-vfs-2.0/modules/libvfs-pipe.so lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.800 +lib/libgnomevfs-2.so.1000 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc @@ -110,6 +104,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html @@ -143,9 +138,9 @@ share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html share/doc/gnome-vfs-2.0/networking.html share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/style.css share/doc/gnome-vfs-2.0/up.png share/doc/gnome-vfs-2.0/volumes.html -%%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo @@ -214,18 +209,18 @@ share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zu/LC_MESSAGES/gnome-vfs-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/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true @dirrm share/doc/gnome-vfs-2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs @dirrm include/gnome-vfs-2.0/include @dirrm include/gnome-vfs-2.0 -@dirrm etc/gnome-vfs-2.0/vfolders +@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 diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 9bb4bd71232b..1189bceee5ea 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -6,21 +6,25 @@ # PORTNAME= libglade2 -PORTVERSION= 2.4.2 +PORTVERSION= 2.5.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME glade library -RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr +BUILD_DEPENDS= ${PYEXPAT} +RUN_DEPENDS= ${PYEXPAT} \ + xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes +USE_PYTHON= yes USE_LIBTOOL_VER=15 USE_GNOME= gnomehack libxml2 gtk20 INSTALLS_SHLIB= yes @@ -33,19 +37,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \ CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports" -.if !defined(WITHOUT_PYTHON) -BUILD_DEPENDS+= ${PYEXPAT} -RUN_DEPENDS+= ${PYEXPAT} - -USE_PYTHON= yes -PLIST_SUB+= PYTHON="" -.else -USE_REINPLACE= yes -PLIST_SUB+= PYTHON="@comment " - -post-patch: - @${REINPLACE_CMD} -E 's/in (python.*)+ none/in none/' \ - ${WRKSRC}/configure -.endif - .include <bsd.port.mk> diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo index e9de85991c82..5282553c1b70 100644 --- a/devel/libglade2/distinfo +++ b/devel/libglade2/distinfo @@ -1,2 +1,4 @@ -MD5 (gnome2/libglade-2.4.2.tar.bz2) = 83d08f9ab485a10454bd5171d2d53fb0 -SIZE (gnome2/libglade-2.4.2.tar.bz2) = 317692 +MD5 (gnome2/libglade-2.5.1.tar.bz2) = e4734a59f1f2308d7714dc0ebf8163f1 +SIZE (gnome2/libglade-2.5.1.tar.bz2) = 317524 +MD5 (gnome2/tacos) = e4734a59f1f2308d7714dc0ebf8163f2 +SIZE (gnome2/tacos) = 317525 diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab index 48724e9e9200..1ef7b7ed18bc 100644 --- a/devel/libglade2/files/patch-ab +++ b/devel/libglade2/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Mon Nov 29 15:14:24 2004 -+++ Makefile.in Mon Nov 29 15:14:24 2004 +--- Makefile.in.orig Mon May 17 12:30:40 2004 ++++ Makefile.in Mon May 17 12:31:44 2004 @@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -9,7 +9,7 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -250,7 +250,7 @@ +@@ -229,7 +229,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist index 588f41a86546..cba156fe6624 100644 --- a/devel/libglade2/pkg-plist +++ b/devel/libglade2/pkg-plist @@ -1,4 +1,4 @@ -%%PYTHON%%bin/libglade-convert +bin/libglade-convert include/libglade-2.0/glade/glade-build.h include/libglade-2.0/glade/glade-init.h include/libglade-2.0/glade/glade-parser.h diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 0634e22a7f49..172b752b9c27 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -7,7 +7,6 @@ CATEGORIES= devel gnome PKGNAMESUFFIX= -gnome -PORTREVISION= 1 MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME wrapper for libgsf diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist index 7951e9d386d1..fdd0f93c589f 100644 --- a/devel/libgsf-gnome/pkg-plist +++ b/devel/libgsf-gnome/pkg-plist @@ -5,6 +5,6 @@ include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h lib/libgsf-gnome-1.a lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.11 +lib/libgsf-gnome-1.so.12 libdata/pkgconfig/libgsf-gnome-1.pc @dirrm include/libgsf-1/gsf-gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 9e1572e154d1..e7a43b557eb1 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libgsf -PORTVERSION= 1.10.1 +PORTVERSION= 1.11.1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -24,7 +24,7 @@ USE_GMAKE= yes INSTALLS_SHLIB= yes USE_GNOME?= gnomehack glib20 libxml2 USE_LIBTOOL_VER=15 -CONFIGURE_ARGS?= --with-html-dir=${PREFIX}/share/doc \ +CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc --without-gnome --with-bz2 CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 8d2a941e63ad..01cc1c40a6dd 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgsf-1.10.1.tar.bz2) = b7b1c1e9adf3fd39a4df6f6891bf3bca -SIZE (gnome2/libgsf-1.10.1.tar.bz2) = 399510 +MD5 (gnome2/libgsf-1.11.1.tar.bz2) = b6d867f46e20dca5c6bf2cf3bfc38cfc +SIZE (gnome2/libgsf-1.11.1.tar.bz2) = 413711 diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 0e9f5a3ec9b5..9f6dc384532b 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,5 +1,6 @@ include/libgsf-1/gsf-win32/gsf-input-win32.h include/libgsf-1/gsf-win32/gsf-output-win32.h +include/libgsf-1/gsf/gsf-doc-meta-data.h include/libgsf-1/gsf/gsf-impl-utils.h include/libgsf-1/gsf/gsf-infile-impl.h include/libgsf-1/gsf/gsf-infile-msole.h @@ -12,10 +13,12 @@ include/libgsf-1/gsf/gsf-input-gzip.h include/libgsf-1/gsf/gsf-input-impl.h include/libgsf-1/gsf/gsf-input-iochannel.h include/libgsf-1/gsf/gsf-input-memory.h +include/libgsf-1/gsf/gsf-input-proxy.h include/libgsf-1/gsf/gsf-input-stdio.h include/libgsf-1/gsf/gsf-input-textline.h include/libgsf-1/gsf/gsf-input.h include/libgsf-1/gsf/gsf-libxml.h +include/libgsf-1/gsf/gsf-meta-names.h include/libgsf-1/gsf/gsf-msole-utils.h include/libgsf-1/gsf/gsf-outfile-impl.h include/libgsf-1/gsf/gsf-outfile-msole.h @@ -35,7 +38,7 @@ include/libgsf-1/gsf/gsf-utils.h include/libgsf-1/gsf/gsf.h lib/libgsf-1.a lib/libgsf-1.so -lib/libgsf-1.so.11 +lib/libgsf-1.so.12 libdata/pkgconfig/libgsf-1.pc share/doc/gsf/api.html share/doc/gsf/gsf-Bononbo.html diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 862a5ca17378..5a15a4612020 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgtop2 -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index 05e797b96de7..f6a71904beaf 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtop-2.8.3.tar.bz2) = 4cacb87938bf702b17a721b2ac068252 -SIZE (gnome2/libgtop-2.8.3.tar.bz2) = 1047504 +MD5 (gnome2/libgtop-2.10.0.tar.bz2) = 9a52cd5332a13e57ca606d8a85a67c97 +SIZE (gnome2/libgtop-2.10.0.tar.bz2) = 746223 diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah deleted file mode 100644 index e0d7484420ec..000000000000 --- a/devel/libgtop2/files/patch-ah +++ /dev/null @@ -1,63 +0,0 @@ ---- sysdeps/freebsd/procmap.c.orig Sat Sep 25 07:49:06 2004 -+++ sysdeps/freebsd/procmap.c Fri Nov 19 11:26:15 2004 -@@ -47,7 +47,13 @@ - #endif - #endif - -+#ifdef __FreeBSD__ -+#define _KVM_VNODE -+#endif - #include <sys/vnode.h> -+#ifdef __FreeBSD__ -+#undef _KVM_VNODE -+#endif - #include <sys/mount.h> - #include <ufs/ufs/quota.h> - #include <ufs/ufs/inode.h> -@@ -104,7 +110,7 @@ - glibtop_map_entry *maps; - #if defined __FreeBSD__ - struct vnode vnode; --#if __FreeBSD_version >= 500039 -+#if __FreeBSD_version < 500039 - struct inode inode; - #endif - #endif -@@ -122,8 +128,10 @@ - - /* Get the process data */ - pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); -- if ((pinfo == NULL) || (count < 1)) -+ if ((pinfo == NULL) || (count < 1)) { - glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); -+ return NULL; -+ } - - /* Now we get the memory maps. */ - -@@ -264,8 +272,10 @@ - #if defined(__FreeBSD__) && (__FreeBSD_version >= 500039) - switch (vnode.v_type) { - case VREG: -+#if __FreeBSD_version < 600006 - maps [i-1].inode = vnode.v_cachedid; - maps [i-1].device = vnode.v_cachedfs; -+#endif - default: - continue; - } -@@ -278,13 +288,9 @@ - &inode, sizeof (inode)) != sizeof (inode)) - glibtop_error_io_r (server, "kvm_read (inode)"); - -- if (kvm_read (server->machine.kd, -- (unsigned long) vnode.v_mount, -- &mount, sizeof (mount)) != sizeof (mount)) -- glibtop_error_io_r (server, "kvm_read (mount)"); --#endif - maps [i-1].inode = inode.i_number; - maps [i-1].device = inode.i_dev; -+#endif - #endif - } while (entry.next != first); - diff --git a/devel/libgtop2/files/patch-lib::lib.pl b/devel/libgtop2/files/patch-lib::lib.pl deleted file mode 100644 index 6e08ba030855..000000000000 --- a/devel/libgtop2/files/patch-lib::lib.pl +++ /dev/null @@ -1,62 +0,0 @@ ---- lib/lib.pl.orig Mon Sep 1 20:17:45 2003 -+++ lib/lib.pl Wed Sep 3 11:53:12 2003 -@@ -116,6 +116,8 @@ - $param_decl = ''; - $send_size = ''; - $send_ptr = ''; -+ $send_buf_decl = ''; -+ $send_buf = ''; - $nr_params = (@params = split(/:/, $param_def, 9999)); - for ($param = 1; $param <= $nr_params; $param++) { - $list = $params[$param]; -@@ -135,28 +137,37 @@ - - $fields[$field]; - $call_param = $call_param . ', ' . $fields[$field]; -- if ($send_ptr eq '') { -- $send_ptr = "\n\tconst void *send_ptr = &" . -- -- $fields[$field] . ';'; -- } -- if ($send_size eq '') { -- $send_size = "\n\tconst size_t send_size =\n\t\t"; -+ if ($send_buf eq '') { -+ $send_size = "\n\tconst size_t send_size = "; -+ $send_ptr = "\n\tconst void *send_ptr = &"; -+ if ($nr_params == 1 && $count == 1) { -+ $send_size = $send_size . 'sizeof (' . $fields[$field] . ');'; -+ $send_ptr = $send_ptr . $fields[$field] . ';'; -+ last; -+ } -+ $send_size = $send_size . 'sizeof (send_buf);'; -+ $send_ptr = $send_ptr . 'send_buf;'; - } - else { -- $send_size = $send_size . ' + '; -+ $send_buf_decl = $send_buf_decl . ' '; -+ $send_buf = $send_buf . ', '; - } -- $send_size = $send_size . 'sizeof (' . $fields[$field] . ')'; -+ $send_buf_decl = $send_buf_decl . '' . $convert{$type} . ' ' . -+ -+ $fields[$field] . ';'; -+ $send_buf = $send_buf . '' . $fields[$field]; - } - } -- if ($send_size ne '') { -- $send_size = $send_size . ';'; -- } -- else { -+ if ($send_size eq '') { - $send_size = "\n\tconst size_t send_size = 0;"; - } - if ($send_ptr eq '') { - $send_ptr = "\n\tconst void *send_ptr = NULL;"; -+ } -+ if ($send_buf ne '') { -+ $send_ptr = "\n\tconst struct { " . $send_buf_decl . " } send_buf =\n" . -+ "\t\t{ " . $send_buf . ' };' . -+ $send_ptr; - } - } - diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c deleted file mode 100644 index 0713da61925e..000000000000 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c +++ /dev/null @@ -1,30 +0,0 @@ ---- sysdeps/freebsd/procmem.c.orig Mon Jul 19 02:07:03 2004 -+++ sysdeps/freebsd/procmem.c Tue Jul 20 22:03:29 2004 -@@ -125,7 +125,7 @@ - #else - struct vm_object object; - #endif -- struct plimit plimit; -+ struct rlimit rlimit; - int count; - - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0); -@@ -160,15 +160,12 @@ - - #define PROC_VMSPACE kp_proc.p_vmspace - -- if (kvm_read (server->machine.kd, -- (unsigned long) pinfo [0].PROC_VMSPACE, -- (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) { -- glibtop_warn_io_r (server, "kvm_read (plimit)"); -+ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) { -+ glibtop_warn_io_r (server, "getrlimit"); - return; - } - -- buf->rss_rlim = (guint64) -- (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur); -+ buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur); - - vms = &pinfo [0].kp_eproc.e_vm; - diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c deleted file mode 100644 index 37b5b56df49a..000000000000 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c +++ /dev/null @@ -1,48 +0,0 @@ ---- sysdeps/freebsd/proctime.c.orig Wed Mar 10 21:23:52 2004 -+++ sysdeps/freebsd/proctime.c Thu Mar 11 15:47:35 2004 -@@ -59,6 +59,7 @@ - - #ifndef __FreeBSD__ - -+#ifndef __FreeBSD__ - static void - calcru(p, up, sp, ip) - struct proc *p; -@@ -81,19 +82,10 @@ - tot = 1; - } - --#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003) -- -- /* This was changed from a `struct timeval' into a `guint64' -- * on FreeBSD 3.0 and renamed p_rtime -> p_runtime. -- */ -- -- totusec = (u_quad_t) p->p_runtime; --#else - sec = p->p_rtime.tv_sec; - usec = p->p_rtime.tv_usec; - - totusec = (quad_t)sec * 1000000 + usec; --#endif - - if (totusec < 0) { - /* XXX no %qd in kernel. Truncate. */ -@@ -116,6 +108,7 @@ - ip->tv_usec = it % 1000000; - } - } -+#endif - - #endif /* !__FreeBSD__ */ - -@@ -133,9 +126,6 @@ - #endif - struct pstats pstats; - int count; -- -- char filename [BUFSIZ]; -- struct stat statb; - - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0); - diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c deleted file mode 100644 index de564dcfd5f6..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c +++ /dev/null @@ -1,14 +0,0 @@ ---- sysdeps/common/fsusage.c.orig Sun Oct 17 00:51:26 2004 -+++ sysdeps/common/fsusage.c Sun Oct 17 00:52:07 2004 -@@ -253,8 +253,9 @@ - if (statvfs (path, &fsd) < 0) - return; - --#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) -- /* Solaris but not SunOS */ -+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \ -+ || defined(__FreeBSD__) -+ /* Solaris but not SunOS and FreeBSD */ - buf->block_size = fsd.f_frsize; - #else - /* else, including Linux */ diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index 16bcbb055472..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig Sun Feb 15 16:13:22 2004 -+++ sysdeps/freebsd/Makefile.in Sun Feb 15 16:16:05 2004 -@@ -138,7 +138,7 @@ - - noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la - --libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c -+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - -@@ -172,7 +172,7 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ - libgtop_sysdeps_2_0_la_LIBADD = --libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo -+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo - libgtop_sysdeps_suid_2_0_la_LIBADD = - libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo siglist.lo \ - cpu.lo mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo \ diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index 8bc83937eb9c..1f1a0363cadd 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -4,7 +4,6 @@ include/libgtop-2.0/glibtop.h include/libgtop-2.0/glibtop/close.h include/libgtop-2.0/glibtop/command.h include/libgtop-2.0/glibtop/cpu.h -include/libgtop-2.0/glibtop/error.h include/libgtop-2.0/glibtop/fsusage.h include/libgtop-2.0/glibtop/global.h include/libgtop-2.0/glibtop/gnuserv.h @@ -13,8 +12,8 @@ include/libgtop-2.0/glibtop/loadavg.h include/libgtop-2.0/glibtop/mem.h include/libgtop-2.0/glibtop/mountlist.h include/libgtop-2.0/glibtop/msg_limits.h +include/libgtop-2.0/glibtop/netlist.h include/libgtop-2.0/glibtop/netload.h -include/libgtop-2.0/glibtop/open.h include/libgtop-2.0/glibtop/parameter.h include/libgtop-2.0/glibtop/ppp.h include/libgtop-2.0/glibtop/procargs.h @@ -22,27 +21,25 @@ include/libgtop-2.0/glibtop/prockernel.h include/libgtop-2.0/glibtop/proclist.h include/libgtop-2.0/glibtop/procmap.h include/libgtop-2.0/glibtop/procmem.h +include/libgtop-2.0/glibtop/procopenfiles.h include/libgtop-2.0/glibtop/procsegment.h include/libgtop-2.0/glibtop/procsignal.h include/libgtop-2.0/glibtop/procstate.h include/libgtop-2.0/glibtop/proctime.h include/libgtop-2.0/glibtop/procuid.h -include/libgtop-2.0/glibtop/read.h -include/libgtop-2.0/glibtop/read_data.h include/libgtop-2.0/glibtop/sem_limits.h include/libgtop-2.0/glibtop/shm_limits.h include/libgtop-2.0/glibtop/signal.h include/libgtop-2.0/glibtop/swap.h include/libgtop-2.0/glibtop/sysdeps.h include/libgtop-2.0/glibtop/sysinfo.h -include/libgtop-2.0/glibtop/types.h include/libgtop-2.0/glibtop/union.h include/libgtop-2.0/glibtop/uptime.h include/libgtop-2.0/glibtop/version.h -include/libgtop-2.0/glibtop/write.h include/libgtop-2.0/glibtop_machine.h include/libgtop-2.0/glibtop_server.h include/libgtop-2.0/glibtop_suid.h +include/libgtop-2.0/libgtopconfig.h lib/libgtop-2.0.a lib/libgtop-2.0.so lib/libgtop-2.0.so.2 @@ -87,6 +84,7 @@ share/locale/ml/LC_MESSAGES/libgtop-2.0.mo share/locale/mn/LC_MESSAGES/libgtop-2.0.mo share/locale/ms/LC_MESSAGES/libgtop-2.0.mo share/locale/nb/LC_MESSAGES/libgtop-2.0.mo +share/locale/ne/LC_MESSAGES/libgtop-2.0.mo share/locale/nl/LC_MESSAGES/libgtop-2.0.mo share/locale/nn/LC_MESSAGES/libgtop-2.0.mo share/locale/no/LC_MESSAGES/libgtop-2.0.mo |