diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:35:50 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:35:50 +0000 |
| commit | f1bb12de8e50bf76ae21f37debda60994ec7fd99 (patch) | |
| tree | 1671d4beef381f12d939e34b344eb385a3af4f19 /devel | |
| parent | 29adee7bb42244f34736c5c24ed18a9b269d0925 (diff) | |
| download | ports-f1bb12de8e50bf76ae21f37debda60994ec7fd99.tar.gz ports-f1bb12de8e50bf76ae21f37debda60994ec7fd99.zip | |
Notes
Diffstat (limited to 'devel')
87 files changed, 1040 insertions, 1275 deletions
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index d220c6e9dc84..5f8d94f87fe3 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/bugbuddy/Makefile,v 1.29 2006/04/13 07:52:31 bland Exp $ +# $MCom: ports/devel/bug-buddy/Makefile,v 1.38 2006/09/20 06:35:57 marcus Exp $ # PORTNAME= bug-buddy -PORTVERSION= 2.14.0 +PORTVERSION= 2.16.0 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -16,21 +17,27 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 +LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ + soup-2.2.8:${PORTSDIR}/devel/libsoup + USE_BZIP2= yes USE_GETTEXT= yes -USE_X_PREFIX= yes -INSTALLS_OMF= yes +USE_XLIB= yes +INSTALLS_ICONS= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ - desktopfileutils gnomedocutils + desktopfileutils gnomedocutils evolutiondataserver GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas +post-patch: + @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \ + ${WRKSRC}/src/bugzilla.c + post-install: @-update-desktop-database diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index 4e73e147c587..aa6bbc1b0657 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.14.0.tar.bz2) = 4fb288adc8f67cbfb8886ddf7b400530 -SHA256 (gnome2/bug-buddy-2.14.0.tar.bz2) = f091ca6c55b2f76011d2c7f6c3c60069070e894ee455483bc8f77edc7f0eaaf6 -SIZE (gnome2/bug-buddy-2.14.0.tar.bz2) = 577253 +MD5 (gnome2/bug-buddy-2.16.0.tar.bz2) = 199b8fe6454096b1c8e514eaa925caa3 +SHA256 (gnome2/bug-buddy-2.16.0.tar.bz2) = 7c2d178a4539044654654acbe8365f925f34f312799e98f7cc1ddb09ff141c22 +SIZE (gnome2/bug-buddy-2.16.0.tar.bz2) = 511355 diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in new file mode 100644 index 000000000000..5093e3e9a0b5 --- /dev/null +++ b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in @@ -0,0 +1,11 @@ +--- src/bug-buddy.menu.in.orig Wed Sep 20 02:28:05 2006 ++++ src/bug-buddy.menu.in Wed Sep 20 02:28:12 2006 +@@ -6,7 +6,7 @@ + <Name>Bug Buddy programs</Name> + + <!-- Read only files in default .desktop file location --> +- <LegacyDir>@prefix@/@DATADIRNAME@/applications</LegacyDir> ++ <LegacyDir>@prefix@/@DATADIRNAME@/gnome/applications</LegacyDir> + + <!-- we want to process all desktop files; Unfortunately, + files with NoDisplay=true won't be returned by the diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index d785341759a3..8a283a99abc4 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -1,8 +1,7 @@ bin/bug-buddy -share/gnome/application-registry/bug-buddy.applications -share/gnome/applications/bug-buddy-core.desktop share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade +share/gnome/bug-buddy/bug-buddy.menu share/gnome/bug-buddy/bug-buddy.png share/gnome/bug-buddy/bugzilla/gnome.bugzilla share/gnome/bug-buddy/bugzilla/gnome/config @@ -15,33 +14,21 @@ share/gnome/bug-buddy/bugzilla/ximian/products share/gnome/bug-buddy/gdb-cmd 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/help/bug-buddy/vi/bug-buddy.xml -share/gnome/mime-info/bug-buddy.keys -share/gnome/omf/bug-buddy/bug-buddy-C.omf -share/gnome/omf/bug-buddy/bug-buddy-es.omf -share/gnome/omf/bug-buddy/bug-buddy-pa.omf -share/gnome/omf/bug-buddy/bug-buddy-sr.omf -share/gnome/omf/bug-buddy/bug-buddy-uk.omf -share/gnome/omf/bug-buddy/bug-buddy-vi.omf -share/gnome/pixmaps/bug-buddy.png +share/icons/hicolor/48x48/apps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo share/locale/az/LC_MESSAGES/bug-buddy.mo share/locale/be/LC_MESSAGES/bug-buddy.mo share/locale/bg/LC_MESSAGES/bug-buddy.mo share/locale/bn/LC_MESSAGES/bug-buddy.mo +share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo share/locale/bs/LC_MESSAGES/bug-buddy.mo share/locale/ca/LC_MESSAGES/bug-buddy.mo share/locale/cs/LC_MESSAGES/bug-buddy.mo share/locale/cy/LC_MESSAGES/bug-buddy.mo share/locale/da/LC_MESSAGES/bug-buddy.mo share/locale/de/LC_MESSAGES/bug-buddy.mo +share/locale/dz/LC_MESSAGES/bug-buddy.mo share/locale/el/LC_MESSAGES/bug-buddy.mo share/locale/en_CA/LC_MESSAGES/bug-buddy.mo share/locale/en_GB/LC_MESSAGES/bug-buddy.mo @@ -62,11 +49,13 @@ share/locale/id/LC_MESSAGES/bug-buddy.mo share/locale/is/LC_MESSAGES/bug-buddy.mo share/locale/it/LC_MESSAGES/bug-buddy.mo share/locale/ja/LC_MESSAGES/bug-buddy.mo +share/locale/ka/LC_MESSAGES/bug-buddy.mo share/locale/ko/LC_MESSAGES/bug-buddy.mo share/locale/ku/LC_MESSAGES/bug-buddy.mo share/locale/ky/LC_MESSAGES/bug-buddy.mo share/locale/lt/LC_MESSAGES/bug-buddy.mo share/locale/lv/LC_MESSAGES/bug-buddy.mo +share/locale/mg/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 @@ -76,7 +65,6 @@ share/locale/nb/LC_MESSAGES/bug-buddy.mo share/locale/ne/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo -share/locale/no/LC_MESSAGES/bug-buddy.mo share/locale/or/LC_MESSAGES/bug-buddy.mo share/locale/pa/LC_MESSAGES/bug-buddy.mo share/locale/pl/LC_MESSAGES/bug-buddy.mo @@ -102,31 +90,65 @@ share/locale/xh/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo +@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 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku -@dirrm share/gnome/omf/bug-buddy -@dirrm share/gnome/help/bug-buddy/vi -@dirrm share/gnome/help/bug-buddy/uk -@dirrm share/gnome/help/bug-buddy/sr -@dirrm share/gnome/help/bug-buddy/pa -@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 +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile new file mode 100644 index 000000000000..8644bd1c0800 --- /dev/null +++ b/devel/dbus-glib/Makefile @@ -0,0 +1,35 @@ +# New ports collection makefile for: dbus-glib +# Date Created: 07 October 2006 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= dbus +PORTVERSION= 0.71 +CATEGORIES= devel gnome +MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-glib/ +PKGNAMESUFFIX= -glib +DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GLib bindings for the D-BUS messaging system + +LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus + +USE_GNOME= gnomehack glib20 +USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \ + --disable-doxygen-docs \ + --disable-xml-docs +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + +PLIST_SUB= VERSION="1.0" + +pre-build: + @${CP} ${FILESDIR}/dbus-bus-introspect.xml ${WRKSRC}/tools + +.include <bsd.port.mk> diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo new file mode 100644 index 000000000000..77979418b298 --- /dev/null +++ b/devel/dbus-glib/distinfo @@ -0,0 +1,3 @@ +MD5 (dbus-glib-0.71.tar.gz) = 4e1e7348b26ee8b6485452113f4221cc +SHA256 (dbus-glib-0.71.tar.gz) = b58a489fdd35a70d241f512bc08f3b6d9d8e05110f4a1d5341cff6a0b7d854b7 +SIZE (dbus-glib-0.71.tar.gz) = 566889 diff --git a/devel/dbus-glib/files/dbus-bus-introspect.xml b/devel/dbus-glib/files/dbus-bus-introspect.xml new file mode 100644 index 000000000000..889d1cfafc04 --- /dev/null +++ b/devel/dbus-glib/files/dbus-bus-introspect.xml @@ -0,0 +1,77 @@ + <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> +<node> + <interface name="org.freedesktop.DBus.Introspectable"> + <method name="Introspect"> + <arg name="data" direction="out" type="s"/> + </method> + </interface> + <interface name="org.freedesktop.DBus"> + <method name="RequestName"> + <arg direction="in" type="s"/> + <arg direction="in" type="u"/> + <arg direction="out" type="u"/> + </method> + <method name="ReleaseName"> + <arg direction="in" type="s"/> + <arg direction="out" type="u"/> + </method> + <method name="StartServiceByName"> + <arg direction="in" type="s"/> + <arg direction="in" type="u"/> + <arg direction="out" type="u"/> + </method> + <method name="Hello"> + <arg direction="out" type="s"/> + </method> + <method name="NameHasOwner"> + <arg direction="in" type="s"/> + <arg direction="out" type="b"/> + </method> + <method name="ListNames"> + <arg direction="out" type="as"/> + </method> + <method name="ListActivatableNames"> + <arg direction="out" type="as"/> + </method> + <method name="AddMatch"> + <arg direction="in" type="s"/> + </method> + <method name="RemoveMatch"> + <arg direction="in" type="s"/> + </method> + <method name="GetNameOwner"> + <arg direction="in" type="s"/> + <arg direction="out" type="s"/> + </method> + <method name="ListQueuedOwners"> + <arg direction="in" type="s"/> + <arg direction="out" type="as"/> + </method> + <method name="GetConnectionUnixUser"> + <arg direction="in" type="s"/> + <arg direction="out" type="u"/> + </method> + <method name="GetConnectionUnixProcessID"> + <arg direction="in" type="s"/> + <arg direction="out" type="u"/> + </method> + <method name="GetConnectionSELinuxSecurityContext"> + <arg direction="in" type="s"/> + <arg direction="out" type="ay"/> + </method> + <method name="ReloadConfig"> + </method> + <signal name="NameOwnerChanged"> + <arg type="s"/> + <arg type="s"/> + <arg type="s"/> + </signal> + <signal name="NameLost"> + <arg type="s"/> + </signal> + <signal name="NameAcquired"> + <arg type="s"/> + </signal> + </interface> +</node> diff --git a/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh b/devel/dbus-glib/files/patch-tools_run-with-tmp-session-bus.sh index 064503a1aaa0..4aa4e5a1893a 100644 --- a/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh +++ b/devel/dbus-glib/files/patch-tools_run-with-tmp-session-bus.sh @@ -1,5 +1,5 @@ ---- tools/run-with-tmp-session-bus.sh.orig Fri Mar 18 02:48:29 2005 -+++ tools/run-with-tmp-session-bus.sh Tue Apr 4 20:40:12 2006 +--- tools/run-with-tmp-session-bus.sh.orig Sat Oct 7 16:18:50 2006 ++++ tools/run-with-tmp-session-bus.sh Sat Oct 7 16:19:24 2006 @@ -1,10 +1,10 @@ -#! /bin/bash +#! /bin/sh diff --git a/devel/dbus-glib/pkg-descr b/devel/dbus-glib/pkg-descr new file mode 100644 index 000000000000..bc3c57d8fe62 --- /dev/null +++ b/devel/dbus-glib/pkg-descr @@ -0,0 +1,3 @@ +GLib bindings for the D-BUS interprocess messaging system. + +WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist new file mode 100644 index 000000000000..abc3049f93a5 --- /dev/null +++ b/devel/dbus-glib/pkg-plist @@ -0,0 +1,11 @@ +bin/dbus-binding-tool +include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h +include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h +include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h +include/dbus-%%VERSION%%/dbus/dbus-glib.h +include/dbus-%%VERSION%%/dbus/dbus-gtype-specialized.h +lib/libdbus-glib-1.a +lib/libdbus-glib-1.la +lib/libdbus-glib-1.so +lib/libdbus-glib-1.so.2 +libdata/pkgconfig/dbus-glib-1.pc diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile index 18f226870a04..56d3d1e01b3f 100644 --- a/devel/dbus-sharp/Makefile +++ b/devel/dbus-sharp/Makefile @@ -6,20 +6,23 @@ # $Id: Makefile,v 1.18 2006/01/02 20:54:03 tmclau02 Exp $ # -PORTREVISION= 13 +PORTVERSION= 0.62 +PORTREVISION= 16 CATEGORIES= devel gnome PKGNAMESUFFIX= -sharp MAINTAINER= bsd-sharp-list@forge.novell.com COMMENT= Mono interface to the D-BUS messaging system -LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus BUILD_DEPENDS= monodoc:${PORTSDIR}/devel/mono-tools RUN_DEPENDS= monodoc:${PORTSDIR}/devel/mono-tools MASTERDIR= ${.CURDIR}/../dbus BUILD_WRKSRC= ${WRKSRC}/mono INSTALL_WRKSRC= ${BUILD_WRKSRC} +PATCHDIR= ${.CURDIR}/files +MD5_FILE= ${.CURDIR}/distinfo DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist @@ -31,6 +34,7 @@ CONFIGURE_ARGS= --enable-mono \ --disable-gcj \ --disable-gtk \ --disable-qt \ + --with-test-socket-dir=${WRKDIR} \ --with-system-pid-file=/var/run/dbus.pid \ --with-system-socket=/var/run/dbus \ --with-session-socket-dir=/var/tmp \ diff --git a/devel/dbus-sharp/distinfo b/devel/dbus-sharp/distinfo new file mode 100644 index 000000000000..363c5a579806 --- /dev/null +++ b/devel/dbus-sharp/distinfo @@ -0,0 +1,3 @@ +MD5 (dbus-0.62.tar.gz) = ba7692f63d0e9f1ef06703dff56cb650 +SHA256 (dbus-0.62.tar.gz) = 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707 +SIZE (dbus-0.62.tar.gz) = 1737361 diff --git a/devel/dbus/files/patch-mono_Makefile.in b/devel/dbus-sharp/files/patch-mono_Makefile.in index 7f1d7026cf22..7f1d7026cf22 100644 --- a/devel/dbus/files/patch-mono_Makefile.in +++ b/devel/dbus-sharp/files/patch-mono_Makefile.in diff --git a/devel/dbus/files/patch-mono_dbus-sharp.dll.config.in b/devel/dbus-sharp/files/patch-mono_dbus-sharp.dll.config.in index b7c0032aad1f..b7c0032aad1f 100644 --- a/devel/dbus/files/patch-mono_dbus-sharp.dll.config.in +++ b/devel/dbus-sharp/files/patch-mono_dbus-sharp.dll.config.in diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 47b86af15f4e..590c3fea87a4 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -6,88 +6,58 @@ # PORTNAME= dbus -PORTVERSION= 0.62 -PORTREVISION?= 1 -CATEGORIES?= devel gnome +PORTVERSION?= 0.93 +PORTREVISION?= 2 +CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/ -MAINTAINER?= gnome@FreeBSD.org -COMMENT?= A message bus system for inter-application communication +MAINTAINER= gnome@FreeBSD.org +COMMENT= A message bus system for inter-application communication -LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_GNOME?= gnomehack glib20 libxml2 +USE_GNOME= gnomehack gnometarget libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -CONFIGURE_ARGS?=--disable-gtk \ - --disable-python \ - --disable-gcj \ - --disable-qt \ - --disable-mono \ - --disable-mono-docs \ - --localstatedir=/var \ +USE_LDCONFIG= yes +CONFIGURE_ARGS=--localstatedir=/var \ + --with-test-socket-dir=${WRKDIR} \ --with-system-pid-file=/var/run/dbus/dbus.pid \ --with-system-socket=/var/run/dbus/dbus.pipe \ --with-session-socket-dir=/var/tmp \ --disable-doxygen-docs \ --disable-xml-docs CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" .if !defined(DBUS_SLAVE) USE_RC_SUBR= dbus -OPTIONS= QT "Enable Qt client support" off PLIST_SUB= VERSION="1.0" MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \ dbus-monitor.1 dbus-send.1 + +.if !defined(WITHOUT_X11) +USE_XLIB= yes +.endif .endif .include <bsd.port.pre.mk> -.if !defined(DBUS_SLAVE) -.if defined(WITH_QT) && !defined(WITHOUT_QT) -CONFIGURE_ARGS+=--enable-qt3 -CONFIGURE_ENV+= QTDIR=${X11BASE} -LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 -PLIST_SUB+= QT="" -.else -PLIST_SUB+= QT="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \ ${WRKSRC}/bus/session.conf.in \ ${WRKSRC}/bus/system.conf.in .if !defined(DBUS_SLAVE) -pre-su-install: - @for i in 15 9 ; do \ - if [ -f /var/run/dbus/dbus.pid ]; then \ - kill -$${i} $$(${CAT} /var/run/dbus/dbus.pid) 2>/dev/null || ${TRUE} ; \ - sleep 3 ; \ - fi ; \ - done - @if [ -f /var/run/dbus/dbus.pid ]; then \ - ${RM} -f /var/run/dbus/dbus.pid ; \ - fi -.endif - post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif ${MKDIR} ${X11BASE}/etc/dbus-1/system.d ${MKDIR} ${X11BASE}/share/dbus-1/services -.else -.if defined(PKGNAMEPREFIX) -.if ${PKGNAMEPREFIX}==${PYTHON_PKGNAMEPREFIX} && ${OSVERSION} < 500000 -# Ignore for py-dbus -IGNORE= does not build on 4.X -.endif -.endif .endif diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo index 363c5a579806..6f41a76bd3bf 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-0.62.tar.gz) = ba7692f63d0e9f1ef06703dff56cb650 -SHA256 (dbus-0.62.tar.gz) = 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707 -SIZE (dbus-0.62.tar.gz) = 1737361 +MD5 (dbus-0.93.tar.gz) = 0770dce874c76f7364d055e4648900fb +SHA256 (dbus-0.93.tar.gz) = bdb6a229bc87944e46b656d6e568f9bf9e8fedcb0e1ca53f48f3ed333915168b +SIZE (dbus-0.93.tar.gz) = 1340600 diff --git a/devel/dbus/files/patch-bus_dir-watch.c b/devel/dbus/files/patch-bus_dir-watch.c deleted file mode 100644 index c848f1fd9746..000000000000 --- a/devel/dbus/files/patch-bus_dir-watch.c +++ /dev/null @@ -1,178 +0,0 @@ ---- bus/dir-watch.c.orig Tue Jun 14 22:31:38 2005 -+++ bus/dir-watch.c Tue May 2 12:52:08 2006 -@@ -28,17 +28,25 @@ - #include <stdlib.h> - #include <unistd.h> - #include <fcntl.h> -+#elif defined(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD) -+#include <sys/types.h> -+#include <sys/event.h> -+#include <sys/time.h> -+#include <signal.h> -+#include <fcntl.h> -+#include <unistd.h> -+#include "bus.h" -+#include <dbus/dbus-watch.h> - #endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */ - - #include <dbus/dbus-internals.h> - #include "dir-watch.h" - -+#define MAX_DIRS_TO_WATCH 128 - - /* D_NOTIFY is available on Linux 2.4 or greater - the actual SIGIO signal is handled in main.c:signal_handler() */ - #ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX - --#define MAX_DIRS_TO_WATCH 128 -- - /* use a static array to avoid handling OOM */ - static int fds[MAX_DIRS_TO_WATCH]; - static int num_fds = 0; -@@ -92,6 +100,147 @@ bus_drop_all_directory_watches (void) - } - } - -+ num_fds = 0; -+} -+ -+#elif defined(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD) -+ -+static int kq = -1; -+static int fds[MAX_DIRS_TO_WATCH]; -+static int num_fds = 0; -+static DBusWatch *watch = NULL; -+static DBusLoop *loop = NULL; -+ -+static dbus_bool_t -+_kqueue_watch_callback (DBusWatch *watch, unsigned int condition, void *data) -+{ -+ return dbus_watch_handle (watch, condition); -+} -+ -+static dbus_bool_t -+_handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data) -+{ -+ struct kevent ev; -+ struct timespec nullts = { 0, 0 }; -+ int res; -+ pid_t pid; -+ -+ res = kevent (kq, NULL, 0, &ev, 1, &nullts); -+ -+ /* Sleep for half a second to avoid a race when files are install(1)'d -+ * to system.d. */ -+ usleep(500000); -+ -+ if (res > 0) -+ { -+ pid = getpid (); -+ _dbus_verbose ("Sending SIGHUP signal on reception of a kevent\n"); -+ (void) kill (pid, SIGHUP); -+ } -+ else if (res < 0 && errno == EBADF) -+ { -+ kq = -1; -+ if (watch != NULL) -+ { -+ _dbus_loop_remove_watch (loop, watch, _kqueue_watch_callback, NULL); -+ _dbus_watch_unref (watch); -+ watch = NULL; -+ } -+ pid = getpid (); -+ _dbus_verbose ("Sending SIGHUP signal since kqueue has been closed\n"); -+ (void) kill (pid, SIGHUP); -+ } -+ -+ return TRUE; -+} -+ -+void -+bus_watch_directory (const char *dir, void *userdata) -+{ -+ int fd; -+ struct kevent ev; -+ -+ _dbus_assert (dir != NULL); -+ -+ if (kq < 0) -+ { -+ -+ kq = kqueue (); -+ if (kq < 0) -+ { -+ _dbus_warn ("Cannot create kqueue; error '%s'\n", _dbus_strerror (errno)); -+ goto out; -+ } -+ -+ loop = userdata; -+ -+ watch = _dbus_watch_new (kq, DBUS_WATCH_READABLE, TRUE, -+ _handle_kqueue_watch, NULL, NULL); -+ -+ if (watch == NULL) -+ { -+ _dbus_warn ("Unable to create kqueue watch\n"); -+ close (kq); -+ kq = -1; -+ goto out; -+ } -+ -+ if (!_dbus_loop_add_watch (loop, watch, _kqueue_watch_callback, -+ NULL, NULL)) -+ { -+ _dbus_warn ("Unable to add reload watch to main loop"); -+ close (kq); -+ kq = -1; -+ _dbus_watch_unref (watch); -+ watch = NULL; -+ goto out; -+ } -+ } -+ -+ if (num_fds >= MAX_DIRS_TO_WATCH ) -+ { -+ _dbus_warn ("Cannot watch config directory '%s'. Already watching %d directories\n", dir, MAX_DIRS_TO_WATCH); -+ goto out; -+ } -+ -+ fd = open (dir, O_RDONLY); -+ if (fd < 0) -+ { -+ _dbus_warn ("Cannot open directory '%s'; error '%s'\n", dir, _dbus_strerror (errno)); -+ goto out; -+ } -+ -+ EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, -+ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0); -+ if (kevent (kq, &ev, 1, NULL, 0, NULL) == -1) -+ { -+ _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", dir, _dbus_strerror (errno)); -+ close (fd); -+ goto out; -+ } -+ -+ fds[num_fds++] = fd; -+ _dbus_verbose ("Added kqueue watch on config directory '%s'\n", dir); -+ -+ out: -+ ; -+} -+ -+void -+bus_drop_all_directory_watches (void) -+{ -+ int i; -+ -+ _dbus_verbose ("Dropping all watches on config directories\n"); -+ -+ for (i = 0; i < num_fds; i++) -+ { -+ if (close (fds[i]) != 0) -+ { -+ _dbus_verbose ("Error closing fd %d for config directory watch\n", fds[i]); -+ } -+ } -+ - num_fds = 0; - } - diff --git a/devel/dbus/files/patch-config.h.in b/devel/dbus/files/patch-config.h.in deleted file mode 100644 index 479d32470af5..000000000000 --- a/devel/dbus/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig Fri Jul 1 00:48:36 2005 -+++ config.h.in Fri Jul 1 00:48:56 2005 -@@ -9,6 +9,9 @@ - /* Use dnotify on Linux */ - #undef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX - -+/* Use kqueue on FreeBSD */ -+#undef DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD -+ - /* Disable assertion checking */ - #undef DBUS_DISABLE_ASSERT - diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure index 13e08d566774..0f19547d7d66 100644 --- a/devel/dbus/files/patch-configure +++ b/devel/dbus/files/patch-configure @@ -1,51 +1,28 @@ ---- configure.orig Wed Jun 14 00:57:48 2006 -+++ configure Wed Jun 14 00:58:20 2006 -@@ -1057,6 +1057,7 @@ Optional Features: - --enable-python build python bindings - --enable-selinux build with SELinux support - --enable-dnotify build with dnotify support (linux only) -+ --enable-kqueue build with kqueue support (FreeBSD only) - --enable-console-owner-file - enable console owner file - --enable-shared[=PKGS] -@@ -4550,7 +4551,7 @@ if test "x$GCC" = "xyes"; then +--- configure.orig Sun Oct 8 02:48:06 2006 ++++ configure Sun Oct 8 02:50:34 2006 +@@ -463,7 +463,7 @@ ac_includes_default="\ + # include <unistd.h> + #endif" - case " $CFLAGS " in - *[\ \ ]-Wfloat-equal[\ \ ]*) ;; -- *) CFLAGS="$CFLAGS -Wfloat-equal" ;; -+ *) CFLAGS="$CFLAGS" ;; - esac +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS PTHREAD_LIBS' + ac_subst_files='' - case " $CFLAGS " in -@@ -28332,6 +28333,31 @@ if test x$have_dnotify = xyes; then + # Initialize some variables set by options. +@@ -25187,7 +25187,7 @@ DBUS_CLIENT_LIBS= - cat >>confdefs.h <<\_ACEOF - #define DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 1 -+_ACEOF -+ -+fi -+ -+# kqueue checks -+case "${target_os}" in -+ freebsd*) -+ # Check whether --enable-kqueue or --disable-kqueue was given. -+ if test "${enable_kqueue+set}" = set; then -+ enableval="$enable_kqueue" -+ enable_kqueue=$enableval -+ else -+ enable_kqueue=auto -+ fi; -+ if test x$enable_kqueue = xno ; then -+ have_kqueue=no; -+ else -+ have_kqueue=yes; -+ fi -+;; -+esac -+if test x$have_kqueue = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD 1 - _ACEOF - fi + DBUS_BUS_CFLAGS=$XML_CFLAGS +-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS" ++DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS $PTHREAD_LIBS" + + + +@@ -27929,6 +27929,7 @@ s,@X_LIBS@,$X_LIBS,;t t + s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t + s,@DBUS_X_CFLAGS@,$DBUS_X_CFLAGS,;t t + s,@DBUS_X_LIBS@,$DBUS_X_LIBS,;t t ++s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t + s,@DOXYGEN@,$DOXYGEN,;t t + s,@DBUS_DOXYGEN_DOCS_ENABLED_TRUE@,$DBUS_DOXYGEN_DOCS_ENABLED_TRUE,;t t + s,@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@,$DBUS_DOXYGEN_DOCS_ENABLED_FALSE,;t t diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in index 1b96c24f5857..b9c5fdcc2333 100644 --- a/devel/dbus/files/patch-dbus-1.pc.in +++ b/devel/dbus/files/patch-dbus-1.pc.in @@ -1,9 +1,11 @@ ---- dbus-1.pc.in.orig Tue Jun 22 14:50:57 2004 -+++ dbus-1.pc.in Tue Jun 22 14:54:24 2004 -@@ -7,5 +7,5 @@ +--- ./dbus-1.pc.in.orig Thu Mar 16 22:20:14 2006 ++++ ./dbus-1.pc.in Sun Oct 8 02:02:33 2006 +@@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATAD + Name: dbus Description: Free desktop message bus Version: @VERSION@ - Libs: -L${libdir} -ldbus-1 +-Libs: -L${libdir} -ldbus-1 -Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include ++Libs: -L${libdir} -ldbus-1 @PTHREAD_LIBS@ +Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c index d7182118603b..42a7509663bc 100644 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps.c +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c @@ -1,6 +1,6 @@ ---- dbus/dbus-sysdeps.c.orig Tue Nov 22 15:37:00 2005 -+++ dbus/dbus-sysdeps.c Sat Dec 31 13:08:04 2005 -@@ -781,16 +781,16 @@ write_credentials_byte (int +--- dbus/dbus-sysdeps-unix.c.orig Thu Sep 14 01:07:11 2006 ++++ dbus/dbus-sysdeps-unix.c Sat Oct 7 12:23:40 2006 +@@ -719,16 +719,16 @@ write_credentials_byte (int { int bytes_written; char buf[1] = { '\0' }; @@ -21,7 +21,7 @@ iov.iov_base = buf; iov.iov_len = 1; -@@ -798,10 +798,10 @@ write_credentials_byte (int +@@ -736,10 +736,10 @@ write_credentials_byte (int msg.msg_iov = &iov; msg.msg_iovlen = 1; @@ -35,7 +35,7 @@ cmsg.hdr.cmsg_level = SOL_SOCKET; cmsg.hdr.cmsg_type = SCM_CREDS; #endif -@@ -810,7 +810,7 @@ write_credentials_byte (int +@@ -748,7 +748,7 @@ write_credentials_byte (int again: @@ -44,7 +44,7 @@ bytes_written = sendmsg (server_fd, &msg, 0); #else bytes_written = write (server_fd, buf, 1); -@@ -868,9 +868,10 @@ _dbus_read_credentials_unix_socket (int +@@ -806,9 +806,10 @@ _dbus_read_credentials_unix_socket (int char buf; #ifdef HAVE_CMSGCRED @@ -55,20 +55,11 @@ - struct cmsgcred cred; + char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; } cmsg; - #endif - -@@ -886,7 +887,7 @@ _dbus_read_credentials_unix_socket (int - - _dbus_credentials_clear (credentials); --#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) -+#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED) - /* Set the socket to receive credentials on the next message */ - { - int on = 1; -@@ -907,8 +908,8 @@ _dbus_read_credentials_unix_socket (int + #elif defined(LOCAL_CREDS) +@@ -845,8 +846,8 @@ _dbus_read_credentials_unix_socket (int - #ifdef HAVE_CMSGCRED + #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) memset (&cmsg, 0, sizeof (cmsg)); - msg.msg_control = &cmsg; - msg.msg_controllen = sizeof (cmsg); @@ -77,17 +68,17 @@ #endif again: -@@ -931,7 +932,8 @@ _dbus_read_credentials_unix_socket (int +@@ -869,7 +870,8 @@ _dbus_read_credentials_unix_socket (int } - #ifdef HAVE_CMSGCRED + #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) - if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) + if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) + || cmsg.hdr.cmsg_type != SCM_CREDS) { dbus_set_error (error, DBUS_ERROR_FAILED, "Message from recvmsg() was not SCM_CREDS"); -@@ -959,9 +961,10 @@ _dbus_read_credentials_unix_socket (int +@@ -897,9 +899,10 @@ _dbus_read_credentials_unix_socket (int cr_len, (int) sizeof (cr), _dbus_strerror (errno)); } #elif defined(HAVE_CMSGCRED) @@ -98,6 +89,6 @@ + credentials->pid = cred->cmcred_pid; + credentials->uid = cred->cmcred_euid; + credentials->gid = cred->cmcred_groups[0]; - #elif defined(HAVE_GETPEEREID) - uid_t euid; - gid_t egid; + #elif defined(LOCAL_CREDS) + credentials->pid = DBUS_PID_UNSET; + credentials->uid = cmsg.cred.sc_uid; diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c new file mode 100644 index 000000000000..28701094bd8b --- /dev/null +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c @@ -0,0 +1,11 @@ +--- dbus/dbus-sysdeps-util-unix.c.orig Sat Oct 7 12:33:47 2006 ++++ dbus/dbus-sysdeps-util-unix.c Sat Oct 7 12:34:13 2006 +@@ -502,7 +502,7 @@ static dbus_bool_t + dirent_buf_size(DIR * dirp, size_t *size) + { + long name_max; +-# if defined(HAVE_FPATHCONF) && defined(HAVE_DIRFD) \ ++# if defined(HAVE_FPATHCONF) && ( defined(HAVE_DIRFD) || defined(dirfd) )\ + && defined(_PC_NAME_MAX) + name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX); + if (name_max == -1) diff --git a/devel/dbus/files/patch-python_Makefile.in b/devel/dbus/files/patch-python_Makefile.in deleted file mode 100644 index 98f8f61041f8..000000000000 --- a/devel/dbus/files/patch-python_Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- python/Makefile.in.orig Sat Jul 16 13:21:22 2005 -+++ python/Makefile.in Sat Jul 16 13:22:22 2005 -@@ -60,12 +60,12 @@ - "$(DESTDIR)$(dbusdir)" - dbusbindingsLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(dbusbindings_LTLIBRARIES) --dbus_bindings_la_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la -+dbus_bindings_la_DEPENDENCIES = -ldbus-1 - nodist_dbus_bindings_la_OBJECTS = dbus_bindings.lo - dbus_bindings_la_OBJECTS = $(nodist_dbus_bindings_la_OBJECTS) - dbus_glib_bindings_la_DEPENDENCIES = \ -- $(top_builddir)/dbus/libdbus-1.la \ -- $(top_builddir)/glib/libdbus-glib-1.la -+ -ldbus-1 \ -+ -ldbus-glib-1 - nodist_dbus_glib_bindings_la_OBJECTS = \ - dbus_glib_bindings_la-dbus_glib_bindings.lo - dbus_glib_bindings_la_OBJECTS = \ -@@ -345,10 +345,10 @@ - dbusbindingsdir = $(pyexecdir)/dbus - dbusbindings_LTLIBRARIES = dbus_bindings.la dbus_glib_bindings.la - dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings --dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la -+dbus_bindings_la_LIBADD = -ldbus-1 - nodist_dbus_bindings_la_SOURCES = dbus_bindings.c - dbus_glib_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_glib_bindings --dbus_glib_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la -+dbus_glib_bindings_la_LIBADD = -ldbus-1 -ldbus-glib-1 - dbus_glib_bindings_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) - nodist_dbus_glib_bindings_la_SOURCES = dbus_glib_bindings.c - EXTRA_DIST = \ diff --git a/devel/dbus/files/patch-python_dbus_h_wrapper.h b/devel/dbus/files/patch-python_dbus_h_wrapper.h deleted file mode 100644 index b8c6cd9fd747..000000000000 --- a/devel/dbus/files/patch-python_dbus_h_wrapper.h +++ /dev/null @@ -1,7 +0,0 @@ ---- python/dbus_h_wrapper.h.orig Sat Jul 16 03:30:40 2005 -+++ python/dbus_h_wrapper.h Sat Jul 16 03:28:47 2005 -@@ -1,3 +1,4 @@ - #define DBUS_API_SUBJECT_TO_CHANGE 1 -+#define lint 1 - #include <dbus/dbus.h> - diff --git a/devel/dbus/files/patch-tools_Makefile.in b/devel/dbus/files/patch-tools_Makefile.in new file mode 100644 index 000000000000..41a417ecfc30 --- /dev/null +++ b/devel/dbus/files/patch-tools_Makefile.in @@ -0,0 +1,32 @@ +--- tools/Makefile.in.orig Sun Oct 8 02:49:22 2006 ++++ tools/Makefile.in Sun Oct 8 02:51:10 2006 +@@ -150,6 +150,7 @@ DBUS_XML_DOCS_ENABLED_FALSE = @DBUS_XML_ + DBUS_XML_DOCS_ENABLED_TRUE = @DBUS_XML_DOCS_ENABLED_TRUE@ + DBUS_X_CFLAGS = @DBUS_X_CFLAGS@ + DBUS_X_LIBS = @DBUS_X_LIBS@ ++PTHREAD_LIBS = @PTHREAD_LIBS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DOXYGEN = @DOXYGEN@ +@@ -264,7 +265,7 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" ++INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" + dbus_send_SOURCES = \ + dbus-print-message.c \ + dbus-print-message.h \ +@@ -281,9 +282,9 @@ dbus_launch_SOURCES = \ + dbus_cleanup_sockets_SOURCES = \ + dbus-cleanup-sockets.c + +-dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la +-dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la +-dbus_launch_LDADD = $(DBUS_X_LIBS) ++dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS) ++dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS) ++dbus_launch_LDADD = $(DBUS_X_LIBS) $(PTHREAD_LIBS) + man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 + EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh + CLEANFILES = \ diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist index b165f80b1f2b..e1703343c567 100644 --- a/devel/dbus/pkg-plist +++ b/devel/dbus/pkg-plist @@ -1,4 +1,3 @@ -bin/dbus-binding-tool bin/dbus-cleanup-sockets bin/dbus-daemon bin/dbus-launch @@ -6,45 +5,27 @@ bin/dbus-monitor bin/dbus-send etc/dbus-1/session.conf etc/dbus-1/system.conf -%%QT%%include/dbus-%%VERSION%%/dbus/connection.h include/dbus-%%VERSION%%/dbus/dbus-address.h include/dbus-%%VERSION%%/dbus/dbus-bus.h include/dbus-%%VERSION%%/dbus/dbus-connection.h include/dbus-%%VERSION%%/dbus/dbus-errors.h -include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h -include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h -include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h -include/dbus-%%VERSION%%/dbus/dbus-glib.h -include/dbus-%%VERSION%%/dbus/dbus-gtype-specialized.h include/dbus-%%VERSION%%/dbus/dbus-macros.h include/dbus-%%VERSION%%/dbus/dbus-memory.h include/dbus-%%VERSION%%/dbus/dbus-message.h include/dbus-%%VERSION%%/dbus/dbus-pending-call.h include/dbus-%%VERSION%%/dbus/dbus-protocol.h -%%QT%%include/dbus-%%VERSION%%/dbus/dbus-qt.h include/dbus-%%VERSION%%/dbus/dbus-server.h include/dbus-%%VERSION%%/dbus/dbus-shared.h include/dbus-%%VERSION%%/dbus/dbus-signature.h include/dbus-%%VERSION%%/dbus/dbus-threads.h include/dbus-%%VERSION%%/dbus/dbus-types.h include/dbus-%%VERSION%%/dbus/dbus.h -%%QT%%include/dbus-%%VERSION%%/dbus/message.h -%%QT%%include/dbus-%%VERSION%%/dbus/server.h include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h lib/libdbus-1.a lib/libdbus-1.la lib/libdbus-1.so -lib/libdbus-1.so.2 -lib/libdbus-glib-1.a -lib/libdbus-glib-1.la -lib/libdbus-glib-1.so -lib/libdbus-glib-1.so.2 -%%QT%%lib/libdbus-qt-1.a -%%QT%%lib/libdbus-qt-1.la -%%QT%%lib/libdbus-qt-1.so -%%QT%%lib/libdbus-qt-1.so.1 +lib/libdbus-1.so.3 libdata/pkgconfig/dbus-1.pc -libdata/pkgconfig/dbus-glib-1.pc @exec mkdir -p %D/etc/dbus-1/system.d @exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d @exec mkdir -p %D/share/dbus-1/services diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index b44163bea142..5d12ec4b7096 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -4,30 +4,39 @@ # Whom: Matthew Condell (mcondell@alum.mit.edu) # # $FreeBSD$ -# +# $MCom: ports/devel/g-wrap/Makefile,v 1.4 2006/09/12 21:27:18 ahze Exp $ PORTNAME= g-wrap -PORTVERSION= 1.3.4 -PORTREVISION= 9 +PORTVERSION= 1.9.6 +PORTREVISION= 2 CATEGORIES= devel scheme -MASTER_SITES= http://www.gnucash.org/pub/g-wrap/source/ \ - http://people.freebsd.org/~sobomax/ +MASTER_SITES= SAVANNAH MAINTAINER= gnome@FreeBSD.org COMMENT= A tool for exporting C libraries into Scheme interpreters -BUILD_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile -LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile \ - guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk -RUN_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile +BUILD_DEPENDS= slib-guile>0:${PORTSDIR}/lang/slib-guile +LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile +RUN_DEPENDS= slib-guile>0:${PORTSDIR}/lang/slib-guile INFO= g-wrap +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gtk12 -INSTALLS_SHLIB= yes -CONFIGURE_ENV+= GW_GLIB_CONFIG="${GLIB_CONFIG}" -MAKE_ENV+= GUILE_LOAD_PATH=${WRKSRC} +USE_GNOME= glib20 gnomehack + +post-patch: + @${REINPLACE_CMD} -e 's|"glib"|"glib-2.0"|' \ + ${WRKSRC}/configure + +pre-install: + @${REINPLACE_CMD} -e 's|libffi||' ${WRKSRC}/${MAKEFILE} + +post-install: + ${MKDIR} ${PREFIX}/include/g-wrap/ffi +.for f in ffi.h ffitarget.h + ${INSTALL_DATA} ${WRKSRC}/libffi/include/${f} ${PREFIX}/include/g-wrap/ffi +.endfor .include <bsd.port.mk> diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo index 2cef87078feb..9eabe531c56d 100644 --- a/devel/g-wrap/distinfo +++ b/devel/g-wrap/distinfo @@ -1,3 +1,3 @@ -MD5 (g-wrap-1.3.4.tar.gz) = bf29b8b563cc27d9f7fd90a6243653aa -SHA256 (g-wrap-1.3.4.tar.gz) = bb9fa9b7b6b2a11899d98d730cf5970179bbf942fd763eda13b7b541278adee4 -SIZE (g-wrap-1.3.4.tar.gz) = 403570 +MD5 (g-wrap-1.9.6.tar.gz) = 4d83964f51376500eedced538c1620cb +SHA256 (g-wrap-1.9.6.tar.gz) = ddb0e31d40581402d6d7045cce7cdc79e0bc0627831a4b12012f45703446d311 +SIZE (g-wrap-1.9.6.tar.gz) = 826045 diff --git a/devel/g-wrap/files/patch-Makefile.in b/devel/g-wrap/files/patch-Makefile.in deleted file mode 100644 index 93024a542005..000000000000 --- a/devel/g-wrap/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Nov 7 23:40:46 2002 -+++ Makefile.in Tue Feb 4 20:43:51 2003 -@@ -144,7 +144,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = doc rpm bin g-wrap example test -+SUBDIRS = doc rpm bin g-wrap example - - guilemoduledir = @GUILEMODDIR@ - guilemodule_DATA = @GUILEMOD_TARGET@ diff --git a/devel/g-wrap/files/patch-ab b/devel/g-wrap/files/patch-ab deleted file mode 100644 index b22e980a6ce2..000000000000 --- a/devel/g-wrap/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/g-wrap.texi.orig Thu Jun 22 06:42:12 2000 -+++ doc/g-wrap.texi Sat Jul 15 12:15:38 2000 -@@ -2,6 +2,10 @@ - @c %**start of header - @setfilename g-wrap.info - @settitle g-wrap -+@dircategory Scheme Programming -+@direntry -+* g-wrap: (g-wrap). A tool for exporting C libraries into Scheme interpreters. -+@end direntry - @setchapternewpage on - @c Choices for setchapternewpage are {on,off,odd}. - @paragraphindent 0 diff --git a/devel/g-wrap/files/patch-g-wrap_Makefile.in b/devel/g-wrap/files/patch-g-wrap_Makefile.in deleted file mode 100644 index 1e5ab26f8e38..000000000000 --- a/devel/g-wrap/files/patch-g-wrap_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- g-wrap/Makefile.in.orig Tue Feb 4 20:45:49 2003 -+++ g-wrap/Makefile.in Tue Feb 4 20:46:00 2003 -@@ -197,7 +197,7 @@ - - - #AM_CFLAGS = -O2 -g -Wall -Wno-uninitialized -Werror --AM_CFLAGS = -O2 -g -Wall -Werror \ -+AM_CFLAGS = -Wall -Werror \ - ${GW_GLIB_CFLAGS_ADD} \ - ${GW_GUILE_GTK_CFLAGS_ADD} - diff --git a/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in b/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in new file mode 100644 index 000000000000..6ffbfe171907 --- /dev/null +++ b/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in @@ -0,0 +1,15 @@ +--- guile/g-wrap-2.0-guile.pc.in.orig Mon Oct 11 06:32:16 2004 ++++ guile/g-wrap-2.0-guile.pc.in Tue Sep 12 17:10:41 2006 +@@ -5,9 +5,10 @@ + libdir=@libdir@ + includedir=@includedir@ + module_directory=@GUILEMODDIR@ ++ffiincludedir= @includedir@/g-wrap/ffi + + Name: G-Wrap + Description: A Guile wrapper generator + Version: @VERSION@ +-Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS_INSTALLED@ +-Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@ ++Libs: -L/usr/local/lib/elf -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ ++Cflags: @STD_CFLAGS@ -I${includedir} -I${ffiincludedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@ diff --git a/devel/g-wrap/files/patch-libffi_configure b/devel/g-wrap/files/patch-libffi_configure new file mode 100644 index 000000000000..2121d0c04a00 --- /dev/null +++ b/devel/g-wrap/files/patch-libffi_configure @@ -0,0 +1,11 @@ +--- libffi/configure.orig Tue Sep 12 17:01:51 2006 ++++ libffi/configure Tue Sep 12 17:02:19 2006 +@@ -3285,7 +3285,7 @@ + ;; + esac + else +- enable_shared=yes ++ enable_shared=no # don't build shared lib (or conflict with gcc3*) + fi; + + # Check whether --enable-static or --disable-static was given. diff --git a/devel/g-wrap/pkg-plist b/devel/g-wrap/pkg-plist index 75a89facdc33..51e877875029 100644 --- a/devel/g-wrap/pkg-plist +++ b/devel/g-wrap/pkg-plist @@ -1,47 +1,54 @@ bin/g-wrap-config -include/g-wrap/g-wrap-compatibility.h -include/g-wrap/g-wrap-glib.h -include/g-wrap/g-wrap-wct.h -lib/libgw-glib.a -lib/libgw-glib.la -lib/libgw-glib.so -lib/libgw-glib.so.0 -lib/libgw-gtk.a -lib/libgw-gtk.la -lib/libgw-gtk.so -lib/libgw-gtk.so.0 -lib/libgw-standard.a -lib/libgw-standard.la -lib/libgw-standard.so -lib/libgw-standard.so.0 -lib/libgw-wct.a -lib/libgw-wct.la -lib/libgw-wct.so -lib/libgw-wct.so.0 -lib/libgwrap-glib.a -lib/libgwrap-glib.la -lib/libgwrap-glib.so -lib/libgwrap-glib.so.1 -lib/libgwrap-wct.a -lib/libgwrap-wct.la -lib/libgwrap-wct.so -lib/libgwrap-wct.so.1 -share/aclocal/g-wrap.m4 -share/guile/g-wrap.scm -share/guile/g-wrap/enumeration.scm -share/guile/g-wrap/g-translate.scm -share/guile/g-wrap/gtkobj.scm -share/guile/g-wrap/gw-glib-spec.scm -share/guile/g-wrap/gw-glib.scm -share/guile/g-wrap/gw-gtk-spec.scm -share/guile/g-wrap/gw-gtk.scm -share/guile/g-wrap/gw-standard-spec.scm -share/guile/g-wrap/gw-standard.scm -share/guile/g-wrap/gw-wct-spec.scm -share/guile/g-wrap/gw-wct.scm -share/guile/g-wrap/output-file.scm -share/guile/g-wrap/runtime.scm -share/guile/g-wrap/simple-type.scm -share/guile/g-wrap/sorting.scm -@dirrm share/guile/g-wrap +include/g-wrap-wct.h +include/g-wrap/core-runtime.h +include/g-wrap/ffi-support.h +include/g-wrap/ffi/ffi.h +include/g-wrap/ffi/ffitarget.h +include/g-wrap/guile-compatibility.h +include/g-wrap/guile-runtime.h +include/g-wrap/guile-wct.h +lib/libgw-guile-gw-glib.a +lib/libgw-guile-gw-glib.la +lib/libgw-guile-gw-glib.so +lib/libgw-guile-gw-glib.so.0 +lib/libgw-guile-standard.a +lib/libgw-guile-standard.la +lib/libgw-guile-standard.so +lib/libgw-guile-standard.so.0 +lib/libgwrap-core-runtime.a +lib/libgwrap-core-runtime.la +lib/libgwrap-core-runtime.so +lib/libgwrap-core-runtime.so.0 +lib/libgwrap-guile-runtime.a +lib/libgwrap-guile-runtime.la +lib/libgwrap-guile-runtime.so +lib/libgwrap-guile-runtime.so.0 +libdata/pkgconfig/g-wrap-2.0-guile.pc +share/guile/site/g-wrap.scm +share/guile/site/g-wrap/c-types.scm +share/guile/site/g-wrap/compat.scm +share/guile/site/g-wrap/enumeration.scm +share/guile/site/g-wrap/guile.scm +share/guile/site/g-wrap/guile/ws/standard.scm +share/guile/site/g-wrap/gw-glib-spec.scm +share/guile/site/g-wrap/gw-glib.scm +share/guile/site/g-wrap/gw-standard-spec.scm +share/guile/site/g-wrap/gw-wct-spec.scm +share/guile/site/g-wrap/gw-wct.scm +share/guile/site/g-wrap/gw/standard.scm +share/guile/site/g-wrap/rti.scm +share/guile/site/g-wrap/simple-type.scm +share/guile/site/g-wrap/util.scm +share/guile/site/g-wrap/ws/standard.scm +share/guile/site/srfi/srfi-34.scm +share/guile/site/srfi/srfi-35.scm +@dirrmtry share/guile/site/srfi +@dirrmtry share/guile/site/g-wrap/ws +@dirrmtry share/guile/site/g-wrap/gw +@dirrmtry share/guile/site/g-wrap/guile/ws +@dirrmtry share/guile/site/g-wrap/guile +@dirrmtry share/guile/site/g-wrap +@dirrmtry share/guile/site +@dirrmtry share/guile +@dirrm include/g-wrap/ffi @dirrm include/g-wrap diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index eb1fee6c27c8..54ae95ea3a61 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.72 2006/04/13 07:52:32 bland Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.79 2006/10/05 18:09:30 mezz Exp $ # PORTNAME= gconf2 -PORTVERSION= 2.14.0 -PORTREVISION?= 3 +PORTVERSION= 2.16.0 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -26,8 +26,9 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes USE_GETTEXT= yes -USE_X_PREFIX= yes -USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack referencehack +USE_XLIB= yes +USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack \ + referencehack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index 5bc575714c76..2aa3e29181b9 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/GConf-2.14.0.tar.bz2) = d07c2efcaf477cf34225c604a04b6271 -SHA256 (gnome2/GConf-2.14.0.tar.bz2) = 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525 -SIZE (gnome2/GConf-2.14.0.tar.bz2) = 1895477 +MD5 (gnome2/GConf-2.16.0.tar.bz2) = b1a202f36661c0d9c87f8fe27a28bd52 +SHA256 (gnome2/GConf-2.16.0.tar.bz2) = d687ea919e20e08c42eeedf32e40f0845cd6799dbfa2edec9dbc644d386805c2 +SIZE (gnome2/GConf-2.16.0.tar.bz2) = 1307732 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 278e79888538..035a6e805ad0 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -35,6 +35,7 @@ share/locale/az/LC_MESSAGES/GConf2.mo share/locale/be/LC_MESSAGES/GConf2.mo share/locale/bg/LC_MESSAGES/GConf2.mo share/locale/bn/LC_MESSAGES/GConf2.mo +share/locale/bn_IN/LC_MESSAGES/GConf2.mo share/locale/bs/LC_MESSAGES/GConf2.mo share/locale/ca/LC_MESSAGES/GConf2.mo share/locale/cs/LC_MESSAGES/GConf2.mo @@ -61,6 +62,7 @@ share/locale/id/LC_MESSAGES/GConf2.mo share/locale/is/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo +share/locale/ka/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 @@ -73,7 +75,7 @@ share/locale/nb/LC_MESSAGES/GConf2.mo share/locale/ne/LC_MESSAGES/GConf2.mo share/locale/nl/LC_MESSAGES/GConf2.mo share/locale/nn/LC_MESSAGES/GConf2.mo -share/locale/no/LC_MESSAGES/GConf2.mo +share/locale/or/LC_MESSAGES/GConf2.mo share/locale/pa/LC_MESSAGES/GConf2.mo share/locale/pl/LC_MESSAGES/GConf2.mo share/locale/pt/LC_MESSAGES/GConf2.mo @@ -99,20 +101,57 @@ share/locale/zh_HK/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo share/sgml/gconf/gconf-1.0.dtd @dirrm share/sgml/gconf -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK %%LDAP%%@dirrm share/GConf/schema %%LDAP%%@dirrm share/GConf @dirrm lib/GConf/2 @dirrm include/gconf/2/gconf @dirrm include/gconf/2 @dirrm etc/gconf/2 -@dirrmtry share/sgml +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 78d103c31f24..83fdd84a816f 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,15 +3,15 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.75 2006/04/13 07:57:40 bland Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.91 2006/10/05 06:55:34 mezz Exp $ # PORTNAME= glib -PORTVERSION= 2.10.3 +PORTVERSION= 2.12.4 PORTREVISION?= 0 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/2.10,} \ - ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ + ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -30,7 +30,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= gnomehack gnometarget pkgconfig ltverhack USE_GMAKE= yes USE_PERL5= yes @@ -42,20 +42,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -OPTIONS= COLLATION_FIX "fix string collation" off - .include <bsd.port.pre.mk> .if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) ) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c .endif -.if defined(WITH_COLLATION_FIX) -LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ - ${FILESDIR}/extra-patch-glib_gunicollate.c -.endif - post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index e467aeb74ae5..9fda3523c122 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.10.3.tar.bz2) = 87206e721c12d185d17dd9ecd7e30369 -SHA256 (gnome2/glib-2.10.3.tar.bz2) = 1d3700e35ca7240a9ce28cf222429648ea50271d62524e008191ccd04a3f8f6f -SIZE (gnome2/glib-2.10.3.tar.bz2) = 2774011 +MD5 (gnome2/glib-2.12.4.tar.bz2) = ef7b9595fa788e245a0f883bddba8a25 +SHA256 (gnome2/glib-2.12.4.tar.bz2) = 1b1a0dc746a07c67aad15e22e3d751c3e7068c889d171efb1ab45efbab87c75d +SIZE (gnome2/glib-2.12.4.tar.bz2) = 2868828 diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in deleted file mode 100644 index 3c5676d2eb1e..000000000000 --- a/devel/glib20/files/extra-patch-glib_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- glib/Makefile.in.orig Wed Jul 19 01:08:13 2006 -+++ glib/Makefile.in Wed Jul 19 01:09:10 2006 -@@ -130,7 +130,7 @@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -licui18n - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c deleted file mode 100644 index 5d31cbd2ed72..000000000000 --- a/devel/glib20/files/extra-patch-glib_gunicollate.c +++ /dev/null @@ -1,116 +0,0 @@ ---- glib/gunicollate.c.orig Sun Nov 27 21:15:41 2005 -+++ glib/gunicollate.c Thu Oct 5 17:11:44 2006 -@@ -26,10 +26,57 @@ - #include <wchar.h> - #endif - -+#include <unicode/umachine.h> -+#include <unicode/ustring.h> -+#include <unicode/ucol.h> -+ - #include "glib.h" - #include "gunicodeprivate.h" - #include "galias.h" - -+static gboolean icu_collator_initialized = FALSE; -+static UCollator *icu_collator = NULL; -+G_LOCK_DEFINE_STATIC(icu_collator); -+ -+static void -+init_icu_collator (void) -+{ -+ G_LOCK(icu_collator); -+ if (! icu_collator_initialized) -+ { -+ UErrorCode error = U_ZERO_ERROR; -+ -+ icu_collator = ucol_open(NULL, &error); -+ if (icu_collator == NULL) -+ g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error)); -+ -+ icu_collator_initialized = TRUE; -+ } -+ G_UNLOCK(icu_collator); -+} -+ -+static UChar * -+utf8_to_uchar (const char *str, int32_t len, int32_t *result_len) -+{ -+ UErrorCode error = U_ZERO_ERROR; -+ UChar *result = NULL; -+ -+ u_strFromUTF8(NULL, 0, result_len, str, len, &error); -+ if (error <= U_ZERO_ERROR || error == U_BUFFER_OVERFLOW_ERROR) -+ { -+ error = U_ZERO_ERROR; -+ result = g_new(UChar, *result_len); -+ u_strFromUTF8(result, *result_len, NULL, str, len, &error); -+ if (error > U_ZERO_ERROR) -+ { -+ g_free(result); -+ result = NULL; -+ } -+ } -+ -+ return result; -+} -+ - /** - * g_utf8_collate: - * @str1: a UTF-8 encoded string -@@ -76,6 +123,28 @@ - g_return_val_if_fail (str1 != NULL, 0); - g_return_val_if_fail (str2 != NULL, 0); - -+ init_icu_collator(); -+ if (icu_collator != NULL) -+ { -+ int32_t wstr1_len; -+ UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len); -+ if (wstr1 != NULL) -+ { -+ int32_t wstr2_len; -+ UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len); -+ if (wstr2 != NULL) -+ { -+ result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len); -+ -+ g_free(wstr1); -+ g_free(wstr2); -+ -+ return result; -+ } -+ g_free(wstr1); -+ } -+ } -+ - str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE); - str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE); - -@@ -217,6 +286,26 @@ - gchar *str_norm; - - g_return_val_if_fail (str != NULL, NULL); -+ -+ init_icu_collator(); -+ if (icu_collator != NULL) -+ { -+ int32_t wstr_len; -+ UChar *wstr = utf8_to_uchar(str, len, &wstr_len); -+ if (wstr != NULL) -+ { -+ int32_t result_len; -+ -+ /* get size of result */ -+ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0); -+ -+ result = g_new(char, result_len); -+ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len); -+ g_free(wstr); -+ -+ return result; -+ } -+ } - - str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE); - diff --git a/devel/glib20/files/patch-glib_gatomic.c b/devel/glib20/files/patch-glib_gatomic.c deleted file mode 100644 index 93b29baddabe..000000000000 --- a/devel/glib20/files/patch-glib_gatomic.c +++ /dev/null @@ -1,37 +0,0 @@ ---- glib/gatomic.c.orig Thu Jul 6 11:21:02 2006 -+++ glib/gatomic.c Thu Jul 6 11:18:48 2006 -@@ -414,14 +414,14 @@ - g_atomic_int_exchange_and_add (volatile gint *atomic, - gint val) - { -- return __sync_fetch_and_add (atomic, val); -+ return __sync_fetch_and_add_si (atomic, val); - } - - void - g_atomic_int_add (volatile gint *atomic, - gint val) - { -- __sync_fetch_and_add (atomic, val); -+ __sync_fetch_and_add_si (atomic, val); - } - - gboolean -@@ -429,7 +429,7 @@ - gint oldval, - gint newval) - { -- return __sync_bool_compare_and_swap (atomic, oldval, newval); -+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval); - } - - gboolean -@@ -437,7 +437,7 @@ - gpointer oldval, - gpointer newval) - { -- return __sync_bool_compare_and_swap ((long *)atomic, -+ return __sync_bool_compare_and_swap_di ((long *)atomic, - (long)oldval, (long)newval); - } - diff --git a/devel/glib20/files/patch-glib_gthread.c b/devel/glib20/files/patch-glib_gthread.c deleted file mode 100644 index 1dce08388674..000000000000 --- a/devel/glib20/files/patch-glib_gthread.c +++ /dev/null @@ -1,28 +0,0 @@ ---- glib/gthread.c.orig Mon Mar 14 05:02:07 2005 -+++ glib/gthread.c Wed Jul 20 19:44:08 2005 -@@ -42,24 +42,8 @@ - - #include "glib.h" - #include "gthreadinit.h" -+#include "gthreadprivate.h" - #include "galias.h" -- --#if GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P --# define g_system_thread_equal_simple(thread1, thread2) \ -- ((thread1).dummy_pointer == (thread2).dummy_pointer) --# define g_system_thread_assign(dest, src) \ -- ((dest).dummy_pointer = (src).dummy_pointer) --#else /* GLIB_SIZEOF_SYSTEM_THREAD != SIZEOF_VOID_P */ --# define g_system_thread_equal_simple(thread1, thread2) \ -- (memcmp (&(thread1), &(thread2), GLIB_SIZEOF_SYSTEM_THREAD) == 0) --# define g_system_thread_assign(dest, src) \ -- (memcpy (&(dest), &(src), GLIB_SIZEOF_SYSTEM_THREAD)) --#endif /* GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P */ -- --#define g_system_thread_equal(thread1, thread2) \ -- (g_thread_functions_for_glib_use.thread_equal ? \ -- g_thread_functions_for_glib_use.thread_equal (&(thread1), &(thread2)) :\ -- g_system_thread_equal_simple((thread1), (thread2))) - - GQuark - g_thread_error_quark (void) diff --git a/devel/glib20/files/patch-glib_gtimer.c b/devel/glib20/files/patch-glib_gtimer.c new file mode 100644 index 000000000000..a0661056559f --- /dev/null +++ b/devel/glib20/files/patch-glib_gtimer.c @@ -0,0 +1,11 @@ +--- glib/gtimer.c.orig Sun Oct 1 01:51:15 2006 ++++ glib/gtimer.c Tue Oct 3 17:00:39 2006 +@@ -257,7 +257,7 @@ + + if (microseconds) + *microseconds = (elapsed / 10) % 1000000; +-#elif HAVE_CLOCK_GETTIME ++#elif USE_CLOCK_GETTIME + if (timer->active) + GETTIME (timer->end); + diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c index cf1338425a1c..47ca3e672044 100644 --- a/devel/glib20/files/patch-gmodule::gmodule-dl.c +++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c @@ -1,6 +1,6 @@ $FreeBSD$ - $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.16 2005/12/15 00:18:44 marcus Exp $ + $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.19 2006/10/10 20:22:06 mezz 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/files/patch-gthread_gthread-impl.c b/devel/glib20/files/patch-gthread_gthread-impl.c deleted file mode 100644 index 5f1b6dcbd7ec..000000000000 --- a/devel/glib20/files/patch-gthread_gthread-impl.c +++ /dev/null @@ -1,185 +0,0 @@ ---- gthread/gthread-impl.c.orig Fri Feb 14 16:08:46 2003 -+++ gthread/gthread-impl.c Wed Jul 20 19:44:08 2005 -@@ -37,9 +37,11 @@ - - #include <glib.h> - #include <gthreadinit.h> -+#include "gthreadprivate.h" - - #ifdef G_THREADS_ENABLED - -+static GSystemThread zero_thread; /* This is initialized to all zero */ - static gboolean thread_system_already_initialized = FALSE; - static gint g_thread_priority_map [G_THREAD_PRIORITY_URGENT + 1]; - -@@ -76,7 +78,7 @@ - struct _ErrorCheckInfo - { - gchar *location; -- GThread *owner; -+ GSystemThread owner; - }; - - static GMutex * -@@ -94,7 +96,9 @@ - gchar *location) - { - ErrorCheckInfo *info; -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; -@@ -116,14 +120,14 @@ - } - - info = G_MUTEX_DEBUG_INFO (mutex); -- if (info->owner == self) -+ if (g_system_thread_equal (info->owner, self)) - g_error ("Trying to recursivly lock a mutex at '%s', " - "previously locked at '%s'", - location, info->location); - - g_thread_functions_for_glib_use_default.mutex_lock (mutex); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - } - -@@ -133,7 +137,9 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; -@@ -145,7 +151,7 @@ - return TRUE; - } - -- if (info->owner == self) -+ if (g_system_thread_equal (info->owner, self)) - g_error ("Trying to recursivly lock a mutex at '%s', " - "previously locked at '%s'", - location, info->location); -@@ -153,7 +159,7 @@ - if (!g_thread_functions_for_glib_use_default.mutex_trylock (mutex)) - return FALSE; - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - - return TRUE; -@@ -165,20 +171,22 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to unlock an unlocked mutex at '%s'", location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_warning ("Trying to unlock a mutex at '%s', " - "previously locked by a different thread at '%s'", - location, info->location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - info->location = NULL; - - g_thread_functions_for_glib_use_default.mutex_unlock (mutex); -@@ -194,7 +202,7 @@ - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (info && info->owner != NULL) -+ if (info && !g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to free a locked mutex at '%s', " - "which was previously locked at '%s'", - location, info->location); -@@ -211,25 +219,27 @@ - { - - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to use an unlocked mutex in g_cond_wait() at '%s'", - location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_error ("Trying to use a mutex locked by another thread in " - "g_cond_wait() at '%s'", location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - location = info->location; - - g_thread_functions_for_glib_use_default.cond_wait (cond, mutex); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - } - -@@ -242,28 +252,30 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; - gboolean retval; - -+ g_thread_functions_for_glib_use.thread_self (&self); -+ - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to use an unlocked mutex in g_cond_timed_wait() at '%s'", - location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_error ("Trying to use a mutex locked by another thread in " - "g_cond_timed_wait() at '%s'", location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - location = info->location; - - retval = g_thread_functions_for_glib_use_default.cond_timed_wait (cond, - mutex, - end_time); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - - return retval; diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index aa6628f4ee74..7820f1240885 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -9,6 +9,8 @@ include/glib-2.0/glib/garray.h include/glib-2.0/glib/gasyncqueue.h include/glib-2.0/glib/gatomic.h include/glib-2.0/glib/gbacktrace.h +include/glib-2.0/glib/gbase64.h +include/glib-2.0/glib/gbookmarkfile.h include/glib-2.0/glib/gcache.h include/glib-2.0/glib/gcompletion.h include/glib-2.0/glib/gconvert.h @@ -107,6 +109,7 @@ share/locale/az/LC_MESSAGES/glib20.mo share/locale/be/LC_MESSAGES/glib20.mo share/locale/bg/LC_MESSAGES/glib20.mo share/locale/bn/LC_MESSAGES/glib20.mo +share/locale/bn_IN/LC_MESSAGES/glib20.mo share/locale/bs/LC_MESSAGES/glib20.mo share/locale/ca/LC_MESSAGES/glib20.mo share/locale/cs/LC_MESSAGES/glib20.mo @@ -131,6 +134,7 @@ share/locale/he/LC_MESSAGES/glib20.mo share/locale/hi/LC_MESSAGES/glib20.mo share/locale/hr/LC_MESSAGES/glib20.mo share/locale/hu/LC_MESSAGES/glib20.mo +share/locale/hy/LC_MESSAGES/glib20.mo share/locale/id/LC_MESSAGES/glib20.mo share/locale/is/LC_MESSAGES/glib20.mo share/locale/it/LC_MESSAGES/glib20.mo @@ -148,7 +152,6 @@ share/locale/nb/LC_MESSAGES/glib20.mo share/locale/ne/LC_MESSAGES/glib20.mo share/locale/nl/LC_MESSAGES/glib20.mo share/locale/nn/LC_MESSAGES/glib20.mo -share/locale/no/LC_MESSAGES/glib20.mo share/locale/or/LC_MESSAGES/glib20.mo share/locale/pa/LC_MESSAGES/glib20.mo share/locale/pl/LC_MESSAGES/glib20.mo @@ -178,31 +181,69 @@ share/locale/yi/LC_MESSAGES/glib20.mo share/locale/zh_CN/LC_MESSAGES/glib20.mo share/locale/zh_HK/LC_MESSAGES/glib20.mo share/locale/zh_TW/LC_MESSAGES/glib20.mo -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/ne/LC_MESSAGES -@dirrmtry share/locale/ne -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/sr@ije/LC_MESSAGES -@dirrmtry share/locale/sr@ije -@dirrmtry share/locale/tt/LC_MESSAGES -@dirrmtry share/locale/tt -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/tl/LC_MESSAGES -@dirrmtry share/locale/tl -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK @dirrm share/glib-2.0/gettext/po @dirrm share/glib-2.0/gettext @dirrm share/glib-2.0 @dirrm include/glib-2.0/gobject @dirrm include/glib-2.0/glib @dirrm include/glib-2.0 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt +@dirrmtry share/locale/tl/LC_MESSAGES +@dirrmtry share/locale/tl +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile new file mode 100644 index 000000000000..386e89bd9df9 --- /dev/null +++ b/devel/gnome-vfs-monikers/Makefile @@ -0,0 +1,24 @@ +# New ports collection makefile for: gnome-vfs-monikers +# Date created: 2006-07-11 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/gnome-vfs-monikers/Makefile,v 1.4 2006/07/18 11:37:57 ahze Exp $ + +PORTNAME= gnome-vfs-monikers +PORTVERSION= 2.15.3 +PORTREVISION= 3 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/..$//} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Gnome-vfs monikers module + +USE_GNOME= gnomevfs2 +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + +.include <bsd.port.mk> diff --git a/devel/gnome-vfs-monikers/distinfo b/devel/gnome-vfs-monikers/distinfo new file mode 100644 index 000000000000..711322cfce9a --- /dev/null +++ b/devel/gnome-vfs-monikers/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome-vfs-monikers-2.15.3.tar.gz) = a3950f72170744026d0e66f9118a393c +SHA256 (gnome-vfs-monikers-2.15.3.tar.gz) = bc9fe3fe97a937f04c7cb3fc5b43436be00168c4753d000d9d49913715556ca4 +SIZE (gnome-vfs-monikers-2.15.3.tar.gz) = 368226 diff --git a/devel/gnome-vfs-monikers/pkg-descr b/devel/gnome-vfs-monikers/pkg-descr new file mode 100644 index 000000000000..e9478f14c952 --- /dev/null +++ b/devel/gnome-vfs-monikers/pkg-descr @@ -0,0 +1 @@ +Gnome-vfs monikers module diff --git a/devel/gnome-vfs-monikers/pkg-plist b/devel/gnome-vfs-monikers/pkg-plist new file mode 100644 index 000000000000..793e8a54109b --- /dev/null +++ b/devel/gnome-vfs-monikers/pkg-plist @@ -0,0 +1,6 @@ +lib/bonobo/monikers/libmoniker_gnome_vfs_std.a +lib/bonobo/monikers/libmoniker_gnome_vfs_std.la +lib/bonobo/monikers/libmoniker_gnome_vfs_std.so +lib/bonobo/servers/GNOME_VFS_Moniker_std.server +@dirrm lib/bonobo/monikers +@dirrmtry lib/bonobo/servers diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index dd49c88511eb..7e5ce1c881f2 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,11 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gnome-vfs/Makefile,v 1.160 2006/10/07 15:04:44 marcus Exp $ # PORTNAME= gnome-vfs -PORTVERSION= 2.14.2 -PORTREVISION?= 3 +PORTVERSION= 2.16.1 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,6 +18,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Virtual File System +LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal + USE_BZIP2= yes .if !defined(REFERENCE_PORT) @@ -25,15 +28,18 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_GMAKE= yes USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo ltverhack referencehack USE_AUTOTOOLS= libtool:15 USE_OPENSSL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls \ - --disable-howl + --disable-howl \ + --enable-hal \ + --with-hal-mount=/sbin/mount \ + --with-hal-umount=/sbin/umount CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} @@ -76,11 +82,16 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ + s|/usr/X11R6|${X11BASE}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c - @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ + ${WRKSRC}/libgnomevfs/xdgmime.c \ + ${WRKSRC}/libgnomevfs/gnome-vfs-hal-mounts.c + @${REINPLACE_CMD} -e 's|-lacl||g' \ + ${WRKSRC}/configure + @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ + @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} pre-configure: diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index c4d97b903183..6552ad8718cd 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.14.2.tar.bz2) = b657e31974d6981adf9b2c4db981f62c -SHA256 (gnome2/gnome-vfs-2.14.2.tar.bz2) = 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7 -SIZE (gnome2/gnome-vfs-2.14.2.tar.bz2) = 1816194 +MD5 (gnome2/gnome-vfs-2.16.1.tar.bz2) = 2d9f7b01496ecc227015bc7a08fb798f +SHA256 (gnome2/gnome-vfs-2.16.1.tar.bz2) = 8e6aaa1fb1fcf682484b27bbdf4335234752868ef3bc84ea1102a6ebf0d89067 +SIZE (gnome2/gnome-vfs-2.16.1.tar.bz2) = 1893290 diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in index 8c0d2a13160c..7213df2fa7e0 100644 --- a/devel/gnome-vfs/files/patch-Makefile.in +++ b/devel/gnome-vfs/files/patch-Makefile.in @@ -1,10 +1,10 @@ ---- Makefile.in.orig Tue Nov 30 02:05:26 2004 -+++ Makefile.in Tue Nov 30 02:05:34 2004 -@@ -230,7 +230,6 @@ +--- Makefile.in.orig Tue Jul 11 09:30:02 2006 ++++ Makefile.in Tue Jul 11 09:30:32 2006 +@@ -352,7 +352,6 @@ devel-docs \ doc \ programs \ - test \ - monikers \ po + EXTRA_DIST = \ diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure index 8835cb06b0c1..1bef1ebaca77 100644 --- a/devel/gnome-vfs/files/patch-configure +++ b/devel/gnome-vfs/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed May 17 11:33:28 2006 -+++ configure Wed May 17 21:44:26 2006 -@@ -23540,6 +23540,8 @@ +--- configure.orig Tue Jul 11 09:30:54 2006 ++++ configure Tue Jul 11 09:31:51 2006 +@@ -23202,6 +23202,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23622,6 +23624,7 @@ +@@ -23283,6 +23285,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -23629,6 +23632,7 @@ +@@ -23290,6 +23293,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25,7 +25,7 @@ have_ngettext=yes else echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -25026,7 +25030,7 @@ +@@ -24669,7 +24673,7 @@ @@ -34,7 +34,7 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then -@@ -33396,7 +33400,7 @@ +@@ -32940,7 +32944,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -43,7 +43,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33694,7 +33698,7 @@ +@@ -33236,7 +33240,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -52,7 +52,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -37536,6 +37540,9 @@ +@@ -38765,6 +38769,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -62,7 +62,7 @@ #include <sys/statfs.h> #include <sys/fstyp.h> _ACEOF -@@ -37577,6 +37584,9 @@ +@@ -38806,6 +38813,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -72,9 +72,9 @@ #include <sys/statfs.h> #include <sys/vmount.h> _ACEOF -@@ -39016,6 +39026,7 @@ - s,@ORBIT_IDL@,$ORBIT_IDL,;t t - s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t +@@ -40026,6 +40036,7 @@ + s,@TEST_CFLAGS@,$TEST_CFLAGS,;t t + s,@TEST_LIBS@,$TEST_LIBS,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t +s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t 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 088433c51a28..eb0f4592025e 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,9 +1,9 @@ ---- 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 +--- gnome-vfs-2.0.pc.in.orig Tue Jul 11 07:31:58 2006 ++++ gnome-vfs-2.0.pc.in Tue Jul 11 09:33:47 2006 @@ -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-no-export-2.0 gobject-2.0 + Requires: 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 c3f0d2c30ea2..168fba882ca8 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,9 +1,9 @@ ---- 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 +--- gnome-vfs-module-2.0.pc.in.orig Tue Jul 11 07:31:58 2006 ++++ gnome-vfs-module-2.0.pc.in Tue Jul 11 09:34:36 2006 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ - Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 + Requires: 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-hal-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c index 05dd579ba16d..5260a0f3ec76 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c @@ -1,5 +1,5 @@ ---- libgnomevfs/gnome-vfs-hal-mounts.c.orig Sun May 7 01:07:27 2006 -+++ libgnomevfs/gnome-vfs-hal-mounts.c Sun May 7 01:07:42 2006 +--- libgnomevfs/gnome-vfs-hal-mounts.c.orig Mon Aug 7 04:16:27 2006 ++++ libgnomevfs/gnome-vfs-hal-mounts.c Sun Sep 17 17:39:48 2006 @@ -32,7 +32,9 @@ #include <stdlib.h> #include <string.h> @@ -10,3 +10,34 @@ #include <sys/types.h> #include <unistd.h> #include <limits.h> +@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume + "/", + "/bin", + "/boot", ++ "/compat/linux/proc", ++ "/compat/linux/sys", + "/dev", + "/etc", + "/home", + "/lib", + "/lib64", ++ "/libexec", + "/media", + "/mnt", + "/opt", ++ "/rescue", + "/root", + "/sbin", + "/srv", + "/tmp", + "/usr", ++ "/usr/local", ++ "/usr/obj", ++ "/usr/ports", ++ "/usr/src", ++ "/usr/X11R6", + "/var", ++ "/var/tmp", + "/proc", + "/sbin", + NULL diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c deleted file mode 100644 index 11d73973b413..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c +++ /dev/null @@ -1,131 +0,0 @@ ---- libgnomevfs/gnome-vfs-monitor.c.orig Fri May 12 20:46:39 2006 -+++ libgnomevfs/gnome-vfs-monitor.c Fri May 12 22:29:57 2006 -@@ -48,9 +48,6 @@ - - GList *pending_callbacks; /* protected by handle_hash */ - guint pending_timeout; /* protected by handle_hash */ -- guint timeout_count; /* count up each time pending_timeout is changed -- to avoid timeout remove race. -- protected by handle_hash */ - }; - - struct GnomeVFSMonitorCallbackData { -@@ -69,6 +66,9 @@ - static GHashTable *handle_hash = NULL; - G_LOCK_DEFINE_STATIC (handle_hash); - -+static gint actually_dispatch_callback (gpointer data); -+static guint32 get_min_delay (GList *list, gint32 now); -+ - static void - init_hash_table (void) - { -@@ -202,17 +202,25 @@ - return result; - } - -+static void -+install_timeout (GnomeVFSMonitorHandle *monitor_handle, time_t now) -+{ -+ guint32 delay; - --typedef struct { -- guint timeout_count; -- GnomeVFSMonitorHandle *monitor_handle; --} DispatchData; -+ if (monitor_handle->pending_timeout) -+ g_source_remove (monitor_handle->pending_timeout); -+ -+ delay = get_min_delay (monitor_handle->pending_callbacks, now); -+ if (delay == 0) -+ monitor_handle->pending_timeout = g_idle_add (actually_dispatch_callback, monitor_handle); -+ else -+ monitor_handle->pending_timeout = g_timeout_add (delay * 1000, actually_dispatch_callback, monitor_handle); -+} - - static gint - actually_dispatch_callback (gpointer data) - { -- DispatchData *ddata = data; -- GnomeVFSMonitorHandle *monitor_handle = ddata->monitor_handle; -+ GnomeVFSMonitorHandle *monitor_handle = data; - GnomeVFSMonitorCallbackData *callback_data; - gchar *uri; - GList *l, *next; -@@ -228,13 +236,6 @@ - - G_LOCK (handle_hash); - -- /* Don't clear pending_timeout if we started another timeout -- * (and removed this) -- */ -- if (monitor_handle->timeout_count == ddata->timeout_count) { -- monitor_handle->pending_timeout = 0; -- } -- - if (!monitor_handle->cancelled) { - /* Find all callbacks that needs to be dispatched */ - dispatch = NULL; -@@ -305,13 +306,17 @@ - - } - -- /* if we were waiting for this callback to be dispatched to free -- * this monitor, then do it now. -- */ -- if (monitor_handle->cancelled && -- no_live_callbacks (monitor_handle)) { -- destroy_monitor_handle (monitor_handle); -- } -+ if (no_live_callbacks (monitor_handle)) { -+ /* if we were waiting for this callback to be dispatched -+ * to free this monitor, then do it now. -+ */ -+ if (monitor_handle->cancelled) -+ destroy_monitor_handle (monitor_handle); -+ else -+ monitor_handle->pending_timeout = 0; -+ } else -+ /* pending callbacks left, install another timeout */ -+ install_timeout (monitor_handle, now); - - G_UNLOCK (handle_hash); - -@@ -375,9 +380,7 @@ - GnomeVFSMonitorHandle *monitor_handle; - char *uri; - time_t now; -- guint32 delay; - GList *l; -- DispatchData *ddata; - - g_return_if_fail (info_uri != NULL); - -@@ -435,26 +438,7 @@ - monitor_handle->pending_callbacks = - g_list_append(monitor_handle->pending_callbacks, callback_data); - -- delay = get_min_delay (monitor_handle->pending_callbacks, now); -- -- if (monitor_handle->pending_timeout) { -- g_source_remove (monitor_handle->pending_timeout); -- } -- -- ddata = g_new (DispatchData, 1); -- ddata->monitor_handle = monitor_handle; -- ddata->timeout_count = ++monitor_handle->timeout_count; -- -- if (delay == 0) { -- monitor_handle->pending_timeout = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, -- actually_dispatch_callback, -- ddata, (GDestroyNotify)g_free); -- } else { -- monitor_handle->pending_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, -- delay * 1000, -- actually_dispatch_callback, -- ddata, (GDestroyNotify)g_free); -- } -+ install_timeout (monitor_handle, now); - } - - g_free (uri); diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c deleted file mode 100644 index dc1259ac425f..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 14 22:20:23 2005 -+++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 14 22:20:43 2005 -@@ -25,6 +25,7 @@ - - #include <sys/types.h> - #include <errno.h> -+#include <signal.h> - #include <string.h> - #include <stdlib.h> - #include <glib.h> diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c index 37cc69f1ea3b..7119f852fa75 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c @@ -5,7 +5,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) - 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/"; ++ xdg_data_dirs = "%%LOCALBASE%%/share/gnome/:%%X11BASE%%/share/gnome/:%%LOCALBASE%%/share/:%%X11BASE%%/share/:/usr/share/"; ptr = xdg_data_dirs; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h new file mode 100644 index 000000000000..218578c258b7 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h @@ -0,0 +1,17 @@ +--- libgnomevfs/xdgmime.h.orig Sat Oct 7 10:42:32 2006 ++++ libgnomevfs/xdgmime.h Sat Oct 7 11:01:57 2006 +@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u + #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name) + #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type) + #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal) ++#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p) + #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal) + #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass) ++#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p) + #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents) + #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents) + #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type) ++#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p) + #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents) + #define xdg_mime_shutdown XDG_ENTRY(shutdown) + #define xdg_mime_dump XDG_ENTRY(dump) diff --git a/devel/gnome-vfs/files/patch-modules_file-method-acl.c b/devel/gnome-vfs/files/patch-modules_file-method-acl.c new file mode 100644 index 000000000000..7ec9a33b8f5f --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_file-method-acl.c @@ -0,0 +1,11 @@ +--- modules/file-method-acl.c.orig Mon Jul 24 18:47:12 2006 ++++ modules/file-method-acl.c Mon Jul 24 22:01:34 2006 +@@ -45,7 +45,7 @@ + #endif + + #ifdef HAVE_POSIX_ACL +-# include <acl/libacl.h> ++# include <sys/acl.h> + #define HAVE_ACL 1 + #endif + diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index f1b405661c94..d1783a46cd02 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.7 2005/11/15 06:12:28 marcus Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.10 2006/07/22 20:45:37 mezz Exp $ # # Restore gconf keys of libgnome. @@ -9,11 +9,11 @@ if [ "$2" != "POST-DEINSTALL" ]; then exit 0 fi -SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas +SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas if [ -f ${SCHEMAS} ]; then - env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \ - %%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ + env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \ + %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ > /dev/null || /usr/bin/true fi diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index 0b792521a116..98e90d3db5f0 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.7 2005/11/15 06:12:28 marcus Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.10 2006/07/22 20:45:37 mezz Exp $ # # Restore gconf keys of libgnome. @@ -9,11 +9,11 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0 fi -SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas +SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas if [ -f ${SCHEMAS} ]; then - env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \ - %%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ + env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \ + %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ > /dev/null || /usr/bin/true fi diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 5e66ee7b8f29..1e606b847900 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -11,6 +11,8 @@ 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 include/gnome-vfs-2.0/include/gnome-vfs-file-size.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h @@ -26,6 +28,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h @@ -40,6 +43,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-version.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h @@ -48,7 +52,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h @@ -58,9 +61,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h -lib/bonobo/monikers/libmoniker_gnome_vfs_std.a -lib/bonobo/monikers/libmoniker_gnome_vfs_std.la -lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.a lib/gnome-vfs-2.0/modules/libbzip2.la lib/gnome-vfs-2.0/modules/libbzip2.so @@ -104,11 +104,10 @@ lib/libgnomevfs-2.a lib/libgnomevfs-2.la lib/libgnomevfs-2.so 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 libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon +share/dbus-1/services/gnome-vfs-daemon.service share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo @@ -116,6 +115,7 @@ share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo @@ -192,9 +192,57 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm include/gnome-vfs-2.0 @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index 046d1857bcb8..bfabce9d33f4 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -3,10 +3,10 @@ # 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 $ +# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.42 2006/10/14 06:29:06 ahze Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel gnome PKGNAMESUFFIX= -hacker-tools @@ -14,7 +14,7 @@ COMMENT= GNOME 2 development tools RUN_DEPENDS= mlview:${PORTSDIR}/editors/mlview \ gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \ - glade-2:${PORTSDIR}/devel/glade2 \ + glade-3:${PORTSDIR}/devel/glade3 \ ghex2:${PORTSDIR}/editors/ghex \ gob2:${PORTSDIR}/devel/gob2 \ conglomerate:${PORTSDIR}/editors/conglomerate \ diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 08555a4df1e2..de96345554e6 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libbonobo/Makefile,v 1.45 2006/04/13 07:52:33 bland Exp $ +# $MCom: ports/devel/libbonobo/Makefile,v 1.52 2006/09/10 00:51:08 mezz Exp $ # PORTNAME= libbonobo -PORTVERSION= 2.14.0 -PORTREVISION?= 3 +PORTVERSION= 2.16.0 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -26,7 +26,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes USE_BISON= yes USE_GETTEXT= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_PERL5= yes USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 70ebbb7b074f..9fb497d1f00b 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libbonobo-2.14.0.tar.bz2) = f1f0255f94e3354250d142b688013fad -SHA256 (gnome2/libbonobo-2.14.0.tar.bz2) = d49cc01bf85a185836689013191f92c21b625e7f38bcfcd06b41e19201765754 -SIZE (gnome2/libbonobo-2.14.0.tar.bz2) = 1386855 +MD5 (gnome2/libbonobo-2.16.0.tar.bz2) = 30cdcf2b5316888f10fea6362b38499c +SHA256 (gnome2/libbonobo-2.16.0.tar.bz2) = d8124bedaec7e67dd3fbf12a4a6bcb4d76235128b2784a59219174671a8f63e4 +SIZE (gnome2/libbonobo-2.16.0.tar.bz2) = 1406355 diff --git a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c deleted file mode 100644 index ced10add3d34..000000000000 --- a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c +++ /dev/null @@ -1,21 +0,0 @@ ---- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Sep 9 17:20:15 2005 -+++ bonobo-activation/bonobo-activation-fork-server.c Fri Sep 9 17:31:52 2005 -@@ -359,10 +359,18 @@ - g_source_destroy (source); - g_source_unref (source); - -+ g_io_channel_shutdown (ai.ioc, FALSE, NULL); - g_io_channel_unref (ai.ioc); - - if (use_new_loop) - g_main_context_unref (context); -+ -+ close (iopipes[1]); -+ -+ g_strfreev(newenv); -+ -+ if (fd_arg != 0) -+ g_free ((char *) cmd[fd_arg]); - - return CORBA_OBJECT_NIL; - } diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index 9047e06155d4..676939f1d83b 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -8,6 +8,7 @@ include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-mime.h include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h @@ -100,6 +101,7 @@ share/locale/az/LC_MESSAGES/libbonobo-2.0.mo share/locale/be/LC_MESSAGES/libbonobo-2.0.mo share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo +share/locale/bn_IN/LC_MESSAGES/libbonobo-2.0.mo share/locale/bs/LC_MESSAGES/libbonobo-2.0.mo share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo @@ -127,6 +129,7 @@ share/locale/id/LC_MESSAGES/libbonobo-2.0.mo share/locale/is/LC_MESSAGES/libbonobo-2.0.mo share/locale/it/LC_MESSAGES/libbonobo-2.0.mo share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo +share/locale/ka/LC_MESSAGES/libbonobo-2.0.mo share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo share/locale/li/LC_MESSAGES/libbonobo-2.0.mo @@ -140,7 +143,7 @@ share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo -share/locale/no/LC_MESSAGES/libbonobo-2.0.mo +share/locale/or/LC_MESSAGES/libbonobo-2.0.mo share/locale/pa/LC_MESSAGES/libbonobo-2.0.mo share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo share/locale/pt/LC_MESSAGES/libbonobo-2.0.mo @@ -162,6 +165,7 @@ share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo share/locale/xh/LC_MESSAGES/libbonobo-2.0.mo share/locale/yi/LC_MESSAGES/libbonobo-2.0.mo share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo +share/locale/zh_HK/LC_MESSAGES/libbonobo-2.0.mo share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrm share/idl/bonobo-activation-2.0 @dirrm share/idl/bonobo-2.0 @@ -176,7 +180,53 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrm etc/bonobo-activation @dirrmtry lib/bonobo/monikers @dirrmtry lib/bonobo +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne @dirrmtry share/locale/li/LC_MESSAGES @dirrmtry share/locale/li @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index d17a65952007..53c5bcb54530 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@lovett.com> # # $FreeBSD$ -# $MCom: ports/devel/libglade2/Makefile,v 1.20 2006/07/12 17:23:04 ahze Exp $ +# $MCom: ports/devel/libglade2/Makefile,v 1.23 2006/09/10 00:51:09 mezz Exp $ PORTNAME= libglade2 PORTVERSION= 2.6.0 -PORTREVISION?= 0 +PORTREVISION?= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//} @@ -24,10 +24,9 @@ USE_BZIP2= yes RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr USE_GMAKE= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack libxml2 gtk20 referencehack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc \ --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 514b19c55a04..da8bcd1184cf 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.22 2006/04/23 22:42:46 mezz Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.27 2006/10/04 00:03:42 ahze Exp $ # PORTNAME= libgsf -PORTVERSION= 1.14.1 +PORTVERSION= 1.14.2 PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} @@ -21,17 +21,18 @@ 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_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -INSTALLS_SHLIB= yes -USE_GNOME?= gnomehack glib20 libxml2 gconf2 ltverhack intlhack +USE_LDCONFIG= yes +USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc --without-gnome --with-bz2 \ --mandir=${PREFIX}/man \ - --with-gconf-source=${GCONF_CONFIG_SOURCE} + --with-gconf-source=${GCONF_CONFIG_SOURCE} \ + --without-python CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index ec06e1d287ad..67beda5e8eca 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgsf-1.14.1.tar.bz2) = 00de00b99382d0b7e034e0fffd8951d4 -SHA256 (gnome2/libgsf-1.14.1.tar.bz2) = 7bd920640f8a164cb0faeffbe846bf302ffbd16ccd3751cc9d58f99e0a60c024 -SIZE (gnome2/libgsf-1.14.1.tar.bz2) = 530415 +MD5 (gnome2/libgsf-1.14.2.tar.bz2) = aea16a8408b65f95c308b0db3e3d3d47 +SHA256 (gnome2/libgsf-1.14.2.tar.bz2) = 8b78905b3c61f67dbe9b50782b7005ee5a44cdb48dd0f654f42732b4807c829d +SIZE (gnome2/libgsf-1.14.2.tar.bz2) = 543516 diff --git a/devel/libgsf/files/patch-gsf-python-Makefile.in b/devel/libgsf/files/patch-gsf-python-Makefile.in new file mode 100644 index 000000000000..007dc120bd4e --- /dev/null +++ b/devel/libgsf/files/patch-gsf-python-Makefile.in @@ -0,0 +1,39 @@ +--- python/Makefile.in.orig Tue Oct 3 20:31:15 2006 ++++ python/Makefile.in Tue Oct 3 20:32:17 2006 +@@ -59,15 +59,13 @@ + pygsfexecLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(pygsfexec_LTLIBRARIES) + am__DEPENDENCIES_1 = +-_gsfmodule_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la \ +- $(am__DEPENDENCIES_1) ++_gsfmodule_la_DEPENDENCIES = $(am__DEPENDENCIES_1) + am__gsfmodule_la_OBJECTS = _gsfmodule_la-gsfmodule.lo + nodist__gsfmodule_la_OBJECTS = _gsfmodule_la-gsf.lo + _gsfmodule_la_OBJECTS = $(am__gsfmodule_la_OBJECTS) \ + $(nodist__gsfmodule_la_OBJECTS) + gnomemodule_la_DEPENDENCIES = \ +- $(top_builddir)/gsf-gnome/libgsf-gnome-1.la \ +- $(top_builddir)/gsf/libgsf-1.la $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) + am_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnomemodule.lo + nodist_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnome.lo +@@ -312,8 +310,7 @@ + + gnomemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgnome + gnomemodule_la_LIBADD = \ +- $(top_builddir)/gsf-gnome/libgsf-gnome-1.la \ +- $(top_builddir)/gsf/libgsf-1.la \ ++ -lgsf-1 -lgsf-gnome-1 \ + $(LIBGSF_LIBS) $(LIBGSF_GNOME_LIBS) + + gnomemodule_la_SOURCES = gsfgnomemodule.c +@@ -323,7 +320,7 @@ + $(LIBGSF_CFLAGS) + + _gsfmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gsf +-_gsfmodule_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) ++_gsfmodule_la_LIBADD = $(LIBGSF_LIBS) + _gsfmodule_la_SOURCES = gsfmodule.c + nodist__gsfmodule_la_SOURCES = gsf.c + all: all-am diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 5644e10f0899..4eef810962b2 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,4 +1,6 @@ +bin/gsf bin/gsf-office-thumbnailer +bin/gsf-vba-dump 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 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 744ee000ad53..83f80f2faa72 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,8 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgtop2/Makefile,v 1.70 2006/04/15 05:49:08 marcus Exp $ -# +# $MCom: ports/devel/libgtop/Makefile,v 1.5 2006/10/02 23:26:51 ahze Exp $ PORTNAME= libgtop PORTVERSION= 2.14.4 @@ -21,10 +20,9 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes USE_PERL5_BUILD=yes USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 ltverhack intlhack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --infodir=${PREFIX}/info CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index db71ee9d54ff..123feb467308 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -121,12 +121,34 @@ share/locale/zh_HK/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 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @@ -135,7 +157,21 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile index d3290d13e3f9..1749c4a55cb3 100644 --- a/devel/p5-Net-DBus/Makefile +++ b/devel/p5-Net-DBus/Makefile @@ -7,7 +7,7 @@ PORTNAME= Net-DBus PORTVERSION= 0.33.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Net @@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= novel@FreeBSD.org COMMENT= Perl extension for the DBus message system -LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus RUN_DEPENDS= ${SITE_PERL}/XML/Twig.pm:${PORTSDIR}/textproc/p5-XML-Twig \ ${SITE_PERL}/XML/Grove.pm:${PORTSDIR}/textproc/p5-XML-Grove \ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile index 598860d6467d..c62b179454cf 100644 --- a/devel/py-dbus/Makefile +++ b/devel/py-dbus/Makefile @@ -5,45 +5,27 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTNAME= dbus +PORTVERSION= 0.71 CATEGORIES= devel gnome python +MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= ${PORTNAME}-python-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -COMMENT= Python interface to the D-BUS messaging system +COMMENT= Python bindings for the D-BUS messaging system BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex -LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex \ - ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 + ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 -MASTERDIR= ${.CURDIR}/../dbus -BUILD_WRKSRC= ${WRKSRC}/python -INSTALL_WRKSRC= ${BUILD_WRKSRC} -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -NOT_FOR_ARCHS= ia64 - -DBUS_SLAVE= yes - -USE_GNOME= gnomehack gnometarget USE_PYTHON= yes -CONFIGURE_ARGS= --enable-python \ - --disable-gcj \ - --disable-mono \ - --disable-mono-docs \ - --disable-gtk \ - --disable-qt3 \ - --localstatedir=/var \ - --with-system-pid-file=/var/run/dbus/dbus.pid \ - --with-system-socket=/var/run/dbus/dbus.pipe \ - --with-session-socket-dir=/var/tmp \ - --disable-doxygen-docs \ - --disable-xml-docs +USE_GMAKE= yes +USE_PYDISTUTILS=yes post-install: - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR} - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR} + @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus + @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus -.include "${MASTERDIR}/Makefile" +.include <bsd.port.mk> diff --git a/devel/py-dbus/distinfo b/devel/py-dbus/distinfo new file mode 100644 index 000000000000..3a92835e9d7e --- /dev/null +++ b/devel/py-dbus/distinfo @@ -0,0 +1,3 @@ +MD5 (dbus-python-0.71.tar.gz) = ee893bc87b784a8c2285f5041b5e7033 +SHA256 (dbus-python-0.71.tar.gz) = 4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57 +SIZE (dbus-python-0.71.tar.gz) = 137613 diff --git a/devel/py-dbus/pkg-descr b/devel/py-dbus/pkg-descr index 059c9a3ed457..3c46c16da394 100644 --- a/devel/py-dbus/pkg-descr +++ b/devel/py-dbus/pkg-descr @@ -1,3 +1,3 @@ -Python interface to the D-BUS messaging system. +Python bindings for the D-BUS interprocess messaging system. -WWW: http://www.freedesktop.org/Software/dbus +WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist index 1df8e680a782..76158ca386fa 100644 --- a/devel/py-dbus/pkg-plist +++ b/devel/py-dbus/pkg-plist @@ -1,41 +1,36 @@ -lib/%%PYTHON_VERSION%%/site-packages/dbus.pth -lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.a -lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.la -lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.so -lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.a -lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.la -lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.so -lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/service.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/service.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/service.pyo -lib/%%PYTHON_VERSION%%/site-packages/dbus/types.py -lib/%%PYTHON_VERSION%%/site-packages/dbus/types.pyc -lib/%%PYTHON_VERSION%%/site-packages/dbus/types.pyo -@dirrm lib/%%PYTHON_VERSION%%/site-packages/dbus +%%PYTHON_SITELIBDIR%%/dbus/__init__.py +%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc +%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo +%%PYTHON_SITELIBDIR%%/dbus/_dbus.py +%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc +%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo +%%PYTHON_SITELIBDIR%%/dbus/_util.py +%%PYTHON_SITELIBDIR%%/dbus/_util.pyc +%%PYTHON_SITELIBDIR%%/dbus/_util.pyo +%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.so +%%PYTHON_SITELIBDIR%%/dbus/dbus_glib_bindings.so +%%PYTHON_SITELIBDIR%%/dbus/decorators.py +%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc +%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo +%%PYTHON_SITELIBDIR%%/dbus/exceptions.py +%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc +%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo +%%PYTHON_SITELIBDIR%%/dbus/glib.py +%%PYTHON_SITELIBDIR%%/dbus/glib.pyc +%%PYTHON_SITELIBDIR%%/dbus/glib.pyo +%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.py +%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyc +%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyo +%%PYTHON_SITELIBDIR%%/dbus/matchrules.py +%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyc +%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyo +%%PYTHON_SITELIBDIR%%/dbus/proxies.py +%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc +%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo +%%PYTHON_SITELIBDIR%%/dbus/service.py +%%PYTHON_SITELIBDIR%%/dbus/service.pyc +%%PYTHON_SITELIBDIR%%/dbus/service.pyo +%%PYTHON_SITELIBDIR%%/dbus/types.py +%%PYTHON_SITELIBDIR%%/dbus/types.pyc +%%PYTHON_SITELIBDIR%%/dbus/types.pyo +@dirrm %%PYTHON_SITELIBDIR%%/dbus diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index c8faa7191d4c..230d7d7bd97d 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -3,10 +3,10 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-gobject/Makefile,v 1.7 2006/04/13 07:52:34 bland Exp $ +# $MCom: ports/devel/py-gobject/Makefile,v 1.17 2006/10/03 20:44:25 ahze Exp $ PORTNAME= gobject -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.2 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,6 +22,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_PYTHON= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs CONFLICTS= py*-gtk-0* diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo index 9bf7994d19f5..c83fa0cb3df3 100644 --- a/devel/py-gobject/distinfo +++ b/devel/py-gobject/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygobject-2.10.1.tar.bz2) = 3a69a75b4dfdb52642f26a4d45fcfde8 -SHA256 (gnome2/pygobject-2.10.1.tar.bz2) = dff4a3e4a53c8190b2249e2fc7dd71258b2d6b2f65762aa59f5d56a52d53b86d -SIZE (gnome2/pygobject-2.10.1.tar.bz2) = 273207 +MD5 (gnome2/pygobject-2.12.2.tar.bz2) = 394999abd1921ceff653c98165c713a0 +SHA256 (gnome2/pygobject-2.12.2.tar.bz2) = 83787be6e11f6c7a45c111fa37f674a153274c45c2ab3f4b38b3b6dad933fcda +SIZE (gnome2/pygobject-2.12.2.tar.bz2) = 337829 diff --git a/devel/py-gobject/files/patch-docs_Makefile.in b/devel/py-gobject/files/patch-docs_Makefile.in new file mode 100644 index 000000000000..76edf5de1d78 --- /dev/null +++ b/devel/py-gobject/files/patch-docs_Makefile.in @@ -0,0 +1,11 @@ +--- docs/Makefile.in.orig Thu Aug 24 23:34:38 2006 ++++ docs/Makefile.in Thu Aug 24 23:35:02 2006 +@@ -218,7 +218,7 @@ XSL_FILES = \ + + CSSdir = $(HTMLdir) + CSS_DATA = $(CSS_FILES) +-HTMLdir = $(datadir)/gtk-doc/html/pygobject ++HTMLdir = $(prefix)/share/doc/pygobject + HTML_DATA = $(HTML_FILES) + XSLdir = $(datadir)/pygobject/xsl + XSL_DATA = $(XSL_FILES) diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist index bbd12810ba5d..d623216add61 100644 --- a/devel/py-gobject/pkg-plist +++ b/devel/py-gobject/pkg-plist @@ -2,12 +2,44 @@ include/pygtk-2.0/pygobject.h %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyo %%PYTHON_SITELIBDIR%%/pygtk.pth %%PYTHON_SITELIBDIR%%/pygtk.py %%PYTHON_SITELIBDIR%%/pygtk.pyc %%PYTHON_SITELIBDIR%%/pygtk.pyo libdata/pkgconfig/pygobject-2.0.pc -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0 -@dirrm include/pygtk-2.0 +share/doc/pygobject/class-gobject.html +share/doc/pygobject/class-gobjectgboxed.html +share/doc/pygobject/class-gobjectginterface.html +share/doc/pygobject/class-gobjectgpointer.html +share/doc/pygobject/class-gobjectmaincontext.html +share/doc/pygobject/class-gobjectmainloop.html +share/doc/pygobject/gobject-class-reference.html +share/doc/pygobject/gobject-constants.html +share/doc/pygobject/gobject-functions.html +share/doc/pygobject/index.html +share/doc/pygobject/index.sgml +share/doc/pygobject/pygobject-introduction.html +share/doc/pygobject/pygobject-reference-copyright.html +share/doc/pygobject/pygobject.devhelp +share/doc/pygobject/style.css +share/pygobject/xsl/common.xsl +share/pygobject/xsl/devhelp.xsl +share/pygobject/xsl/fixxref.py +share/pygobject/xsl/html.xsl +share/pygobject/xsl/pdf-style.xsl +share/pygobject/xsl/pdf.xsl +share/pygobject/xsl/ref-html-style.xsl +@dirrm share/pygobject/xsl +@dirrm share/pygobject +@dirrm share/doc/pygobject +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject +@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0 +@dirrmtry include/pygtk-2.0 |