diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-04-30 00:47:21 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-04-30 00:47:21 +0000 |
| commit | 798e9bed2a389dce8a970e15b68176fd49f442db (patch) | |
| tree | 9dc5597aab073298ec381964f72cd853b3dd366c /devel | |
| parent | 48b92584b0722f7f6ca412e6cfe16f1381e043cc (diff) | |
| download | ports-798e9bed2a389dce8a970e15b68176fd49f442db.tar.gz ports-798e9bed2a389dce8a970e15b68176fd49f442db.zip | |
Notes
Diffstat (limited to 'devel')
86 files changed, 702 insertions, 606 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 3059e25cae05..fa9264c1ccc0 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -3,14 +3,14 @@ # Whom: Chia-liang Kao <clkao@CirX.ORG> # # $FreeBSD$ +# $MCom: ports/devel/ORBit2/Makefile,v 1.50 2006/04/13 07:52:31 bland Exp $ # PORTNAME= ORBit2 -PORTVERSION= 2.12.5 -PORTREVISION= 2 +PORTVERSION= 2.14.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,8 +21,8 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -USE_GNOME= gnomehack libidl +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack libidl ltverhack CONFIGURE_ARGS= --disable-indent \ --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 559037724aea..91e91a657ea2 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/ORBit2-2.12.5.tar.bz2) = cc52f71d974043414afea44c78e6d705 -SHA256 (gnome2/ORBit2-2.12.5.tar.bz2) = dc6d9c22875b178ed26103b445e6c937a7120225de581ca56d3865c069722591 -SIZE (gnome2/ORBit2-2.12.5.tar.bz2) = 685516 +MD5 (gnome2/ORBit2-2.14.0.tar.bz2) = bb1b4859522cb6e1a3a3dc4b7397db64 +SHA256 (gnome2/ORBit2-2.14.0.tar.bz2) = 412e4880d79533a2bbd33757e031a2bee24a7bc771f22cf4fed3cb81790b1b68 +SIZE (gnome2/ORBit2-2.14.0.tar.bz2) = 704207 diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab index e58bbe318953..a423955e29ea 100644 --- a/devel/ORBit2/files/patch-ab +++ b/devel/ORBit2/files/patch-ab @@ -1,11 +1,11 @@ ---- Makefile.in.orig Fri Mar 5 23:34:38 2004 -+++ Makefile.in Fri Mar 5 23:35:59 2004 -@@ -125,7 +125,7 @@ - +--- Makefile.in.orig Tue Mar 14 17:52:25 2006 ++++ Makefile.in Tue Mar 14 17:52:45 2006 +@@ -250,7 +250,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + AUTOMAKE_OPTIONS = 1.3 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc - -SUBDIRS = linc2 src include test docs +SUBDIRS = linc2 src include docs - bin_SCRIPTS = orbit2-config - + EXTRA_DIST = \ + ORBit2.m4 \ diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index e859e29b9601..8de5ef0a24c5 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -70,6 +70,7 @@ share/aclocal/ORBit2.m4 %%DOCSDIR%%/ORBit2-orbit2-allocators.html %%DOCSDIR%%/ORBit2-orbit2-small.html %%DOCSDIR%%/ORBit2.devhelp +%%DOCSDIR%%/ORBit2.devhelp2 %%DOCSDIR%%/general.html %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html @@ -79,10 +80,10 @@ share/aclocal/ORBit2.m4 %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png share/idl/orbit-2.0/CosNaming.idl -@dirrm %%DOCSDIR%% @dirrm share/idl/orbit-2.0 @exec /bin/mkdir -p %D/lib/orbit-2.0/idl-backends @dirrmtry share/idl +@dirrm %%DOCSDIR%% @dirrmtry lib/orbit-2.0/idl-backends @dirrmtry lib/orbit-2.0 @dirrm include/orbit-2.0/orbit/util diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index 089ee5c0cb8c..10e9f77a0e5a 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/bugbuddy/Makefile,v 1.19 2005/10/01 04:41:05 ahze Exp $ +# $MCom: ports/devel/bugbuddy/Makefile,v 1.29 2006/04/13 07:52:31 bland Exp $ # PORTNAME= bugbuddy -PORTVERSION= 2.12.1 +PORTVERSION= 2.14.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.12 +MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,9 +18,9 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 USE_BZIP2= yes +USE_GETTEXT= yes USE_X_PREFIX= yes INSTALLS_OMF= yes -USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index 8330a32218df..4e73e147c587 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.12.1.tar.bz2) = 2f8b52ad25891e7c99820c80e7c6d78d -SHA256 (gnome2/bug-buddy-2.12.1.tar.bz2) = 596748b154a1db3f622c5a31a9c1734426bb90e88e48ff992cb5f39e9deb7108 -SIZE (gnome2/bug-buddy-2.12.1.tar.bz2) = 555641 +MD5 (gnome2/bug-buddy-2.14.0.tar.bz2) = 4fb288adc8f67cbfb8886ddf7b400530 +SHA256 (gnome2/bug-buddy-2.14.0.tar.bz2) = f091ca6c55b2f76011d2c7f6c3c60069070e894ee455483bc8f77edc7f0eaaf6 +SIZE (gnome2/bug-buddy-2.14.0.tar.bz2) = 577253 diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index 06832c1205cd..5a032cc21231 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -21,12 +21,14 @@ share/gnome/help/bug-buddy/es/bug-buddy.xml share/gnome/help/bug-buddy/pa/bug-buddy.xml share/gnome/help/bug-buddy/sr/bug-buddy.xml share/gnome/help/bug-buddy/uk/bug-buddy.xml +share/gnome/help/bug-buddy/vi/bug-buddy.xml share/gnome/mime-info/bug-buddy.keys share/gnome/omf/bug-buddy/bug-buddy-C.omf share/gnome/omf/bug-buddy/bug-buddy-es.omf share/gnome/omf/bug-buddy/bug-buddy-pa.omf share/gnome/omf/bug-buddy/bug-buddy-sr.omf share/gnome/omf/bug-buddy/bug-buddy-uk.omf +share/gnome/omf/bug-buddy/bug-buddy-vi.omf share/gnome/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -61,6 +63,8 @@ share/locale/is/LC_MESSAGES/bug-buddy.mo share/locale/it/LC_MESSAGES/bug-buddy.mo share/locale/ja/LC_MESSAGES/bug-buddy.mo share/locale/ko/LC_MESSAGES/bug-buddy.mo +share/locale/ku/LC_MESSAGES/bug-buddy.mo +share/locale/ky/LC_MESSAGES/bug-buddy.mo share/locale/lt/LC_MESSAGES/bug-buddy.mo share/locale/lv/LC_MESSAGES/bug-buddy.mo share/locale/mk/LC_MESSAGES/bug-buddy.mo @@ -96,6 +100,7 @@ share/locale/vi/LC_MESSAGES/bug-buddy.mo share/locale/wa/LC_MESSAGES/bug-buddy.mo share/locale/xh/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo +share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @@ -105,7 +110,10 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrmtry share/locale/rw @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky @dirrm share/gnome/omf/bug-buddy +@dirrm share/gnome/help/bug-buddy/vi @dirrm share/gnome/help/bug-buddy/uk @dirrm share/gnome/help/bug-buddy/sr @dirrm share/gnome/help/bug-buddy/pa diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index 089ee5c0cb8c..10e9f77a0e5a 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/bugbuddy/Makefile,v 1.19 2005/10/01 04:41:05 ahze Exp $ +# $MCom: ports/devel/bugbuddy/Makefile,v 1.29 2006/04/13 07:52:31 bland Exp $ # PORTNAME= bugbuddy -PORTVERSION= 2.12.1 +PORTVERSION= 2.14.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.12 +MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,9 +18,9 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 USE_BZIP2= yes +USE_GETTEXT= yes USE_X_PREFIX= yes INSTALLS_OMF= yes -USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo index 8330a32218df..4e73e147c587 100644 --- a/devel/bugbuddy/distinfo +++ b/devel/bugbuddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.12.1.tar.bz2) = 2f8b52ad25891e7c99820c80e7c6d78d -SHA256 (gnome2/bug-buddy-2.12.1.tar.bz2) = 596748b154a1db3f622c5a31a9c1734426bb90e88e48ff992cb5f39e9deb7108 -SIZE (gnome2/bug-buddy-2.12.1.tar.bz2) = 555641 +MD5 (gnome2/bug-buddy-2.14.0.tar.bz2) = 4fb288adc8f67cbfb8886ddf7b400530 +SHA256 (gnome2/bug-buddy-2.14.0.tar.bz2) = f091ca6c55b2f76011d2c7f6c3c60069070e894ee455483bc8f77edc7f0eaaf6 +SIZE (gnome2/bug-buddy-2.14.0.tar.bz2) = 577253 diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist index 06832c1205cd..5a032cc21231 100644 --- a/devel/bugbuddy/pkg-plist +++ b/devel/bugbuddy/pkg-plist @@ -21,12 +21,14 @@ share/gnome/help/bug-buddy/es/bug-buddy.xml share/gnome/help/bug-buddy/pa/bug-buddy.xml share/gnome/help/bug-buddy/sr/bug-buddy.xml share/gnome/help/bug-buddy/uk/bug-buddy.xml +share/gnome/help/bug-buddy/vi/bug-buddy.xml share/gnome/mime-info/bug-buddy.keys share/gnome/omf/bug-buddy/bug-buddy-C.omf share/gnome/omf/bug-buddy/bug-buddy-es.omf share/gnome/omf/bug-buddy/bug-buddy-pa.omf share/gnome/omf/bug-buddy/bug-buddy-sr.omf share/gnome/omf/bug-buddy/bug-buddy-uk.omf +share/gnome/omf/bug-buddy/bug-buddy-vi.omf share/gnome/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -61,6 +63,8 @@ share/locale/is/LC_MESSAGES/bug-buddy.mo share/locale/it/LC_MESSAGES/bug-buddy.mo share/locale/ja/LC_MESSAGES/bug-buddy.mo share/locale/ko/LC_MESSAGES/bug-buddy.mo +share/locale/ku/LC_MESSAGES/bug-buddy.mo +share/locale/ky/LC_MESSAGES/bug-buddy.mo share/locale/lt/LC_MESSAGES/bug-buddy.mo share/locale/lv/LC_MESSAGES/bug-buddy.mo share/locale/mk/LC_MESSAGES/bug-buddy.mo @@ -96,6 +100,7 @@ share/locale/vi/LC_MESSAGES/bug-buddy.mo share/locale/wa/LC_MESSAGES/bug-buddy.mo share/locale/xh/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo +share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @@ -105,7 +110,10 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrmtry share/locale/rw @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky @dirrm share/gnome/omf/bug-buddy +@dirrm share/gnome/help/bug-buddy/vi @dirrm share/gnome/help/bug-buddy/uk @dirrm share/gnome/help/bug-buddy/sr @dirrm share/gnome/help/bug-buddy/pa diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index f13b83e6c1b7..f1c3969a5219 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,15 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.62 2005/11/03 18:43:02 mezz Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.72 2006/04/13 07:52:32 bland Exp $ # PORTNAME= gconf2 -PORTVERSION= 2.12.1 -PORTREVISION= 1 +PORTVERSION= 2.14.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.12 +MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +19,7 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes USE_GMAKE= yes +USE_GETTEXT= yes USE_X_PREFIX= yes USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack INSTALLS_SHLIB= yes diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index 7c5f6943fb73..5bc575714c76 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/GConf-2.12.1.tar.bz2) = 247110de013ed24b17cf4191eb6daec5 -SHA256 (gnome2/GConf-2.12.1.tar.bz2) = 2e3c72ecc66348be6edecfbb2e424adc8d4e5a4afb92443e98cd2e50de7cf68e -SIZE (gnome2/GConf-2.12.1.tar.bz2) = 1945241 +MD5 (gnome2/GConf-2.14.0.tar.bz2) = d07c2efcaf477cf34225c604a04b6271 +SHA256 (gnome2/GConf-2.14.0.tar.bz2) = 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525 +SIZE (gnome2/GConf-2.14.0.tar.bz2) = 1895477 diff --git a/devel/gconf2/files/patch-gconf_gconf-listeners.c b/devel/gconf2/files/patch-gconf_gconf-listeners.c deleted file mode 100644 index 9b08a72d2954..000000000000 --- a/devel/gconf2/files/patch-gconf_gconf-listeners.c +++ /dev/null @@ -1,13 +0,0 @@ ---- gconf/gconf-listeners.c.orig Sun Nov 6 11:08:58 2005 -+++ gconf/gconf-listeners.c Sun Nov 6 11:09:05 2005 -@@ -366,8 +366,8 @@ - - while (across != NULL) - { -- lte = across->data; - int cmp; -+ lte = across->data; - - cmp = strcmp(lte->name, dirnames[i]); - - diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 22363c351e76..566b5bfd71e3 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -79,6 +79,7 @@ share/locale/hi/LC_MESSAGES/GConf2.mo share/locale/hr/LC_MESSAGES/GConf2.mo share/locale/hu/LC_MESSAGES/GConf2.mo share/locale/id/LC_MESSAGES/GConf2.mo +share/locale/is/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo @@ -115,9 +116,12 @@ 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_HK/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo share/sgml/gconf/gconf-1.0.dtd @dirrm share/sgml/gconf +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrm share/doc/gconf @@ -127,4 +131,4 @@ share/sgml/gconf/gconf-1.0.dtd @dirrm include/gconf/2/gconf @dirrm include/gconf/2 @dirrm etc/gconf/2 -@unexec /bin/rmdir %D/share/sgml 2>/dev/null || /usr/bin/true +@dirrmtry share/sgml diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile index ae1d57fd10be..ac3eae4eccb8 100644 --- a/devel/gconfmm26/Makefile +++ b/devel/gconfmm26/Makefile @@ -3,15 +3,14 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/gconfmm26/Makefile,v 1.7 2005/10/29 22:31:16 marcus Exp $ +# $MCom: ports/devel/gconfmm26/Makefile,v 1.10 2006/04/13 07:52:32 bland Exp $ # PORTNAME= gconfmm -PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTVERSION= 2.14.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo index 53632d6623bf..d0114d7ce094 100644 --- a/devel/gconfmm26/distinfo +++ b/devel/gconfmm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconfmm-2.12.0.tar.bz2) = dfd62a95e7675943933b793183649402 -SHA256 (gnome2/gconfmm-2.12.0.tar.bz2) = f6ddd48a01e28d34f0cb3a20cc03ddf79fa04bf696ab933a16911d28eabaedc5 -SIZE (gnome2/gconfmm-2.12.0.tar.bz2) = 264170 +MD5 (gnome2/gconfmm-2.14.0.tar.bz2) = 27b4703412c582ae9e6383de7c7ead6b +SHA256 (gnome2/gconfmm-2.14.0.tar.bz2) = 5c88ffa2b9a168155765d970c2ca6c56d182af54c4cb7a50c48afddedbb3073a +SIZE (gnome2/gconfmm-2.14.0.tar.bz2) = 268566 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 0898bbe4d466..250f869ec472 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,20 +3,19 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.55 2005/10/03 17:39:56 mezz Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.75 2006/04/13 07:57:40 bland Exp $ # PORTNAME= glib -PORTVERSION= 2.8.6 -PORTREVISION= 1 +PORTVERSION= 2.10.2 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.8,} \ - ftp://ftp.gtk.org/pub/gtk/v2.8/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.10,} \ + ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} +MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -27,7 +26,6 @@ LATEST_LINK= glib20 USE_BZIP2= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 -USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_GNOME= gnomehack gnometarget pkgconfig ltverhack USE_GMAKE= yes diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 91f5d3c04c0c..30f93eebafeb 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.8.6.tar.bz2) = fce6835fd8c99ab4c3e5213bc5bcd0ed -SHA256 (gnome2/glib-2.8.6.tar.bz2) = e2da2eec8c87dccdbce16dcd77489d225b613074764f2f39f2815db15b5deeea -SIZE (gnome2/glib-2.8.6.tar.bz2) = 2691171 +MD5 (gnome2/glib-2.10.2.tar.bz2) = 718961161ee1692c216a2d542196a04a +SHA256 (gnome2/glib-2.10.2.tar.bz2) = 0e30917c2f916de991195db16d8db22298064e876e1a4a965d5ee43bea3d2144 +SIZE (gnome2/glib-2.10.2.tar.bz2) = 2784594 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 89850e10217f..46738f939e1a 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig Fri Apr 30 09:05:01 2004 -+++ configure Tue May 4 12:52:56 2004 -@@ -31818,6 +31819,8 @@ +--- configure.orig Sun Jan 29 13:06:22 2006 ++++ configure Sun Jan 29 13:06:48 2006 +@@ -34462,6 +34461,8 @@ ;; esac fi diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c index d3c7dc6bf2db..cf1338425a1c 100644 --- a/devel/glib20/files/patch-gmodule::gmodule-dl.c +++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c @@ -1,6 +1,6 @@ $FreeBSD$ - $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.14 2005/06/28 05:40:00 adamw Exp $ + $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.16 2005/12/15 00:18:44 marcus Exp $ --- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001 +++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002 diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index f4e699f1f6d8..aa6628f4ee74 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -42,6 +42,7 @@ include/glib-2.0/glib/grand.h include/glib-2.0/glib/grel.h include/glib-2.0/glib/gscanner.h include/glib-2.0/glib/gshell.h +include/glib-2.0/glib/gslice.h include/glib-2.0/glib/gslist.h include/glib-2.0/glib/gspawn.h include/glib-2.0/glib/gstdio.h @@ -112,6 +113,7 @@ share/locale/cs/LC_MESSAGES/glib20.mo share/locale/cy/LC_MESSAGES/glib20.mo share/locale/da/LC_MESSAGES/glib20.mo share/locale/de/LC_MESSAGES/glib20.mo +share/locale/dz/LC_MESSAGES/glib20.mo share/locale/el/LC_MESSAGES/glib20.mo share/locale/en_CA/LC_MESSAGES/glib20.mo share/locale/en_GB/LC_MESSAGES/glib20.mo @@ -133,7 +135,9 @@ share/locale/id/LC_MESSAGES/glib20.mo share/locale/is/LC_MESSAGES/glib20.mo share/locale/it/LC_MESSAGES/glib20.mo share/locale/ja/LC_MESSAGES/glib20.mo +share/locale/ka/LC_MESSAGES/glib20.mo share/locale/ko/LC_MESSAGES/glib20.mo +share/locale/ku/LC_MESSAGES/glib20.mo share/locale/lt/LC_MESSAGES/glib20.mo share/locale/lv/LC_MESSAGES/glib20.mo share/locale/mk/LC_MESSAGES/glib20.mo @@ -165,6 +169,7 @@ share/locale/te/LC_MESSAGES/glib20.mo share/locale/th/LC_MESSAGES/glib20.mo share/locale/tl/LC_MESSAGES/glib20.mo share/locale/tr/LC_MESSAGES/glib20.mo +share/locale/tt/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 @@ -173,12 +178,18 @@ share/locale/yi/LC_MESSAGES/glib20.mo share/locale/zh_CN/LC_MESSAGES/glib20.mo share/locale/zh_HK/LC_MESSAGES/glib20.mo share/locale/zh_TW/LC_MESSAGES/glib20.mo +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrmtry share/locale/ne/LC_MESSAGES @dirrmtry share/locale/ne @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/tl/LC_MESSAGES diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index c0bbb145f7e9..497fbb839b46 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -3,14 +3,14 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/glibmm/Makefile,v 1.1 2006/03/08 14:38:06 marcus Exp $ +# $MCom: ports/devel/glibmm/Makefile,v 1.31 2006/04/14 21:55:21 mezz Exp $ # PORTNAME= glibmm -PORTVERSION= 2.8.6 +PORTVERSION= 2.10.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,7 +23,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GCC= 3.4 USE_GNOME= gnomehack gnometarget glib20 -USE_REINPLACE= yes USE_PERL5= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index df2d47a8388b..1cdf128f8eca 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glibmm-2.8.6.tar.bz2) = e5747f4216a80d29f647ad1c05090146 -SHA256 (gnome2/glibmm-2.8.6.tar.bz2) = 26864501770a3ec291c2b4e19c4305dc1634aeb63d85e72cc2021020b9a0c5c1 -SIZE (gnome2/glibmm-2.8.6.tar.bz2) = 2378213 +MD5 (gnome2/glibmm-2.10.1.tar.bz2) = 3af9f4f3dbec200545f1eb21a678706d +SHA256 (gnome2/glibmm-2.10.1.tar.bz2) = 5e401a2dd369c50c058e6023a2b071d4086328e1930af193e937b91e86859659 +SIZE (gnome2/glibmm-2.10.1.tar.bz2) = 2383901 diff --git a/devel/glibmm/files/patch-glib_glibmm_date.cc b/devel/glibmm/files/patch-glib_glibmm_date.cc new file mode 100644 index 000000000000..bac31b4c991e --- /dev/null +++ b/devel/glibmm/files/patch-glib_glibmm_date.cc @@ -0,0 +1,17 @@ +--- glib/glibmm/date.cc.orig Mon Feb 6 00:50:58 2006 ++++ glib/glibmm/date.cc Mon Feb 6 00:51:32 2006 +@@ -72,12 +72,14 @@ void Date::set_parse(const Glib::ustring + } + + #ifndef GLIBMM_DISABLE_DEPRECATED ++#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__) + + void Date::set_time(GTime time) + { + //This method, and the C function that it wraps, are deprecated. + g_date_set_time(&gobject_, time); + } ++#endif + #endif // GLIBMM_DISABLE_DEPRECATED + + diff --git a/devel/glibmm/files/patch-glib_glibmm_date.h b/devel/glibmm/files/patch-glib_glibmm_date.h new file mode 100644 index 000000000000..0d249931c1d5 --- /dev/null +++ b/devel/glibmm/files/patch-glib_glibmm_date.h @@ -0,0 +1,18 @@ +--- glib/glibmm/date.h.orig Mon Feb 6 00:51:03 2006 ++++ glib/glibmm/date.h Mon Feb 6 00:52:08 2006 +@@ -120,6 +120,7 @@ enum DMY + void set_parse (const Glib::ustring& str); + + #ifndef GLIBMM_DISABLE_DEPRECATED ++#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__) + + /** Sets the value of a date from a GTime (time_t) value. + * +@@ -128,6 +129,7 @@ enum DMY + * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&). + */ + void set_time(GTime time); ++#endif + #endif // GLIBMM_DISABLE_DEPRECATED + + diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index 25dc9e0cbf23..0916b1d62b2b 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -133,7 +133,6 @@ share/aclocal/glibmm_check_perl.m4 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Cond-members.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Cond.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ArrayHandleIterator.html -%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ListHandleIterator-members.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ListHandleIterator.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1SListHandleIterator.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1ConvertError-members.html @@ -427,6 +426,7 @@ share/aclocal/glibmm_check_perl.m4 %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/convert_8h.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/date_8h.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/debug_8h.html +%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/deprecated.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/dispatcher_8h.html %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/doxygen.css %%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/doxygen.png diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index c34da1d3dd46..db99d72416d5 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,15 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.115 2005/10/31 00:12:01 marcus Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.137 2006/04/20 14:00:03 marcus Exp $ # PORTNAME= gnomevfs2 -PORTVERSION= 2.12.2 -PORTREVISION= 2 +PORTVERSION= 2.14.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12 +MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -22,15 +21,16 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes USE_GMAKE= yes +USE_GETTEXT= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo ltverhack -USE_REINPLACE= yes USE_AUTOTOOLS= libtool:15 USE_OPENSSL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-openssl \ - --disable-gnutls + --disable-gnutls \ + --disable-howl CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} @@ -40,8 +40,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ - system_http_proxy.schemas system_smb.schemas \ - system_storage.schemas + system_http_proxy.schemas system_smb.schemas OPTIONS= SAMBA "Enable SMB volume support" on \ MDNS "Enable Bonjour/Rendezvous support" on @@ -65,9 +64,9 @@ CONFIGURE_ARGS+=--disable-samba .endif .if !defined(WITHOUT_MDNS) -LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi .else -CONFIGURE_ARGS+=--disable-howl +CONFIGURE_ARGS+=--disable-avahi .endif post-patch: diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 52b0d0baf261..da121ec287a5 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.12.2.tar.bz2) = 4d7b9c14af29a9bf813ab4831eeeacbb -SHA256 (gnome2/gnome-vfs-2.12.2.tar.bz2) = 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177 -SIZE (gnome2/gnome-vfs-2.12.2.tar.bz2) = 1558218 +MD5 (gnome2/gnome-vfs-2.14.1.tar.bz2) = d7ba7e667b46b5929b3e277a8b870868 +SHA256 (gnome2/gnome-vfs-2.14.1.tar.bz2) = cdcef326c3bacd89bf40551932f6b8e2c04bee4ebf3afc1633032af04a7631bf +SIZE (gnome2/gnome-vfs-2.14.1.tar.bz2) = 1813793 diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index 0f976d16a464..4b5c0cfaea3d 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Oct 5 10:56:02 2005 -+++ configure Mon Nov 28 13:34:48 2005 -@@ -23119,6 +23119,8 @@ +--- configure.orig Mon Nov 14 11:43:13 2005 ++++ configure Mon Nov 28 13:52:39 2005 +@@ -23123,6 +23123,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23201,6 +23203,7 @@ +@@ -23205,6 +23207,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -24292,6 +24295,7 @@ +@@ -24296,6 +24299,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25,7 +25,7 @@ have_ngettext=yes else echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -33558,7 +33562,7 @@ +@@ -33559,7 +33563,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34,7 +34,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -36964,6 +36968,9 @@ +@@ -37107,6 +37111,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -44,7 +44,7 @@ #include <sys/statfs.h> #include <sys/fstyp.h> _ACEOF -@@ -37005,6 +37012,9 @@ +@@ -37148,6 +37155,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -54,7 +54,7 @@ #include <sys/statfs.h> #include <sys/vmount.h> _ACEOF -@@ -38439,6 +38449,7 @@ +@@ -38604,6 +38614,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in deleted file mode 100644 index 5d2778e291bf..000000000000 --- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - $MCom: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.18 2005/06/28 05:40:02 adamw Exp $ - ---- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1 -+++ devel-docs/Makefile.in 2002/02/16 16:45:47 -@@ -168,7 +168,7 @@ - TEXT_FILES = gnome-vfs-mime-type-handling.txt - - --docdir = $(prefix)/doc -+docdir = $(prefix)/share/doc - doc_DATA = - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c new file mode 100644 index 000000000000..1636ca99d4df --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c @@ -0,0 +1,10 @@ +--- libgnomevfs/gnome-vfs-address.c.orig Wed Apr 12 10:16:28 2006 ++++ libgnomevfs/gnome-vfs-address.c Thu Apr 20 09:52:12 2006 +@@ -32,6 +32,7 @@ + #include <sys/types.h> + + #ifndef G_OS_WIN32 ++#include <sys/socket.h> + #include <sys/select.h> + #include <netinet/in.h> + #include <arpa/inet.h> diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c deleted file mode 100644 index 6e3660c845b0..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libgnomevfs/gnome-vfs-resolve.c.orig Tue Apr 19 07:54:52 2005 -+++ libgnomevfs/gnome-vfs-resolve.c Sun May 22 23:25:22 2005 -@@ -171,10 +171,12 @@ _gnome_vfs_result_from_gai_error (int er - switch (error) { - - case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; -+#ifdef EAI_NODATA - #ifdef EAI_ADDRFAMILY - case EAI_ADDRFAMILY: - #endif - case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; -+#endif - #ifdef EAI_SYSTEM - case EAI_SYSTEM: return gnome_vfs_result_from_errno (); - #endif diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c new file mode 100644 index 000000000000..dc1259ac425f --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c @@ -0,0 +1,10 @@ +--- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 14 22:20:23 2005 ++++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 14 22:20:43 2005 +@@ -25,6 +25,7 @@ + + #include <sys/types.h> + #include <errno.h> ++#include <signal.h> + #include <string.h> + #include <stdlib.h> + #include <glib.h> diff --git a/devel/gnome-vfs/files/patch-modules__http-neon-method.c b/devel/gnome-vfs/files/patch-modules__http-neon-method.c deleted file mode 100644 index 77e14080f5b0..000000000000 --- a/devel/gnome-vfs/files/patch-modules__http-neon-method.c +++ /dev/null @@ -1,21 +0,0 @@ ---- modules/http-neon-method.c.orig Wed Jan 25 23:15:42 2006 -+++ modules/http-neon-method.c Wed Jan 25 23:17:47 2006 -@@ -1908,9 +1908,7 @@ - } - } - -- - result = resolve_result (res, req); -- ne_request_destroy (req); - - if (result == GNOME_VFS_OK) { - const char *name; -@@ -1929,6 +1927,8 @@ - } - - } -+ -+ ne_request_destroy (req); - - return result; - } diff --git a/devel/gnome-vfs/files/patch-modules_bzip2-method.c b/devel/gnome-vfs/files/patch-modules_bzip2-method.c deleted file mode 100644 index a1fd982c28bd..000000000000 --- a/devel/gnome-vfs/files/patch-modules_bzip2-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/bzip2-method.c.orig Wed Apr 13 21:58:54 2005 -+++ modules/bzip2-method.c Mon Nov 28 15:09:59 2005 -@@ -435,7 +435,7 @@ - - if (bzip2_handle->last_bz_result != BZ_OK) { - if (bzip2_handle->last_bz_result == BZ_STREAM_END) -- return GNOME_VFS_OK; -+ return GNOME_VFS_ERROR_EOF; - else - return result_from_bz_result (bzip2_handle->last_bz_result); - } else if (bzip2_handle->last_vfs_result != GNOME_VFS_OK) { diff --git a/devel/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c deleted file mode 100644 index e1255db179c1..000000000000 --- a/devel/gnome-vfs/files/patch-modules_sftp-method.c +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/sftp-method.c.orig Tue May 11 01:53:30 2004 -+++ modules/sftp-method.c Tue May 11 01:54:07 2004 -@@ -1081,7 +1081,9 @@ - if (io_status == G_IO_STATUS_NORMAL) { - buffer[len] = 0; - if (g_str_has_suffix (buffer, "password: ") || -+ g_str_has_suffix (buffer, "password:") || - g_str_has_suffix (buffer, "Password: ") || -+ g_str_has_suffix (buffer, "Password:") || - g_str_has_prefix (buffer, "Enter passphrase for key")) { - if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) { - g_io_channel_write_chars (tty_channel, password, -1, &len, NULL); diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index ed494001730b..f1b405661c94 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ +# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.7 2005/11/15 06:12:28 marcus Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index f7ad446b9783..0b792521a116 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ +# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.7 2005/11/15 06:12:28 marcus Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index e10dc309542b..739ca05e8761 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -1,5 +1,6 @@ bin/gnomevfs-cat bin/gnomevfs-copy +bin/gnomevfs-df bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir @@ -52,6 +53,7 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h +include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-pty.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h @@ -107,6 +109,67 @@ libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp2 +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +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 +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png +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 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 @@ -141,6 +204,7 @@ share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo @@ -154,8 +218,8 @@ share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo @@ -179,8 +243,10 @@ 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_HK/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 +@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 @@ -188,6 +254,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm include/gnome-vfs-2.0 @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 diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile index 978cbb3ae59b..48c146419b57 100644 --- a/devel/gnome-vfsmm/Makefile +++ b/devel/gnome-vfsmm/Makefile @@ -3,15 +3,14 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.14 2005/10/14 20:39:56 adamw Exp $ +# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.17 2006/04/13 07:52:32 bland Exp $ # PORTNAME= gnome-vfsmm -PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTVERSION= 2.14.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo index ab4772088fdc..6678e003e9e7 100644 --- a/devel/gnome-vfsmm/distinfo +++ b/devel/gnome-vfsmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfsmm-2.12.0.tar.bz2) = 4a73741ab5232bf85cb631108c5b6430 -SHA256 (gnome2/gnome-vfsmm-2.12.0.tar.bz2) = 3ba572ca0db177d923d9a687e5bebd9b81343f9e913cc75b725ca40d81c2c329 -SIZE (gnome2/gnome-vfsmm-2.12.0.tar.bz2) = 321830 +MD5 (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = bd5c3796e417a9780201835060461be3 +SHA256 (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = c59e640cdff8f877a3eae0e39a67e2ff07485290d8abccffbb522c54ccccb796 +SIZE (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = 324357 diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index c34da1d3dd46..db99d72416d5 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -3,15 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.115 2005/10/31 00:12:01 marcus Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.137 2006/04/20 14:00:03 marcus Exp $ # PORTNAME= gnomevfs2 -PORTVERSION= 2.12.2 -PORTREVISION= 2 +PORTVERSION= 2.14.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12 +MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -22,15 +21,16 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes USE_GMAKE= yes +USE_GETTEXT= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo ltverhack -USE_REINPLACE= yes USE_AUTOTOOLS= libtool:15 USE_OPENSSL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-openssl \ - --disable-gnutls + --disable-gnutls \ + --disable-howl CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} @@ -40,8 +40,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ - system_http_proxy.schemas system_smb.schemas \ - system_storage.schemas + system_http_proxy.schemas system_smb.schemas OPTIONS= SAMBA "Enable SMB volume support" on \ MDNS "Enable Bonjour/Rendezvous support" on @@ -65,9 +64,9 @@ CONFIGURE_ARGS+=--disable-samba .endif .if !defined(WITHOUT_MDNS) -LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi .else -CONFIGURE_ARGS+=--disable-howl +CONFIGURE_ARGS+=--disable-avahi .endif post-patch: diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 52b0d0baf261..da121ec287a5 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.12.2.tar.bz2) = 4d7b9c14af29a9bf813ab4831eeeacbb -SHA256 (gnome2/gnome-vfs-2.12.2.tar.bz2) = 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177 -SIZE (gnome2/gnome-vfs-2.12.2.tar.bz2) = 1558218 +MD5 (gnome2/gnome-vfs-2.14.1.tar.bz2) = d7ba7e667b46b5929b3e277a8b870868 +SHA256 (gnome2/gnome-vfs-2.14.1.tar.bz2) = cdcef326c3bacd89bf40551932f6b8e2c04bee4ebf3afc1633032af04a7631bf +SIZE (gnome2/gnome-vfs-2.14.1.tar.bz2) = 1813793 diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index 0f976d16a464..4b5c0cfaea3d 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Oct 5 10:56:02 2005 -+++ configure Mon Nov 28 13:34:48 2005 -@@ -23119,6 +23119,8 @@ +--- configure.orig Mon Nov 14 11:43:13 2005 ++++ configure Mon Nov 28 13:52:39 2005 +@@ -23123,6 +23123,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23201,6 +23203,7 @@ +@@ -23205,6 +23207,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -24292,6 +24295,7 @@ +@@ -24296,6 +24299,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25,7 +25,7 @@ have_ngettext=yes else echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -33558,7 +33562,7 @@ +@@ -33559,7 +33563,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34,7 +34,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -36964,6 +36968,9 @@ +@@ -37107,6 +37111,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -44,7 +44,7 @@ #include <sys/statfs.h> #include <sys/fstyp.h> _ACEOF -@@ -37005,6 +37012,9 @@ +@@ -37148,6 +37155,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -54,7 +54,7 @@ #include <sys/statfs.h> #include <sys/vmount.h> _ACEOF -@@ -38439,6 +38449,7 @@ +@@ -38604,6 +38614,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in deleted file mode 100644 index 5d2778e291bf..000000000000 --- a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - $MCom: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.18 2005/06/28 05:40:02 adamw Exp $ - ---- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1 -+++ devel-docs/Makefile.in 2002/02/16 16:45:47 -@@ -168,7 +168,7 @@ - TEXT_FILES = gnome-vfs-mime-type-handling.txt - - --docdir = $(prefix)/doc -+docdir = $(prefix)/share/doc - doc_DATA = - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c new file mode 100644 index 000000000000..1636ca99d4df --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c @@ -0,0 +1,10 @@ +--- libgnomevfs/gnome-vfs-address.c.orig Wed Apr 12 10:16:28 2006 ++++ libgnomevfs/gnome-vfs-address.c Thu Apr 20 09:52:12 2006 +@@ -32,6 +32,7 @@ + #include <sys/types.h> + + #ifndef G_OS_WIN32 ++#include <sys/socket.h> + #include <sys/select.h> + #include <netinet/in.h> + #include <arpa/inet.h> diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c deleted file mode 100644 index 6e3660c845b0..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libgnomevfs/gnome-vfs-resolve.c.orig Tue Apr 19 07:54:52 2005 -+++ libgnomevfs/gnome-vfs-resolve.c Sun May 22 23:25:22 2005 -@@ -171,10 +171,12 @@ _gnome_vfs_result_from_gai_error (int er - switch (error) { - - case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; -+#ifdef EAI_NODATA - #ifdef EAI_ADDRFAMILY - case EAI_ADDRFAMILY: - #endif - case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; -+#endif - #ifdef EAI_SYSTEM - case EAI_SYSTEM: return gnome_vfs_result_from_errno (); - #endif diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c new file mode 100644 index 000000000000..dc1259ac425f --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c @@ -0,0 +1,10 @@ +--- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 14 22:20:23 2005 ++++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 14 22:20:43 2005 +@@ -25,6 +25,7 @@ + + #include <sys/types.h> + #include <errno.h> ++#include <signal.h> + #include <string.h> + #include <stdlib.h> + #include <glib.h> diff --git a/devel/gnomevfs2/files/patch-modules__http-neon-method.c b/devel/gnomevfs2/files/patch-modules__http-neon-method.c deleted file mode 100644 index 77e14080f5b0..000000000000 --- a/devel/gnomevfs2/files/patch-modules__http-neon-method.c +++ /dev/null @@ -1,21 +0,0 @@ ---- modules/http-neon-method.c.orig Wed Jan 25 23:15:42 2006 -+++ modules/http-neon-method.c Wed Jan 25 23:17:47 2006 -@@ -1908,9 +1908,7 @@ - } - } - -- - result = resolve_result (res, req); -- ne_request_destroy (req); - - if (result == GNOME_VFS_OK) { - const char *name; -@@ -1929,6 +1927,8 @@ - } - - } -+ -+ ne_request_destroy (req); - - return result; - } diff --git a/devel/gnomevfs2/files/patch-modules_bzip2-method.c b/devel/gnomevfs2/files/patch-modules_bzip2-method.c deleted file mode 100644 index a1fd982c28bd..000000000000 --- a/devel/gnomevfs2/files/patch-modules_bzip2-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/bzip2-method.c.orig Wed Apr 13 21:58:54 2005 -+++ modules/bzip2-method.c Mon Nov 28 15:09:59 2005 -@@ -435,7 +435,7 @@ - - if (bzip2_handle->last_bz_result != BZ_OK) { - if (bzip2_handle->last_bz_result == BZ_STREAM_END) -- return GNOME_VFS_OK; -+ return GNOME_VFS_ERROR_EOF; - else - return result_from_bz_result (bzip2_handle->last_bz_result); - } else if (bzip2_handle->last_vfs_result != GNOME_VFS_OK) { diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c deleted file mode 100644 index e1255db179c1..000000000000 --- a/devel/gnomevfs2/files/patch-modules_sftp-method.c +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/sftp-method.c.orig Tue May 11 01:53:30 2004 -+++ modules/sftp-method.c Tue May 11 01:54:07 2004 -@@ -1081,7 +1081,9 @@ - if (io_status == G_IO_STATUS_NORMAL) { - buffer[len] = 0; - if (g_str_has_suffix (buffer, "password: ") || -+ g_str_has_suffix (buffer, "password:") || - g_str_has_suffix (buffer, "Password: ") || -+ g_str_has_suffix (buffer, "Password:") || - g_str_has_prefix (buffer, "Enter passphrase for key")) { - if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) { - g_io_channel_write_chars (tty_channel, password, -1, &len, NULL); diff --git a/devel/gnomevfs2/pkg-deinstall.in b/devel/gnomevfs2/pkg-deinstall.in index ed494001730b..f1b405661c94 100644 --- a/devel/gnomevfs2/pkg-deinstall.in +++ b/devel/gnomevfs2/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ +# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.7 2005/11/15 06:12:28 marcus Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnomevfs2/pkg-install.in b/devel/gnomevfs2/pkg-install.in index f7ad446b9783..0b792521a116 100644 --- a/devel/gnomevfs2/pkg-install.in +++ b/devel/gnomevfs2/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ +# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.7 2005/11/15 06:12:28 marcus Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index e10dc309542b..739ca05e8761 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -1,5 +1,6 @@ bin/gnomevfs-cat bin/gnomevfs-copy +bin/gnomevfs-df bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir @@ -52,6 +53,7 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h +include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-pty.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h @@ -107,6 +109,67 @@ libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp2 +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +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 +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png +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 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 @@ -141,6 +204,7 @@ share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo @@ -154,8 +218,8 @@ share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo @@ -179,8 +243,10 @@ 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_HK/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 +@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 @@ -188,6 +254,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm include/gnome-vfs-2.0 @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 diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 278beefbb260..a2cd560e7f53 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -3,14 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libbonobo/Makefile,v 1.45 2006/04/13 07:52:33 bland Exp $ # PORTNAME= libbonobo -PORTVERSION= 2.10.1 -PORTREVISION= 3 +PORTVERSION= 2.14.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,6 +19,7 @@ COMMENT= A component and compound document system for GNOME2 USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes +USE_GETTEXT= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_PERL5= yes diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 3b59eb12f9d8..70ebbb7b074f 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libbonobo-2.10.1.tar.bz2) = 927d572970d87121c8375aab1b4b1d37 -SHA256 (gnome2/libbonobo-2.10.1.tar.bz2) = 7799f889eeea4cd0758be9dd37a85e135f1b0c8e1b6042ddea75a79ba6caebb0 -SIZE (gnome2/libbonobo-2.10.1.tar.bz2) = 1358327 +MD5 (gnome2/libbonobo-2.14.0.tar.bz2) = f1f0255f94e3354250d142b688013fad +SHA256 (gnome2/libbonobo-2.14.0.tar.bz2) = d49cc01bf85a185836689013191f92c21b625e7f38bcfcd06b41e19201765754 +SIZE (gnome2/libbonobo-2.14.0.tar.bz2) = 1386855 diff --git a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c deleted file mode 100644 index ced10add3d34..000000000000 --- a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c +++ /dev/null @@ -1,21 +0,0 @@ ---- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Sep 9 17:20:15 2005 -+++ bonobo-activation/bonobo-activation-fork-server.c Fri Sep 9 17:31:52 2005 -@@ -359,10 +359,18 @@ - g_source_destroy (source); - g_source_unref (source); - -+ g_io_channel_shutdown (ai.ioc, FALSE, NULL); - g_io_channel_unref (ai.ioc); - - if (use_new_loop) - g_main_context_unref (context); -+ -+ close (iopipes[1]); -+ -+ g_strfreev(newenv); -+ -+ if (fd_arg != 0) -+ g_free ((char *) cmd[fd_arg]); - - return CORBA_OBJECT_NIL; - } diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index 1a5ef4155a8b..2bf441f2bb1c 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -217,6 +217,7 @@ share/locale/is/LC_MESSAGES/libbonobo-2.0.mo share/locale/it/LC_MESSAGES/libbonobo-2.0.mo share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo +share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo share/locale/li/LC_MESSAGES/libbonobo-2.0.mo share/locale/lt/LC_MESSAGES/libbonobo-2.0.mo share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo @@ -264,7 +265,9 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrm include/bonobo-activation-2.0/bonobo-activation @dirrm include/bonobo-activation-2.0 @dirrm etc/bonobo-activation -@unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/li/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/li 2>/dev/null || /usr/bin/true +@dirrmtry lib/bonobo/monikers +@dirrmtry lib/bonobo +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 63f12c1d616a..73bd353da6d8 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.8 2005/09/08 17:53:00 marcus Exp $ +# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.10 2006/03/05 21:26:56 marcus Exp $ # CATEGORIES= devel gnome diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist index 73fb82d06985..4f502a67c6fb 100644 --- a/devel/libgsf-gnome/pkg-plist +++ b/devel/libgsf-gnome/pkg-plist @@ -6,6 +6,6 @@ include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h lib/libgsf-gnome-1.a lib/libgsf-gnome-1.la lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.113 +lib/libgsf-gnome-1.so.114 libdata/pkgconfig/libgsf-gnome-1.pc @dirrm include/libgsf-1/gsf-gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 1dc1177554b2..db4ce3e3908f 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,15 +3,15 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.17 2005/10/11 22:08:17 marcus Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.22 2006/04/23 22:42:46 mezz Exp $ # PORTNAME= libgsf -PORTVERSION= 1.13.3 -PORTREVISION?= 1 +PORTVERSION= 1.14.0 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -24,6 +24,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes +USE_GETTEXT= yes INSTALLS_SHLIB= yes USE_GNOME?= gnomehack glib20 libxml2 gconf2 ltverhack intlhack USE_AUTOTOOLS= libtool:15 diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index bc1038665ea7..9164f4ed7be4 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgsf-1.13.3.tar.bz2) = b35e95f6bd7b8add9981b6cf6336674a -SHA256 (gnome2/libgsf-1.13.3.tar.bz2) = 458e7b2ca26f0d212f91b445f0a93db62a679ec671bd3cc980f3c1ac65f06b96 -SIZE (gnome2/libgsf-1.13.3.tar.bz2) = 513659 +MD5 (gnome2/libgsf-1.14.0.tar.bz2) = 2d3b112a2c6e7e1740306c32b1ebf6e6 +SHA256 (gnome2/libgsf-1.14.0.tar.bz2) = 1572b131c4d32527c9adda40faea5a58bd67dfc5e16cdbd7ff9b1e793790568a +SIZE (gnome2/libgsf-1.14.0.tar.bz2) = 525532 diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 3f3152f53afa..e654b64cf300 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -46,7 +46,7 @@ include/libgsf-1/gsf/gsf.h lib/libgsf-1.a lib/libgsf-1.la lib/libgsf-1.so -lib/libgsf-1.so.113 +lib/libgsf-1.so.114 libdata/pkgconfig/libgsf-1.pc share/doc/gsf/GsfBlob.html share/doc/gsf/GsfClipData.html @@ -72,6 +72,7 @@ share/doc/gsf/gsf-metadata.html share/doc/gsf/gsf-users.html share/doc/gsf/gsf-utils.html share/doc/gsf/gsf.devhelp +share/doc/gsf/gsf.devhelp2 share/doc/gsf/history.html share/doc/gsf/home.png share/doc/gsf/index.html @@ -87,6 +88,7 @@ share/doc/gsf/sources.html share/doc/gsf/style.css share/doc/gsf/up.png share/locale/es/LC_MESSAGES/libgsf.mo +share/locale/sv/LC_MESSAGES/libgsf.mo @dirrm share/doc/gsf @dirrm include/libgsf-1/gsf-win32 @dirrm include/libgsf-1/gsf diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 2dfbe78cdfea..e8d7dcb40ee6 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgtop2/Makefile,v 1.49 2005/09/05 19:23:42 ahze Exp $ +# $MCom: ports/devel/libgtop2/Makefile,v 1.70 2006/04/15 05:49:08 marcus Exp $ # PORTNAME= libgtop2 -PORTVERSION= 2.12.2 -PORTREVISION= 1 +PORTVERSION= 2.14.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,13 +20,13 @@ COMMENT= GNOME 2 top library LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_PERL5= yes +USE_PERL5_BUILD=yes +USE_GETTEXT= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomehack glib20 -USE_REINPLACE= yes +USE_GNOME= gnomehack glib20 ltverhack INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -38,8 +37,6 @@ INFO= libgtop2 .if ${OSVERSION} >= 600000 PKGMESSAGE= ${FILESDIR}/pkg-message EXTRA_PATCHES+= ${FILESDIR}/extra-67-patch-sysdeps_freebsd_Makefile.in -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-45-patch-sysdeps_freebsd_Makefile.in .endif post-patch: diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index b2e15a7aef74..dd81ddab3cba 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgtop-2.12.2.tar.bz2) = 050e0d7834a3e73f693895e0a3130917 -SHA256 (gnome2/libgtop-2.12.2.tar.bz2) = 32d3e0f538c5851b9ca908f24170ce63d7c09d5028704bce6218e6130a9169d3 -SIZE (gnome2/libgtop-2.12.2.tar.bz2) = 623479 +MD5 (gnome2/libgtop-2.14.1.tar.bz2) = 59cc661ae518fcae158517cc029b2add +SHA256 (gnome2/libgtop-2.14.1.tar.bz2) = b0658ab0327bf833295bb8d2467ab16747c017c8cd26ff6936a927def6818fb2 +SIZE (gnome2/libgtop-2.14.1.tar.bz2) = 661846 diff --git a/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index dea0aec8224c..000000000000 --- a/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig Mon Aug 8 15:10:50 2005 -+++ sysdeps/freebsd/Makefile.in Mon Aug 8 15:15:54 2005 -@@ -143,12 +143,11 @@ - - 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 siglist.c netlist.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c -- -+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - -@@ -171,13 +170,13 @@ - 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 siglist.lo netlist.lo - libgtop_sysdeps_suid_2_0_la_LIBADD = - libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \ - swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \ - proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ - procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \ --netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo -+netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in index 8168ecb6ddd0..1258d576f76d 100644 --- a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in +++ b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in @@ -1,34 +1,20 @@ ---- sysdeps/freebsd/Makefile.in.orig Mon Aug 8 20:25:56 2005 -+++ sysdeps/freebsd/Makefile.in Mon Aug 8 20:28:06 2005 -@@ -143,12 +143,11 @@ - +--- sysdeps/freebsd/Makefile.in.orig Mon Apr 10 14:08:39 2006 ++++ sysdeps/freebsd/Makefile.in Mon Apr 10 14:11:50 2006 +@@ -50,7 +50,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) +-libgtop_sysdeps_2_0_la_LIBADD = ++libgtop_sysdeps_2_0_la_LIBADD = -lgeom -ldevstat + am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo + libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS) + am__DEPENDENCIES_1 = +@@ -260,7 +260,7 @@ target_vendor = @target_vendor@ 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 siglist.c netlist.c - + libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c sysinfo.c libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c -- -+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - -@@ -171,13 +170,13 @@ - 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_suid_2_0_la_LIBADD = -+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo -+libgtop_sysdeps_suid_2_0_la_LIBADD = -lgeom -ldevstat - libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \ - swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \ - proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ - procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \ --netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo -+netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) ++libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) -lgeom -ldevstat + libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ + uptime.c loadavg.c shm_limits.c msg_limits.c \ + sem_limits.c proclist.c procstate.c procuid.c \ diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure index e40ac7b08c2c..934f89e79fdc 100644 --- a/devel/libgtop2/files/patch-configure +++ b/devel/libgtop2/files/patch-configure @@ -1,33 +1,19 @@ ---- configure.orig Wed Jul 13 19:29:53 2005 -+++ configure Wed Jul 13 19:36:36 2005 -@@ -1931,9 +1931,9 @@ - - # libtool versioning - LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION --LT_CURRENT=$LIBGTOP_CURRENT --LT_REVISION=$LIBGTOP_REVISION --LT_AGE=$LIBGTOP_AGE -+LT_CURRENT=2 -+LT_REVISION=0 -+LT_AGE=0 - LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}" - - -@@ -23654,6 +23654,8 @@ - fi - - done -+;; -+esac - - - -@@ -23792,8 +23794,6 @@ - - fi - -- ;; --esac - - - echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5 +--- configure.orig Mon Apr 10 15:28:24 2006 ++++ configure Mon Apr 10 15:30:40 2006 +@@ -20568,6 +20568,7 @@ else + for def in nothing KERNEL _KERNEL; do + cat >conftest.$ac_ext <<_ACEOF + #define $def ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/msg.h> + #include <stdio.h> +@@ -23458,7 +23459,7 @@ fi + + + case "$host_os" in +- solaris*) ++ solaris*|freebsd*) + + echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 + echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6 diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c index b4ca4953413b..18c837d377c2 100644 --- a/devel/libgtop2/files/patch-lib::read.c +++ b/devel/libgtop2/files/patch-lib::read.c @@ -1,5 +1,5 @@ ---- lib/read.c.orig Mon Apr 11 03:25:32 2005 -+++ lib/read.c Mon Apr 11 03:27:06 2005 +--- lib/read.c.orig Mon Apr 10 04:41:46 2006 ++++ lib/read.c Mon Apr 10 15:12:31 2006 @@ -22,6 +22,7 @@ */ @@ -7,9 +7,9 @@ +#include <errno.h> #include <glibtop/read.h> #include <glibtop/error.h> - #include "libgtop-i18n.h" -@@ -56,14 +57,18 @@ - fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size); + #include <glib/gi18n-lib.h> +@@ -56,14 +57,18 @@ glibtop_read_l (glibtop *server, size_t + fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size); #endif +retry: @@ -24,7 +24,7 @@ server, ngettext ("read %d byte", "read %d bytes", size), - size); + (int)size); + } } } diff --git a/devel/libgtop2/files/patch-lib::write.c b/devel/libgtop2/files/patch-lib::write.c index 0d00f7a5f243..acb63c489cc1 100644 --- a/devel/libgtop2/files/patch-lib::write.c +++ b/devel/libgtop2/files/patch-lib::write.c @@ -1,5 +1,5 @@ ---- lib/write.c.orig Mon Apr 11 03:28:12 2005 -+++ lib/write.c Mon Apr 11 03:29:00 2005 +--- lib/write.c.orig Mon Apr 10 04:41:46 2006 ++++ lib/write.c Mon Apr 10 15:37:00 2006 @@ -22,7 +22,7 @@ */ @@ -8,9 +8,9 @@ +#include <errno.h> #include <glibtop/write.h> #include <glibtop/error.h> - #include "libgtop-i18n.h" -@@ -42,12 +42,16 @@ - fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size); + #include <glib/gi18n-lib.h> +@@ -42,15 +42,19 @@ glibtop_write_l (glibtop *server, size_t + fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size); #endif +retry: @@ -24,6 +24,9 @@ + if (ret < 0) { + if (errno == EINTR) + goto retry; - glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size); + glibtop_error_io_r (server, + ngettext("wrote %d byte", + "wrote %d bytes", size), + (int) size); + } } diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop2/files/patch-src::daemon::io.c index a2d23482266c..f8fb71b0378b 100644 --- a/devel/libgtop2/files/patch-src::daemon::io.c +++ b/devel/libgtop2/files/patch-src::daemon::io.c @@ -1,14 +1,14 @@ ---- src/daemon/io.c.orig Mon Apr 11 03:30:12 2005 -+++ src/daemon/io.c Mon Apr 11 03:33:22 2005 +--- src/daemon/io.c.orig Mon Dec 12 05:09:38 2005 ++++ src/daemon/io.c Wed Dec 14 18:58:01 2005 @@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA. */ +#include <errno.h> + #include <config.h> #include "daemon.h" #include <glibtop/error.h> - -@@ -36,9 +37,13 @@ +@@ -37,9 +38,13 @@ do_output (int s, glibtop_response *resp resp->offset = offset; resp->data_size = data_size; @@ -23,7 +23,7 @@ } else { if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0) glibtop_warn_io ("send"); -@@ -49,9 +54,13 @@ +@@ -50,9 +55,13 @@ do_output (int s, glibtop_response *resp fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size); #endif @@ -38,7 +38,7 @@ } else { if (send (s, data, resp->data_size, 0) , 0) glibtop_warn_io ("send"); -@@ -67,6 +76,7 @@ +@@ -68,6 +77,7 @@ do_read (int s, void *ptr, size_t total_ size_t already_read = 0, remaining = total_size; while (already_read < total_size) { @@ -46,7 +46,7 @@ if (s) nread = recv (s, ptr, remaining, 0); else -@@ -78,6 +88,8 @@ +@@ -79,6 +89,8 @@ do_read (int s, void *ptr, size_t total_ } if (nread <= 0) { diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c index 128eda35b6cb..85c9822f86f9 100644 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c @@ -1,21 +1,28 @@ ---- sysdeps/freebsd/fsusage.c.orig Mon Feb 28 03:54:41 2005 -+++ sysdeps/freebsd/fsusage.c Tue May 24 01:49:42 2005 -@@ -9,6 +9,12 @@ +--- sysdeps/freebsd/jfsusage.c.orig Sun Apr 9 12:52:45 2006 ++++ sysdeps/freebsd/fsusage.c Mon Apr 10 15:34:42 2006 +@@ -9,10 +9,12 @@ + #include <unistd.h> #include <sys/param.h> +-#if defined (HAVE_SYS_STATVFS_H) +-#include <sys/statvfs.h> +-#else #include <sys/mount.h> +#if __FreeBSD_version >= 600000 +#include <libgeom.h> +#include <sys/resource.h> +#include <devstat.h> +#include <sys/devicestat.h> -+#endif + #endif #include <stdio.h> - #include <string.h> -@@ -27,15 +33,107 @@ _glibtop_freebsd_get_fsusage_read_write( +@@ -31,24 +33,108 @@ _glibtop_freebsd_get_fsusage_read_write( + const char *path) { int result; +-#if defined (STAT_STATVFS) +- struct statvfs sfs; +-#else struct statfs sfs; +#if __FreeBSD_version >= 600000 + struct devstat *ds; @@ -26,14 +33,18 @@ + struct gmesh gmp; + double etime; + uint64_t ld[2]; -+#endif + #endif +-#if defined (STAT_STATVFS) +- result = statvfs (path, &sfs); +-#else result = statfs (path, &sfs); +-#endif if (result == -1) { + glibtop_warn_io_r (server, "statfs"); - return; - } ++ return; ++ } +#if __FreeBSD_version >= 600000 + ld[0] = 0; + ld[1] = 0; @@ -55,9 +66,9 @@ + glibtop_warn_io_r (server, "geom_stats_snapshot_get()"); + geom_stats_close (); + geom_deletetree (&gmp); -+ return; -+ } -+ + return; + } + + geom_stats_snapshot_timestamp (sc, &ts); + etime = ts.tv_sec + (ts.tv_nsec * 1e-9); + geom_stats_snapshot_reset (sc); @@ -107,7 +118,7 @@ + break; + } + } - ++ + geom_stats_snapshot_free (sc); + geom_stats_close (); + geom_deletetree (&gmp); diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h index 5ded2dc3c3c0..4955aed65da5 100644 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h @@ -1,5 +1,5 @@ ---- sysdeps/freebsd/glibtop_server.h.orig Mon Oct 20 11:19:49 2003 -+++ sysdeps/freebsd/glibtop_server.h Mon Aug 8 15:10:14 2005 +--- sysdeps/freebsd/glibtop_server.h.orig Tue Apr 4 16:06:13 2006 ++++ sysdeps/freebsd/glibtop_server.h Mon Apr 10 15:27:11 2006 @@ -21,8 +21,8 @@ Boston, MA 02111-1307, USA. */ @@ -11,11 +11,3 @@ G_BEGIN_DECLS -@@ -45,6 +45,7 @@ G_BEGIN_DECLS - #define GLIBTOP_SUID_PROC_ARGS (1 << GLIBTOP_SYSDEPS_PROC_ARGS) - #define GLIBTOP_SUID_PROC_MAP (1 << GLIBTOP_SYSDEPS_PROC_MAP) - #define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD) -+#define GLIBTOP_SUID_NETLIST 0 - #define GLIBTOP_SUID_PPP (1 << GLIBTOP_SYSDEPS_PPP) - - G_END_DECLS diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c b/devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c new file mode 100644 index 000000000000..6881723bd3ad --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c @@ -0,0 +1,41 @@ +--- sysdeps/freebsd/siglist.c.orig Fri Jan 20 02:56:40 2006 ++++ sysdeps/freebsd/siglist.c Fri Jan 20 02:56:44 2006 +@@ -26,4 +26,37 @@ + #include <glibtop/signal.h> + + const glibtop_signame glibtop_sys_siglist [] = +-{ { 0, NULL, NULL } }; ++{ { 1, "SIGHUP", "Hangup" }, ++ { 2, "SIGINT", "Interrupt" }, ++ { 3, "SIGQUIT", "Quit" }, ++ { 4, "SIGILL", "Illegal Instruction" }, ++ { 5, "SIGTRAP", "Trace/Breakpoint Trap" }, ++ { 6, "SIGABRT", "Abort" }, ++ { 7, "SIGEMT", "Emulation Trap" }, ++ { 8, "SIGFPE", "Arithmetic Exception" }, ++ { 9, "SIGKILL", "Killed" }, ++ { 10, "SIGBUS", "Bus Error" }, ++ { 11, "SIGSEGV", "Segmentation Fault" }, ++ { 12, "SIGSYS", "Bad System Call" }, ++ { 13, "SIGPIPE", "Broken Pipe" }, ++ { 14, "SIGALRM", "Alarm Clock" }, ++ { 15, "SIGTERM", "Terminated" }, ++ { 16, "SIGURG", "Urgent Condition Present On Socket" }, ++ { 17, "SIGSTOP", "Stop (cannot be caught or ignored)" }, ++ { 18, "SIGTSTP", "Stop Signal Generated From Keyboard" }, ++ { 19, "SIGCONT", "Continue After Stop" }, ++ { 20, "SIGCHLD", "Child Status Has Changed" }, ++ { 21, "SIGTTIN", "Background Read Attempted From Control Terminal" }, ++ { 22, "SIGTTOU", "Background Write Attempted To Control Terminal" }, ++ { 23, "SIGIO", "I/O Is Possible On A Descriptor" }, ++ { 24, "SIGXCPU", "CPU Time Limit Exceeded" }, ++ { 25, "SIGXFSZ", "File Size Limit Exceeded" }, ++ { 26, "SIGVTALRM","Virtual Time Alarm" }, ++ { 27, "SIGPROF", "Profiling Timer Alarm" }, ++ { 28, "SIGWINCH","Window Size Change" }, ++ { 29, "SIGINFO", "Status Request From Keyboard" }, ++ { 30, "SIGUSR1", "User Defined Signal 1" }, ++ { 31, "SIGUSR2", "User Defined Signal 2" }, ++ { 32, "SIGTHR", "Thread Interrupt" }, ++ { 0, NULL, NULL } ++}; diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c deleted file mode 100644 index 7a86f3327730..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c +++ /dev/null @@ -1,95 +0,0 @@ ---- sysdeps/freebsd/sysinfo.c.orig Thu Jun 9 22:56:29 2005 -+++ sysdeps/freebsd/sysinfo.c Thu Jun 9 22:58:36 2005 -@@ -0,0 +1,92 @@ -+/* $Id$ */ -+ -+/* Copyright (C) 1998-99 Martin Baulig -+ This file is part of LibGTop 1.0. -+ -+ Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998. -+ -+ LibGTop is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, -+ or (at your option) any later version. -+ -+ LibGTop is distributed in the hope that it will be useful, but WITHOUT -+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with LibGTop; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#include <config.h> -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#include <glibtop/error.h> -+#include <glibtop/cpu.h> -+#include <glibtop/sysinfo.h> -+ -+static const unsigned long _glibtop_sysdeps_sysinfo = -+(1L << GLIBTOP_SYSINFO_CPUINFO); -+ -+static glibtop_sysinfo sysinfo = { .flags = 0 }; -+ -+static void -+init_sysinfo (glibtop *server) -+{ -+ char *model; -+ int ncpus = 1; -+ int mhz = 0; -+ size_t len; -+ -+ if(G_LIKELY(sysinfo.flags)) return; -+ -+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); -+ -+ len = sizeof (ncpus); -+ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); -+ len = 0; -+ sysctlbyname ("hw.model", NULL, &len, NULL, 0); -+ model = malloc (len); -+ sysctlbyname ("hw.model", model, &len, NULL, 0); -+ len = sizeof (mhz); -+ sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0); -+ -+ for(sysinfo.ncpu = 0; -+ sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus; -+ sysinfo.ncpu++) { -+ -+ glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu]; -+ -+ cpuinfo->labels = g_ptr_array_new (); -+ -+ cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal, -+ g_free, g_free); -+ -+ cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal, -+ g_free, g_free); -+ -+ g_ptr_array_add (cpuinfo->labels, "processor"); -+ g_hash_table_insert (cpuinfo->values, "processor", &sysinfo.ncpu); -+ -+ g_ptr_array_add (cpuinfo->labels, "vendor_id"); -+ g_hash_table_insert (cpuinfo->values, "vendor_id", model); -+ -+ g_ptr_array_add (cpuinfo->labels, "cpu MHz"); -+ g_hash_table_insert (cpuinfo->values, "cpu MHz", &mhz); -+ -+ } -+ -+ free (model); -+ -+ sysinfo.flags = _glibtop_sysdeps_sysinfo; -+} -+ -+const glibtop_sysinfo * -+glibtop_get_sysinfo_s (glibtop *server) -+{ -+ init_sysinfo (server); -+ return &sysinfo; -+} diff --git a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c b/devel/libgtop2/files/patch-systeps::freebsd::procmap.c index c8c701e46eca..a17e9595e7c8 100644 --- a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c +++ b/devel/libgtop2/files/patch-systeps::freebsd::procmap.c @@ -1,11 +1,155 @@ ---- sysdeps/freebsd/procmap.c Wed Feb 23 17:20:45 2005 -+++ sysdeps/freebsd/procmap.c.orig Sat Mar 19 02:46:57 2005 -@@ -129,7 +129,7 @@ +--- sysdeps/freebsd/procmap.c.orig Mon Dec 12 05:09:39 2005 ++++ sysdeps/freebsd/procmap.c Fri Jan 20 16:28:33 2006 +@@ -108,14 +108,16 @@ glibtop_get_proc_map_p (glibtop *server, + #else + struct vm_object object; + #endif +- glibtop_map_entry *maps; ++ GArray *maps = g_array_sized_new(FALSE, FALSE, ++ sizeof(glibtop_map_entry), ++ 100); + #if defined __FreeBSD__ + struct vnode vnode; + #if __FreeBSD_version < 500039 + struct inode inode; + #endif + #endif +- int count, i = 0; ++ int count; + int update = 0; + + glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MAP), 0); +@@ -123,15 +125,15 @@ glibtop_get_proc_map_p (glibtop *server, + memset (buf, 0, sizeof (glibtop_proc_map)); + + /* It does not work for the swapper task. */ +- if (pid == 0) return NULL; ++ if (pid == 0) return (glibtop_map_entry*) g_array_free(maps, TRUE); + + glibtop_suid_enter (server); + /* Get the process data */ pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); if ((pinfo == NULL) || (count < 1)) { - glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); +- return NULL; + glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); - return NULL; ++ return (glibtop_map_entry*) g_array_free(maps, TRUE); } + /* Now we get the memory maps. */ +@@ -159,8 +161,6 @@ glibtop_get_proc_map_p (glibtop *server, + + buf->total = buf->number * buf->size; + +- maps = g_malloc0(buf->total); +- + buf->flags = _glibtop_sysdeps_proc_map; + + /* Walk through the `vm_map_entry' list ... */ +@@ -170,6 +170,10 @@ glibtop_get_proc_map_p (glibtop *server, + * to OBJT_DEFAULT so if seems this really works. */ + + do { ++ glibtop_map_entry *mentry; ++ unsigned long inode, dev; ++ guint len; ++ + if (update) { + if (kvm_read (server->machine.kd, + (unsigned long) entry.next, +@@ -197,22 +201,6 @@ glibtop_get_proc_map_p (glibtop *server, + #endif + #endif + +- maps [i].flags = _glibtop_sysdeps_map_entry; +- +- maps [i].start = entry.start; +- maps [i].end = entry.end; +- maps [i].offset = entry.offset; +- +- maps [i].perm = 0; +- +- if (entry.protection & VM_PROT_READ) +- maps [i].perm |= GLIBTOP_MAP_PERM_READ; +- if (entry.protection & VM_PROT_WRITE) +- maps [i].perm |= GLIBTOP_MAP_PERM_WRITE; +- if (entry.protection & VM_PROT_EXECUTE) +- maps [i].perm |= GLIBTOP_MAP_PERM_EXECUTE; +- +- i++; + + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) + if (!entry.object.uvm_obj) +@@ -224,7 +212,7 @@ glibtop_get_proc_map_p (glibtop *server, + (unsigned long) entry.object.uvm_obj, + &vnode, sizeof (vnode)) != sizeof (vnode)) { + glibtop_warn_io_r (server, "kvm_read (vnode)"); +- return NULL; ++ return (glibtop_map_entry*) g_array_free(maps, TRUE); + } + #else + if (!entry.object.vm_object) +@@ -251,8 +239,8 @@ glibtop_get_proc_map_p (glibtop *server, + &inode, sizeof (inode)) != sizeof (inode)) + glibtop_error_io_r (server, "kvm_read (inode)"); + +- maps [i-1].inode = inode.i_number; +- maps [i-1].device = inode.i_dev; ++ inode = inode.i_number; ++ dev = inode.i_dev; + #endif + + +@@ -274,8 +262,8 @@ glibtop_get_proc_map_p (glibtop *server, + switch (vnode.v_type) { + case VREG: + #if __FreeBSD_version < 600006 +- maps [i-1].inode = vnode.v_cachedid; +- maps [i-1].device = vnode.v_cachedfs; ++ inode = vnode.v_cachedid; ++ dev = vnode.v_cachedfs; + #endif + default: + continue; +@@ -289,11 +277,37 @@ glibtop_get_proc_map_p (glibtop *server, + &inode, sizeof (inode)) != sizeof (inode)) + glibtop_error_io_r (server, "kvm_read (inode)"); + +- maps [i-1].inode = inode.i_number; +- maps [i-1].device = inode.i_dev; ++ inode = inode.i_number; ++ dev = inode.i_dev; + #endif + #endif ++ len = maps->len; ++ g_array_set_size(maps, len + 1); ++ mentry = &g_array_index(maps, glibtop_map_entry, len); ++ ++ mentry->flags = _glibtop_sysdeps_map_entry; ++ ++ mentry->start = (guint64) entry.start; ++ mentry->end = (guint64) entry.end; ++ mentry->offset = (guint64) entry.offset; ++ mentry->device = (guint64) dev; ++ mentry->inode = (guint64) inode; ++ ++ mentry->perm = (guint64) 0; ++ ++ if (entry.protection & VM_PROT_READ) ++ mentry->perm |= GLIBTOP_MAP_PERM_READ; ++ if (entry.protection & VM_PROT_WRITE) ++ mentry->perm |= GLIBTOP_MAP_PERM_WRITE; ++ if (entry.protection & VM_PROT_EXECUTE) ++ mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE; + } while (entry.next != first); + +- return maps; ++ buf->flags = _glibtop_sysdeps_proc_map; ++ ++ buf->number = maps->len; ++ buf->size = sizeof (glibtop_map_entry); ++ buf->total = buf->number * buf->size; ++ ++ return (glibtop_map_entry*) g_array_free(maps, FALSE); + } diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index b4f95e658e86..020a91183bd2 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -44,7 +44,7 @@ include/libgtop-2.0/libgtopconfig.h lib/libgtop-2.0.a lib/libgtop-2.0.la lib/libgtop-2.0.so -lib/libgtop-2.0.so.2 +lib/libgtop-2.0.so.7 libdata/pkgconfig/libgtop-2.0.pc share/locale/am/LC_MESSAGES/libgtop-2.0.mo share/locale/ar/LC_MESSAGES/libgtop-2.0.mo @@ -77,6 +77,7 @@ share/locale/hu/LC_MESSAGES/libgtop-2.0.mo share/locale/id/LC_MESSAGES/libgtop-2.0.mo share/locale/it/LC_MESSAGES/libgtop-2.0.mo share/locale/ja/LC_MESSAGES/libgtop-2.0.mo +share/locale/ka/LC_MESSAGES/libgtop-2.0.mo share/locale/ko/LC_MESSAGES/libgtop-2.0.mo share/locale/ku/LC_MESSAGES/libgtop-2.0.mo share/locale/ky/LC_MESSAGES/libgtop-2.0.mo @@ -107,6 +108,7 @@ share/locale/sr/LC_MESSAGES/libgtop-2.0.mo share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo share/locale/sv/LC_MESSAGES/libgtop-2.0.mo share/locale/ta/LC_MESSAGES/libgtop-2.0.mo +share/locale/th/LC_MESSAGES/libgtop-2.0.mo share/locale/tr/LC_MESSAGES/libgtop-2.0.mo share/locale/uk/LC_MESSAGES/libgtop-2.0.mo share/locale/vi/LC_MESSAGES/libgtop-2.0.mo diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index a6185a42c864..9585ed091e7f 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.36 2006/04/13 07:52:33 bland Exp $ # PORTNAME= libsoup -PORTVERSION= 2.2.7 -PORTREVISION= 2 +PORTVERSION= 2.2.92 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index ec61826f0643..ec6f038c1dee 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libsoup-2.2.7.tar.bz2) = fd1d6bf0ec3e57c8a1498b935d13ace4 -SHA256 (gnome2/libsoup-2.2.7.tar.bz2) = bd5992ab97ae7da9dafce67a58513580831bb1f8ab61e00daed8c12cd7d7dc3f -SIZE (gnome2/libsoup-2.2.7.tar.bz2) = 440977 +MD5 (gnome2/libsoup-2.2.92.tar.bz2) = 44803c568d80f0adf3141fa23998ca74 +SHA256 (gnome2/libsoup-2.2.92.tar.bz2) = 142bf49e6f09dbe3a9f298e18546ef794a46cd8fc13867fa4716f15fec2c4c2f +SIZE (gnome2/libsoup-2.2.92.tar.bz2) = 446636 diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index a6185a42c864..9585ed091e7f 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.36 2006/04/13 07:52:33 bland Exp $ # PORTNAME= libsoup -PORTVERSION= 2.2.7 -PORTREVISION= 2 +PORTVERSION= 2.2.92 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/libsoup22/distinfo b/devel/libsoup22/distinfo index ec61826f0643..ec6f038c1dee 100644 --- a/devel/libsoup22/distinfo +++ b/devel/libsoup22/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libsoup-2.2.7.tar.bz2) = fd1d6bf0ec3e57c8a1498b935d13ace4 -SHA256 (gnome2/libsoup-2.2.7.tar.bz2) = bd5992ab97ae7da9dafce67a58513580831bb1f8ab61e00daed8c12cd7d7dc3f -SIZE (gnome2/libsoup-2.2.7.tar.bz2) = 440977 +MD5 (gnome2/libsoup-2.2.92.tar.bz2) = 44803c568d80f0adf3141fa23998ca74 +SHA256 (gnome2/libsoup-2.2.92.tar.bz2) = 142bf49e6f09dbe3a9f298e18546ef794a46cd8fc13867fa4716f15fec2c4c2f +SIZE (gnome2/libsoup-2.2.92.tar.bz2) = 446636 diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index 677c0e8184d0..c8faa7191d4c 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -3,13 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/py-gobject/Makefile,v 1.7 2006/04/13 07:52:34 bland Exp $ PORTNAME= gobject -PORTVERSION= 2.8.0 -PORTREVISION= 1 +PORTVERSION= 2.10.1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/pygobject/2.8 +MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pygobject-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,6 +23,6 @@ USE_GNOME= gnomehack glib20 USE_PYTHON= yes GNU_CONFIGURE= yes -CONFLICTS= py*-gtk-[0-9]* +CONFLICTS= py*-gtk-0* .include <bsd.port.mk> diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo index 4e818922b9f5..9bf7994d19f5 100644 --- a/devel/py-gobject/distinfo +++ b/devel/py-gobject/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygobject-2.8.0.tar.bz2) = 9ad0bd2d296417321bccea4d9abf077c -SHA256 (gnome2/pygobject-2.8.0.tar.bz2) = 82dfc3054c4fcfb37847e43df8ad298808fda955aa7c2056f5cab991fd9aa145 -SIZE (gnome2/pygobject-2.8.0.tar.bz2) = 262853 +MD5 (gnome2/pygobject-2.10.1.tar.bz2) = 3a69a75b4dfdb52642f26a4d45fcfde8 +SHA256 (gnome2/pygobject-2.10.1.tar.bz2) = dff4a3e4a53c8190b2249e2fc7dd71258b2d6b2f65762aa59f5d56a52d53b86d +SIZE (gnome2/pygobject-2.10.1.tar.bz2) = 273207 diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist index 9c1badfcdd1b..bbd12810ba5d 100644 --- a/devel/py-gobject/pkg-plist +++ b/devel/py-gobject/pkg-plist @@ -1,4 +1,7 @@ include/pygtk-2.0/pygobject.h +%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.so %%PYTHON_SITELIBDIR%%/pygtk.pth diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile index 5a5752b5d3b2..33ed83a1de10 100644 --- a/devel/py-orbit2/Makefile +++ b/devel/py-orbit2/Makefile @@ -3,13 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/py-orbit2/Makefile,v 1.11 2006/04/13 07:52:34 bland Exp $ PORTNAME= orbit -PORTVERSION= 2.0.1 -PORTREVISION= 3 +PORTVERSION= 2.14.0 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/pyorbit/2.0 +MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pyorbit-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/py-orbit2/distinfo b/devel/py-orbit2/distinfo index c0926d4a02c7..7338e67c233d 100644 --- a/devel/py-orbit2/distinfo +++ b/devel/py-orbit2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pyorbit-2.0.1.tar.bz2) = c39384f6257a386231d79db9e403d905 -SHA256 (gnome2/pyorbit-2.0.1.tar.bz2) = 4ef3a52ebfc028b21d227d29179211f86e1c51bbcc3bf8796df746065788a1bf -SIZE (gnome2/pyorbit-2.0.1.tar.bz2) = 242959 +MD5 (gnome2/pyorbit-2.14.0.tar.bz2) = ff62b983d5d9be164bd5a207d692eab5 +SHA256 (gnome2/pyorbit-2.14.0.tar.bz2) = 4963d045f92b5975c0a7df28e7915d7efaf4c6d6f79642ecb1e8121410add32f +SIZE (gnome2/pyorbit-2.14.0.tar.bz2) = 275825 |