diff options
Diffstat (limited to 'devel')
87 files changed, 689 insertions, 565 deletions
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index ac0b3069a4f8..09e8d6085e4c 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,35 +3,31 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/bugbuddy/Makefile,v 1.19 2005/10/01 04:41:05 ahze Exp $ # PORTNAME= bugbuddy -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.12.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.10 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.12 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils - USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ - desktopfileutils + desktopfileutils gnomedocutils GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index d7003e3d31ca..5147bcc5c05b 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac -SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182 +MD5 (gnome2/bug-buddy-2.12.1.tar.bz2) = 2f8b52ad25891e7c99820c80e7c6d78d +SIZE (gnome2/bug-buddy-2.12.1.tar.bz2) = 555641 diff --git a/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in deleted file mode 100644 index 1074dd7520d2..000000000000 --- a/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in +++ /dev/null @@ -1,12 +0,0 @@ ---- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005 -+++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005 -@@ -0,0 +1,9 @@ -+<?xml version="1.0" standalone="no"?> -+<omf> -+ <resource> -+ <subject category="GNOME|Development"/> -+ <type>user's guide</type> -+ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/> -+ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/> -+ </resource> -+</omf> diff --git a/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c deleted file mode 100644 index bc0a6ba22c2f..000000000000 --- a/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004 -+++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004 -@@ -36,6 +36,7 @@ - #include <sys/types.h> - #include <sysexits.h> - #include <sys/wait.h> -+#include <signal.h> - - #if 0 - static char *help_pages[] = { diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index ec291fb0ac4e..ea36fa1c04a7 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -1,7 +1,6 @@ bin/bug-buddy share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy-core.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png @@ -18,8 +17,16 @@ share/gnome/bug-buddy/gnome.png share/gnome/bug-buddy/ximian.png share/gnome/help/bug-buddy/C/bug-buddy.xml share/gnome/help/bug-buddy/C/legal.xml +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/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/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -59,6 +66,7 @@ share/locale/lv/LC_MESSAGES/bug-buddy.mo share/locale/mk/LC_MESSAGES/bug-buddy.mo share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo +share/locale/mr/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nb/LC_MESSAGES/bug-buddy.mo share/locale/ne/LC_MESSAGES/bug-buddy.mo @@ -72,6 +80,7 @@ share/locale/pt/LC_MESSAGES/bug-buddy.mo share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo share/locale/ro/LC_MESSAGES/bug-buddy.mo share/locale/ru/LC_MESSAGES/bug-buddy.mo +share/locale/rw/LC_MESSAGES/bug-buddy.mo share/locale/sk/LC_MESSAGES/bug-buddy.mo share/locale/sl/LC_MESSAGES/bug-buddy.mo share/locale/sq/LC_MESSAGES/bug-buddy.mo @@ -81,16 +90,31 @@ share/locale/sv/LC_MESSAGES/bug-buddy.mo share/locale/ta/LC_MESSAGES/bug-buddy.mo share/locale/th/LC_MESSAGES/bug-buddy.mo share/locale/tr/LC_MESSAGES/bug-buddy.mo +share/locale/ug/LC_MESSAGES/bug-buddy.mo share/locale/uk/LC_MESSAGES/bug-buddy.mo 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_TW/LC_MESSAGES/bug-buddy.mo +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 2> /dev/null || true @dirrm share/gnome/omf/bug-buddy +@dirrm share/gnome/help/bug-buddy/uk +@dirrm share/gnome/help/bug-buddy/sr +@dirrm share/gnome/help/bug-buddy/pa +@dirrm share/gnome/help/bug-buddy/es @dirrm share/gnome/help/bug-buddy/C @dirrm share/gnome/help/bug-buddy @dirrm share/gnome/bug-buddy/bugzilla/ximian @dirrm share/gnome/bug-buddy/bugzilla/gnome @dirrm share/gnome/bug-buddy/bugzilla @dirrm share/gnome/bug-buddy +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index ac0b3069a4f8..09e8d6085e4c 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -3,35 +3,31 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/bugbuddy/Makefile,v 1.19 2005/10/01 04:41:05 ahze Exp $ # PORTNAME= bugbuddy -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.12.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.10 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.12 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils - USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ - desktopfileutils + desktopfileutils gnomedocutils GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo index d7003e3d31ca..5147bcc5c05b 100644 --- a/devel/bugbuddy/distinfo +++ b/devel/bugbuddy/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac -SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182 +MD5 (gnome2/bug-buddy-2.12.1.tar.bz2) = 2f8b52ad25891e7c99820c80e7c6d78d +SIZE (gnome2/bug-buddy-2.12.1.tar.bz2) = 555641 diff --git a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in deleted file mode 100644 index 1074dd7520d2..000000000000 --- a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in +++ /dev/null @@ -1,12 +0,0 @@ ---- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005 -+++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005 -@@ -0,0 +1,9 @@ -+<?xml version="1.0" standalone="no"?> -+<omf> -+ <resource> -+ <subject category="GNOME|Development"/> -+ <type>user's guide</type> -+ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/> -+ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/> -+ </resource> -+</omf> diff --git a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c deleted file mode 100644 index bc0a6ba22c2f..000000000000 --- a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004 -+++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004 -@@ -36,6 +36,7 @@ - #include <sys/types.h> - #include <sysexits.h> - #include <sys/wait.h> -+#include <signal.h> - - #if 0 - static char *help_pages[] = { diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist index ec291fb0ac4e..ea36fa1c04a7 100644 --- a/devel/bugbuddy/pkg-plist +++ b/devel/bugbuddy/pkg-plist @@ -1,7 +1,6 @@ bin/bug-buddy share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy-core.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png @@ -18,8 +17,16 @@ share/gnome/bug-buddy/gnome.png share/gnome/bug-buddy/ximian.png share/gnome/help/bug-buddy/C/bug-buddy.xml share/gnome/help/bug-buddy/C/legal.xml +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/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/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -59,6 +66,7 @@ share/locale/lv/LC_MESSAGES/bug-buddy.mo share/locale/mk/LC_MESSAGES/bug-buddy.mo share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo +share/locale/mr/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nb/LC_MESSAGES/bug-buddy.mo share/locale/ne/LC_MESSAGES/bug-buddy.mo @@ -72,6 +80,7 @@ share/locale/pt/LC_MESSAGES/bug-buddy.mo share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo share/locale/ro/LC_MESSAGES/bug-buddy.mo share/locale/ru/LC_MESSAGES/bug-buddy.mo +share/locale/rw/LC_MESSAGES/bug-buddy.mo share/locale/sk/LC_MESSAGES/bug-buddy.mo share/locale/sl/LC_MESSAGES/bug-buddy.mo share/locale/sq/LC_MESSAGES/bug-buddy.mo @@ -81,16 +90,31 @@ share/locale/sv/LC_MESSAGES/bug-buddy.mo share/locale/ta/LC_MESSAGES/bug-buddy.mo share/locale/th/LC_MESSAGES/bug-buddy.mo share/locale/tr/LC_MESSAGES/bug-buddy.mo +share/locale/ug/LC_MESSAGES/bug-buddy.mo share/locale/uk/LC_MESSAGES/bug-buddy.mo 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_TW/LC_MESSAGES/bug-buddy.mo +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 2> /dev/null || true @dirrm share/gnome/omf/bug-buddy +@dirrm share/gnome/help/bug-buddy/uk +@dirrm share/gnome/help/bug-buddy/sr +@dirrm share/gnome/help/bug-buddy/pa +@dirrm share/gnome/help/bug-buddy/es @dirrm share/gnome/help/bug-buddy/C @dirrm share/gnome/help/bug-buddy @dirrm share/gnome/bug-buddy/bugzilla/ximian @dirrm share/gnome/bug-buddy/bugzilla/gnome @dirrm share/gnome/bug-buddy/bugzilla @dirrm share/gnome/bug-buddy +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 4a56b29b8ed2..5fd580ee5ed2 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,13 +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 $ # PORTNAME= gconf2 -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.10 +MASTER_SITE_SUBDIR= sources/GConf/2.12 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,14 +20,33 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc +USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc +# --enable-gconf-source=${PREFIX}/etc/gconf/schemas \ + CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" - MAN1= gconftool-2.1 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(WITH_LDAP) || exists(${LOCALBASE}/include/ldap.h) +USE_OPENLDAP= yes + +PLIST_SUB+= LDAP="" +.else +PLIST_SUB+= LDAP="@comment " +.endif + +pre-everything:: +.if !defined(WITH_LDAP) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable ldap support by defining" + @${ECHO_MSG} "WITH_LDAP" + @${ECHO_MSG} +.endif + +.include <bsd.port.post.mk> diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index ace963253f36..7044307011b8 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/GConf-2.10.1.tar.bz2) = c411bd6e9e25362ea613bb9a084be904 -SIZE (gnome2/GConf-2.10.1.tar.bz2) = 1797862 +MD5 (gnome2/GConf-2.12.1.tar.bz2) = 247110de013ed24b17cf4191eb6daec5 +SIZE (gnome2/GConf-2.12.1.tar.bz2) = 1945241 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 05cf76ac212e..37a1e763d824 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -1,5 +1,6 @@ bin/gconf-merge-tree bin/gconftool-2 +%%LDAP%%etc/gconf/2/evoldap.conf etc/gconf/2/path include/gconf/2/gconf/gconf-changeset.h include/gconf/2/gconf/gconf-client.h @@ -10,14 +11,16 @@ include/gconf/2/gconf/gconf-listeners.h include/gconf/2/gconf/gconf-schema.h include/gconf/2/gconf/gconf-value.h include/gconf/2/gconf/gconf.h +%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.so lib/GConf/2/libgconfbackend-oldxml.so lib/GConf/2/libgconfbackend-xml.so lib/libgconf-2.a lib/libgconf-2.so -lib/libgconf-2.so.5 +lib/libgconf-2.so.4 libdata/pkgconfig/gconf-2.0.pc libexec/gconf-sanity-check-2 libexec/gconfd-2 +%%LDAP%%share/GConf/schema/evoldap.schema share/aclocal/gconf-2.m4 share/doc/gconf/ch01.html share/doc/gconf/gconf-GConfClient.html @@ -64,6 +67,7 @@ share/locale/fr/LC_MESSAGES/GConf2.mo share/locale/ga/LC_MESSAGES/GConf2.mo share/locale/gl/LC_MESSAGES/GConf2.mo share/locale/gu/LC_MESSAGES/GConf2.mo +share/locale/he/LC_MESSAGES/GConf2.mo share/locale/hi/LC_MESSAGES/GConf2.mo share/locale/hr/LC_MESSAGES/GConf2.mo share/locale/hu/LC_MESSAGES/GConf2.mo @@ -71,6 +75,7 @@ share/locale/id/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 +share/locale/ku/LC_MESSAGES/GConf2.mo share/locale/lt/LC_MESSAGES/GConf2.mo share/locale/lv/LC_MESSAGES/GConf2.mo share/locale/mk/LC_MESSAGES/GConf2.mo @@ -96,6 +101,7 @@ share/locale/sr/LC_MESSAGES/GConf2.mo share/locale/sr@Latn/LC_MESSAGES/GConf2.mo share/locale/sv/LC_MESSAGES/GConf2.mo share/locale/ta/LC_MESSAGES/GConf2.mo +share/locale/th/LC_MESSAGES/GConf2.mo share/locale/tr/LC_MESSAGES/GConf2.mo share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo @@ -105,13 +111,11 @@ share/locale/zh_CN/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo share/sgml/gconf/gconf-1.0.dtd @dirrm share/sgml/gconf -@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/doc/gconf +@dirrm share/GConf/schema +@dirrm share/GConf @dirrm lib/GConf/2 @dirrm include/gconf/2/gconf @dirrm include/gconf/2 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 5fc2c11da242..2819fd997a61 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,13 +3,14 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/glib20/Makefile,v 1.55 2005/10/03 17:39:56 mezz Exp $ # PORTNAME= glib -PORTVERSION= 2.6.6 +PORTVERSION= 2.8.3 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.6,} \ - ftp://ftp.gtk.org/pub/gtk/v2.6/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.8,} \ + ftp://ftp.gtk.org/pub/gtk/v2.8/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -24,10 +25,10 @@ LATEST_LINK= glib20 USE_BZIP2= yes USE_GETTEXT= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_GNOME= gnomehack gnometarget pkgconfig +USE_GNOME= gnomehack gnometarget pkgconfig ltverhack USE_GMAKE= yes USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 7d233fea9ba5..0cca1c837dce 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/glib-2.6.6.tar.bz2) = 6e22b0639d314536f23ee118f29b43de -SIZE (gnome2/glib-2.6.6.tar.bz2) = 2380899 +MD5 (gnome2/glib-2.8.3.tar.bz2) = 58177fe64c189b86bac1625350512159 +SIZE (gnome2/glib-2.8.3.tar.bz2) = 2564822 diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c index b74c39d48df2..bde2862f605e 100644 --- a/devel/glib20/files/extra-patch-gthread_gthread-posix.c +++ b/devel/glib20/files/extra-patch-gthread_gthread-posix.c @@ -1,6 +1,6 @@ ---- gthread/gthread-posix.c.orig Thu Jun 9 17:27:13 2005 -+++ gthread/gthread-posix.c Fri Jun 10 22:38:37 2005 -@@ -115,7 +115,11 @@ +--- gthread/gthread-posix.c.orig Thu Jun 9 11:25:01 2005 ++++ gthread/gthread-posix.c Fri Jun 10 20:23:17 2005 +@@ -115,7 +115,11 @@ static gint priority_normal_value; # define PRIORITY_NORMAL_VALUE priority_normal_value #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ @@ -12,18 +12,18 @@ #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) -@@ -309,8 +313,16 @@ +@@ -309,8 +313,16 @@ g_thread_create_posix_impl (GThreadFunc stack_size = MAX (g_thread_min_stack_size, stack_size); /* No error check here, because some systems can't do it and * we simply don't want threads to fail because of that. */ - pthread_attr_setstacksize (&attr, stack_size); } -+ else ++ else + { + if (sizeof(void *) == 8) -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; + else -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; + stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); + } + pthread_attr_setstacksize (&attr, stack_size); diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c index eaa43a74e423..d3c7dc6bf2db 100644 --- a/devel/glib20/files/patch-gmodule::gmodule-dl.c +++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.14 2005/06/28 05:40:00 adamw 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 11ff429c7984..0cc41e9d3b01 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -26,6 +26,7 @@ include/glib-2.0/glib/gkeyfile.h include/glib-2.0/glib/glist.h include/glib-2.0/glib/gmacros.h include/glib-2.0/glib/gmain.h +include/glib-2.0/glib/gmappedfile.h include/glib-2.0/glib/gmarkup.h include/glib-2.0/glib/gmem.h include/glib-2.0/glib/gmessages.h @@ -75,18 +76,19 @@ include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h lib/libglib-2.0.a lib/libglib-2.0.so -lib/libglib-2.0.so.600 +lib/libglib-2.0.so.0 lib/libgmodule-2.0.a lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.600 +lib/libgmodule-2.0.so.0 lib/libgobject-2.0.a lib/libgobject-2.0.so -lib/libgobject-2.0.so.600 +lib/libgobject-2.0.so.0 lib/libgthread-2.0.a lib/libgthread-2.0.so -lib/libgthread-2.0.so.600 +lib/libgthread-2.0.so.0 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc +libdata/pkgconfig/gmodule-export-2.0.pc libdata/pkgconfig/gmodule-no-export-2.0.pc libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gthread-2.0.pc @@ -155,6 +157,7 @@ share/locale/sr@ije/LC_MESSAGES/glib20.mo share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo 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/uk/LC_MESSAGES/glib20.mo @@ -170,10 +173,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true -@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/tl 2> /dev/null || true @unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/tl 2> /dev/null || true @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index dddfaa261ac6..764daaf916a3 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnomecommon/Makefile,v 1.5 2005/09/20 09:39:51 ahze Exp $ # PORTNAME= gnomecommon -PORTVERSION= 2.8.0 +PORTVERSION= 2.12.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-common/2.8 +MASTER_SITE_SUBDIR= sources/gnome-common/2.12 DISTNAME= gnome-common-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo index a3fa6f30afaa..e22e25e9fb8d 100644 --- a/devel/gnome-common/distinfo +++ b/devel/gnome-common/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-common-2.8.0.tar.bz2) = 4630d4cf2b83499c89211b3ae76b662f -SIZE (gnome2/gnome-common-2.8.0.tar.bz2) = 58694 +MD5 (gnome2/gnome-common-2.12.0.tar.bz2) = 817be32ab5dc7a5d56e6ec50d56100f8 +SIZE (gnome2/gnome-common-2.12.0.tar.bz2) = 60283 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index e152131a2aae..56cd876c36b4 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,14 +3,15 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.115 2005/10/31 00:12:01 marcus Exp $ # PORTNAME= gnomevfs2 -PORTVERSION= 2.10.1 -PORTREVISION= 1 +PORTVERSION= 2.12.1.1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,9 +24,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ - libbonobo + libbonobo ltverhack USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls @@ -38,37 +39,13 @@ 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_http_proxy.schemas system_smb.schemas \ + system_storage.schemas -.include <bsd.port.pre.mk> - -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_CDPARANOIA -.undef WITHOUT_SAMBA -.undef WITHOUT_MDNS -WITH_MDNS= yes -WITH_CDPARANOIA= yes -WITH_SAMBA= yes -.endif - -.if exists(${LOCALBASE}/lib/libcdda_paranoia.a) -WITH_CDPARANOIA= yes -.endif - -.if exists(${LOCALBASE}/lib/libsmbclient.so) -WITH_SAMBA= yes -.endif +OPTIONS= SAMBA "Enable SMB volume support" on \ + MDNS "Enable Bonjour/Rendezvous support" on -.if exists(${LOCALBASE}/lib/libhowl.so) -WITH_MDNS= yes -.endif - -.if defined(WITH_CDPARANOIA) -LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia -PLIST_SUB+= CDPARANOIA="" -.else -PLIST_SUB+= CDPARANOIA="@comment " -.endif +.include <bsd.port.pre.mk> .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) USE_FAM= yes @@ -78,15 +55,18 @@ USE_FAM= yes LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal .endif -.if defined(WITH_SAMBA) +.if !defined(WITHOUT_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" .else PLIST_SUB+= SAMBA="@comment " +CONFIGURE_ARGS+=--disable-samba .endif -.if defined(WITH_MDNS) +.if !defined(WITHOUT_MDNS) LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.else +CONFIGURE_ARGS+=--disable-howl .endif post-patch: @@ -94,8 +74,7 @@ post-patch: ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c + ${WRKSRC}/libgnomevfs/xdgmime.c @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index e4923630ccb0..df476c6026a5 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.10.1.tar.bz2) = 88b520e5de748a310a2aef62fc095c8b -SIZE (gnome2/gnome-vfs-2.10.1.tar.bz2) = 1905314 +MD5 (gnome2/gnome-vfs-2.12.1.1.tar.bz2) = bc62212600167acf78c9771add5cce7e +SIZE (gnome2/gnome-vfs-2.12.1.1.tar.bz2) = 1726588 diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac index 9362cac1715f..383987654ef2 100644 --- a/devel/gnome-vfs/files/patch-ac +++ b/devel/gnome-vfs/files/patch-ac @@ -1,11 +1,11 @@ ---- modules/Makefile.in.orig Tue May 6 15:39:48 2003 -+++ modules/Makefile.in Tue May 6 15:41:28 2003 -@@ -210,7 +210,7 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la - @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = - +--- modules/Makefile.in.orig Mon Oct 3 11:55:14 2005 ++++ modules/Makefile.in Mon Oct 3 11:55:55 2005 +@@ -465,7 +465,7 @@ + @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la + @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la + @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = -module_flags = -export_dynamic -avoid-version -module -no-undefined +module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) modulesdir = $(libdir)/gnome-vfs-2.0/modules - modules_LTLIBRARIES = \ + $(CDDA_LTLIBS) \ diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in index b02290aa2ebb..5d2778e291bf 100644 --- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in +++ b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in @@ -1,5 +1,6 @@ $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 diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in index 4acd9a1bc552..088433c51a28 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in @@ -1,13 +1,9 @@ - -$FreeBSD$ - ---- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 -+++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 +--- gnome-vfs-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 ++++ gnome-vfs-2.0.pc.in Mon Oct 3 12:00:02 2005 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system libraries Version: @VERSION@ - Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include - diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in index f9b09d46b7a3..c3f0d2c30ea2 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in @@ -1,12 +1,9 @@ - -$FreeBSD$ - ---- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 -+++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 +--- gnome-vfs-module-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 ++++ gnome-vfs-module-2.0.pc.in Mon Oct 3 12:01:04 2005 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c index bd679de032d2..2747466f7bd9 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 07:31:15 1.1 -+++ libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 08:25:24 -@@ -940,6 +940,8 @@ +--- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005 ++++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005 +@@ -943,6 +943,8 @@ load_application_info (void) static void gnome_vfs_application_registry_init (void) { @@ -12,18 +9,18 @@ $FreeBSD$ if (gnome_vfs_application_registry_initialized) return; -@@ -961,6 +963,14 @@ - gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry"); +@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi + "application-registry", + NULL); gnome_registry_dir.system_dir = TRUE; - ++ + tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL); + if (mkdir (tmp, 0700) && -+ errno != EEXIST) { -+ g_warning("Could not create per-user Gnome configuration directory: %s", -+ tmp); ++ errno != EEXIST) { ++ g_warning("Could not create per-user GNOME configuration directory: %s", ++ tmp); + } + g_free(tmp); -+ - user_registry_dir.dirname = g_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL); - user_registry_dir.system_dir = FALSE; - + + user_registry_dir.dirname = g_build_filename (g_get_home_dir(), + ".gnome", diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c deleted file mode 100644 index a61e83417651..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 -+++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 -@@ -149,7 +149,7 @@ - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c deleted file mode 100644 index 698150125205..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c +++ /dev/null @@ -1,38 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime.c.orig Sat Mar 19 18:59:45 2005 -+++ libgnomevfs/gnome-vfs-mime.c Sat Mar 19 19:02:24 2005 -@@ -167,7 +167,9 @@ - GnomeVFSResult result = GNOME_VFS_OK; - const char *mime_type; - -+ G_LOCK (mime_mutex); - max_extents = xdg_mime_get_max_buffer_extents (); -+ G_UNLOCK (mime_mutex); - max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED); - - if (!buffer->read_whole_file) { -@@ -592,7 +594,9 @@ - g_return_val_if_fail (a != NULL, FALSE); - g_return_val_if_fail (b != NULL, FALSE); - -+ G_LOCK (mime_mutex); - xdg_mime_mime_type_equal (a, b); -+ G_UNLOCK (mime_mutex); - - return FALSE; - } -@@ -626,8 +630,13 @@ - - if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) { - return GNOME_VFS_MIME_IDENTICAL; -- } else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -- return GNOME_VFS_MIME_PARENT; -+ } else { -+ G_LOCK (mime_mutex); -+ if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -+ G_UNLOCK (mime_mutex); -+ return GNOME_VFS_MIME_PARENT; -+ } -+ G_UNLOCK (mime_mutex); - } - - return GNOME_VFS_MIME_UNRELATED; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c index c58be91fa94b..6e3660c845b0 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c @@ -1,13 +1,15 @@ ---- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 -+++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 -@@ -171,8 +171,10 @@ +--- 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; -+#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) ++#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 (); - case EAI_FAIL: - case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; + #endif diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index 9788a89f060e..9c558eefd4f2 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,11 +1,26 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 -@@ -871,7 +871,7 @@ - paths = g_strsplit (gnome_var, ":", 0); - +--- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005 ++++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005 +@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { -- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); -+ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); - if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) { - g_strfreev (paths); - return full_filename; + full_filename = g_build_filename (*temp_paths, + "share", ++ "gnome", + "pixmaps", + relative_filename, + NULL); +@@ -1991,9 +1992,14 @@ _gnome_vfs_uri_resolve_all_symlinks_uri + resolved_uri = gnome_vfs_uri_resolve_relative (new_uri, + info->symlink_name); + if (*p != 0) { ++ gnome_vfs_uri_unref (new_uri); ++ ++ new_uri = gnome_vfs_uri_append_string (resolved_uri, p); ++ + gnome_vfs_uri_unref (uri); +- uri = gnome_vfs_uri_append_string (resolved_uri, p); + gnome_vfs_uri_unref (resolved_uri); ++ ++ uri = gnome_vfs_uri_ref (new_uri); + } else { + gnome_vfs_uri_unref (uri); + uri = resolved_uri; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c index 472a4b5f6c19..37cc69f1ea3b 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c @@ -1,6 +1,6 @@ ---- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 -+++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 -@@ -189,7 +189,7 @@ +--- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005 ++++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005 +@@ -234,7 +234,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) diff --git a/devel/gnome-vfs/files/patch-modules_file-method.c b/devel/gnome-vfs/files/patch-modules_file-method.c new file mode 100644 index 000000000000..dbb237226e99 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_file-method.c @@ -0,0 +1,12 @@ +--- modules/file-method.c.orig Sun May 22 23:30:16 2005 ++++ modules/file-method.c Sun May 22 23:31:08 2005 +@@ -66,6 +66,9 @@ + #if HAVE_SYS_VFS_H + #include <sys/vfs.h> + #elif HAVE_SYS_MOUNT_H ++#if HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #include <sys/mount.h> + #endif + diff --git a/devel/gnome-vfs/files/patch-modules_smb-method.c b/devel/gnome-vfs/files/patch-modules_smb-method.c deleted file mode 100644 index 34c10cd54f08..000000000000 --- a/devel/gnome-vfs/files/patch-modules_smb-method.c +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/smb-method.c.orig Wed Mar 2 18:44:11 2005 -+++ modules/smb-method.c Mon Sep 12 02:36:28 2005 -@@ -1425,7 +1425,7 @@ do_close (GnomeVFSMethod *method, - - /* Important: perform_authentication leaves and re-enters the lock! */ - while (perform_authentication (&actx) > 0) { -- r = smb_context->close (smb_context, handle->file); -+ r = smb_context->close_fn (smb_context, handle->file); - actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); - } - -@@ -1446,7 +1446,7 @@ do_read (GnomeVFSMethod *method, - GnomeVFSContext *context) - { - FileHandle *handle = (FileHandle *)method_handle; -- GnomeVFSResult res = GNOME_VFS_OK;; -+ GnomeVFSResult res = GNOME_VFS_OK; - SmbAuthContext actx; - ssize_t n = 0; - diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index 7e289a563dd1..ed494001730b 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index 6a407a1e4f42..f7ad446b9783 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 48f676f445a3..e3505b507a49 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -3,9 +3,9 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-monitor bin/gnomevfs-mv bin/gnomevfs-rm -%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/modules/ssl-modules.conf @@ -58,7 +58,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so -%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.so @@ -70,12 +69,10 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfs-pipe.so lib/gnome-vfs-2.0/modules/libvfs-test.so -lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.1000 +lib/libgnomevfs-2.so.0 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index 997d799397dc..2a2218b602e2 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -3,16 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.40 2005/08/11 02:55:29 marcus Exp $ # -PORTNAME= gnome2-hacker-tools -PORTVERSION= 2.10.2 +PORTREVISION= 0 CATEGORIES= devel gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -hacker-tools -MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 development tools RUN_DEPENDS= mlview:${PORTSDIR}/editors/mlview \ @@ -26,8 +23,9 @@ RUN_DEPENDS= mlview:${PORTSDIR}/editors/mlview \ regexxer:${PORTSDIR}/devel/regexxer \ anjuta:${PORTSDIR}/devel/anjuta -NO_BUILD= yes +MASTERDIR= ${.CURDIR}/../../x11/gnome2 +GNOME_SLAVE= yes -do-install: # empty +DESCR= ${.CURDIR}/pkg-descr -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/devel/gnome2-hacker-tools/pkg-plist b/devel/gnome2-hacker-tools/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/devel/gnome2-hacker-tools/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile index dddfaa261ac6..764daaf916a3 100644 --- a/devel/gnomecommon/Makefile +++ b/devel/gnomecommon/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnomecommon/Makefile,v 1.5 2005/09/20 09:39:51 ahze Exp $ # PORTNAME= gnomecommon -PORTVERSION= 2.8.0 +PORTVERSION= 2.12.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-common/2.8 +MASTER_SITE_SUBDIR= sources/gnome-common/2.12 DISTNAME= gnome-common-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/gnomecommon/distinfo b/devel/gnomecommon/distinfo index a3fa6f30afaa..e22e25e9fb8d 100644 --- a/devel/gnomecommon/distinfo +++ b/devel/gnomecommon/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-common-2.8.0.tar.bz2) = 4630d4cf2b83499c89211b3ae76b662f -SIZE (gnome2/gnome-common-2.8.0.tar.bz2) = 58694 +MD5 (gnome2/gnome-common-2.12.0.tar.bz2) = 817be32ab5dc7a5d56e6ec50d56100f8 +SIZE (gnome2/gnome-common-2.12.0.tar.bz2) = 60283 diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index e152131a2aae..56cd876c36b4 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -3,14 +3,15 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.115 2005/10/31 00:12:01 marcus Exp $ # PORTNAME= gnomevfs2 -PORTVERSION= 2.10.1 -PORTREVISION= 1 +PORTVERSION= 2.12.1.1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,9 +24,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ - libbonobo + libbonobo ltverhack USE_REINPLACE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls @@ -38,37 +39,13 @@ 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_http_proxy.schemas system_smb.schemas \ + system_storage.schemas -.include <bsd.port.pre.mk> - -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_CDPARANOIA -.undef WITHOUT_SAMBA -.undef WITHOUT_MDNS -WITH_MDNS= yes -WITH_CDPARANOIA= yes -WITH_SAMBA= yes -.endif - -.if exists(${LOCALBASE}/lib/libcdda_paranoia.a) -WITH_CDPARANOIA= yes -.endif - -.if exists(${LOCALBASE}/lib/libsmbclient.so) -WITH_SAMBA= yes -.endif +OPTIONS= SAMBA "Enable SMB volume support" on \ + MDNS "Enable Bonjour/Rendezvous support" on -.if exists(${LOCALBASE}/lib/libhowl.so) -WITH_MDNS= yes -.endif - -.if defined(WITH_CDPARANOIA) -LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia -PLIST_SUB+= CDPARANOIA="" -.else -PLIST_SUB+= CDPARANOIA="@comment " -.endif +.include <bsd.port.pre.mk> .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) USE_FAM= yes @@ -78,15 +55,18 @@ USE_FAM= yes LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal .endif -.if defined(WITH_SAMBA) +.if !defined(WITHOUT_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" .else PLIST_SUB+= SAMBA="@comment " +CONFIGURE_ARGS+=--disable-samba .endif -.if defined(WITH_MDNS) +.if !defined(WITHOUT_MDNS) LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.else +CONFIGURE_ARGS+=--disable-howl .endif post-patch: @@ -94,8 +74,7 @@ post-patch: ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c + ${WRKSRC}/libgnomevfs/xdgmime.c @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index e4923630ccb0..df476c6026a5 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.10.1.tar.bz2) = 88b520e5de748a310a2aef62fc095c8b -SIZE (gnome2/gnome-vfs-2.10.1.tar.bz2) = 1905314 +MD5 (gnome2/gnome-vfs-2.12.1.1.tar.bz2) = bc62212600167acf78c9771add5cce7e +SIZE (gnome2/gnome-vfs-2.12.1.1.tar.bz2) = 1726588 diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac index 9362cac1715f..383987654ef2 100644 --- a/devel/gnomevfs2/files/patch-ac +++ b/devel/gnomevfs2/files/patch-ac @@ -1,11 +1,11 @@ ---- modules/Makefile.in.orig Tue May 6 15:39:48 2003 -+++ modules/Makefile.in Tue May 6 15:41:28 2003 -@@ -210,7 +210,7 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la - @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = - +--- modules/Makefile.in.orig Mon Oct 3 11:55:14 2005 ++++ modules/Makefile.in Mon Oct 3 11:55:55 2005 +@@ -465,7 +465,7 @@ + @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la + @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la + @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = -module_flags = -export_dynamic -avoid-version -module -no-undefined +module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) modulesdir = $(libdir)/gnome-vfs-2.0/modules - modules_LTLIBRARIES = \ + $(CDDA_LTLIBS) \ diff --git a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in index b02290aa2ebb..5d2778e291bf 100644 --- a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in +++ b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in @@ -1,5 +1,6 @@ $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 diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in index 4acd9a1bc552..088433c51a28 100644 --- a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in @@ -1,13 +1,9 @@ - -$FreeBSD$ - ---- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 -+++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 +--- gnome-vfs-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 ++++ gnome-vfs-2.0.pc.in Mon Oct 3 12:00:02 2005 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system libraries Version: @VERSION@ - Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include - diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in index f9b09d46b7a3..c3f0d2c30ea2 100644 --- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in @@ -1,12 +1,9 @@ - -$FreeBSD$ - ---- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 -+++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 +--- gnome-vfs-module-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 ++++ gnome-vfs-module-2.0.pc.in Mon Oct 3 12:01:04 2005 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c index bd679de032d2..2747466f7bd9 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 07:31:15 1.1 -+++ libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 08:25:24 -@@ -940,6 +940,8 @@ +--- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005 ++++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005 +@@ -943,6 +943,8 @@ load_application_info (void) static void gnome_vfs_application_registry_init (void) { @@ -12,18 +9,18 @@ $FreeBSD$ if (gnome_vfs_application_registry_initialized) return; -@@ -961,6 +963,14 @@ - gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry"); +@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi + "application-registry", + NULL); gnome_registry_dir.system_dir = TRUE; - ++ + tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL); + if (mkdir (tmp, 0700) && -+ errno != EEXIST) { -+ g_warning("Could not create per-user Gnome configuration directory: %s", -+ tmp); ++ errno != EEXIST) { ++ g_warning("Could not create per-user GNOME configuration directory: %s", ++ tmp); + } + g_free(tmp); -+ - user_registry_dir.dirname = g_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL); - user_registry_dir.system_dir = FALSE; - + + user_registry_dir.dirname = g_build_filename (g_get_home_dir(), + ".gnome", diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c deleted file mode 100644 index a61e83417651..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 -+++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 -@@ -149,7 +149,7 @@ - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c deleted file mode 100644 index 698150125205..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c +++ /dev/null @@ -1,38 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime.c.orig Sat Mar 19 18:59:45 2005 -+++ libgnomevfs/gnome-vfs-mime.c Sat Mar 19 19:02:24 2005 -@@ -167,7 +167,9 @@ - GnomeVFSResult result = GNOME_VFS_OK; - const char *mime_type; - -+ G_LOCK (mime_mutex); - max_extents = xdg_mime_get_max_buffer_extents (); -+ G_UNLOCK (mime_mutex); - max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED); - - if (!buffer->read_whole_file) { -@@ -592,7 +594,9 @@ - g_return_val_if_fail (a != NULL, FALSE); - g_return_val_if_fail (b != NULL, FALSE); - -+ G_LOCK (mime_mutex); - xdg_mime_mime_type_equal (a, b); -+ G_UNLOCK (mime_mutex); - - return FALSE; - } -@@ -626,8 +630,13 @@ - - if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) { - return GNOME_VFS_MIME_IDENTICAL; -- } else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -- return GNOME_VFS_MIME_PARENT; -+ } else { -+ G_LOCK (mime_mutex); -+ if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -+ G_UNLOCK (mime_mutex); -+ return GNOME_VFS_MIME_PARENT; -+ } -+ G_UNLOCK (mime_mutex); - } - - return GNOME_VFS_MIME_UNRELATED; diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c index c58be91fa94b..6e3660c845b0 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c @@ -1,13 +1,15 @@ ---- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 -+++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 -@@ -171,8 +171,10 @@ +--- 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; -+#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) ++#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 (); - case EAI_FAIL: - case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; + #endif diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index 9788a89f060e..9c558eefd4f2 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,11 +1,26 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 -@@ -871,7 +871,7 @@ - paths = g_strsplit (gnome_var, ":", 0); - +--- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005 ++++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005 +@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { -- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); -+ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); - if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) { - g_strfreev (paths); - return full_filename; + full_filename = g_build_filename (*temp_paths, + "share", ++ "gnome", + "pixmaps", + relative_filename, + NULL); +@@ -1991,9 +1992,14 @@ _gnome_vfs_uri_resolve_all_symlinks_uri + resolved_uri = gnome_vfs_uri_resolve_relative (new_uri, + info->symlink_name); + if (*p != 0) { ++ gnome_vfs_uri_unref (new_uri); ++ ++ new_uri = gnome_vfs_uri_append_string (resolved_uri, p); ++ + gnome_vfs_uri_unref (uri); +- uri = gnome_vfs_uri_append_string (resolved_uri, p); + gnome_vfs_uri_unref (resolved_uri); ++ ++ uri = gnome_vfs_uri_ref (new_uri); + } else { + gnome_vfs_uri_unref (uri); + uri = resolved_uri; diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c index 472a4b5f6c19..37cc69f1ea3b 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c @@ -1,6 +1,6 @@ ---- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 -+++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 -@@ -189,7 +189,7 @@ +--- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005 ++++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005 +@@ -234,7 +234,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) diff --git a/devel/gnomevfs2/files/patch-modules_file-method.c b/devel/gnomevfs2/files/patch-modules_file-method.c new file mode 100644 index 000000000000..dbb237226e99 --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_file-method.c @@ -0,0 +1,12 @@ +--- modules/file-method.c.orig Sun May 22 23:30:16 2005 ++++ modules/file-method.c Sun May 22 23:31:08 2005 +@@ -66,6 +66,9 @@ + #if HAVE_SYS_VFS_H + #include <sys/vfs.h> + #elif HAVE_SYS_MOUNT_H ++#if HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #include <sys/mount.h> + #endif + diff --git a/devel/gnomevfs2/files/patch-modules_smb-method.c b/devel/gnomevfs2/files/patch-modules_smb-method.c deleted file mode 100644 index 34c10cd54f08..000000000000 --- a/devel/gnomevfs2/files/patch-modules_smb-method.c +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/smb-method.c.orig Wed Mar 2 18:44:11 2005 -+++ modules/smb-method.c Mon Sep 12 02:36:28 2005 -@@ -1425,7 +1425,7 @@ do_close (GnomeVFSMethod *method, - - /* Important: perform_authentication leaves and re-enters the lock! */ - while (perform_authentication (&actx) > 0) { -- r = smb_context->close (smb_context, handle->file); -+ r = smb_context->close_fn (smb_context, handle->file); - actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); - } - -@@ -1446,7 +1446,7 @@ do_read (GnomeVFSMethod *method, - GnomeVFSContext *context) - { - FileHandle *handle = (FileHandle *)method_handle; -- GnomeVFSResult res = GNOME_VFS_OK;; -+ GnomeVFSResult res = GNOME_VFS_OK; - SmbAuthContext actx; - ssize_t n = 0; - diff --git a/devel/gnomevfs2/pkg-deinstall.in b/devel/gnomevfs2/pkg-deinstall.in index 7e289a563dd1..ed494001730b 100644 --- a/devel/gnomevfs2/pkg-deinstall.in +++ b/devel/gnomevfs2/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnomevfs2/pkg-install.in b/devel/gnomevfs2/pkg-install.in index 6a407a1e4f42..f7ad446b9783 100644 --- a/devel/gnomevfs2/pkg-install.in +++ b/devel/gnomevfs2/pkg-install.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.5 2005/06/28 05:40:01 adamw Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 48f676f445a3..e3505b507a49 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -3,9 +3,9 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-monitor bin/gnomevfs-mv bin/gnomevfs-rm -%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/modules/ssl-modules.conf @@ -58,7 +58,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so -%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.so @@ -70,12 +69,10 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfs-pipe.so lib/gnome-vfs-2.0/modules/libvfs-test.so -lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.1000 +lib/libgnomevfs-2.so.0 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 172b752b9c27..63f12c1d616a 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -3,6 +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 $ # CATEGORIES= devel gnome @@ -15,17 +16,21 @@ MASTERDIR= ${.CURDIR}/../libgsf DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USE_GNOME= gnomehack libgsf gnomevfs2 +USE_GNOME= gnomehack libgsf gnomevfs2 ltverhack intlhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ --disable-gtk-doc --with-bz2 --with-gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lgsf-1" +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lgsf-1" + +GCONF_SCHEMAS= +GSF_SLAVE= yes do-build: @cd ${WRKSRC}/gsf-gnome && ${MAKE} do-install: - cd ${WRKSRC}/gsf-gnome && ${MAKE} install + cd ${WRKSRC}/gsf-gnome && ${MAKE} ${INSTALL_TARGET} + ${MKDIR} ${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/libgsf-gnome-1.pc ${PREFIX}/libdata/pkgconfig .include "${MASTERDIR}/Makefile" diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist index fdd0f93c589f..9c9ca34bf41d 100644 --- a/devel/libgsf-gnome/pkg-plist +++ b/devel/libgsf-gnome/pkg-plist @@ -5,6 +5,6 @@ include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h lib/libgsf-gnome-1.a lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.12 +lib/libgsf-gnome-1.so.113 libdata/pkgconfig/libgsf-gnome-1.pc @dirrm include/libgsf-1/gsf-gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index b76935f4dfff..7aed3c3c1b32 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,11 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libgsf/Makefile,v 1.17 2005/10/11 22:08:17 marcus Exp $ # PORTNAME= libgsf -PORTVERSION= 1.11.1 -PORTREVISION?= 1 +PORTVERSION= 1.13.2 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -20,14 +21,21 @@ COMMENT?= An extensible i/o abstraction for dealing with structured file formats LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif +USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -USE_GNOME?= gnomehack glib20 libxml2 -USE_LIBTOOL_VER=15 +USE_GNOME?= gnomehack glib20 libxml2 gconf2 ltverhack intlhack +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc --without-gnome --with-bz2 + --disable-gtk-doc --without-gnome --with-bz2 \ + --mandir=${PREFIX}/man CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.if !defined(GSF_SLAVE) +GCONF_SCHEMAS= gsf-office-thumbnailer.schemas +MAN1= gsf-office-thumbnailer.1 +.endif + .include <bsd.port.mk> diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 01cc1c40a6dd..bcd0b44dd610 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgsf-1.11.1.tar.bz2) = b6d867f46e20dca5c6bf2cf3bfc38cfc -SIZE (gnome2/libgsf-1.11.1.tar.bz2) = 413711 +MD5 (gnome2/libgsf-1.13.2.tar.bz2) = 0894afd88f9e43eada27e52cb22cd0f1 +SIZE (gnome2/libgsf-1.13.2.tar.bz2) = 504413 diff --git a/devel/libgsf/files/patch-doc_Makefile.in b/devel/libgsf/files/patch-doc_Makefile.in new file mode 100644 index 000000000000..2d1069fce2c8 --- /dev/null +++ b/devel/libgsf/files/patch-doc_Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig Tue Oct 11 15:56:09 2005 ++++ doc/Makefile.in Tue Oct 11 15:56:24 2005 +@@ -293,7 +293,7 @@ + # if $(DOC_MODULE).types is non-empty. + GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) + GTKDOC_LIBS = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) +-manpagedir = $(datadir)/man/man1 ++manpagedir = $(prefix)/man/man1 + manpage_DATA = gsf-office-thumbnailer.1 + @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in index 4051a60c2310..ffe67fa45f86 100644 --- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in +++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in @@ -1,30 +1,29 @@ ---- gsf-gnome/Makefile.in.orig Sat May 22 18:56:24 2004 -+++ gsf-gnome/Makefile.in Sat May 22 18:57:23 2004 -@@ -170,7 +170,7 @@ - - lib_LTLIBRARIES = $(target_libgsf_gnome) - --libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) -+libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS) - libgsf_gnome_1_la_LDFLAGS = -version-info $(VERSION_INFO) - libgsf_gnome_1_la_SOURCES = \ - gsf-input-gnomevfs.c \ -@@ -199,7 +199,7 @@ - CONFIG_CLEAN_FILES = +--- gsf-gnome/Makefile.in.orig Tue Oct 11 15:47:39 2005 ++++ gsf-gnome/Makefile.in Tue Oct 11 15:50:56 2005 +@@ -54,9 +54,7 @@ + libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) - --libgsf_gnome_1_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la -+libgsf_gnome_1_la_DEPENDENCIES = - am_libgsf_gnome_1_la_OBJECTS = gsf-input-gnomevfs.lo \ - gsf-output-gnomevfs.lo gsf-input-bonobo.lo gsf-output-bonobo.lo \ - gsf-shared-bonobo-stream.lo ---- gsf-gnome/Makefile.in.orig Sat May 22 19:26:16 2004 -+++ gsf-gnome/Makefile.in Sat May 22 19:30:30 2004 -@@ -179,14 +179,15 @@ - gsf-output-bonobo.c \ + am__DEPENDENCIES_1 = +-@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = \ +-@WITH_LIBGSF_GNOME_TRUE@ $(top_builddir)/gsf/libgsf-1.la \ +-@WITH_LIBGSF_GNOME_TRUE@ $(am__DEPENDENCIES_1) ++@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = + am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \ + gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \ gsf-shared-bonobo-stream.c +@@ -273,7 +271,7 @@ + target_alias = @target_alias@ + AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS) + @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la +-@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) ++@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS) + @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info $(VERSION_INFO) $(am__append_1) + @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = \ + @WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.c \ +@@ -282,13 +280,15 @@ + @WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.c \ + @WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.c -- -libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome -libgsf_gnome_1_include_HEADERS = \ - gsf-input-gnomevfs.h \ @@ -36,11 +35,11 @@ +@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS = +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_include_HEADERS = \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h + all: all-am - # include these just in case we are building a tarball without diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 9f6dc384532b..169911e34ccb 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,6 +1,10 @@ +bin/gsf-office-thumbnailer include/libgsf-1/gsf-win32/gsf-input-win32.h include/libgsf-1/gsf-win32/gsf-output-win32.h +include/libgsf-1/gsf/gsf-blob.h +include/libgsf-1/gsf/gsf-clip-data.h include/libgsf-1/gsf/gsf-doc-meta-data.h +include/libgsf-1/gsf/gsf-docprop-vector.h include/libgsf-1/gsf/gsf-impl-utils.h include/libgsf-1/gsf/gsf-infile-impl.h include/libgsf-1/gsf/gsf-infile-msole.h @@ -20,13 +24,16 @@ include/libgsf-1/gsf/gsf-input.h include/libgsf-1/gsf/gsf-libxml.h include/libgsf-1/gsf/gsf-meta-names.h include/libgsf-1/gsf/gsf-msole-utils.h +include/libgsf-1/gsf/gsf-opendoc-utils.h include/libgsf-1/gsf/gsf-outfile-impl.h include/libgsf-1/gsf/gsf-outfile-msole.h include/libgsf-1/gsf/gsf-outfile-stdio.h include/libgsf-1/gsf/gsf-outfile-zip.h include/libgsf-1/gsf/gsf-outfile.h include/libgsf-1/gsf/gsf-output-bzip.h +include/libgsf-1/gsf/gsf-output-csv.h include/libgsf-1/gsf/gsf-output-gzip.h +include/libgsf-1/gsf/gsf-output-iconv.h include/libgsf-1/gsf/gsf-output-impl.h include/libgsf-1/gsf/gsf-output-iochannel.h include/libgsf-1/gsf/gsf-output-memory.h @@ -38,8 +45,10 @@ include/libgsf-1/gsf/gsf-utils.h include/libgsf-1/gsf/gsf.h lib/libgsf-1.a lib/libgsf-1.so -lib/libgsf-1.so.12 +lib/libgsf-1.so.113 libdata/pkgconfig/libgsf-1.pc +share/doc/gsf/GsfBlob.html +share/doc/gsf/GsfClipData.html share/doc/gsf/api.html share/doc/gsf/gsf-Bononbo.html share/doc/gsf/gsf-Compression.html @@ -72,6 +81,7 @@ share/doc/gsf/right.png share/doc/gsf/sources.html share/doc/gsf/style.css share/doc/gsf/up.png +share/locale/es/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 2ba4862787c9..dd0e06b48b1c 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -3,13 +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 $ # PORTNAME= libgtop2 -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -25,7 +26,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -35,7 +36,9 @@ INFO= libgtop2 .if ${OSVERSION} >= 600000 PKGMESSAGE= ${FILESDIR}/pkg-message -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sysdeps_freebsd_Makefile.in +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 49626f8eac1a..8e403b0b1b28 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtop-2.10.2.tar.bz2) = 59d1f49a37abe98a25fdb005711cd5fe -SIZE (gnome2/libgtop-2.10.2.tar.bz2) = 751695 +MD5 (gnome2/libgtop-2.12.0.tar.bz2) = 616ed8352f3463855b3eace26b22536e +SIZE (gnome2/libgtop-2.12.0.tar.bz2) = 740843 diff --git a/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in new file mode 100644 index 000000000000..dea0aec8224c --- /dev/null +++ b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in @@ -0,0 +1,33 @@ +--- 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 new file mode 100644 index 000000000000..8168ecb6ddd0 --- /dev/null +++ b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in @@ -0,0 +1,34 @@ +--- 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 @@ + + 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_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) diff --git a/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index 9abc77d16d84..000000000000 --- a/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig Thu May 12 15:12:13 2005 -+++ sysdeps/freebsd/Makefile.in Thu May 12 15:22:01 2005 -@@ -175,7 +175,7 @@ - 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_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 \ diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure index 662f75ac3671..e40ac7b08c2c 100644 --- a/devel/libgtop2/files/patch-configure +++ b/devel/libgtop2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Mar 11 15:38:00 2004 -+++ configure Thu Mar 11 15:38:00 2004 -@@ -1917,9 +1917,9 @@ +--- 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 @@ -13,3 +13,21 @@ 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 diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h new file mode 100644 index 000000000000..5ded2dc3c3c0 --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h @@ -0,0 +1,21 @@ +--- 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 +@@ -21,8 +21,8 @@ + Boston, MA 02111-1307, USA. + */ + +-#ifndef __GLIBTOP_SERVER_H__ +-#define __GLIBTOP_SERVER_H__ ++#ifndef __FREEBSD__GLIBTOP_SERVER_H__ ++#define __FREEBSD__GLIBTOP_SERVER_H__ + + 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_sysinfo.c b/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c new file mode 100644 index 000000000000..7a86f3327730 --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c @@ -0,0 +1,95 @@ +--- 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::proctime.c b/devel/libgtop2/files/patch-systeps::freebsd::proctime.c index da0908ce778c..9857d6cb856d 100644 --- a/devel/libgtop2/files/patch-systeps::freebsd::proctime.c +++ b/devel/libgtop2/files/patch-systeps::freebsd::proctime.c @@ -1,6 +1,6 @@ ---- sysdeps/freebsd/proctime.c Wed Feb 23 17:20:45 2005 -+++ sysdeps/freebsd/proctime.c.orig Sat Mar 19 02:38:31 2005 -@@ -146,8 +146,10 @@ +--- sysdeps/freebsd/proctime.c.orig Wed Feb 23 03:20:45 2005 ++++ sysdeps/freebsd/proctime.c Tue Aug 2 12:49:38 2005 +@@ -146,8 +146,10 @@ glibtop_get_proc_time_p (glibtop *server /* Get the process information */ pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); @@ -13,3 +13,19 @@ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) buf->rtime = pinfo [0].ki_runtime; +@@ -193,9 +195,13 @@ glibtop_get_proc_time_p (glibtop *server + if ((pinfo [0].ki_flag & P_INMEM)) { + #endif + buf->utime = pinfo [0].ki_runtime; +- buf->stime = 0; /* XXX */ ++ buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime); + buf->cutime = tv2sec (pinfo [0].ki_childtime); +- buf->cstime = 0; /* XXX */ ++#if __FreeBSD_version >= 600000 ++ buf->cstime = tv2sec (pinfo [0].ki_rusage_ch.ru_stime); ++#else ++ buf->cstime = 0; ++#endif + buf->start_time = tv2sec (pinfo [0].ki_start); + buf->flags = _glibtop_sysdeps_proc_time_user; + } diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index a6f6c3607b25..a7e68fc0f119 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -110,11 +110,11 @@ share/locale/vi/LC_MESSAGES/libgtop-2.0.mo share/locale/xh/LC_MESSAGES/libgtop-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo +@dirrm include/libgtop-2.0/glibtop +@dirrm include/libgtop-2.0 @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/mi 2> /dev/null || true -@dirrm include/libgtop-2.0/glibtop -@dirrm include/libgtop-2.0 diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 285cf8293a9e..125ff3a2e1cf 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,10 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $ # PORTNAME= libsoup PORTVERSION= 2.2.6.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 @@ -18,9 +20,9 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_GNOME= gnomehack glib20 libxml2 +USE_GNOME= gnomehack glib20 libxml2 ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index e3f0fb313d97..8ff6cd1639bd 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -25,7 +25,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-response.h include/libsoup-%%VERSION%%/libsoup/soup.h lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.so -lib/libsoup-%%VERSION%%.so.9 +lib/libsoup-%%VERSION%%.so.8 libdata/pkgconfig/libsoup-%%VERSION%%.pc %%DOCSDIR%%/SoupAddress.html %%DOCSDIR%%/SoupAuth.html diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index 285cf8293a9e..125ff3a2e1cf 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -3,10 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $ # PORTNAME= libsoup PORTVERSION= 2.2.6.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 @@ -18,9 +20,9 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_GNOME= gnomehack glib20 libxml2 +USE_GNOME= gnomehack glib20 libxml2 ltverhack INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/devel/libsoup22/pkg-plist b/devel/libsoup22/pkg-plist index e3f0fb313d97..8ff6cd1639bd 100644 --- a/devel/libsoup22/pkg-plist +++ b/devel/libsoup22/pkg-plist @@ -25,7 +25,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-response.h include/libsoup-%%VERSION%%/libsoup/soup.h lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.so -lib/libsoup-%%VERSION%%.so.9 +lib/libsoup-%%VERSION%%.so.8 libdata/pkgconfig/libsoup-%%VERSION%%.pc %%DOCSDIR%%/SoupAddress.html %%DOCSDIR%%/SoupAuth.html diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 742b418057fe..4a66677fc427 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -3,19 +3,21 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/pkgconfig/Makefile,v 1.6 2005/10/14 20:39:57 adamw Exp $ # PORTNAME= pkgconfig -PORTVERSION= 0.17.2 +PORTVERSION= 0.19 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ +DISTNAME= pkg-config-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A utility to retrieve information about installed libraries USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnometarget LIBTOOLFILES= glib-1.2.8/configure LIBTOOLFLAGS= --disable-ltlibs \ diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index 20b35cccca85..220f87d0cfa3 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/pkgconfig-0.17.2.tar.gz) = a0829ae71b586e027183b2a1cfe0ce88 -SIZE (gnome2/pkgconfig-0.17.2.tar.gz) = 965129 +MD5 (gnome2/pkg-config-0.19.tar.gz) = 25f106d2cc82a0013f5bdc89875d5790 +SIZE (gnome2/pkg-config-0.19.tar.gz) = 968790 diff --git a/devel/pkg-config/files/patch-parse.c b/devel/pkg-config/files/patch-parse.c index b591663c5709..eb828f3e7743 100644 --- a/devel/pkg-config/files/patch-parse.c +++ b/devel/pkg-config/files/patch-parse.c @@ -1,5 +1,6 @@ $FreeBSD$ +$MCom: ports/devel/pkgconfig/files/patch-parse.c,v 1.4 2005/10/14 20:39:57 adamw Exp $ --- parse.c 2001/08/01 07:24:17 1.1 +++ parse.c 2001/08/01 07:25:02 diff --git a/devel/pkg-config/pkg-descr b/devel/pkg-config/pkg-descr index afd75d04435b..c24838f6230e 100644 --- a/devel/pkg-config/pkg-descr +++ b/devel/pkg-config/pkg-descr @@ -1,18 +1,13 @@ The pkg-config program is used to retrieve information about installed libraries in the system. It is typically used to compile and link against one -or more libraries. +or more libraries. It's more useful to the compilation process than to +the end-user. pkg-config retrieves information about packages from special metadata files. These files are named after the package, with the extension .pc. By default, -pkg-config looks in the following directories: ${PREFIX}/libdata/pkgconfig, -${LOCALBASE}/libdata/pkgconfig and ${X11BASE}/libdata/pkgconfig for these -files; it will also look in the list of directories specified by the -PKG_CONFIG_PATH environment variable. +pkg-config looks for these files in the following directories: +${PREFIX}/libdata/pkgconfig, ${LOCALBASE}/libdata/pkgconfig and +${X11BASE}/libdata/pkgconfig; it will also look in the list of directories +specified by the PKG_CONFIG_PATH environment variable. -The package name specified on the pkg-config command line is defined to be the -name of the metadata file, minus the .pc extension. If a library can install -multiple versions simultaneously, it must give each version its own name (for -example, GTK 1.2 might have the package name "gtk+" while GTK 2.0 has -"gtk+-2.0"). - -WWW: http://www.freedesktop.org/wiki/Software_2fpkgconfig +WWW: http://pkgconfig.freedesktop.org/wiki/ diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 742b418057fe..4a66677fc427 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -3,19 +3,21 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/pkgconfig/Makefile,v 1.6 2005/10/14 20:39:57 adamw Exp $ # PORTNAME= pkgconfig -PORTVERSION= 0.17.2 +PORTVERSION= 0.19 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ +DISTNAME= pkg-config-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A utility to retrieve information about installed libraries USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnometarget LIBTOOLFILES= glib-1.2.8/configure LIBTOOLFLAGS= --disable-ltlibs \ diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo index 20b35cccca85..220f87d0cfa3 100644 --- a/devel/pkgconfig/distinfo +++ b/devel/pkgconfig/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/pkgconfig-0.17.2.tar.gz) = a0829ae71b586e027183b2a1cfe0ce88 -SIZE (gnome2/pkgconfig-0.17.2.tar.gz) = 965129 +MD5 (gnome2/pkg-config-0.19.tar.gz) = 25f106d2cc82a0013f5bdc89875d5790 +SIZE (gnome2/pkg-config-0.19.tar.gz) = 968790 diff --git a/devel/pkgconfig/files/patch-parse.c b/devel/pkgconfig/files/patch-parse.c index b591663c5709..eb828f3e7743 100644 --- a/devel/pkgconfig/files/patch-parse.c +++ b/devel/pkgconfig/files/patch-parse.c @@ -1,5 +1,6 @@ $FreeBSD$ +$MCom: ports/devel/pkgconfig/files/patch-parse.c,v 1.4 2005/10/14 20:39:57 adamw Exp $ --- parse.c 2001/08/01 07:24:17 1.1 +++ parse.c 2001/08/01 07:25:02 diff --git a/devel/pkgconfig/pkg-descr b/devel/pkgconfig/pkg-descr index afd75d04435b..c24838f6230e 100644 --- a/devel/pkgconfig/pkg-descr +++ b/devel/pkgconfig/pkg-descr @@ -1,18 +1,13 @@ The pkg-config program is used to retrieve information about installed libraries in the system. It is typically used to compile and link against one -or more libraries. +or more libraries. It's more useful to the compilation process than to +the end-user. pkg-config retrieves information about packages from special metadata files. These files are named after the package, with the extension .pc. By default, -pkg-config looks in the following directories: ${PREFIX}/libdata/pkgconfig, -${LOCALBASE}/libdata/pkgconfig and ${X11BASE}/libdata/pkgconfig for these -files; it will also look in the list of directories specified by the -PKG_CONFIG_PATH environment variable. +pkg-config looks for these files in the following directories: +${PREFIX}/libdata/pkgconfig, ${LOCALBASE}/libdata/pkgconfig and +${X11BASE}/libdata/pkgconfig; it will also look in the list of directories +specified by the PKG_CONFIG_PATH environment variable. -The package name specified on the pkg-config command line is defined to be the -name of the metadata file, minus the .pc extension. If a library can install -multiple versions simultaneously, it must give each version its own name (for -example, GTK 1.2 might have the package name "gtk+" while GTK 2.0 has -"gtk+-2.0"). - -WWW: http://www.freedesktop.org/wiki/Software_2fpkgconfig +WWW: http://pkgconfig.freedesktop.org/wiki/ |