diff options
408 files changed, 3635 insertions, 2754 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index eb326bc1628d..dae33fd7b1c8 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -1,9 +1,9 @@ -#-*- tab-width: 4; -*- +#-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.549 2011/06/10 22:16:59 mezz Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.574 2012/12/18 12:15:14 kwm Exp $ # # Please view me with 4 column tabs! @@ -78,7 +78,7 @@ _USE_GNOME_ALL+= bonobo gconf gdkpixbuf glib12 \ libgda libghttp libglade libxml imlib oaf orbit # GNOME 2 components -_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \ +_USE_GNOME_ALL+= atk atspi cairo desktopfileutils eel2 evolutiondataserver gal2 \ gdkpixbuf2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop \ gnomedesktopsharp20 gnomedocutils gnomemenus gnomepanel gnomesharp20 \ gnomespeech gnomevfs2 gtk-update-icon-cache gtk20 gtkhtml3 gtksharp10 \ @@ -93,11 +93,18 @@ _USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \ # GNOME 3 components _USE_GNOME_ALL+= dconf gtk30 +# C++ bindings +_USE_GNOME_ALL+=atkmm cairomm gconfmm gconfmm26 glibmm gtkmm20 gtkmm24 \ + gtkmm30 libgdamm \ + libgtksourceviewmm libxml++ libxml++26 libsigc++12 libsigc++20 \ + pangomm + GNOME_MAKEFILEIN?= Makefile.in SCROLLKEEPER_DIR= /var/db/rarian gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \ s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|{libdir}/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \ @@ -129,6 +136,67 @@ gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \ --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier +atkmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/atkmm-1.6.pc +atkmm_LIB_DEPENDS= atkmm-1.6:${PORTSDIR}/accessibility/atkmm +atkmm_USE_GNOME_IMPL= glibmm atk + +libxml++_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxml++-1.0.pc +libxml++_LIB_DEPENDS= xml++-1.0:${PORTSDIR}/textproc/libxml++ +libxml++_USE_GNOME_IMPL= libxml2 + +libxml++26_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc +libxml++26_LIB_DEPENDS= xml++-2.6:${PORTSDIR}/textproc/libxml++26 +libxml++26_USE_GNOME_IMPL= glibmm libxml2 + +cairo_DETECT= ${LOCALBASE}/libdata/pkgconfig/cairo.pc +cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo + +cairomm_DETECT= ${LOCALBASE}/libdata/pkgconfig/cairomm-1.0.pc +cairomm_LIB_DEPENDS= cairomm-1.0:${PORTSDIR}/graphics/cairomm +cairomm_USE_GNOME_IMPL= cairo libxml++26 + +gconfmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconfmm-2.0.pc +gconfmm_LIB_DEPENDS= gconfmm-2.0:${PORTSDIR}/devel/gconfmm +gconfmm_USE_GNOME_IMPL= gtkmm20 gconf2 + +gconfmm26_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconfmm-2.6.pc +gconfmm26_LIB_DEPENDS= gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 +gconfmm26_USE_GNOME_IMPL= glibmm gconf2 + +glibmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc +glibmm_LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm +glibmm_USE_GNOME_IMPL= libsigc++20 glib20 + +gtkmm20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc +gtkmm20_LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 +gtkmm20_USE_GNOME_IMPL= libsigc++12 gtk20 + +gtkmm24_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc +gtkmm24_LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 +gtkmm24_USE_GNOME_IMPL= glibmm cairomm atkmm pangomm gtk20 + +gtkmm30_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc +gtkmm30_LIB_DEPENDS= gtkmm-3.0:${PORTSDIR}/x11-toolkits/gtkmm30 +gtkmm30_USE_GNOME_IMPL= glibmm cairomm atkmm pangomm gtk30 + +libgdamm_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgdamm-4.0.pc +libgdamm_LIB_DEPENDS= gdamm-4.0:${PORTSDIR}/databases/libgdamm +libgdamm_USE_GNOME_IMPL=libgda4 glibmm + +libgtksourceviewmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceviewmm-2.0.pc +libgtksourceviewmm_LIB_DEPENDS= gtksourceviewmm-2.0:${PORTSDIR}/x11-toolkits/libgtksourceviewmm +libgtksourceviewmm_USE_GNOME_IMPL= gtksourceview2 gtkmm24 + +libsigc++12_DETECT= ${LOCALBASE}/libdata/pkgconfig/sigc++-1.2.pc +libsigc++12_LIB_DEPENDS= sigc-1.2:${PORTSDIR}/devel/libsigc++12 + +libsigc++20_DETECT= ${LOCALBASE}/libdata/pkgconfig/sigc++-2.0.pc +libsigc++20_LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 + +pangomm_DETECT= ${LOCALBASE}/libdata/pkgconfig/pangomm-1.4.pc +pangomm_LIB_DEPENDS= pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm +pangomm_USE_GNOME_IMPL= pango glibmm cairomm + ESD_CONFIG?= ${LOCALBASE}/bin/esd-config esound_LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound esound_CONFIGURE_ENV= ESD_CONFIG="${ESD_CONFIG}" @@ -143,7 +211,6 @@ glib12_LIB_DEPENDS= glib-12.3:${PORTSDIR}/devel/glib12 glib12_CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" glib12_MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" glib12_DETECT= ${GLIB_CONFIG} -glib12_USE_GNOME_IMPL= pkgconfig GTK_CONFIG?= ${LOCALBASE}/bin/gtk12-config gtk12_LIB_DEPENDS= gtk-12.2:${PORTSDIR}/x11-toolkits/gtk12 @@ -246,9 +313,9 @@ libglade_MAKE_ENV= LIBGLADE_CONFIG="${LIBGLADE_CONFIG}" libglade_DETECT= ${LIBGLADE_CONFIG} libglade_USE_GNOME_IMPL=gnomedb -_glib20_LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +_glib20_LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \ + pcre:${PORTSDIR}/devel/pcre _glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc -_glib20_USE_GNOME_IMPL= pkgconfig glib20_RUN_DEPENDS= ${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend glib20_DETECT= ${LOCALBASE}/lib/gio/modules/libgiofam.so @@ -301,11 +368,14 @@ libglade2_LIB_DEPENDS= glade-2.0.0:${PORTSDIR}/devel/libglade2 libglade2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc libglade2_USE_GNOME_IMPL=libxml2 gtk20 +libxml2_BUILD_DEPENDS= xml2-config:${PORTSDIR}/textproc/libxml2 libxml2_LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 +libxml2_RUN_DEPENDS= xml2-config:${PORTSDIR}/textproc/libxml2 libxml2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc -libxml2_USE_GNOME_IMPL= pkgconfig +libxslt_BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt libxslt_LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt +libxslt_RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt libxslt_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxslt.pc libxslt_USE_GNOME_IMPL= libxml2 @@ -327,7 +397,6 @@ libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 libartlgpl2_LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl libartlgpl2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc -libartlgpl2_USE_GNOME_IMPL= pkgconfig libgnomeprint_LIB_DEPENDS= gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint libgnomeprint_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeprint-2.2.pc @@ -364,16 +433,17 @@ libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 gnomedesktop_LIB_DEPENDS= gnome-desktop-2.17:${PORTSDIR}/x11/gnome-desktop gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc gnomedesktop_USE_GNOME_IMPL= gconf2 gnomedocutils pygtk2 -gnomedesktop_GNOME_DESKTOP_VERSION=2 gnomedesktopsharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc gnomedesktopsharp20_BUILD_DEPENDS= ${gnomedesktopsharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-desktop-sharp20 gnomedesktopsharp20_RUN_DEPENDS= ${gnomedesktopsharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-desktop-sharp20 gnomedesktopsharp20_USE_GNOME_IMPL= gnomesharp20 gnomepanel gtkhtml3 librsvg2 vte libgnomeprintui gtksourceview2 gnomepanel libwnck nautiluscdburner +gnomedesktopsharp20_GNOME_DESKTOP_VERSION=2 libwnck_LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck libwnck_DETECT= ${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc libwnck_USE_GNOME_IMPL= gtk20 +libwnck_GNOME_DESKTOP_VERSION=2 vte_LIB_DEPENDS= vte.9:${PORTSDIR}/x11-toolkits/vte vte_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte.pc @@ -397,13 +467,14 @@ gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 gnomepanel_GNOME_DESKTOP_VERSION=2 nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus -nautilus2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-extension.pc +nautilus2_DETECT= ${LOCALBASE}/share/gir-1.0/Nautilus-2.0.gir nautilus2_USE_GNOME_IMPL=librsvg2 gnomedesktop desktopfileutils gvfs nautilus2_GNOME_DESKTOP_VERSION=2 metacity_LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity metacity_DETECT= ${LOCALBASE}/libdata/pkgconfig/libmetacity-private.pc metacity_USE_GNOME_IMPL=gconf2 +metacity_GNOME_DESKTOP_VERSION=2 gal2_LIB_DEPENDS= gal-2.4.0:${PORTSDIR}/x11-toolkits/gal2 gal2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gal-2.4.pc @@ -412,6 +483,7 @@ gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc gnomecontrolcenter2_USE_GNOME_IMPL=metacity gnomemenus desktopfileutils libgnomekbd gnomedesktop librsvg2 +gnomecontrolcenter2_GNOME_DESKTOP_VERSION=2 libgda2_LIB_DEPENDS= gda-2.3:${PORTSDIR}/databases/libgda2 libgda2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda.pc @@ -485,6 +557,7 @@ gnomespeech_USE_GNOME_IMPL=libbonobo evolutiondataserver_LIB_DEPENDS=edataserverui-1.2.11:${PORTSDIR}/databases/evolution-data-server evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc evolutiondataserver_USE_GNOME_IMPL=gconf2 libxml2 +evolutiondataserver_GNOME_DESKTOP_VERSION=2 desktopfileutils_BUILD_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils @@ -494,10 +567,13 @@ desktopfileutils_USE_GNOME_IMPL=glib20 nautiluscdburner_LIB_DEPENDS=nautilus-burn.4:${PORTSDIR}/sysutils/nautilus-cd-burner nautiluscdburner_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-burn.pc nautiluscdburner_USE_GNOME_IMPL=nautilus2 desktopfileutils +nautiluscdburner_GNOME_DESKTOP_VERSION=2 -gnomemenus_LIB_DEPENDS= gnome-menu.2:${PORTSDIR}/x11/gnome-menus +gnomemenus_BUILD_DEPENDS= gnome-menus<=2.39.0:${PORTSDIR}/x11/gnome-menus +gnomemenus_RUN_DEPENDS= gnome-menus<=2.39.0:${PORTSDIR}/x11/gnome-menus gnomemenus_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu.pc gnomemenus_USE_GNOME_IMPL= glib20 +gnomemenus_GNOME_DESKTOP_VERSION=2 pygnomeextras_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-extras-2.0.pc pygnomeextras_BUILD_DEPENDS= ${pygnomeextras_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-extras @@ -513,6 +589,7 @@ pygnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-desktop-2.0. pygnomedesktop_BUILD_DEPENDS= ${pygnomedesktop_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-desktop pygnomedesktop_RUN_DEPENDS= ${pygnomedesktop_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-desktop pygnomedesktop_USE_GNOME_IMPL=pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck nautilus2 metacity +pygnomedesktop_GNOME_DESKTOP_VERSION=2 gtksharp10_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc gtksharp10_BUILD_DEPENDS= ${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10 @@ -529,9 +606,10 @@ gnomesharp20_BUILD_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnom gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20 gnomesharp20_USE_GNOME_IMPL= gnomepanel gtkhtml3 gtksharp20 librsvg2 vte -libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc +libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc libgnomekbd_LIB_DEPENDS= gnomekbd.4:${PORTSDIR}/x11/libgnomekbd libgnomekbd_USE_GNOME_IMPL= gconf2 +libgnomekbd_GNOME_DESKTOP_VERSION=2 pygtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc pygtksourceview_BUILD_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview @@ -734,34 +812,45 @@ USE_CSTD= gnu89 GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH} CONFIGURE_ENV+= ${lthacks_CONFIGURE_ENV} . endif -. for component in ${_USE_GNOME_ALL} -. if ${_USE_GNOME:M${component}}!="" + +. for component in ${_USE_GNOME:O:u} +. if defined(${component}_PATCH_DEPENDS) PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} -FETCH_DEPENDS+= ${${component}_FETCH_DEPENDS} -EXTRACT_DEPENDS+=${${component}_EXTRACT_DEPENDS} +. endif + +. if defined(${component}_DETECT) +. if ${USE_GNOME:M${component}\:build}!="" BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} -. if defined(MARCUSCOM_CVS) -. if !defined(NODEPENDS) -LIB_DEPENDS+= ${${component}_LIB_DEPENDS} +. elif ${USE_GNOME:M${component}\:run}!="" RUN_DEPENDS+= ${${component}_RUN_DEPENDS} -. endif -. else +. else +. if defined(${component}_LIB_DEPENDS) LIB_DEPENDS+= ${${component}_LIB_DEPENDS} +. else +BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} RUN_DEPENDS+= ${${component}_RUN_DEPENDS} +. endif +. endif . endif +. if defined(${component}_CONFIGURE_ARGS) CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS} +. endif + +. if defined(${component}_CONFIGURE_ENV) CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV} +. endif + +. if defined(${component}_MAKE_ENV) MAKE_ENV+= ${${component}_MAKE_ENV} +. endif -. if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET) +. if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET) CONFIGURE_TARGET= ${${component}_CONFIGURE_TARGET} -. endif +. endif -. if defined(${component}_PRE_PATCH) +. if defined(${component}_PRE_PATCH) GNOME_PRE_PATCH+= ; ${${component}_PRE_PATCH} -. endif - . endif . endfor .endif @@ -835,9 +924,9 @@ gnome-post-install: ${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \ done @${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ - >> ${TMPPLIST}; \ - ${ECHO_CMD} "@unexec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ - >> ${TMPPLIST}; + >> ${TMPPLIST}; \ + ${ECHO_CMD} "@unexec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ + >> ${TMPPLIST}; .endif . if defined(INSTALLS_OMF) @@ -5,6 +5,22 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130308: + AFFECTS: users of net-im/folks and devel/libgee + AUTHOR: kwm@FreeBSD.org + + folks and libgee have been repocopied net-im/folks04 and devel/libgee06 + respectively. Please do the following according to package manager used. + + # portmaster -o devel/libgee06 devel/libgee + # portmaster -o net-im/folks04 net-im/folks + or + # portupgrade -fo devel/libgee06 devel/libgee + # portupgrade -fo net-im/folks04 net-im/folks + or + # pkg set -o devel/libgee:devel/libgee06 + # pkg set -o net-im/folks:net-im/folks04 + 20130307: AFFECTS: users of textproc/elasticsearch AUTHOR: tj@FreeBSD.org diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile index de74c4281b6e..28d4f723d853 100644 --- a/accessibility/at-poke/Makefile +++ b/accessibility/at-poke/Makefile @@ -21,4 +21,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/eventlog.h + .include <bsd.port.mk> diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile index fb67fdb8750b..607125e93a4e 100644 --- a/accessibility/at-spi2-atk/Makefile +++ b/accessibility/at-spi2-atk/Makefile @@ -1,34 +1,34 @@ -# New ports collection makefile for: at-spi -# Date Created: 12 April 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.16 2010/11/16 11:53:13 kwm Exp $ -# +# $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.38 2012/12/16 22:36:25 kwm Exp $ PORTNAME= at-spi2-atk -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 2.6.2 CATEGORIES= accessibility x11-toolkits MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Assisted Technology Provider module for GTK+ -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core +LICENSE= LGPL21 -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING -USE_BZIP2= yes -USE_GETTEXT= yes +BUILD_DEPENDS= at-spi2-core>=2.1.4:${PORTSDIR}/accessibility/at-spi2-core +LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus +RUN_DEPENDS= at-spi2-core>=2.1.4:${PORTSDIR}/accessibility/at-spi2-core + +CONFLICTS= at-spi-1.[0-9]* +PORTSCOUT= limitw:1,even + +USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomehier intlhack gconf2 libxml2 +USE_GNOME= gnomehack gnomehier intlhack glib20 atk +USE_PKGCONFIG= build GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-static +USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -GCONF_SCHEMAS= at-spi2.schemas +CONFIGURE_ARGS= --enable-p2p +GLIB_SCHEMAS= org.a11y.atspi.gschema.xml .include <bsd.port.mk> diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo index 21d9b152adc4..e325fa4f0063 100644 --- a/accessibility/at-spi2-atk/distinfo +++ b/accessibility/at-spi2-atk/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/at-spi2-atk-0.4.1.tar.bz2) = ad885b257f9e12bc1cfb0f21bd1075c00bdedca3f66d01b57401ecb12c9f411c -SIZE (gnome2/at-spi2-atk-0.4.1.tar.bz2) = 337286 +SHA256 (gnome3/at-spi2-atk-2.6.2.tar.xz) = 496c8432e8ab82735145f9af5d45209e9b708bf3c94e527ee091d08641a9bcfa +SIZE (gnome3/at-spi2-atk-2.6.2.tar.xz) = 274748 diff --git a/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c b/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c new file mode 100644 index 000000000000..2ccb400fb7b9 --- /dev/null +++ b/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c @@ -0,0 +1,11 @@ +--- atk-adaptor/accessible-cache.c.orig 2012-11-21 23:46:32.000000000 +0000 ++++ atk-adaptor/accessible-cache.c 2012-11-21 23:47:06.000000000 +0000 +@@ -362,7 +362,7 @@ + if (!child) + { + g_static_rec_mutex_unlock (&cache_mutex); +- return; ++ return FALSE; + } + + g_object_ref (child); diff --git a/accessibility/at-spi2-atk/pkg-plist b/accessibility/at-spi2-atk/pkg-plist index ef93366a36d6..1085e7997bb5 100644 --- a/accessibility/at-spi2-atk/pkg-plist +++ b/accessibility/at-spi2-atk/pkg-plist @@ -1,63 +1,14 @@ -lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.a -lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.la -lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.so -lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.a -lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.la -lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.so -share/gnome/autostart/atk-bridge.desktop -share/locale/ar/LC_MESSAGES/at-spi2-atk.mo -share/locale/ast/LC_MESSAGES/at-spi2-atk.mo -share/locale/bg/LC_MESSAGES/at-spi2-atk.mo -share/locale/bn/LC_MESSAGES/at-spi2-atk.mo -share/locale/ca/LC_MESSAGES/at-spi2-atk.mo -share/locale/cs/LC_MESSAGES/at-spi2-atk.mo -share/locale/cy/LC_MESSAGES/at-spi2-atk.mo -share/locale/de/LC_MESSAGES/at-spi2-atk.mo -share/locale/el/LC_MESSAGES/at-spi2-atk.mo -share/locale/en@shaw/LC_MESSAGES/at-spi2-atk.mo -share/locale/en_GB/LC_MESSAGES/at-spi2-atk.mo -share/locale/es/LC_MESSAGES/at-spi2-atk.mo -share/locale/et/LC_MESSAGES/at-spi2-atk.mo -share/locale/eu/LC_MESSAGES/at-spi2-atk.mo -share/locale/fi/LC_MESSAGES/at-spi2-atk.mo -share/locale/fr/LC_MESSAGES/at-spi2-atk.mo -share/locale/gl/LC_MESSAGES/at-spi2-atk.mo -share/locale/he/LC_MESSAGES/at-spi2-atk.mo -share/locale/hu/LC_MESSAGES/at-spi2-atk.mo -share/locale/it/LC_MESSAGES/at-spi2-atk.mo -share/locale/ko/LC_MESSAGES/at-spi2-atk.mo -share/locale/lt/LC_MESSAGES/at-spi2-atk.mo -share/locale/nb/LC_MESSAGES/at-spi2-atk.mo -share/locale/nl/LC_MESSAGES/at-spi2-atk.mo -share/locale/nn/LC_MESSAGES/at-spi2-atk.mo -share/locale/pl/LC_MESSAGES/at-spi2-atk.mo -share/locale/pt/LC_MESSAGES/at-spi2-atk.mo -share/locale/pt_BR/LC_MESSAGES/at-spi2-atk.mo -share/locale/ro/LC_MESSAGES/at-spi2-atk.mo -share/locale/ru/LC_MESSAGES/at-spi2-atk.mo -share/locale/sk/LC_MESSAGES/at-spi2-atk.mo -share/locale/sl/LC_MESSAGES/at-spi2-atk.mo -share/locale/sr/LC_MESSAGES/at-spi2-atk.mo -share/locale/sr@latin/LC_MESSAGES/at-spi2-atk.mo -share/locale/sv/LC_MESSAGES/at-spi2-atk.mo -share/locale/ta/LC_MESSAGES/at-spi2-atk.mo -share/locale/th/LC_MESSAGES/at-spi2-atk.mo -share/locale/uk/LC_MESSAGES/at-spi2-atk.mo -share/locale/vi/LC_MESSAGES/at-spi2-atk.mo -share/locale/zh_CN/LC_MESSAGES/at-spi2-atk.mo -share/locale/zh_HK/LC_MESSAGES/at-spi2-atk.mo -share/locale/zh_TW/LC_MESSAGES/at-spi2-atk.mo -@dirrm lib/gtk-2.0/modules/at-spi-dbus/modules -@dirrm lib/gtk-2.0/modules/at-spi-dbus -@dirrm lib/gtk-3.0/modules/at-spi-dbus/modules -@dirrm lib/gtk-3.0/modules/at-spi-dbus -@dirrmtry lib/gtk-3.0/modules -@dirrmtry lib/gtk-3.0 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/en@shaw/LC_MESSAGES -@dirrmtry share/locale/en@shaw -@dirrmtry share/locale/ast/LC_MESSAGES -@dirrmtry share/locale/ast +include/at-spi2-atk/2.0/atk-bridge.h +lib/libatk-bridge-2.0.la +lib/libatk-bridge-2.0.so +lib/libatk-bridge-2.0.so.0 +lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop +lib/gtk-2.0/modules/libatk-bridge.la +lib/gtk-2.0/modules/libatk-bridge.so +libdata/pkgconfig/atk-bridge-2.0.pc +@dirrmtry lib/gtk-2.0/modules +@dirrmtry lib/gtk-2.0 +@dirrmtry lib/gnome-settings-daemon-3.0/gtk-modules +@dirrmtry lib/gnome-settings-daemon-3.0 +@dirrm include/at-spi2-atk/2.0 +@dirrm include/at-spi2-atk diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile index 4e11ffcf028e..d58997e9082b 100644 --- a/accessibility/at-spi2-core/Makefile +++ b/accessibility/at-spi2-core/Makefile @@ -1,28 +1,33 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.17 2010/11/16 11:48:22 kwm Exp $ +# $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.41 2012/12/16 22:36:25 kwm Exp $ PORTNAME= at-spi2-core -PORTVERSION= 0.4.1 +PORTVERSION= 2.6.3 CATEGORIES= accessibility x11-toolkits MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Assistive Technology Service Provider Interface LICENSE= LGPL21 -LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus -USE_BZIP2= yes +PORTSCOUT= limitw:1,even + +USE_XZ= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomehier intlhack -USE_XORG= x11 xi xtst +USE_GNOME= gnomehack gnomehier glib20 intlhack +USE_PKGCONFIG= build +USE_XORG= x11 xi xtst xext +USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-static - +CONFIGURE_ARGS= --enable-static \ + --disable-xevie CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo index 310cdb76efb3..6304e38a067c 100644 --- a/accessibility/at-spi2-core/distinfo +++ b/accessibility/at-spi2-core/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/at-spi2-core-0.4.1.tar.bz2) = e3f10134851691b4c0878c2bdb778e21ded01e140b7a930d1958513c775765f9 -SIZE (gnome2/at-spi2-core-0.4.1.tar.bz2) = 277204 +SHA256 (gnome3/at-spi2-core-2.6.3.tar.xz) = fc4487ae46e847cfd057b329b852cf99923772ecd2ddc29f29670c9f2b15d0ea +SIZE (gnome3/at-spi2-core-2.6.3.tar.xz) = 445084 diff --git a/accessibility/at-spi2-core/files/patch-atspi_Makefile.in b/accessibility/at-spi2-core/files/patch-atspi_Makefile.in new file mode 100644 index 000000000000..e6d6cbeb0b18 --- /dev/null +++ b/accessibility/at-spi2-core/files/patch-atspi_Makefile.in @@ -0,0 +1,10 @@ +--- atspi/Makefile.in.orig 2011-01-24 00:11:24.000000000 +0000 ++++ atspi/Makefile.in 2011-01-24 00:13:25.000000000 +0000 +@@ -897,6 +897,7 @@ + @HAVE_INTROSPECTION_TRUE@ --nsversion=2.0 \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir) \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) \ ++@HAVE_INTROSPECTION_TRUE@ $(CPPFLAGS) \ + @HAVE_INTROSPECTION_TRUE@ --include=GLib-2.0 \ + @HAVE_INTROSPECTION_TRUE@ --include=GObject-2.0 \ + @HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \ diff --git a/accessibility/at-spi2-core/files/patch-registryd_registry.c b/accessibility/at-spi2-core/files/patch-registryd_registry.c deleted file mode 100644 index 678eea097faf..000000000000 --- a/accessibility/at-spi2-core/files/patch-registryd_registry.c +++ /dev/null @@ -1,42 +0,0 @@ ---- registryd/registry.c.orig 2011-06-20 23:41:30.000000000 +0200 -+++ registryd/registry.c 2011-06-20 23:57:26.000000000 +0200 -@@ -348,7 +348,7 @@ - const char *member = dbus_message_get_member (message); - - if (type != DBUS_MESSAGE_TYPE_SIGNAL) -- return; -+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) && - !g_strcmp0(member, "NameOwnerChanged")) -@@ -806,18 +806,18 @@ - - if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &orig_name, - DBUS_TYPE_INVALID)) -- return; -+ return NULL; - - name = ensure_proper_format (orig_name); - - evdata = (event_data *) g_malloc (sizeof (*evdata)); - if (!evdata) -- return; -+ return NULL; - data = g_strsplit (name, ":", 3); - if (!data) - { - g_free (evdata); -- return; -+ return NULL; - } - if (!data [0]) - data [1] = NULL; -@@ -856,7 +856,7 @@ - - if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &orig_name, - DBUS_TYPE_INVALID)) -- return; -+ return NULL; - name = ensure_proper_format (orig_name); - - remove_events (registry, sender, name); diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist index 55de074ee261..09efc89e6cae 100644 --- a/accessibility/at-spi2-core/pkg-plist +++ b/accessibility/at-spi2-core/pkg-plist @@ -1,6 +1,171 @@ -bin/at-spi-dbus-bus etc/at-spi2/accessibility.conf etc/xdg/autostart/at-spi-dbus-bus.desktop +include/at-spi-2.0/atspi/atspi.h +include/at-spi-2.0/atspi/atspi-accessible.h +include/at-spi-2.0/atspi/atspi-action.h +include/at-spi-2.0/atspi/atspi-application.h +include/at-spi-2.0/atspi/atspi-collection.h +include/at-spi-2.0/atspi/atspi-component.h +include/at-spi-2.0/atspi/atspi-constants.h +include/at-spi-2.0/atspi/atspi-device-listener.h +include/at-spi-2.0/atspi/atspi-device-listener-private.h +include/at-spi-2.0/atspi/atspi-document.h +include/at-spi-2.0/atspi/atspi-editabletext.h +include/at-spi-2.0/atspi/atspi-event-listener.h +include/at-spi-2.0/atspi/atspi-event-listener-private.h +include/at-spi-2.0/atspi/atspi-gmain.c +include/at-spi-2.0/atspi/atspi-gmain.h +include/at-spi-2.0/atspi/atspi-hyperlink.h +include/at-spi-2.0/atspi/atspi-hypertext.h +include/at-spi-2.0/atspi/atspi-image.h +include/at-spi-2.0/atspi/atspi-misc.h +include/at-spi-2.0/atspi/atspi-matchrule.h +include/at-spi-2.0/atspi/atspi-object.h +include/at-spi-2.0/atspi/atspi-private.h +include/at-spi-2.0/atspi/atspi-registry.h +include/at-spi-2.0/atspi/atspi-relation.h +include/at-spi-2.0/atspi/atspi-selection.h +include/at-spi-2.0/atspi/atspi-stateset.h +include/at-spi-2.0/atspi/atspi-table.h +include/at-spi-2.0/atspi/atspi-text.h +include/at-spi-2.0/atspi/atspi-types.h +include/at-spi-2.0/atspi/atspi-value.h +lib/girepository-1.0/Atspi-2.0.typelib +lib/libatspi.a +lib/libatspi.la +lib/libatspi.so +lib/libatspi.so.0 +libdata/pkgconfig/atspi-2.pc +libexec/at-spi-bus-launcher libexec/at-spi2-registryd +share/dbus-1/services/org.a11y.Bus.service share/dbus-1/services/org.a11y.atspi.Registry.service +share/gir-1.0/Atspi-2.0.gir +share/gtk-doc/html/libatspi/AtspiAccessible.html +share/gtk-doc/html/libatspi/AtspiDeviceListener.html +share/gtk-doc/html/libatspi/AtspiEventListener.html +share/gtk-doc/html/libatspi/AtspiHyperlink.html +share/gtk-doc/html/libatspi/AtspiMatchRule.html +share/gtk-doc/html/libatspi/AtspiObject.html +share/gtk-doc/html/libatspi/AtspiRelation.html +share/gtk-doc/html/libatspi/AtspiStateSet.html +share/gtk-doc/html/libatspi/annotation-glossary.html +share/gtk-doc/html/libatspi/api-index-full.html +share/gtk-doc/html/libatspi/ch01.html +share/gtk-doc/html/libatspi/home.png +share/gtk-doc/html/libatspi/index.html +share/gtk-doc/html/libatspi/index.sgml +share/gtk-doc/html/libatspi/left.png +share/gtk-doc/html/libatspi/libatspi-AtspiApplication.html +share/gtk-doc/html/libatspi/libatspi-atspi-action.html +share/gtk-doc/html/libatspi/libatspi-atspi-collection.html +share/gtk-doc/html/libatspi/libatspi-atspi-component.html +share/gtk-doc/html/libatspi/libatspi-atspi-constants.html +share/gtk-doc/html/libatspi/libatspi-atspi-document.html +share/gtk-doc/html/libatspi/libatspi-atspi-editabletext.html +share/gtk-doc/html/libatspi/libatspi-atspi-hypertext.html +share/gtk-doc/html/libatspi/libatspi-atspi-image.html +share/gtk-doc/html/libatspi/libatspi-atspi-listener-private.html +share/gtk-doc/html/libatspi/libatspi-atspi-misc-private.html +share/gtk-doc/html/libatspi/libatspi-atspi-misc.html +share/gtk-doc/html/libatspi/libatspi-atspi-registry.html +share/gtk-doc/html/libatspi/libatspi-atspi-selection.html +share/gtk-doc/html/libatspi/libatspi-atspi-table.html +share/gtk-doc/html/libatspi/libatspi-atspi-text.html +share/gtk-doc/html/libatspi/libatspi-atspi-types.html +share/gtk-doc/html/libatspi/libatspi-atspi-value.html +share/gtk-doc/html/libatspi/libatspi.devhelp2 +share/gtk-doc/html/libatspi/object-tree.html +share/gtk-doc/html/libatspi/right.png +share/gtk-doc/html/libatspi/style.css +share/gtk-doc/html/libatspi/up.png +share/locale/an/LC_MESSAGES/at-spi2-core.mo +share/locale/as/LC_MESSAGES/at-spi2-core.mo +share/locale/ast/LC_MESSAGES/at-spi2-core.mo +share/locale/be/LC_MESSAGES/at-spi2-core.mo +share/locale/bg/LC_MESSAGES/at-spi2-core.mo +share/locale/bn_IN/LC_MESSAGES/at-spi2-core.mo +share/locale/ca/LC_MESSAGES/at-spi2-core.mo +share/locale/ca@valencia/LC_MESSAGES/at-spi2-core.mo +share/locale/cs/LC_MESSAGES/at-spi2-core.mo +share/locale/da/LC_MESSAGES/at-spi2-core.mo +share/locale/de/LC_MESSAGES/at-spi2-core.mo +share/locale/el/LC_MESSAGES/at-spi2-core.mo +share/locale/en_CA/LC_MESSAGES/at-spi2-core.mo +share/locale/en_GB/LC_MESSAGES/at-spi2-core.mo +share/locale/eo/LC_MESSAGES/at-spi2-core.mo +share/locale/es/LC_MESSAGES/at-spi2-core.mo +share/locale/et/LC_MESSAGES/at-spi2-core.mo +share/locale/eu/LC_MESSAGES/at-spi2-core.mo +share/locale/fa/LC_MESSAGES/at-spi2-core.mo +share/locale/fi/LC_MESSAGES/at-spi2-core.mo +share/locale/fr/LC_MESSAGES/at-spi2-core.mo +share/locale/gl/LC_MESSAGES/at-spi2-core.mo +share/locale/gu/LC_MESSAGES/at-spi2-core.mo +share/locale/he/LC_MESSAGES/at-spi2-core.mo +share/locale/hi/LC_MESSAGES/at-spi2-core.mo +share/locale/hu/LC_MESSAGES/at-spi2-core.mo +share/locale/id/LC_MESSAGES/at-spi2-core.mo +share/locale/it/LC_MESSAGES/at-spi2-core.mo +share/locale/ja/LC_MESSAGES/at-spi2-core.mo +share/locale/km/LC_MESSAGES/at-spi2-core.mo +share/locale/kn/LC_MESSAGES/at-spi2-core.mo +share/locale/ko/LC_MESSAGES/at-spi2-core.mo +share/locale/lt/LC_MESSAGES/at-spi2-core.mo +share/locale/lv/LC_MESSAGES/at-spi2-core.mo +share/locale/ml/LC_MESSAGES/at-spi2-core.mo +share/locale/mr/LC_MESSAGES/at-spi2-core.mo +share/locale/ms/LC_MESSAGES/at-spi2-core.mo +share/locale/nb/LC_MESSAGES/at-spi2-core.mo +share/locale/nl/LC_MESSAGES/at-spi2-core.mo +share/locale/or/LC_MESSAGES/at-spi2-core.mo +share/locale/pa/LC_MESSAGES/at-spi2-core.mo +share/locale/pl/LC_MESSAGES/at-spi2-core.mo +share/locale/pt/LC_MESSAGES/at-spi2-core.mo +share/locale/pt_BR/LC_MESSAGES/at-spi2-core.mo +share/locale/ro/LC_MESSAGES/at-spi2-core.mo +share/locale/ru/LC_MESSAGES/at-spi2-core.mo +share/locale/sk/LC_MESSAGES/at-spi2-core.mo +share/locale/sl/LC_MESSAGES/at-spi2-core.mo +share/locale/sq/LC_MESSAGES/at-spi2-core.mo +share/locale/sr/LC_MESSAGES/at-spi2-core.mo +share/locale/sr@latin/LC_MESSAGES/at-spi2-core.mo +share/locale/sv/LC_MESSAGES/at-spi2-core.mo +share/locale/ta/LC_MESSAGES/at-spi2-core.mo +share/locale/te/LC_MESSAGES/at-spi2-core.mo +share/locale/tr/LC_MESSAGES/at-spi2-core.mo +share/locale/ug/LC_MESSAGES/at-spi2-core.mo +share/locale/uk/LC_MESSAGES/at-spi2-core.mo +share/locale/uz@cyrillic/LC_MESSAGES/at-spi2-core.mo +share/locale/vi/LC_MESSAGES/at-spi2-core.mo +share/locale/zh_CN/LC_MESSAGES/at-spi2-core.mo +share/locale/zh_HK/LC_MESSAGES/at-spi2-core.mo +share/locale/zh_TW/LC_MESSAGES/at-spi2-core.mo +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as +@dirrmtry share/locale/an/LC_MESSAGES +@dirrmtry share/locale/an +@dirrm share/gtk-doc/html/libatspi +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc +@dirrm include/at-spi-2.0/atspi +@dirrm include/at-spi-2.0 @dirrm etc/at-spi2 diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index f1b57e52e3b5..bdecb6bfa26f 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/accessibility/atk/Makefile,v 1.114 2011/06/13 20:32:27 kwm Exp $ +# $MCom: ports/accessibility/atk/Makefile,v 1.123 2012/10/07 09:00:37 kwm Exp $ PORTNAME= atk -PORTVERSION= 2.0.1 +PORTVERSION= 2.6.0 PORTREVISION?= 0 CATEGORIES= accessibility devel MASTER_SITES= GNOME @@ -22,16 +22,16 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack glib20 ltverhack referencehack +USE_GNOME= gnomehier gnomehack glib20 ltverhack referencehack +USE_PKGCONFIG= build CONFIGURE_ARGS= --enable-static \ - --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= AUTOCONF=${TRUE} AUTOMAKE=${TRUE} post-patch: - @${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \ + @${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests docs//" \ ${WRKSRC}/Makefile.in .include <bsd.port.mk> diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index 2b2e3c1a3b4f..b987ddc3379e 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/atk-2.0.1.tar.xz) = 4588867bb9eb788b2cf3399d3a2d5e4898193a9027436f6cffc9c18a627452a1 -SIZE (gnome2/atk-2.0.1.tar.xz) = 586516 +SHA256 (gnome2/atk-2.6.0.tar.xz) = eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f +SIZE (gnome2/atk-2.6.0.tar.xz) = 609136 diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index bb957f46ffbe..5b6cf77cd359 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -28,6 +28,7 @@ include/atk-1.0/atk/atktable.h include/atk-1.0/atk/atktext.h include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h +include/atk-1.0/atk/atkwindow.h lib/girepository-1.0/Atk-1.0.typelib lib/libatk-1.0.a lib/libatk-1.0.la @@ -55,9 +56,9 @@ share/locale/da/LC_MESSAGES/atk10.mo share/locale/de/LC_MESSAGES/atk10.mo share/locale/dz/LC_MESSAGES/atk10.mo share/locale/el/LC_MESSAGES/atk10.mo +share/locale/en@shaw/LC_MESSAGES/atk10.mo share/locale/en_CA/LC_MESSAGES/atk10.mo share/locale/en_GB/LC_MESSAGES/atk10.mo -share/locale/en@shaw/LC_MESSAGES/atk10.mo share/locale/eo/LC_MESSAGES/atk10.mo share/locale/es/LC_MESSAGES/atk10.mo share/locale/et/LC_MESSAGES/atk10.mo @@ -79,6 +80,7 @@ share/locale/it/LC_MESSAGES/atk10.mo share/locale/ja/LC_MESSAGES/atk10.mo share/locale/ka/LC_MESSAGES/atk10.mo share/locale/kk/LC_MESSAGES/atk10.mo +share/locale/km/LC_MESSAGES/atk10.mo share/locale/kn/LC_MESSAGES/atk10.mo share/locale/ko/LC_MESSAGES/atk10.mo share/locale/ku/LC_MESSAGES/atk10.mo @@ -99,9 +101,9 @@ share/locale/oc/LC_MESSAGES/atk10.mo share/locale/or/LC_MESSAGES/atk10.mo share/locale/pa/LC_MESSAGES/atk10.mo share/locale/pl/LC_MESSAGES/atk10.mo +share/locale/ps/LC_MESSAGES/atk10.mo share/locale/pt/LC_MESSAGES/atk10.mo share/locale/pt_BR/LC_MESSAGES/atk10.mo -share/locale/ps/LC_MESSAGES/atk10.mo share/locale/ro/LC_MESSAGES/atk10.mo share/locale/ru/LC_MESSAGES/atk10.mo share/locale/rw/LC_MESSAGES/atk10.mo @@ -110,8 +112,8 @@ share/locale/sk/LC_MESSAGES/atk10.mo share/locale/sl/LC_MESSAGES/atk10.mo share/locale/sq/LC_MESSAGES/atk10.mo share/locale/sr/LC_MESSAGES/atk10.mo -share/locale/sr@latin/LC_MESSAGES/atk10.mo share/locale/sr@ije/LC_MESSAGES/atk10.mo +share/locale/sr@latin/LC_MESSAGES/atk10.mo share/locale/sv/LC_MESSAGES/atk10.mo share/locale/ta/LC_MESSAGES/atk10.mo share/locale/te/LC_MESSAGES/atk10.mo @@ -129,10 +131,6 @@ share/locale/zh_CN/LC_MESSAGES/atk10.mo share/locale/zh_HK/LC_MESSAGES/atk10.mo share/locale/zh_TW/LC_MESSAGES/atk10.mo share/locale/zu/LC_MESSAGES/atk10.mo -@dirrm include/atk-1.0/atk -@dirrm include/atk-1.0 -@dirrmtry share/gir-1.0 -@dirrmtry lib/girepository-1.0 @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -165,6 +163,8 @@ share/locale/zu/LC_MESSAGES/atk10.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk @dirrmtry share/locale/hy/LC_MESSAGES @@ -183,3 +183,5 @@ share/locale/zu/LC_MESSAGES/atk10.mo @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrm include/atk-1.0/atk +@dirrm include/atk-1.0 diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile index 34a9448cf6f6..0ee57c149d40 100644 --- a/accessibility/atkmm/Makefile +++ b/accessibility/atkmm/Makefile @@ -1,26 +1,21 @@ -# New ports collection makefile for: atkmm -# Date created: 24 June 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/accessibility/atkmm/Makefile,v 1.10 2011/06/11 18:55:54 mezz Exp $ -# +# $MCom: ports/accessibility/atkmm/Makefile,v 1.12 2012/09/01 23:02:08 mezz Exp $ PORTNAME= atkmm -PORTVERSION= 2.22.5 +PORTVERSION= 2.22.6 CATEGORIES= accessibility gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= C++ wrapper for ATK API library -LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm - -USE_BZIP2= yes +USE_XZ= yes USE_LDCONFIG= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_GNOME= gnomehack atk +USE_GNOME= gnomehack atk glibmm +USE_PKGCONFIG= build GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/accessibility/atkmm/distinfo b/accessibility/atkmm/distinfo index e48166c7e49a..2ed888d233c3 100644 --- a/accessibility/atkmm/distinfo +++ b/accessibility/atkmm/distinfo @@ -1,2 +1,2 @@ -SHA256 (atkmm-2.22.5.tar.bz2) = 61e03e5e67952c8fd9919049fae680bd0f2a1547344394f36b98b05b34b7be6c -SIZE (atkmm-2.22.5.tar.bz2) = 715419 +SHA256 (atkmm-2.22.6.tar.xz) = 0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6 +SIZE (atkmm-2.22.6.tar.xz) = 562892 diff --git a/accessibility/py-papi/Makefile b/accessibility/py-papi/Makefile index 67150ce3822f..4032c768ce1b 100644 --- a/accessibility/py-papi/Makefile +++ b/accessibility/py-papi/Makefile @@ -15,6 +15,7 @@ MAINTAINER= mva@FreeBSD.org COMMENT= ATK accessibility wrapper for python USE_GNOME= atk +USE_PKGCONFIG= build USE_PYTHON= yes USE_PYDISTUTILS=yes diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile index 2dde9129e090..1ddde2347392 100644 --- a/archivers/libpar2/Makefile +++ b/archivers/libpar2/Makefile @@ -18,6 +18,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include USE_LDCONFIG= yes +USE_PKGCONFIG= build OPTIONS_DEFINE= ENABLECANCEL OPTIONS_DEFAULT= ENABLECANCEL diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile index 0fbeaee24f16..58451878a411 100644 --- a/audio/abraca/Makefile +++ b/audio/abraca/Makefile @@ -3,7 +3,7 @@ PORTNAME= abraca PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://cloud.github.com/downloads/Abraca/Abraca/ @@ -12,10 +12,11 @@ COMMENT= Abraca is a GTK2 client for the XMMS2 music player BUILD_DEPENDS= ${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala LIB_DEPENDS= xmmsclient:${PORTSDIR}/audio/xmms2 \ - gee:${PORTSDIR}/devel/libgee + gee:${PORTSDIR}/devel/libgee06 USE_SCONS= yes USE_GNOME= gtk30 +USE_PKGCONFIG= build SCONS_ARGS= MANDIR=${MANPREFIX}/man diff --git a/audio/ario/Makefile b/audio/ario/Makefile index 267b20c3215f..e21211950c1e 100644 --- a/audio/ario/Makefile +++ b/audio/ario/Makefile @@ -47,4 +47,11 @@ CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --disable-nls .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/gslist.h|glib.h|g ; \ + s|glib/gkeyfile.h>|glib.h>|g' \ + ${WRKSRC}/src/ario-util.h \ + ${WRKSRC}/src/plugins/ario-plugin-info.c \ + ${WRKSRC}/src/ario-profiles.h + .include <bsd.port.mk> diff --git a/audio/deadbeef-mpris-plugin/Makefile b/audio/deadbeef-mpris-plugin/Makefile index 020c1d6f2588..826084659b45 100644 --- a/audio/deadbeef-mpris-plugin/Makefile +++ b/audio/deadbeef-mpris-plugin/Makefile @@ -24,4 +24,7 @@ USE_GNOME= glib20 WRKSRC= ${WRKDIR}/deadbeef-${PORTVERSION} +post-patch: + @${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/Makefile.in + .include <bsd.port.mk> diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 789769aa524c..e6a7f089be46 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: esound -# Date created: 19 July 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# +# Created by: Vanilla I. Shu <vanilla@FreeBSD.org> # $FreeBSD$ # $MCom: ports/audio/esound/Makefile,v 1.1 2008/11/20 19:38:24 marcus Exp $ -# PORTNAME= esound PORTVERSION= 0.2.41 @@ -21,6 +17,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= JW=false diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile index 9645972b3855..d462f44ba019 100644 --- a/audio/gnomoradio/Makefile +++ b/audio/gnomoradio/Makefile @@ -35,5 +35,9 @@ post-patch: ${WRKSRC}/roboradio/mp3/Makefile.in @${REINPLACE_CMD} -e 's|static char|static const char|' \ ${WRKSRC}/gnomoradio/*.xpm + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/roboradio/mp3/common.c \ + ${WRKSRC}/roboradio/mp3/esd-audio.[ch] \ + ${WRKSRC}/roboradio/mp3/id3.h .include <bsd.port.mk> diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile index 58981d940f54..5439c075a8fc 100644 --- a/audio/gspeakers/Makefile +++ b/audio/gspeakers/Makefile @@ -41,6 +41,8 @@ post-patch: ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's|$$(datadir)/xml|$$(pkgdatadir)/xml|g' \ ${WRKSRC}/xml/Makefile.in + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/*.cc ${WRKSRC}/src/cellitemcrossover.h pre-configure: @${CP} ${AUTOMAKE_DIR}/depcomp ${WRKSRC} diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile index c303d532d160..354838f89a8e 100644 --- a/audio/last.fm/Makefile +++ b/audio/last.fm/Makefile @@ -58,6 +58,8 @@ post-patch: ${WRKSRC}/bin/last.fm.sh.bak \ ${WRKSRC}/bin/*.dll ${WRKSRC}/bin/LastFM.exe.config ${RM} -rf ${WRKSRC}/bin/Microsoft* ${WRKSRC}/bin/sqldrivers + ${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/mediadevices/ipod/IpodDevice.cpp post-build: cd ${WRKSRC}/src/output/RtAudio && \ diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index df7853f1da79..af705e96ee5b 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libaudiofile -# Date created: 22 Dec 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# +# Created by: Vanilla I. Shu <vanilla@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libaudiofile PORTVERSION= 0.2.7 @@ -17,7 +13,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A sound library for SGI audio file USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/audio/libsmf/Makefile b/audio/libsmf/Makefile index e2e996337644..1de5fc49154a 100644 --- a/audio/libsmf/Makefile +++ b/audio/libsmf/Makefile @@ -16,6 +16,7 @@ COMMENT= Standard MIDI File format library LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes MAN1= smfsh.1 diff --git a/audio/pms/Makefile b/audio/pms/Makefile index 7ae359fb6ac2..37d2d7301709 100644 --- a/audio/pms/Makefile +++ b/audio/pms/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= glib20 +USE_PKGCONFIG= build MAN1= ${PORTNAME}.1 PLIST_FILES= bin/${PORTNAME} diff --git a/audio/raul/Makefile b/audio/raul/Makefile index b0d340bc6c7f..e0d4fd41c909 100644 --- a/audio/raul/Makefile +++ b/audio/raul/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= boost_date_time:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes USE_GNOME= glib20 +USE_PKGCONFIG= build USE_PYTHON_BUILD=yes USE_LDCONFIG= yes diff --git a/audio/taglib-sharp/Makefile b/audio/taglib-sharp/Makefile index f3adc20e8c3c..a5447adc5034 100644 --- a/audio/taglib-sharp/Makefile +++ b/audio/taglib-sharp/Makefile @@ -1,3 +1,4 @@ + # New ports collection makefile for: taglib-sharp # Date Created: Aug 25 2008 # Whom: Florent Thoumie <flz@FreeBSD.org> @@ -21,6 +22,7 @@ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|} GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build PLIST_SUB+= PORTVERSION="${PORTVERSION}" \ VERSIONSUFX="db62eba44689b5b0" diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index c2839aec100d..5302f7f42877 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -20,6 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GL= gl USE_GNOME= gtk20 +USE_PKGCONFIG= build USE_GMAKE= yes INSTALL_ICONS= yes MAKE_JOBS_SAFE= yes diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile index cddc460eec93..fc3f3e0c605d 100644 --- a/converters/fribidi/Makefile +++ b/converters/fribidi/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: fribidi -# Date created: Apr 19, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= fribidi PORTVERSION= 0.19.2 @@ -16,7 +11,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A Free Implementation of the Unicode Bidirectional Algorithm USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-glib diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 96281ffbecf1..37e5a08739bc 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: evolution-data-server -# Date created: 09 December 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/databases/evolution-data-server/Makefile,v 1.203 2010/11/15 17:19:55 kwm Exp $ -# PORTNAME= evolution-data-server PORTVERSION= 2.32.1 @@ -16,14 +12,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite -LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ +LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \ gdata.7:${PORTSDIR}/devel/libgdata \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ ical:${PORTSDIR}/devel/libical \ - nss3.1:${PORTSDIR}/security/nss \ - tasn1.5:${PORTSDIR}/security/libtasn1 \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 \ - gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring + nss3:${PORTSDIR}/security/nss \ + tasn1:${PORTSDIR}/security/libtasn1 \ + sqlite3:${PORTSDIR}/databases/sqlite3 \ + gnome-keyring:${PORTSDIR}/security/libgnome-keyring USE_BZIP2= yes USE_GMAKE= yes @@ -82,6 +78,7 @@ post-patch: @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \ s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \ s|-DGTK_DISABLE_DEPRECATED||g ; \ + s|-DG_DISABLE_DEPRECATED||g ; \ s|-Wl,--no-undefined||g ; \ s|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index c5a1b13f8a8f..d90bda2d32f1 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -36,7 +36,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-bdb CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION MAN1= gda-config-tool.1 MAN5= gda-config.5 diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index 228c37759142..1c6c0014e761 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -34,7 +34,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-bdb --without-sybase CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION .include <bsd.port.pre.mk> diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 80fe50a71fe4..d0a6b6d19269 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -28,7 +28,7 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= libgnomedb-3.0.schemas diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index a1339a252351..3f49b686dc32 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -20,6 +20,7 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk USE_AUTOTOOLS= libtool USE_BISON= build USE_GNOME= glib20 +USE_PKGCONFIG= build WANT_GNOME= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile index cb50dd57e590..edc7167ac680 100644 --- a/databases/mydumper/Makefile +++ b/databases/mydumper/Makefile @@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} FETCH_ARGS?= -pRr PLIST_FILES= sbin/mydumper sbin/myloader USE_GNOME= glib20 +USE_PKGCONFIG= build USE_MYSQL= yes USE_CMAKE= yes diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index f996320ddf26..fa8125a3bb94 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: deskbar-applet -# Date created: 2005-07-13 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ # $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.116 2010/09/27 19:36:13 kwm Exp $ -# PORTNAME= deskbar-applet PORTVERSION= 2.32.0 @@ -56,5 +52,7 @@ post-patch: s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/deskbar/handlers/mozilla.py \ ${WRKSRC}/deskbar/core/Utils.py + @${REINPLACE_CMD} -e 's|<glib/g.*\.h>|<glib.h>|g' \ + ${WRKSRC}/deskbar/handlers/evolution/evolution.[ch] .include <bsd.port.post.mk> diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile index 993718b6a364..63cd29f4aad5 100644 --- a/deskutils/drivel/Makefile +++ b/deskutils/drivel/Makefile @@ -31,6 +31,7 @@ USE_AUTOTOOLS= libtool INSTALLS_ICONS= yes INSTALLS_OMF= yes MAKE_JOBS_SAFE= yes +CONFIGURE_ARGS= --disable-error-on-warning GCONF_SCHEMAS= drivel.schemas diff --git a/deskutils/ecru/Makefile b/deskutils/ecru/Makefile index 49f5fc87e5c4..956f7af831a0 100644 --- a/deskutils/ecru/Makefile +++ b/deskutils/ecru/Makefile @@ -22,6 +22,7 @@ USE_PYTHON_BUILD= yes USE_BZIP2= yes MANCOMPRESSED= yes USE_LDCONFIG= yes +USE_PKGCONFIG= build MAN1= ecru-config.1 ecru-delete.1 ecru-edit.1 \ ecru-info.1 ecru-list.1 ecru-post.1 diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile index 05b45765eedb..1d0d6a0f238b 100644 --- a/deskutils/glabels/Makefile +++ b/deskutils/glabels/Makefile @@ -24,7 +24,7 @@ USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION LDFLAGS+= -L${LOCALBASE}/lib MAN1= glabels.1 diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index dc7e82ab5dc6..bdca54a65620 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.150 2010/09/28 08:41:46 kwm Exp $ +# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.159 2012/09/01 23:02:09 mezz Exp $ # PORTNAME= gnome-utils PORTVERSION= 2.32.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME @@ -20,11 +20,14 @@ COMMENT= GNOME 2 support utilities LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra +CONFLICTS= baobob-3.[0-9]* gnome-dictionary-3.[0-9]* \ + gnome-font-viewer-3.[0-9]* gnome-screenshot-3.[0-9]* \ + gnome-search-tool-3.[0-9]* gnome-system-log-3.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes USE_GMAKE= yes -GNOME_DESKTOP_VERSION=2 USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack @@ -42,5 +45,10 @@ GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \ post-patch: @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \ ${WRKSRC}/gsearchtool/libgnomeui-deprecated/Makefile.in + @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/gnome-dictionary/libgdict/Makefile.in \ + ${WRKSRC}/gsearchtool/Makefile.in \ + ${WRKSRC}/gsearchtool/libgnomeui-deprecated/Makefile.in \ + ${WRKSRC}/libeggsmclient/Makefile.in .include <bsd.port.mk> diff --git a/deskutils/gxneur/Makefile b/deskutils/gxneur/Makefile index 8ca9bb668cc4..c668c1210526 100644 --- a/deskutils/gxneur/Makefile +++ b/deskutils/gxneur/Makefile @@ -38,6 +38,7 @@ PLIST_SUB+= NLS="@comment " post-patch: @${REINPLACE_CMD} -e '/all_modifiers/d' ${WRKSRC}/src/misc.c + @${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/configure post-install: @-update-desktop-database diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile index df6fcfbe986e..5c7525566983 100644 --- a/deskutils/pal/Makefile +++ b/deskutils/pal/Makefile @@ -15,6 +15,7 @@ MAINTAINER= h.skuhra@gmail.com COMMENT= A calendar application USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GETTEXT= yes USE_GMAKE= yes ALL_TARGET= diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile index c4963bd82adc..c9831f400920 100644 --- a/deskutils/parcellite/Makefile +++ b/deskutils/parcellite/Makefile @@ -26,4 +26,8 @@ PLIST_SUB+= NLS="@comment " MAN1= parcellite.1 +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g'\ + ${WRKSRC}/src/keybinder.h + .include <bsd.port.mk> diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index e4d6b2145043..705ecd202172 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ --disable-python \ --disable-python-plugin -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= planner.schemas diff --git a/deskutils/steadyflow/Makefile b/deskutils/steadyflow/Makefile index df629c291b0c..bdad3391900a 100644 --- a/deskutils/steadyflow/Makefile +++ b/deskutils/steadyflow/Makefile @@ -13,8 +13,10 @@ COMMENT= Simple download manager LICENSE= GPLv3 +BROKEN= Doesn't build with vala 0.18 + LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - gee:${PORTSDIR}/devel/libgee \ + gee:${PORTSDIR}/devel/libgee06 \ notify:${PORTSDIR}/devel/libnotify \ unique-1:${PORTSDIR}/x11-toolkits/unique BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile index d18e8d18c43f..3dc02e0fa021 100644 --- a/deskutils/superswitcher/Makefile +++ b/deskutils/superswitcher/Makefile @@ -34,5 +34,7 @@ post-patch: 's/x11//g' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ '/_DISABLE_DEPRECATED/d' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/dbus-object.h ${WRKSRC}/src/forward_declarations.h .include <bsd.port.mk> diff --git a/deskutils/xpad-current/Makefile b/deskutils/xpad-current/Makefile index f11b8c0042cc..5d6f2999773e 100644 --- a/deskutils/xpad-current/Makefile +++ b/deskutils/xpad-current/Makefile @@ -30,4 +30,8 @@ USE_GETTEXT= yes MAN1= xpad.1 +post-patch: + @${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \ + ${WRKSRC}/src/xpad-undo.c + .include <bsd.port.mk> diff --git a/devel/Makefile b/devel/Makefile index 0c83cace6d6c..c7e677c2e1a4 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -327,6 +327,7 @@ SUBDIR += dbus-sharp-glib SUBDIR += dcmtk SUBDIR += dconf + SUBDIR += dconf-editor SUBDIR += ddd SUBDIR += deforaos-libsystem SUBDIR += deheader @@ -978,6 +979,7 @@ SUBDIR += libgconf-java SUBDIR += libgdata SUBDIR += libgee + SUBDIR += libgee06 SUBDIR += libgetline SUBDIR += libghthash SUBDIR += libgii diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 0c4ce73300c0..07f53488181d 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: orbit2 -# Date Created: 16 Aug 1998 -# Whom: Chia-liang Kao <clkao@CirX.ORG> -# +# Created by: Chia-liang Kao <clkao@CirX.ORG> # $FreeBSD$ # $MCom: ports/devel/ORBit2/Makefile,v 1.57 2010/09/29 14:08:02 kwm Exp $ -# PORTNAME= ORBit2 PORTVERSION= 2.14.19 @@ -25,6 +21,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack libidl ltverhack referencehack +USE_PKGCONFIG= build CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile index 8c870c4660c7..15b16891e7e6 100644 --- a/devel/dbus-sharp/Makefile +++ b/devel/dbus-sharp/Makefile @@ -20,6 +20,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build .include "${.CURDIR}/../../lang/mono/bsd.mono.mk" .include <bsd.port.mk> diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile new file mode 100644 index 000000000000..57e6d47e38ef --- /dev/null +++ b/devel/dconf-editor/Makefile @@ -0,0 +1,22 @@ +# Created by: Koop Mast <kwm@FreeBSD.org> +# $FreeBSD$ +# $MCom: ports/devel/dconf-editor/Makefile,v 1.2 2012/12/16 22:43:23 kwm Exp $ + +PORTNAME= dconf +PKGNAMESUFFIX= -editor + +COMMENT= configuration editor for dconf + +DCONF_SLAVE= editor + +MASTERDIR= ${.CURDIR}/../dconf + +PLIST= ${.CURDIR}/pkg-plist + +do-build: + @cd ${WRKSRC}/editor && ${GMAKE} + +do-install: + @cd ${WRKSRC}/editor && ${GMAKE} install + +.include "${MASTERDIR}/Makefile" diff --git a/devel/dconf-editor/pkg-plist b/devel/dconf-editor/pkg-plist new file mode 100644 index 000000000000..5c035237dba4 --- /dev/null +++ b/devel/dconf-editor/pkg-plist @@ -0,0 +1,9 @@ +bin/dconf-editor +share/applications/dconf-editor.desktop +share/dconf-editor/dconf-editor.ui +share/icons/hicolor/128x128/apps/dconf-editor.png +share/icons/hicolor/32x32/apps/dconf-editor.png +share/icons/hicolor/48x48/apps/dconf-editor.png +share/icons/hicolor/64x64/apps/dconf-editor.png +@dirrm share/dconf-editor +@dirrmtry share/applications diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 21df21c88cc6..d392d7ac9acc 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -1,41 +1,61 @@ -# New ports collection makefile for: dconf -# Date created: 28 May 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/dconf/Makefile,v 1.9 2010/11/04 16:41:01 kwm Exp $ -# +# $MCom: ports/devel/dconf/Makefile,v 1.30 2012/10/03 17:57:17 kwm Exp $ -PORTNAME= dconf -PORTVERSION= 0.5.1 -PORTREVISION= 4 +PORTNAME?= dconf +PORTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME +DISTNAME= dconf-${PORTVERSION} DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= A configuration database system for GNOME -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ - valac:${PORTSDIR}/lang/vala -LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee +BUILD_DEPENDS= vala>=0.11.7:${PORTSDIR}/lang/vala +LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes -#USE_GETTEXT= yes -USE_GNOME= gnomehack gtk20 +USE_GNOME= gnomehack glib20 gnomehier USE_LDCONFIG= yes GNU_CONFIGURE= yes - -MAKE_JOBS_SAFE= yes - +MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +DCONF_SLAVE?= no + +.if ${DCONF_SLAVE} == "editor" +USE_GNOME+= gtk30 +INSTALLS_ICONS= yes +GLIB_SCHEMAS= ca.desrt.dconf-editor.gschema.xml +LIB_DEPENDS+= dconf:${PORTSDIR}/devel/dconf +.else +CONFIGURE_ARGS+=--disable-editor +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ + ${WRKSRC}/engine/dconf-engine.c \ + ${WRKSRC}/bin/dconf-update.c + @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \ + ${WRKSRC}/editor/dconf-model.c + @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \ + ${WRKSRC}/editor/dconf-model.vala + @${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \ + ${WRKSRC}/bin/Makefile.in \ + ${WRKSRC}/client/Makefile.in \ + ${WRKSRC}/editor/Makefile.in + pre-build: - ${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0 +# ${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0 +# ${GMAKE} -C ${WRKSRC}/dbus-1 dconf-dbus-1.c libdconf-dbus-1.so.0 post-install: -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules + @${MKDIR} ${PREFIX}/etc/dconf/db + @${MKDIR} ${PREFIX}/etc/dconf/profile .include <bsd.port.mk> diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo index 60e18dfbf33e..eccaa2835e51 100644 --- a/devel/dconf/distinfo +++ b/devel/dconf/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/dconf-0.5.1.tar.bz2) = 0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6 -SIZE (gnome3/dconf-0.5.1.tar.bz2) = 251287 +SHA256 (gnome3/dconf-0.12.1.tar.xz) = 3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214 +SIZE (gnome3/dconf-0.12.1.tar.xz) = 202112 diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in index f0452b9173db..d97d83186173 100644 --- a/devel/dconf/files/patch-client_Makefile.in +++ b/devel/dconf/files/patch-client_Makefile.in @@ -1,5 +1,5 @@ ---- client/Makefile.in.orig 2010-11-04 17:09:33.000000000 +0100 -+++ client/Makefile.in 2010-11-04 17:18:20.000000000 +0100 +--- client/Makefile.in.orig 2012-05-28 13:27:17.000000000 +0200 ++++ client/Makefile.in 2012-05-28 13:31:25.000000000 +0200 @@ -34,7 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : @@ -7,31 +7,27 @@ -shlib_PROGRAMS = libdconf.so.0.0.0$(EXEEXT) +shlib_PROGRAMS = libdconf.so.0$(EXEEXT) subdir = client - DIST_COMMON = $(am__dist_gir_DATA_DIST) $(dconfinclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \ @@ -332,9 +332,10 @@ clean-shlibPROGRAMS: -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) --libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) -- @rm -f libdconf.so.0.0.0$(EXEEXT) -+libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) -+ @rm -f libdconf.so.0$(EXEEXT) +-libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) ++libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) + @rm -f libdconf.so.0.0.0$(EXEEXT) $(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS) + $(AM_V_GEN) ln -fs libdconf.so.0 libdconf.so mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -750,14 +751,10 @@ +@@ -695,12 +696,8 @@ + uninstall-vapiDATA - @HAVE_INTROSPECTION_TRUE@include $(INTROSPECTION_MAKEFILE) --@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0 libdconf.so -- -libdconf.so.0 libdconf.so: libdconf.so.0.0.0 - $(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@ -+@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0 - +- install-data-hook: - ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.0 - ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so diff --git a/devel/dconf/files/patch-common_shmdir.c b/devel/dconf/files/patch-common_shmdir.c deleted file mode 100644 index b8ed3eeb2080..000000000000 --- a/devel/dconf/files/patch-common_shmdir.c +++ /dev/null @@ -1,16 +0,0 @@ ---- common/dconf-shmdir.c.orig 2010-10-21 13:46:17.000000000 +0200 -+++ common/dconf-shmdir.c 2010-10-21 13:47:46.000000000 +0200 -@@ -21,8 +21,13 @@ - - #include "dconf-shmdir.h" - -+#ifdef __linux__ - #include <sys/statfs.h> - #include <sys/vfs.h> -+#elif __FreeBSD__ -+#include <sys/param.h> -+#include <sys/mount.h> -+#endif - #include <errno.h> - - #ifndef NFS_SUPER_MAGIC diff --git a/devel/dconf/files/patch-dbus-1_Makefile.in b/devel/dconf/files/patch-dbus-1_Makefile.in new file mode 100644 index 000000000000..907188b52967 --- /dev/null +++ b/devel/dconf/files/patch-dbus-1_Makefile.in @@ -0,0 +1,47 @@ +--- dbus-1/Makefile.in.orig 2012-05-28 13:31:56.000000000 +0200 ++++ dbus-1/Makefile.in 2012-05-28 13:35:25.000000000 +0200 +@@ -34,7 +34,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT) ++shlib_PROGRAMS = libdconf-dbus-1.so.0$(EXEEXT) + subdir = dbus-1 + DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in +@@ -246,7 +246,7 @@ + ../gvdb/gvdb-reader.c \ + dconf-dbus-1.c + +-noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0 ++noinst_DATA = libdconf-dbus-1.so.0 + CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so + all: all-am + +@@ -321,9 +321,10 @@ + + clean-shlibPROGRAMS: + -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) +-libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) +- @rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT) ++libdconf-dbus-1.so.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) ++ @rm -f libdconf-dbus-1.so.0$(EXEEXT) + $(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS) ++ $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0 libdconf-dbus-1.so + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -640,12 +641,8 @@ + uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS + + +-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0 +- $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@ +- + install-data-hook: +- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0 +- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so ++ ln -fs libdconf-dbus-1.so.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so + + uninstall-hook: + rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0 diff --git a/devel/dconf/files/patch-editor_Makefile.in b/devel/dconf/files/patch-editor_Makefile.in new file mode 100644 index 000000000000..8f158fced556 --- /dev/null +++ b/devel/dconf/files/patch-editor_Makefile.in @@ -0,0 +1,20 @@ +--- editor/Makefile.in.orig 2012-10-03 17:32:51.000000000 +0000 ++++ editor/Makefile.in 2012-10-03 17:35:54.000000000 +0000 +@@ -55,7 +55,7 @@ + dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT) + dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) + am__DEPENDENCIES_1 = +-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \ ++dconf_editor_DEPENDENCIES = -ldconf \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +@@ -232,7 +232,7 @@ + top_srcdir = @top_srcdir@ + AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\" + AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf +-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) ++dconf_editor_LDADD = -ldconf $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) + dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala + desktopdir = $(datadir)/applications + desktop_in_files = dconf-editor.desktop.in.in diff --git a/devel/dconf/files/patch-engine_dconf-engine.c b/devel/dconf/files/patch-engine_dconf-engine.c deleted file mode 100644 index 328a8f53fe5f..000000000000 --- a/devel/dconf/files/patch-engine_dconf-engine.c +++ /dev/null @@ -1,11 +0,0 @@ ---- engine/dconf-engine.c.orig 2010-08-04 17:40:53.000000000 +0200 -+++ engine/dconf-engine.c 2010-11-03 00:23:07.000000000 +0100 -@@ -144,7 +144,7 @@ dconf_engine_setup_user (DConfEngine *en - - if (fd >= 0) - { -- if (posix_fallocate (fd, 0, 1) == 0) -+ if (ftruncate (fd, 1) == 0) - { - engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0); - diff --git a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c b/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c deleted file mode 100644 index 4fe175035d88..000000000000 --- a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c +++ /dev/null @@ -1,36 +0,0 @@ ---- gsettings/dconfsettingsbackend.c.orig 2010-11-03 00:18:46.000000000 +0100 -+++ gsettings/dconfsettingsbackend.c 2010-11-03 00:21:03.000000000 +0100 -@@ -155,6 +155,7 @@ dconf_settings_backend_remove_outstandin - g_dbus_message_get_sender (message), - g_dbus_message_get_body (message), - anti_expose, NULL); -+ g_slice_free (Outstanding, tmp); - - found = TRUE; - break; -@@ -457,6 +458,7 @@ dconf_settings_backend_write_tree (GSett - gpointer origin_tag) - { - DConfSettingsBackend *dcsb = (DConfSettingsBackend *) backend; -+ gboolean success = FALSE; - volatile guint32 *serial; - DConfEngineMessage dcem; - GDBusConnection *bus; -@@ -478,15 +480,11 @@ dconf_settings_backend_write_tree (GSett - - g_settings_backend_keys_changed (backend, prefix, keys, origin_tag); - -- return TRUE; -+ success = TRUE; - } - } - -- g_free (prefix); -- g_free (values); -- g_free (keys); -- -- return FALSE; -+ return success; - } - - static void diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist index 3f2a96fbe976..167169ca8e7c 100644 --- a/devel/dconf/pkg-plist +++ b/devel/dconf/pkg-plist @@ -1,26 +1,24 @@ bin/dconf -bin/dconf-editor +etc/bash_completion.d/dconf-bash-completion.sh include/dconf/dconf-client.h +include/dconf-dbus-1/dconf-dbus-1.h include/dconf/dconf-engine.h include/dconf/dconf-paths.h -include/dconf/dconf-readtype.h -include/dconf/dconf-resetlist.h include/dconf/dconf.h lib/gio/modules/libdconfsettings.so -lib/girepository-1.0/dconf-1.0.typelib lib/libdconf.so lib/libdconf.so.0 +lib/libdconf-dbus-1.so +lib/libdconf-dbus-1.so.0 libdata/pkgconfig/dconf.pc +libdata/pkgconfig/dconf-dbus-1.pc libexec/dconf-service share/dbus-1/services/ca.desrt.dconf.service -share/dbus-1/system-services/ca.desrt.dconf.service -share/gir-1.0/dconf-1.0.gir share/gtk-doc/html/dconf/DConfClient.html share/gtk-doc/html/dconf/dconf-DConf-Paths.html share/gtk-doc/html/dconf/annotation-glossary.html share/gtk-doc/html/dconf/api-index-full.html share/gtk-doc/html/dconf/ch01.html -share/gtk-doc/html/dconf/dconf.devhelp share/gtk-doc/html/dconf/dconf.devhelp2 share/gtk-doc/html/dconf/home.png share/gtk-doc/html/dconf/index.html @@ -32,13 +30,11 @@ share/gtk-doc/html/dconf/style.css share/gtk-doc/html/dconf/up.png share/vala/vapi/dconf.deps share/vala/vapi/dconf.vapi -@dirrmtry share/vala/vapi @dirrm share/gtk-doc/html/dconf @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc -@dirrmtry share/dbus-1/system-services -@dirrmtry share/dbus-1/services -@dirrmtry share/dbus-1 +@dirrm include/dconf-dbus-1 @dirrm include/dconf @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true +@dirrmtry etc/bash_completion.d diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile index b18e8a7459b8..a9de60394431 100644 --- a/devel/desktop-file-utils/Makefile +++ b/devel/desktop-file-utils/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: desktop-file-utils -# Date created: 11 Jun 2004 -# Whom: Jean-Yves Lefort <jylefort@brutele.be> -# +# Created by: Jean-Yves Lefort <jylefort@brutele.be> # $FreeBSD$ # $MCom: ports/devel/desktop-file-utils/Makefile,v 1.8 2007/09/07 20:22:45 mezz Exp $ -# PORTNAME= desktop-file-utils PORTVERSION= 0.18 @@ -18,7 +14,7 @@ USE_GNOME= glib20 USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -WANT_GNOME= yes +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-lispdir CONFIGURE_ENV= EMACS="no" diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile index cb883bb58ee1..a98a7c99670f 100644 --- a/devel/eggdbus/Makefile +++ b/devel/eggdbus/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: eggdbus -# Date Created: 30 Juli 2009 -# Whom: Koop Mast<kwm@FreeBSD.org> -# +# Created by: Koop Mast<kwm@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/eggdbus/Makefile,v 1.3 2009/11/24 01:46:27 marcus Exp $ -# PORTNAME= eggdbus PORTVERSION= 0.6 @@ -15,9 +11,9 @@ MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= D-Bus bindings for GObject -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib -USE_GNOME= pkgconfig glib20 gnomehack +USE_GNOME= glib20 gnomehack USE_GETTEXT= yes USE_GMAKE= yes MAKE_JOBS_UNSAFE=yes diff --git a/devel/eris/Makefile b/devel/eris/Makefile index cf642892b161..f6c20b55ac6c 100644 --- a/devel/eris/Makefile +++ b/devel/eris/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \ GNU_CONFIGURE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= build USE_GNOME= gnomehack CXXFLAGS+= -include wchar.h diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index cc660f832b9f..867761853f6e 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -1,10 +1,6 @@ -# Ports collection makefile for: g-wrap -# Date created: Jun 29, 2000 -# Whom: Matthew Condell (mcondell@alum.mit.edu) -# +# Created by: Matthew Condell (mcondell@alum.mit.edu) # $FreeBSD$ # $MCom: ports/devel/g-wrap/Makefile,v 1.6 2006/12/24 18:45:08 ahze Exp $ -# PORTNAME= g-wrap PORTVERSION= 1.9.6 @@ -14,7 +10,7 @@ CATEGORIES= devel scheme MASTER_SITES= SAVANNAH MAINTAINER= gnome@FreeBSD.org -COMMENT= A tool for exporting C libraries into Scheme interpreters +COMMENT= Tool for exporting C libraries into Scheme interpreters BUILD_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile \ slib-guile>0:${PORTSDIR}/lang/slib-guile @@ -28,6 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build NOT_FOR_ARCHS= ia64 powerpc CFLAGS+= -fPIC diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index 80a3435d5b69..cab49234d341 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -25,4 +25,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/gconf/gconfmm/client.cc + .include <bsd.port.mk> diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile index 96d6d9e602c1..9b7cbb7b1e45 100644 --- a/devel/giggle/Makefile +++ b/devel/giggle/Makefile @@ -28,7 +28,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lintl +LDFLAGS+= -L${LOCALBASE}/lib -lintl `pkg-config -libs gmodule-2.0` PLIST_SUB+= GIGGLE_VER=${PORTVERSION} .include <bsd.port.options.mk> diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index 8a7fa526ccdf..6996cacb5c3f 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: gio-fam-backend -# Date Created: 22 December 2007 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.82 2011/06/11 19:51:14 mezz Exp $ -# +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.96 2012/12/09 20:42:55 kwm Exp $ PORTNAME= gio-fam-backend -PORTVERSION= 2.28.8 -PORTREVISION= 1 +PORTVERSION= 2.34.3 +PORTREVISION= 0 CATEGORIES= devel 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/}/ \ @@ -27,7 +23,8 @@ USE_XZ= yes BUILD_WRKSRC= ${WRKSRC}/gio/fam INSTALL_WRKSRC= ${BUILD_WRKSRC} GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig _glib20 +USE_PKGCONFIG= build +USE_GNOME= gnomehack _glib20 USE_FAM= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo index 93d831f49734..57207bc60785 100644 --- a/devel/gio-fam-backend/distinfo +++ b/devel/gio-fam-backend/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-2.28.8.tar.xz) = 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353 -SIZE (gnome2/glib-2.28.8.tar.xz) = 5223564 +SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 +SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872 diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae index 2e1ead9eaf8c..9c9caf0ab20c 100644 --- a/devel/gio-fam-backend/files/patch-ae +++ b/devel/gio-fam-backend/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig 2010-03-03 21:31:46.000000000 -0500 -+++ configure 2010-03-03 21:47:47.000000000 -0500 -@@ -714,6 +714,9 @@ ac_includes_default="\ +--- configure.orig 2013-02-14 19:12:15.000000000 +0000 ++++ configure 2013-02-14 19:13:51.000000000 +0000 +@@ -603,6 +603,9 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -10,12 +10,34 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -@@ -23020,7 +23023,7 @@ _ACEOF +@@ -5602,7 +5605,7 @@ + fi + + GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" +-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`" ++ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`" + + + if test "x$with_runtime_libdir" != "x"; then +@@ -23647,7 +23650,7 @@ fi done --for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid -+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname +-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid ++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +@@ -27108,10 +27111,10 @@ + # b) FreeBSD doesn't do this either. + # + case $host in +- *-*-freebsd*|*-*-linux*) ++ *-*-linux*) + G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`" + ;; +- *-*-openbsd*) ++ *-*-freebsd*|*-*-openbsd*) + LDFLAGS="$LDFLAGS -pthread" + ;; + *) diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile index 2a3cdd4e4322..6eec3866c30a 100644 --- a/devel/glib-java/Makefile +++ b/devel/glib-java/Makefile @@ -20,6 +20,7 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_OS= native USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd GLIB_API_VERSION= 0.4 @@ -30,6 +31,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message CONFIGURE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} MAKE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure @@ -51,7 +54,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/macros/* ${PREFIX}/share/${PORTNAME}/macros post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR} diff --git a/devel/glib-java/files/patch-src__jni__jg_jnu.c b/devel/glib-java/files/patch-src__jni__jg_jnu.c new file mode 100644 index 000000000000..484b73d8d48a --- /dev/null +++ b/devel/glib-java/files/patch-src__jni__jg_jnu.c @@ -0,0 +1,10 @@ +--- src/jni/jg_jnu.c.orig 2013-02-11 19:12:37.000000000 +0000 ++++ src/jni/jg_jnu.c 2013-02-11 19:13:27.000000000 +0000 +@@ -5,7 +5,6 @@ + + #include "jg_jnu.h" + #include <stddef.h> +-#include <glib/gmem.h> + #include <glib.h> + #include <string.h> + diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile index 1702b64a48fd..3a5b317c327b 100644 --- a/devel/glib12/Makefile +++ b/devel/glib12/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: glib12 -# Date Created: 28 July 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# +# Created by: Vanilla I. Shu <vanilla@FreeBSD.org> # $FreeBSD$ -# PORTNAME= glib PORTVERSION= 1.2.10 @@ -16,7 +12,6 @@ COMMENT= Some useful routines of C programming (previous stable version) USE_CSTD= gnu89 USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 540d9c1dbc5c..103dd28d82b6 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,59 +1,65 @@ -# New ports collection makefile for: glib13 -# Date Created: 28 July 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# +# Created by: Vanilla I. Shu <vanilla@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.209 2011/06/11 19:51:14 mezz Exp $ -# +# $MCom: ports/devel/glib20/Makefile,v 1.229 2012/12/09 20:42:55 kwm Exp $ # !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib -PORTVERSION= 2.28.8 -PORTREVISION?= 5 +PORTVERSION= 2.34.3 +PORTREVISION?= 0 CATEGORIES= devel -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%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Some useful routines of C programming (current stable version) -LATEST_LINK= glib20 +LICENSE= LGPL20 +LATEST_LINK= glib20 USE_XZ= yes -LICENSE= LGPL20 -LICENSE_FILE= ${WRKSRC}/COPYING +PORTSCOUT= limitw:1,even .if !defined(REFERENCE_PORT) -LIB_DEPENDS+= pcre.3:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ + ffi:${PORTSDIR}/devel/libffi USE_GETTEXT= yes +USE_ICONV= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig ltverhack +USE_PKGCONFIG= build +USE_GNOME= gnomehack ltverhack USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_PYTHON= yes +USE_PYTHON= 2.5+ USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ --disable-man --without-xml-catalog \ - --disable-dtrace \ --with-pcre=system \ --disable-fam CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -OPTIONS= COLLATION_FIX "fix string collation" off +OPTIONS_DEFINE= COLLATION_FIX DEBUG +COLLATION_FIX_DESC= fix string collation .include <bsd.port.pre.mk> +# doesn't build yet +#.if (${OSVERSION} < 800000) \ +# || (${OSVERSION} >= 800000 && ${OSVERSION} < 802000) +# || (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) +CONFIGURE_ARGS+=--disable-dtrace +#.else +#CONFIGURE_ARGS+=--enable-dtrace +#.endif + +.if ${ARCH} == powerpc64 +EXTRA_PATCHES= ${FILESDIR}/extra-arch-powerpc64 +.endif + # Let glib use asm code for implementing atomic ops on i386 and amd64. .if ${ARCH} == "i386" GLIB_ARCH= i486 @@ -64,7 +70,7 @@ GLIB_ARCH= ${ARCH} .endif CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL} -.if defined(WITH_COLLATION_FIX) +.if ${PORT_OPTIONS:MCOLLATION_FIX} LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ ${FILESDIR}/extra-patch-glib_gunicollate.c @@ -72,8 +78,11 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ #CONFIGURE_ENV+= CFLAGS="-D__STDC_ISO_10646__" .endif -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=yes +.if ${PORT_OPTIONS:MDEBUG} +CONFIGURE_ARGS+= --enable-debug=yes \ + --disable-silent-rules +.else +CONFIGURE_ARGS+= --disable-modular-tests .endif post-patch: diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 93d831f49734..57207bc60785 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-2.28.8.tar.xz) = 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353 -SIZE (gnome2/glib-2.28.8.tar.xz) = 5223564 +SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 +SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872 diff --git a/devel/glib20/files/extra-arch-powerpc64 b/devel/glib20/files/extra-arch-powerpc64 new file mode 100644 index 000000000000..d774ebd6b7b1 --- /dev/null +++ b/devel/glib20/files/extra-arch-powerpc64 @@ -0,0 +1,23 @@ + +--- gio/glib-compile-schemas.c.orig 2010-11-24 21:32:15.000000000 +0100 ++++ gio/glib-compile-schemas.c 2010-11-24 21:33:42.000000000 +0100 +@@ -1458,7 +1458,7 @@ + } + /* Text {{{2 */ + static void +-text (GMarkupParseContext *context, ++XXXtext (GMarkupParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, +@@ -1590,7 +1590,7 @@ + parse_gschema_files (gchar **files, + gboolean strict) + { +- GMarkupParser parser = { start_element, end_element, text }; ++ GMarkupParser parser = { start_element, end_element, XXXtext }; + ParseState state = { 0, }; + const gchar *filename; + GError *error = NULL; + + diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in index 01f856f74c03..04e45460c4c8 100644 --- a/devel/glib20/files/extra-patch-glib_Makefile.in +++ b/devel/glib20/files/extra-patch-glib_Makefile.in @@ -1,11 +1,11 @@ ---- glib/Makefile.in.orig 2009-05-31 13:14:18.000000000 +0200 -+++ glib/Makefile.in 2009-05-31 13:15:08.000000000 +0200 -@@ -272,7 +272,7 @@ +--- glib/Makefile.in.orig 2012-09-27 15:07:28.000000000 +0000 ++++ glib/Makefile.in 2012-09-27 15:08:02.000000000 +0000 +@@ -415,7 +415,7 @@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -licui18n - LIBASYNCNS_LIBADD = @LIBASYNCNS_LIBADD@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ + LIBELF_CFLAGS = @LIBELF_CFLAGS@ + LIBELF_LIBS = @LIBELF_LIBS@ + LIBFFI_CFLAGS = @LIBFFI_CFLAGS@ diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c index e2edc6938273..e2493d133990 100644 --- a/devel/glib20/files/extra-patch-glib_gunicollate.c +++ b/devel/glib20/files/extra-patch-glib_gunicollate.c @@ -1,5 +1,5 @@ ---- glib/gunicollate.c.orig -+++ glib/gunicollate.c +--- glib/gunicollate.c.orig 2012-03-12 00:42:42.000000000 +0000 ++++ glib/gunicollate.c 2012-09-27 15:11:08.000000000 +0000 @@ -26,6 +26,10 @@ #include <wchar.h> #endif @@ -11,12 +11,7 @@ #ifdef HAVE_CARBON #include <CoreServices/CoreServices.h> #endif -@@ -36,10 +40,53 @@ - #include "gstring.h" - #include "gstrfuncs.h" - #include "gtestutils.h" -+#include "gthread.h" - #ifndef __STDC_ISO_10646__ +@@ -41,6 +45,48 @@ #include "gconvert.h" #endif @@ -34,7 +29,7 @@ + + 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)); ++ g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error)); + + icu_collator_initialized = TRUE; + } @@ -54,10 +49,10 @@ + 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; -+ } ++ { ++ g_free(result); ++ result = NULL; ++ } + } + + return result; @@ -65,7 +60,7 @@ #ifdef _MSC_VER /* Workaround for bug in MSVCR80.DLL */ -@@ -127,6 +174,28 @@ +@@ -128,6 +174,28 @@ g_return_val_if_fail (str1 != NULL, 0); g_return_val_if_fail (str2 != NULL, 0); @@ -94,7 +89,7 @@ str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE); str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE); -@@ -419,6 +488,26 @@ +@@ -420,6 +488,26 @@ g_return_val_if_fail (str != NULL, NULL); diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index c3e6c139b0e8..9c9caf0ab20c 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig 2011-06-06 01:24:53.000000000 +0200 -+++ configure 2012-12-12 11:23:28.000000000 +0100 -@@ -583,6 +583,9 @@ +--- configure.orig 2013-02-14 19:12:15.000000000 +0000 ++++ configure 2013-02-14 19:13:51.000000000 +0000 +@@ -603,6 +603,9 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -10,7 +10,7 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -@@ -5194,7 +5197,7 @@ +@@ -5602,7 +5605,7 @@ fi GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" @@ -19,21 +19,25 @@ if test "x$with_runtime_libdir" != "x"; then -@@ -23077,7 +23080,7 @@ +@@ -23647,7 +23650,7 @@ fi done --for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid -+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname +-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid ++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -28271,7 +28274,7 @@ - fi - - --if test "x${enable_Bsymbolic}" == "xyes"; then -+if test "x${enable_Bsymbolic}" = "xyes"; then - GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions - fi - +@@ -27108,10 +27111,10 @@ + # b) FreeBSD doesn't do this either. + # + case $host in +- *-*-freebsd*|*-*-linux*) ++ *-*-linux*) + G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`" + ;; +- *-*-openbsd*) ++ *-*-freebsd*|*-*-openbsd*) + LDFLAGS="$LDFLAGS -pthread" + ;; + *) diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag deleted file mode 100644 index 289bc3381903..000000000000 --- a/devel/glib20/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2010-08-08 12:14:27.000000000 +0200 -+++ Makefile.in 2010-08-08 12:15:40.000000000 +0200 -@@ -418,7 +418,7 @@ - gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in - TEST_PROGS = - ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} --SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs -+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs - DIST_SUBDIRS = $(SUBDIRS) build - bin_SCRIPTS = glib-gettextize - AM_CPPFLAGS = \ diff --git a/devel/glib20/files/patch-gio_fam_Makefile.in b/devel/glib20/files/patch-gio_fam_Makefile.in new file mode 100644 index 000000000000..033ff3f5dcda --- /dev/null +++ b/devel/glib20/files/patch-gio_fam_Makefile.in @@ -0,0 +1,35 @@ +--- gio/fam/Makefile.in.orig 2012-03-07 21:07:42.000000000 +0100 ++++ gio/fam/Makefile.in 2012-03-07 21:08:30.000000000 +0100 +@@ -87,9 +87,7 @@ + am__installdirs = "$(DESTDIR)$(giomoduledir)" + LTLIBRARIES = $(giomodule_LTLIBRARIES) + am__DEPENDENCIES_1 = +-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ +- $(top_builddir)/gobject/libgobject-2.0.la \ +- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \ ++libgiofam_la_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) + am__objects_1 = + am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ +@@ -402,9 +400,9 @@ + + libgiofam_la_LDFLAGS = $(module_flags) + libgiofam_la_LIBADD = \ +- $(top_builddir)/gio/libgio-2.0.la \ +- $(top_builddir)/gobject/libgobject-2.0.la \ +- $(top_builddir)/glib/libglib-2.0.la \ ++ -lgio-2.0 \ ++ -lgobject-2.0 \ ++ -lglib-2.0 \ + $(GLIB_LIBS) \ + $(FAM_LIBS) \ + $(NULL) +@@ -843,7 +841,7 @@ + + install-data-hook: + if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ +- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ ++ gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ + fi + + uninstall-local: diff --git a/devel/glib20/files/patch-gio_gdesktopappinfo.c b/devel/glib20/files/patch-gio_gdesktopappinfo.c deleted file mode 100644 index 73283b44dbab..000000000000 --- a/devel/glib20/files/patch-gio_gdesktopappinfo.c +++ /dev/null @@ -1,35 +0,0 @@ ---- gio/gdesktopappinfo.c.orig 2011-09-25 11:41:14.000000000 -0400 -+++ gio/gdesktopappinfo.c 2011-09-25 11:41:18.000000000 -0400 -@@ -1515,18 +1515,29 @@ update_mimeapps_list (const char *deskt - */ - if (!explicit_default) - { -- system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, NULL); -+ char *user_default; -+ /* The system default can be in the list, don't exclude it */ -+ system_list = get_all_desktop_entries_for_mime_type (content_type, NULL, FALSE, &user_default); - -- if (system_list != NULL) -+ string = NULL; -+ if (user_default != NULL) -+ { -+ /* There is an existing default set in a lower priority defaults file, re-use it */ -+ string = user_default; -+ } -+ else if (system_list != NULL) - { - string = system_list->data; -- -+ } -+ if (string) -+ { - g_key_file_set_string (key_file, - DEFAULT_APPLICATIONS_GROUP, - content_types[k], - string); - } - -+ g_free (user_default); - g_list_free_full (system_list, g_free); - } - } diff --git a/devel/glib20/files/patch-gio_glib-compile-schemas.c b/devel/glib20/files/patch-gio_glib-compile-schemas.c new file mode 100644 index 000000000000..e92fac5baff8 --- /dev/null +++ b/devel/glib20/files/patch-gio_glib-compile-schemas.c @@ -0,0 +1,16 @@ +--- gio/glib-compile-schemas.c.orig 2012-06-14 16:39:22.000000000 +0200 ++++ gio/glib-compile-schemas.c 2012-06-14 16:39:55.000000000 +0200 +@@ -1204,11 +1204,13 @@ + return; + } + ++#if 0 + if (path && (g_str_has_prefix (path, "/apps/") || + g_str_has_prefix (path, "/desktop/") || + g_str_has_prefix (path, "/system/"))) + g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " + "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); ++#endif + + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); diff --git a/devel/glib20/files/patch-gio_gunixcredentialsmessage.c b/devel/glib20/files/patch-gio_gunixcredentialsmessage.c deleted file mode 100644 index b81a6e282aa8..000000000000 --- a/devel/glib20/files/patch-gio_gunixcredentialsmessage.c +++ /dev/null @@ -1,16 +0,0 @@ ---- gio/gunixcredentialsmessage.c.orig 2011-09-25 11:42:09.000000000 -0400 -+++ gio/gunixcredentialsmessage.c 2011-09-25 11:42:22.000000000 -0400 -@@ -162,11 +162,11 @@ g_unix_credentials_message_deserialize ( - { - goto out; - } -- if (size < CMSG_LEN (sizeof *cred)) -+ if (size < sizeof *cred) - { - g_warning ("Expected a struct cmsgcred (%" G_GSIZE_FORMAT " bytes) but " - "got %" G_GSIZE_FORMAT " bytes of data", -- CMSG_LEN (sizeof *cred), -+ sizeof *cred, - size); - goto out; - } diff --git a/devel/glib20/files/patch-gio_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c index b9bfe143ed0c..e0b3caa374e2 100644 --- a/devel/glib20/files/patch-gio_gunixmount.c +++ b/devel/glib20/files/patch-gio_gunixmount.c @@ -1,6 +1,6 @@ ---- gio/gunixmount.c.orig 2007-12-23 15:53:50.000000000 -0500 -+++ gio/gunixmount.c 2007-12-23 15:52:52.000000000 -0500 -@@ -372,12 +372,18 @@ g_unix_mount_eject (GMount * +--- gio/gunixmount.c.orig 2011-08-31 19:47:35.000000000 +0200 ++++ gio/gunixmount.c 2011-09-15 17:50:24.000000000 +0200 +@@ -449,12 +449,18 @@ g_unix_mount_eject (GMount * gpointer user_data) { GUnixMount *unix_mount = G_UNIX_MOUNT (mount); @@ -17,5 +17,5 @@ + argv[2] = unix_mount->device_path; +#endif - return eject_unmount_do (mount, cancellable, callback, user_data, argv); + eject_unmount_do (mount, cancellable, callback, user_data, argv); } diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c index f99358ddf2ec..608bd95a3072 100644 --- a/devel/glib20/files/patch-gio_gunixmounts.c +++ b/devel/glib20/files/patch-gio_gunixmounts.c @@ -1,16 +1,16 @@ ---- gio/gunixmounts.c.orig 2011-06-05 19:18:49.000000000 -0400 -+++ gio/gunixmounts.c 2011-11-09 04:20:49.000000000 -0500 -@@ -135,6 +135,9 @@ struct _GUnixMountMonitor { - +--- gio/gunixmounts.c.orig 2012-05-02 22:02:54.000000000 -0500 ++++ gio/gunixmounts.c 2012-05-02 22:15:35.000000000 -0500 +@@ -155,6 +155,9 @@ GFileMonitor *fstab_monitor; GFileMonitor *mtab_monitor; -+ + + guint mount_poller_source; + GList *mount_poller_mounts; ++ + GSource *proc_mounts_watch_source; }; - struct _GUnixMountMonitorClass { -@@ -146,6 +149,8 @@ static GUnixMountMonitor *the_mount_moni +@@ -167,6 +170,8 @@ static GList *_g_get_unix_mounts (void); static GList *_g_get_unix_mount_points (void); @@ -19,15 +19,15 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); #define MOUNT_POLL_INTERVAL 4000 -@@ -172,6 +177,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix +@@ -193,6 +198,7 @@ #endif - #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) + #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) +#include <sys/param.h> #include <sys/ucred.h> #include <sys/mount.h> #include <fstab.h> -@@ -222,20 +228,28 @@ g_unix_is_mount_path_system_internal (co +@@ -243,22 +249,29 @@ "/", /* we already have "Filesystem root" in Nautilus */ "/bin", "/boot", @@ -39,6 +39,8 @@ "/lib", "/lib64", + "/libexec", + "/live/cow", + "/live/image", "/media", "/mnt", "/opt", @@ -48,15 +50,14 @@ "/srv", "/tmp", "/usr", -+ "/usr/X11R6", "/usr/local", + "/usr/obj", + "/usr/ports", + "/usr/src", "/var", - "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */ - "/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */ -@@ -271,6 +285,7 @@ guess_system_internal (const char *mount + "/var/crash", + "/var/local", +@@ -299,6 +312,7 @@ "devfs", "devpts", "ecryptfs", @@ -64,7 +65,7 @@ "kernfs", "linprocfs", "proc", -@@ -1056,6 +1071,10 @@ get_mounts_timestamp (void) +@@ -1122,6 +1136,10 @@ if (stat (monitor_file, &buf) == 0) return (guint64)buf.st_mtime; } @@ -75,7 +76,7 @@ return 0; } -@@ -1198,6 +1217,13 @@ g_unix_mount_monitor_finalize (GObject * +@@ -1267,6 +1285,13 @@ g_object_unref (monitor->mtab_monitor); } @@ -89,11 +90,10 @@ the_mount_monitor = NULL; G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); -@@ -1278,6 +1304,51 @@ mtab_file_changed (GFileMonitor *mo - g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0); +@@ -1348,6 +1373,52 @@ } -+static gboolean + static gboolean +mount_change_poller (gpointer user_data) +{ + GUnixMountMonitor *mount_monitor; @@ -115,15 +115,15 @@ + for (i = 0; i < g_list_length (current_mounts); i++) + { + GUnixMountEntry *m1; -+ GUnixMountEntry *m2; ++ GUnixMountEntry *m2; + -+ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i); -+ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i); ++ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i); ++ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i); + if (! has_changed && g_unix_mount_compare (m1, m2) != 0) + has_changed = TRUE; + -+ g_unix_mount_free (m2); -+ } ++ g_unix_mount_free (m2); ++ } + } + + g_list_free (mount_monitor->mount_poller_mounts); @@ -138,12 +138,14 @@ + return TRUE; +} + - static void - g_unix_mount_monitor_init (GUnixMountMonitor *monitor) - { -@@ -1300,6 +1371,12 @@ g_unix_mount_monitor_init (GUnixMountMon - - g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); ++ ++static gboolean + proc_mounts_changed (GIOChannel *channel, + GIOCondition cond, + gpointer user_data) +@@ -1412,6 +1483,12 @@ + g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); + } } + else + { diff --git a/devel/glib20/files/patch-gio_libasyncns_asyncns.c b/devel/glib20/files/patch-gio_libasyncns_asyncns.c deleted file mode 100644 index 966dd27a689b..000000000000 --- a/devel/glib20/files/patch-gio_libasyncns_asyncns.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gio/libasyncns/asyncns.c.orig 2009-05-05 15:25:10.000000000 -0400 -+++ gio/libasyncns/asyncns.c 2009-05-05 15:25:51.000000000 -0400 -@@ -35,6 +35,8 @@ - #include <errno.h> - #include <sys/wait.h> - #include <sys/types.h> -+#include <sys/time.h> -+#include <sys/resource.h> - #include <pwd.h> - #include <netinet/in.h> - #include <arpa/nameser.h> diff --git a/devel/glib20/files/patch-gio_tests_include.c b/devel/glib20/files/patch-gio_tests_include.c new file mode 100644 index 000000000000..165c97b386e5 --- /dev/null +++ b/devel/glib20/files/patch-gio_tests_include.c @@ -0,0 +1,10 @@ +--- glib/tests/include.c.orig 2012-03-06 12:11:39.000000000 +0100 ++++ glib/tests/include.c 2012-03-06 12:13:17.000000000 +0100 +@@ -3,6 +3,7 @@ + #define _POSIX_C_SOURCE 0 + #undef _GNU_SOURCE + #undef _XOPEN_SOURCE ++#include <sys/types.h> + #include <pthread.h> + #include <glib.h> + diff --git a/devel/glib20/files/patch-glib-2.0.pc.in b/devel/glib20/files/patch-glib-2.0.pc.in index f714b6f6eb02..9bd74ad4394e 100644 --- a/devel/glib20/files/patch-glib-2.0.pc.in +++ b/devel/glib20/files/patch-glib-2.0.pc.in @@ -1,8 +1,8 @@ ---- glib-2.0.pc.in.orig 2011-01-06 07:29:30.000000000 +0000 -+++ glib-2.0.pc.in 2011-01-06 07:29:41.000000000 +0000 -@@ -12,4 +12,4 @@ - Version: @VERSION@ +--- glib-2.0.pc.in.orig 2012-01-16 04:12:06.000000000 +0100 ++++ glib-2.0.pc.in 2012-03-06 12:30:11.000000000 +0100 +@@ -13,4 +13,4 @@ + Requires.private: @PCRE_REQUIRES@ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ - Libs.private: @ICONV_LIBS@ + Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ -Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ +Cflags: -I${includedir}/glib-2.0 @GLIB_EXTRA_CFLAGS@ diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in index d58efb723f81..30d6f1be8f8e 100644 --- a/devel/glib20/files/patch-glib_Makefile.in +++ b/devel/glib20/files/patch-glib_Makefile.in @@ -1,30 +1,30 @@ ---- glib/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200 -+++ glib/Makefile.in 2010-08-08 12:46:01.000000000 +0200 -@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a +--- glib/Makefile.in.orig 2012-09-24 01:59:13.000000000 +0000 ++++ glib/Makefile.in 2012-09-24 02:02:07.000000000 +0000 +@@ -585,7 +585,7 @@ # DISTCLEANFILES = glibconfig-stamp glibconfig.h - CLEANFILES = $(am__append_2) + CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6) -configexecincludedir = $(libdir)/glib-2.0/include +configexecincludedir = $(includedir)/glib-2.0 nodist_configexecinclude_HEADERS = glibconfig.h @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la -@@ -1530,7 +1530,7 @@ info: info-recursive - +@@ -1617,7 +1617,7 @@ info-am: --install-data-am: install-data-local install-dist_gdbSCRIPTS \ -+install-data-am: install-data-local \ - install-glibincludeHEADERS install-glibsubincludeHEADERS \ - install-tapsetDATA + install-data-am: install-data-local install-deprecatedincludeHEADERS \ +- install-dist_gdbSCRIPTS install-glibincludeHEADERS \ ++ install-glibincludeHEADERS \ + install-glibsubincludeHEADERS install-tapsetDATA @$(NORMAL_INSTALL) -@@ -1786,9 +1786,7 @@ distclean-local: + $(MAKE) $(AM_MAKEFLAGS) install-data-hook +@@ -1906,9 +1906,7 @@ libglib-gdb.py: libglib-gdb.py.in - $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py + $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py -install-data-hook: libglib-gdb.py - mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR) -- $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py +- $(INSTALL) $(builddir)/libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py +install-data-hook: @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) diff --git a/devel/glib20/files/patch-glib_deprecated_gthread.h b/devel/glib20/files/patch-glib_deprecated_gthread.h new file mode 100644 index 000000000000..889976f1fca9 --- /dev/null +++ b/devel/glib20/files/patch-glib_deprecated_gthread.h @@ -0,0 +1,10 @@ +--- ./glib/deprecated/gthread.h.orig 2012-05-27 17:07:04.000000000 +0200 ++++ ./glib/deprecated/gthread.h 2012-05-27 17:07:19.000000000 +0200 +@@ -120,6 +120,7 @@ + gpointer user_data); + + #ifndef G_OS_WIN32 ++#include <sys/types.h> + #include <pthread.h> + #endif + diff --git a/devel/glib20/files/patch-glib_fix_hidden b/devel/glib20/files/patch-glib_fix_hidden index c26942a39fb1..813c49808fc2 100644 --- a/devel/glib20/files/patch-glib_fix_hidden +++ b/devel/glib20/files/patch-glib_fix_hidden @@ -1,14 +1,3 @@ ---- glib/gatomic-gcc.c.orig 2011-06-06 01:18:49.000000000 +0200 -+++ glib/gatomic-gcc.c 2011-12-07 00:24:48.000000000 +0100 -@@ -22,6 +22,8 @@ - - #include "gatomic.h" - -+#include "gthreadprivate.h" -+ - gint - g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic, - gint val) --- glib/gmem.c.orig 2011-02-10 00:31:42.000000000 +0100 +++ glib/gmem.c 2011-12-07 00:21:38.000000000 +0100 @@ -39,6 +39,7 @@ diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c deleted file mode 100644 index ef7f0a87b9ff..000000000000 --- a/devel/glib20/files/patch-glib_gregex.c +++ /dev/null @@ -1,13 +0,0 @@ ---- glib/gregex.c.orig 2007-09-09 18:35:32.000000000 -0400 -+++ glib/gregex.c 2007-09-09 18:36:05.000000000 -0400 -@@ -164,8 +164,10 @@ match_error (gint errcode) - case PCRE_ERROR_DFA_RECURSE: - case PCRE_ERROR_RECURSIONLIMIT: - return _("recursion limit reached"); -+#ifdef PCRE_ERROR_NULLWSLIMIT - case PCRE_ERROR_NULLWSLIMIT: - return _("workspace limit for empty substrings reached"); -+#endif - case PCRE_ERROR_BADNEWLINE: - return _("invalid combination of newline flags"); - default: diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c new file mode 100644 index 000000000000..f19007f8c636 --- /dev/null +++ b/devel/glib20/files/patch-glib_gthread-posix.c @@ -0,0 +1,20 @@ +--- glib/gthread-posix.c.orig 2012-11-10 03:24:06.000000000 +0000 ++++ glib/gthread-posix.c 2012-11-12 18:06:36.000000000 +0000 +@@ -89,7 +89,7 @@ + if G_UNLIKELY (mutex == NULL) + g_thread_abort (errno, "malloc"); + +-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP ++#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__) + { + pthread_mutexattr_t attr; + pthread_mutexattr_init (&attr); +@@ -101,7 +101,7 @@ + if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0) + g_thread_abort (status, "pthread_mutex_init"); + +-#ifdef PTHREAD_ADAPTIVE_MUTEX_NP ++#if defined(PTHREAD_ADAPTIVE_MUTEX_NP) && !defined(__FreeBSD__) + pthread_mutexattr_destroy (&attr); + #endif + diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c new file mode 100644 index 000000000000..8a8774254f95 --- /dev/null +++ b/devel/glib20/files/patch-glib_tests_gdatetime.c @@ -0,0 +1,20 @@ +--- glib/tests/gdatetime.c.orig 2012-08-17 00:06:25.000000000 +0000 ++++ glib/tests/gdatetime.c 2012-10-23 12:38:55.000000000 +0000 +@@ -1230,7 +1230,7 @@ + gint64 u; + gint i1, i2; + +- tz = g_time_zone_new ("Canada/Eastern"); ++ tz = g_time_zone_new ("America/Montreal"); + dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0); + u = g_date_time_to_unix (dt); + +@@ -1259,7 +1259,7 @@ + gint64 u, u2; + gint i1, i2; + +- tz = g_time_zone_new ("Canada/Eastern"); ++ tz = g_time_zone_new ("America/Montreal"); + dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0); + u = g_date_time_to_unix (dt); + u2 = u; diff --git a/devel/glib20/files/patch-glib_tests_utils.c b/devel/glib20/files/patch-glib_tests_utils.c new file mode 100644 index 000000000000..0f7544cc4bff --- /dev/null +++ b/devel/glib20/files/patch-glib_tests_utils.c @@ -0,0 +1,11 @@ +--- glib/tests/utils.c.orig 2012-09-24 02:19:54.000000000 +0000 ++++ glib/tests/utils.c 2012-09-24 02:20:48.000000000 +0000 +@@ -416,7 +416,7 @@ + + xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS"); + if (!xdg) +- xdg = "/etc/xdg"; ++ xdg = "/usr/local/etc/xdg:/etc/xdg"; + + dirs = g_get_system_config_dirs (); + diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in index 12a20215a0bb..f99ec4a97002 100644 --- a/devel/glib20/files/patch-gobject_Makefile.in +++ b/devel/glib20/files/patch-gobject_Makefile.in @@ -1,6 +1,6 @@ ---- gobject/Makefile.in.orig 2010-06-08 09:19:51.000000000 +0200 -+++ gobject/Makefile.in 2010-06-08 09:20:41.000000000 +0200 -@@ -1236,7 +1236,7 @@ info: info-recursive +--- gobject/Makefile.in.orig 2012-05-03 11:42:11.000000000 +0200 ++++ gobject/Makefile.in 2012-05-03 11:42:51.000000000 +0200 +@@ -1381,7 +1381,7 @@ info-am: @@ -9,13 +9,13 @@ install-libgobjectincludeHEADERS install-tapsetDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook -@@ -1460,9 +1460,7 @@ libgobject-gdb.py: libgobject-gdb.py.in +@@ -1649,9 +1649,7 @@ uninstall-gdb: -rm -r $(DESTDIR)$(datadir)/gdb -install-data-hook: libgobject-gdb.py - mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR) -- $(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py +- $(INSTALL) $(builddir)/libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py +install-data-hook: @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c deleted file mode 100644 index 47c5ab8f1591..000000000000 --- a/devel/glib20/files/patch-gthread_gthread-posix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004 -+++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005 -@@ -125,7 +129,8 @@ - g_thread_impl_init(void) - { - #ifdef _SC_THREAD_STACK_MIN -- g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0); -+ g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), -+ g_thread_min_stack_size); - #endif /* _SC_THREAD_STACK_MIN */ - #ifdef HAVE_PRIORITIES - # ifdef G_THREADS_IMPL_POSIX -@@ -176,7 +181,7 @@ - result = pthread_mutex_trylock ((pthread_mutex_t *) mutex); - - #ifdef G_THREADS_IMPL_POSIX -- if (result == EBUSY) -+ if ((result == EBUSY) || (result == EDEADLK)) - return FALSE; - #else /* G_THREADS_IMPL_DCE */ - if (result == 0) diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index e3b7ff0f2eaa..fe7f895a6c81 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -1,15 +1,19 @@ bin/gdbus +bin/gdbus-codegen bin/gio-querymodules +bin/glib-compile-resources bin/glib-compile-schemas bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums bin/gobject-query +bin/gresource bin/gsettings bin/gtester bin/gtester-report -etc/bash_completion.d/gdbus-bash-completion.sh -etc/bash_completion.d/gsettings-bash-completion.sh +share/bash-completion/completions/gdbus +share/bash-completion/completions/gsettings +share/bash-completion/completions/gresource include/gio-unix-2.0/gio/gdesktopappinfo.h include/gio-unix-2.0/gio/gfiledescriptorbased.h include/gio-unix-2.0/gio/gunixconnection.h @@ -22,6 +26,8 @@ include/gio-unix-2.0/gio/gunixoutputstream.h include/gio-unix-2.0/gio/gunixsocketaddress.h include/glib-2.0/gio/gaction.h include/glib-2.0/gio/gactiongroup.h +include/glib-2.0/gio/gactiongroupexporter.h +include/glib-2.0/gio/gactionmap.h include/glib-2.0/gio/gappinfo.h include/glib-2.0/gio/gapplication.h include/glib-2.0/gio/gapplicationcommandline.h @@ -38,15 +44,25 @@ include/glib-2.0/gio/gconverteroutputstream.h include/glib-2.0/gio/gcredentials.h include/glib-2.0/gio/gdatainputstream.h include/glib-2.0/gio/gdataoutputstream.h +include/glib-2.0/gio/gdbusactiongroup.h include/glib-2.0/gio/gdbusaddress.h include/glib-2.0/gio/gdbusauthobserver.h include/glib-2.0/gio/gdbusconnection.h include/glib-2.0/gio/gdbuserror.h +include/glib-2.0/gio/gdbusinterface.h +include/glib-2.0/gio/gdbusinterfaceskeleton.h include/glib-2.0/gio/gdbusintrospection.h +include/glib-2.0/gio/gdbusmenumodel.h include/glib-2.0/gio/gdbusmessage.h include/glib-2.0/gio/gdbusmethodinvocation.h include/glib-2.0/gio/gdbusnameowning.h include/glib-2.0/gio/gdbusnamewatching.h +include/glib-2.0/gio/gdbusobject.h +include/glib-2.0/gio/gdbusobjectmanager.h +include/glib-2.0/gio/gdbusobjectmanagerclient.h +include/glib-2.0/gio/gdbusobjectmanagerserver.h +include/glib-2.0/gio/gdbusobjectproxy.h +include/glib-2.0/gio/gdbusobjectskeleton.h include/glib-2.0/gio/gdbusproxy.h include/glib-2.0/gio/gdbusserver.h include/glib-2.0/gio/gdbusutils.h @@ -67,6 +83,7 @@ include/glib-2.0/gio/gfilterinputstream.h include/glib-2.0/gio/gfilteroutputstream.h include/glib-2.0/gio/gicon.h include/glib-2.0/gio/ginetaddress.h +include/glib-2.0/gio/ginetaddressmask.h include/glib-2.0/gio/ginetsocketaddress.h include/glib-2.0/gio/ginitable.h include/glib-2.0/gio/ginputstream.h @@ -81,25 +98,33 @@ include/glib-2.0/gio/giotypes.h include/glib-2.0/gio/gloadableicon.h include/glib-2.0/gio/gmemoryinputstream.h include/glib-2.0/gio/gmemoryoutputstream.h +include/glib-2.0/gio/gmenu.h +include/glib-2.0/gio/gmenuexporter.h +include/glib-2.0/gio/gmenumodel.h include/glib-2.0/gio/gmount.h include/glib-2.0/gio/gmountoperation.h include/glib-2.0/gio/gnativevolumemonitor.h include/glib-2.0/gio/gnetworkaddress.h +include/glib-2.0/gio/gnetworkmonitor.h include/glib-2.0/gio/gnetworkservice.h include/glib-2.0/gio/goutputstream.h include/glib-2.0/gio/gpermission.h include/glib-2.0/gio/gpollableinputstream.h include/glib-2.0/gio/gpollableoutputstream.h +include/glib-2.0/gio/gpollableutils.h include/glib-2.0/gio/gproxy.h include/glib-2.0/gio/gproxyaddress.h include/glib-2.0/gio/gproxyaddressenumerator.h include/glib-2.0/gio/gproxyresolver.h -include/glib-2.0/gio/gsimpleaction.h -include/glib-2.0/gio/gsimpleactiongroup.h +include/glib-2.0/gio/gremoteactiongroup.h include/glib-2.0/gio/gresolver.h +include/glib-2.0/gio/gresource.h include/glib-2.0/gio/gseekable.h include/glib-2.0/gio/gsettings.h include/glib-2.0/gio/gsettingsbackend.h +include/glib-2.0/gio/gsettingsschema.h +include/glib-2.0/gio/gsimpleaction.h +include/glib-2.0/gio/gsimpleactiongroup.h include/glib-2.0/gio/gsimpleasyncresult.h include/glib-2.0/gio/gsimplepermission.h include/glib-2.0/gio/gsocket.h @@ -114,12 +139,17 @@ include/glib-2.0/gio/gsocketservice.h include/glib-2.0/gio/gsrvtarget.h include/glib-2.0/gio/gtcpconnection.h include/glib-2.0/gio/gtcpwrapperconnection.h +include/glib-2.0/gio/gtestdbus.h include/glib-2.0/gio/gthemedicon.h include/glib-2.0/gio/gthreadedsocketservice.h include/glib-2.0/gio/gtlsbackend.h include/glib-2.0/gio/gtlscertificate.h include/glib-2.0/gio/gtlsclientconnection.h include/glib-2.0/gio/gtlsconnection.h +include/glib-2.0/gio/gtlsdatabase.h +include/glib-2.0/gio/gtlsfiledatabase.h +include/glib-2.0/gio/gtlsinteraction.h +include/glib-2.0/gio/gtlspassword.h include/glib-2.0/gio/gtlsserverconnection.h include/glib-2.0/gio/gvfs.h include/glib-2.0/gio/gvolume.h @@ -127,7 +157,14 @@ include/glib-2.0/gio/gvolumemonitor.h include/glib-2.0/gio/gzlibcompressor.h include/glib-2.0/gio/gzlibdecompressor.h include/glib-2.0/glib-object.h +include/glib-2.0/glib-unix.h include/glib-2.0/glib.h +include/glib-2.0/glib/deprecated/gallocator.h +include/glib-2.0/glib/deprecated/gcache.h +include/glib-2.0/glib/deprecated/gcompletion.h +include/glib-2.0/glib/deprecated/gmain.h +include/glib-2.0/glib/deprecated/grel.h +include/glib-2.0/glib/deprecated/gthread.h include/glib-2.0/glib/galloca.h include/glib-2.0/glib/garray.h include/glib-2.0/glib/gasyncqueue.h @@ -136,17 +173,20 @@ include/glib-2.0/glib/gbacktrace.h include/glib-2.0/glib/gbase64.h include/glib-2.0/glib/gbitlock.h include/glib-2.0/glib/gbookmarkfile.h -include/glib-2.0/glib/gcache.h +include/glib-2.0/glib/gbytes.h +include/glib-2.0/glib/gcharset.h include/glib-2.0/glib/gchecksum.h -include/glib-2.0/glib/gcompletion.h include/glib-2.0/glib/gconvert.h include/glib-2.0/glib/gdataset.h include/glib-2.0/glib/gdate.h include/glib-2.0/glib/gdatetime.h include/glib-2.0/glib/gdir.h +include/glib-2.0/glib/genviron.h include/glib-2.0/glib/gerror.h include/glib-2.0/glib/gfileutils.h +include/glib-2.0/glib/ggettext.h include/glib-2.0/glib/ghash.h +include/glib-2.0/glib/ghmac.h include/glib-2.0/glib/ghook.h include/glib-2.0/glib/ghostutils.h include/glib-2.0/glib/gi18n-lib.h @@ -171,7 +211,6 @@ include/glib-2.0/glib/gquark.h include/glib-2.0/glib/gqueue.h include/glib-2.0/glib/grand.h include/glib-2.0/glib/gregex.h -include/glib-2.0/glib/grel.h include/glib-2.0/glib/gscanner.h include/glib-2.0/glib/gsequence.h include/glib-2.0/glib/gshell.h @@ -181,11 +220,13 @@ include/glib-2.0/glib/gspawn.h include/glib-2.0/glib/gstdio.h include/glib-2.0/glib/gstrfuncs.h include/glib-2.0/glib/gstring.h +include/glib-2.0/glib/gstringchunk.h include/glib-2.0/glib/gtestutils.h include/glib-2.0/glib/gthread.h include/glib-2.0/glib/gthreadpool.h include/glib-2.0/glib/gtimer.h include/glib-2.0/glib/gtimezone.h +include/glib-2.0/glib/gtrashstack.h include/glib-2.0/glib/gtree.h include/glib-2.0/glib/gtypes.h include/glib-2.0/glib/gunicode.h @@ -193,6 +234,8 @@ include/glib-2.0/glib/gurifuncs.h include/glib-2.0/glib/gutils.h include/glib-2.0/glib/gvariant.h include/glib-2.0/glib/gvarianttype.h +include/glib-2.0/glib/gversion.h +include/glib-2.0/glib/gversionmacros.h include/glib-2.0/glib/gwin32.h include/glib-2.0/glibconfig.h include/glib-2.0/gmodule.h @@ -200,6 +243,7 @@ include/glib-2.0/gobject/gbinding.h include/glib-2.0/gobject/gboxed.h include/glib-2.0/gobject/gclosure.h include/glib-2.0/gobject/genums.h +include/glib-2.0/gobject/glib-types.h include/glib-2.0/gobject/gmarshal.h include/glib-2.0/gobject/gobject.h include/glib-2.0/gobject/gobjectnotifyqueue.c @@ -214,6 +258,30 @@ include/glib-2.0/gobject/gvalue.h include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h +lib/gdbus-2.0/codegen/__init__.py +lib/gdbus-2.0/codegen/__init__.pyc +lib/gdbus-2.0/codegen/__init__.pyo +lib/gdbus-2.0/codegen/codegen.py +lib/gdbus-2.0/codegen/codegen.pyc +lib/gdbus-2.0/codegen/codegen.pyo +lib/gdbus-2.0/codegen/codegen_docbook.py +lib/gdbus-2.0/codegen/codegen_docbook.pyc +lib/gdbus-2.0/codegen/codegen_docbook.pyo +lib/gdbus-2.0/codegen/codegen_main.py +lib/gdbus-2.0/codegen/codegen_main.pyc +lib/gdbus-2.0/codegen/codegen_main.pyo +lib/gdbus-2.0/codegen/config.py +lib/gdbus-2.0/codegen/config.pyc +lib/gdbus-2.0/codegen/config.pyo +lib/gdbus-2.0/codegen/dbustypes.py +lib/gdbus-2.0/codegen/dbustypes.pyc +lib/gdbus-2.0/codegen/dbustypes.pyo +lib/gdbus-2.0/codegen/parser.py +lib/gdbus-2.0/codegen/parser.pyc +lib/gdbus-2.0/codegen/parser.pyo +lib/gdbus-2.0/codegen/utils.py +lib/gdbus-2.0/codegen/utils.pyc +lib/gdbus-2.0/codegen/utils.pyo lib/libgio-2.0.a lib/libgio-2.0.la lib/libgio-2.0.so @@ -268,9 +336,9 @@ share/locale/da/LC_MESSAGES/glib20.mo share/locale/de/LC_MESSAGES/glib20.mo share/locale/dz/LC_MESSAGES/glib20.mo share/locale/el/LC_MESSAGES/glib20.mo +share/locale/en@shaw/LC_MESSAGES/glib20.mo share/locale/en_CA/LC_MESSAGES/glib20.mo share/locale/en_GB/LC_MESSAGES/glib20.mo -share/locale/en@shaw/LC_MESSAGES/glib20.mo share/locale/eo/LC_MESSAGES/glib20.mo share/locale/es/LC_MESSAGES/glib20.mo share/locale/et/LC_MESSAGES/glib20.mo @@ -342,26 +410,6 @@ 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 -@exec mkdir -p %D/share/glib-2.0/schemas -@exec mkdir -p %D/share/GConf/gsettings -@dirrm share/GConf/gsettings -@dirrm share/GConf -@exec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas -@dirrm share/glib-2.0/schemas -@dirrm share/glib-2.0/gettext/po -@dirrm share/glib-2.0/gettext -@dirrm share/glib-2.0 -@exec mkdir -p %D/lib/gio/modules -@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true -@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache -@dirrmtry lib/gio/modules -@dirrmtry lib/gio -@dirrm include/glib-2.0/gobject -@dirrm include/glib-2.0/glib -@dirrm include/glib-2.0/gio -@dirrm include/glib-2.0 -@dirrm include/gio-unix-2.0/gio -@dirrm include/gio-unix-2.0 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @@ -416,4 +464,27 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry etc/bash_completion.d +@exec mkdir -p %D/share/glib-2.0/schemas +@exec glib-compile-schemas %D/share/glib-2.0/schemas +@dirrm share/glib-2.0/schemas +@dirrm share/glib-2.0/gettext/po +@dirrm share/glib-2.0/gettext +@dirrm share/glib-2.0 +@dirrmtry share/bash-completion/completions +@dirrmtry share/bash-completion +@exec mkdir -p %D/share/GConf/gsettings +@dirrm share/GConf/gsettings +@dirrm share/GConf +@exec mkdir -p %D/lib/gio/modules +@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true +@dirrmtry lib/gio/modules +@dirrmtry lib/gio +@dirrm lib/gdbus-2.0/codegen +@dirrm lib/gdbus-2.0 +@dirrm include/glib-2.0/gobject +@dirrm include/glib-2.0/glib/deprecated +@dirrm include/glib-2.0/glib +@dirrm include/glib-2.0/gio +@dirrm include/glib-2.0 +@dirrm include/gio-unix-2.0/gio +@dirrm include/gio-unix-2.0 diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile index 61a9d1acd86f..c06dd5521015 100644 --- a/devel/glibmm-reference/Makefile +++ b/devel/glibmm-reference/Makefile @@ -12,6 +12,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:${PORTSDIR}/devel/gl USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build DOCSDIR= ${PREFIX}/share/doc/glibmm-2.4 diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 367f961117f4..c1f48b20de6c 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: glibmm -# Date created: 04 December 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/glibmm/Makefile,v 1.114 2011/06/14 12:43:33 kwm Exp $ -# +# $MCom: ports/devel/glibmm/Makefile,v 1.121 2012/12/09 21:00:20 kwm Exp $ PORTNAME= glibmm -PORTVERSION= 2.28.2 +PORTVERSION= 2.34.1 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= devel @@ -23,12 +19,12 @@ PLIST_SUB= VERSION="2.4" API_VERSION="2.4" .if !defined(REFERENCE_PORT) -LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= gnomehack glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack libsigc++20 +USE_PKGCONFIG= build USE_PERL5= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index 4b7ba74b55d3..99984514c4ba 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glibmm-2.28.2.tar.xz) = f84e99858d9674705316ec40cb3f03c34129293ebd370a7d63df6d959644cbe3 -SIZE (gnome2/glibmm-2.28.2.tar.xz) = 4584624 +SHA256 (gnome2/glibmm-2.34.1.tar.xz) = b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4 +SIZE (gnome2/glibmm-2.34.1.tar.xz) = 5670736 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index 2c3971ff9dda..ecfb362d7e39 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -1,23 +1,37 @@ include/giomm-%%API_VERSION%%/giomm.h +include/giomm-%%API_VERSION%%/giomm/action.h +include/giomm-%%API_VERSION%%/giomm/actiongroup.h +include/giomm-%%API_VERSION%%/giomm/actionmap.h include/giomm-%%API_VERSION%%/giomm/appinfo.h +include/giomm-%%API_VERSION%%/giomm/applaunchcontext.h +include/giomm-%%API_VERSION%%/giomm/application.h +include/giomm-%%API_VERSION%%/giomm/applicationcommandline.h include/giomm-%%API_VERSION%%/giomm/asyncinitable.h include/giomm-%%API_VERSION%%/giomm/asyncresult.h include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h include/giomm-%%API_VERSION%%/giomm/cancellable.h +include/giomm-%%API_VERSION%%/giomm/charsetconverter.h include/giomm-%%API_VERSION%%/giomm/contenttype.h +include/giomm-%%API_VERSION%%/giomm/converter.h +include/giomm-%%API_VERSION%%/giomm/converterinputstream.h +include/giomm-%%API_VERSION%%/giomm/converteroutputstream.h include/giomm-%%API_VERSION%%/giomm/credentials.h include/giomm-%%API_VERSION%%/giomm/datainputstream.h include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h +include/giomm-%%API_VERSION%%/giomm/dbusactiongroup.h include/giomm-%%API_VERSION%%/giomm/dbusaddress.h include/giomm-%%API_VERSION%%/giomm/dbusauthobserver.h include/giomm-%%API_VERSION%%/giomm/dbusconnection.h include/giomm-%%API_VERSION%%/giomm/dbuserror.h include/giomm-%%API_VERSION%%/giomm/dbuserrorutils.h +include/giomm-%%API_VERSION%%/giomm/dbusinterface.h include/giomm-%%API_VERSION%%/giomm/dbusinterfacevtable.h include/giomm-%%API_VERSION%%/giomm/dbusintrospection.h +include/giomm-%%API_VERSION%%/giomm/dbusmenumodel.h include/giomm-%%API_VERSION%%/giomm/dbusmessage.h include/giomm-%%API_VERSION%%/giomm/dbusmethodinvocation.h +include/giomm-%%API_VERSION%%/giomm/dbusobject.h include/giomm-%%API_VERSION%%/giomm/dbusownname.h include/giomm-%%API_VERSION%%/giomm/dbusproxy.h include/giomm-%%API_VERSION%%/giomm/dbusserver.h @@ -53,29 +67,50 @@ include/giomm-%%API_VERSION%%/giomm/iostream.h include/giomm-%%API_VERSION%%/giomm/loadableicon.h include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h include/giomm-%%API_VERSION%%/giomm/memoryoutputstream.h +include/giomm-%%API_VERSION%%/giomm/menu.h +include/giomm-%%API_VERSION%%/giomm/menuattributeiter.h +include/giomm-%%API_VERSION%%/giomm/menuitem.h +include/giomm-%%API_VERSION%%/giomm/menulinkiter.h +include/giomm-%%API_VERSION%%/giomm/menumodel.h include/giomm-%%API_VERSION%%/giomm/mount.h include/giomm-%%API_VERSION%%/giomm/mountoperation.h include/giomm-%%API_VERSION%%/giomm/networkaddress.h include/giomm-%%API_VERSION%%/giomm/networkservice.h include/giomm-%%API_VERSION%%/giomm/outputstream.h +include/giomm-%%API_VERSION%%/giomm/pollableinputstream.h +include/giomm-%%API_VERSION%%/giomm/pollableoutputstream.h +include/giomm-%%API_VERSION%%/giomm/private/action_p.h +include/giomm-%%API_VERSION%%/giomm/private/actiongroup_p.h +include/giomm-%%API_VERSION%%/giomm/private/actionmap_p.h include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h +include/giomm-%%API_VERSION%%/giomm/private/applaunchcontext_p.h +include/giomm-%%API_VERSION%%/giomm/private/application_p.h +include/giomm-%%API_VERSION%%/giomm/private/applicationcommandline_p.h include/giomm-%%API_VERSION%%/giomm/private/asyncinitable_p.h include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h +include/giomm-%%API_VERSION%%/giomm/private/charsetconverter_p.h +include/giomm-%%API_VERSION%%/giomm/private/converter_p.h +include/giomm-%%API_VERSION%%/giomm/private/converterinputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/converteroutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/credentials_p.h include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusactiongroup_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusaddress_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusauthobserver_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusconnection_p.h include/giomm-%%API_VERSION%%/giomm/private/dbuserror_p.h include/giomm-%%API_VERSION%%/giomm/private/dbuserrorutils_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusinterface_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusinterfacevtable_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusintrospection_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusmenumodel_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusmessage_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusmethodinvocation_p.h +include/giomm-%%API_VERSION%%/giomm/private/dbusobject_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusownname_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusproxy_p.h include/giomm-%%API_VERSION%%/giomm/private/dbusserver_p.h @@ -110,17 +145,28 @@ include/giomm-%%API_VERSION%%/giomm/private/iostream_p.h include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/memoryoutputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/menu_p.h +include/giomm-%%API_VERSION%%/giomm/private/menuattributeiter_p.h +include/giomm-%%API_VERSION%%/giomm/private/menuitem_p.h +include/giomm-%%API_VERSION%%/giomm/private/menulinkiter_p.h +include/giomm-%%API_VERSION%%/giomm/private/menumodel_p.h include/giomm-%%API_VERSION%%/giomm/private/mount_p.h include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h include/giomm-%%API_VERSION%%/giomm/private/networkaddress_p.h include/giomm-%%API_VERSION%%/giomm/private/networkservice_p.h include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/pollableinputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/pollableoutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/proxy_p.h include/giomm-%%API_VERSION%%/giomm/private/proxyaddress_p.h include/giomm-%%API_VERSION%%/giomm/private/proxyresolver_p.h +include/giomm-%%API_VERSION%%/giomm/private/remoteactiongroup_p.h include/giomm-%%API_VERSION%%/giomm/private/resolver_p.h +include/giomm-%%API_VERSION%%/giomm/private/resource_p.h include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h include/giomm-%%API_VERSION%%/giomm/private/settings_p.h +include/giomm-%%API_VERSION%%/giomm/private/simpleaction_p.h +include/giomm-%%API_VERSION%%/giomm/private/simpleactiongroup_p.h include/giomm-%%API_VERSION%%/giomm/private/socket_p.h include/giomm-%%API_VERSION%%/giomm/private/socketaddress_p.h include/giomm-%%API_VERSION%%/giomm/private/socketaddressenumerator_p.h @@ -143,12 +189,18 @@ include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h include/giomm-%%API_VERSION%%/giomm/private/unixsocketaddress_p.h include/giomm-%%API_VERSION%%/giomm/private/volume_p.h include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h +include/giomm-%%API_VERSION%%/giomm/private/zlibcompressor_p.h +include/giomm-%%API_VERSION%%/giomm/private/zlibdecompressor_p.h include/giomm-%%API_VERSION%%/giomm/proxy.h include/giomm-%%API_VERSION%%/giomm/proxyaddress.h include/giomm-%%API_VERSION%%/giomm/proxyresolver.h +include/giomm-%%API_VERSION%%/giomm/remoteactiongroup.h include/giomm-%%API_VERSION%%/giomm/resolver.h +include/giomm-%%API_VERSION%%/giomm/resource.h include/giomm-%%API_VERSION%%/giomm/seekable.h include/giomm-%%API_VERSION%%/giomm/settings.h +include/giomm-%%API_VERSION%%/giomm/simpleaction.h +include/giomm-%%API_VERSION%%/giomm/simpleactiongroup.h include/giomm-%%API_VERSION%%/giomm/socket.h include/giomm-%%API_VERSION%%/giomm/socketaddress.h include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h @@ -172,15 +224,19 @@ include/giomm-%%API_VERSION%%/giomm/unixsocketaddress.h include/giomm-%%API_VERSION%%/giomm/volume.h include/giomm-%%API_VERSION%%/giomm/volumemonitor.h include/giomm-%%API_VERSION%%/giomm/wrap_init.h +include/giomm-%%API_VERSION%%/giomm/zlibcompressor.h +include/giomm-%%API_VERSION%%/giomm/zlibdecompressor.h include/glibmm-%%API_VERSION%%/glibmm.h include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h include/glibmm-%%API_VERSION%%/glibmm/balancedtree.h +include/glibmm-%%API_VERSION%%/glibmm/bytes.h include/glibmm-%%API_VERSION%%/glibmm/checksum.h include/glibmm-%%API_VERSION%%/glibmm/class.h include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h include/glibmm-%%API_VERSION%%/glibmm/containers.h include/glibmm-%%API_VERSION%%/glibmm/convert.h include/glibmm-%%API_VERSION%%/glibmm/date.h +include/glibmm-%%API_VERSION%%/glibmm/datetime.h include/glibmm-%%API_VERSION%%/glibmm/debug.h include/glibmm-%%API_VERSION%%/glibmm/dispatcher.h include/glibmm-%%API_VERSION%%/glibmm/error.h @@ -208,9 +264,11 @@ include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h include/glibmm-%%API_VERSION%%/glibmm/pattern.h include/glibmm-%%API_VERSION%%/glibmm/priorities.h include/glibmm-%%API_VERSION%%/glibmm/private/balancedtree_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/bytes_p.h include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/datetime_p.h include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h @@ -226,6 +284,8 @@ include/glibmm-%%API_VERSION%%/glibmm/private/regex_p.h include/glibmm-%%API_VERSION%%/glibmm/private/shell_p.h include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/threads_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/timezone_p.h include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h include/glibmm-%%API_VERSION%%/glibmm/private/valuearray_p.h @@ -249,8 +309,10 @@ include/glibmm-%%API_VERSION%%/glibmm/streamiochannel.h include/glibmm-%%API_VERSION%%/glibmm/stringutils.h include/glibmm-%%API_VERSION%%/glibmm/thread.h include/glibmm-%%API_VERSION%%/glibmm/threadpool.h +include/glibmm-%%API_VERSION%%/glibmm/threads.h include/glibmm-%%API_VERSION%%/glibmm/timer.h include/glibmm-%%API_VERSION%%/glibmm/timeval.h +include/glibmm-%%API_VERSION%%/glibmm/timezone.h include/glibmm-%%API_VERSION%%/glibmm/unicode.h include/glibmm-%%API_VERSION%%/glibmm/uriutils.h include/glibmm-%%API_VERSION%%/glibmm/ustring.h @@ -290,6 +352,11 @@ lib/glibmm-%%VERSION%%/proc/m4/ctor.m4 lib/glibmm-%%VERSION%%/proc/m4/doc.m4 lib/glibmm-%%VERSION%%/proc/m4/enum.m4 lib/glibmm-%%VERSION%%/proc/m4/gerror.m4 +lib/glibmm-%%VERSION%%/proc/m4/initialize.m4 +lib/glibmm-%%VERSION%%/proc/m4/initialize_base.m4 +lib/glibmm-%%VERSION%%/proc/m4/initialize_gio.m4 +lib/glibmm-%%VERSION%%/proc/m4/initialize_glib.m4 +lib/glibmm-%%VERSION%%/proc/m4/initialize_glibmm.m4 lib/glibmm-%%VERSION%%/proc/m4/list.m4 lib/glibmm-%%VERSION%%/proc/m4/member.m4 lib/glibmm-%%VERSION%%/proc/m4/method.m4 @@ -320,17 +387,16 @@ lib/libglibmm_generate_extra_defs-%%VERSION%%.so lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1 libdata/pkgconfig/giomm-%%API_VERSION%%.pc libdata/pkgconfig/glibmm-%%API_VERSION%%.pc -share/aclocal/glibmm_check_perl.m4 -@dirrm lib/glibmm-%%API_VERSION%%/proc/m4 @dirrm lib/glibmm-%%API_VERSION%%/proc/pm +@dirrm lib/glibmm-%%API_VERSION%%/proc/m4 @dirrm lib/glibmm-%%API_VERSION%%/proc @dirrm lib/glibmm-%%API_VERSION%%/include @dirrm lib/glibmm-%%API_VERSION%% @dirrm lib/giomm-%%API_VERSION%%/include @dirrm lib/giomm-%%API_VERSION%% +@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs @dirrm include/glibmm-%%API_VERSION%%/glibmm/private @dirrm include/glibmm-%%API_VERSION%%/glibmm -@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs @dirrm include/glibmm-%%API_VERSION%% @dirrm include/giomm-%%API_VERSION%%/giomm/private @dirrm include/giomm-%%API_VERSION%%/giomm diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index 92bd2df9068b..60f970093b82 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -1,24 +1,18 @@ -# New ports collection makefile for: gnomecommon -# Date created: 04 April 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/gnome-common/Makefile,v 1.15 2009/09/26 13:41:58 marcus Exp $ -# +# $MCom: ports/devel/gnome-common/Makefile,v 1.20 2012/10/16 08:47:10 kwm Exp $ PORTNAME= gnome-common -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 3.6.0 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= Common automake macros for GNOME and GNOME 2 +COMMENT= Common automake macros for GNOME 2 and GNOME 3 -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes -USE_GNOME= pkgconfig GNU_CONFIGURE= yes .include <bsd.port.mk> diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo index 0b1846f20689..5ce2e2210154 100644 --- a/devel/gnome-common/distinfo +++ b/devel/gnome-common/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gnome-common-2.28.0.tar.bz2) = dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1 -SIZE (gnome2/gnome-common-2.28.0.tar.bz2) = 151535 +SHA256 (gnome2/gnome-common-3.6.0.tar.xz) = e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95 +SIZE (gnome2/gnome-common-3.6.0.tar.xz) = 143636 diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh deleted file mode 100644 index 5a2716d05123..000000000000 --- a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh +++ /dev/null @@ -1,35 +0,0 @@ -From 1fed4ee7015b89a1ac4c4a535aeb753e820e4970 Mon Sep 17 00:00:00 2001 -From: Xiao-Long Chen <chenxiaolong@cxl.epac.to> -Date: Sun, 29 Apr 2012 17:44:32 +0000 -Subject: Add support for automake 1.12 - -Bug #675093. ---- -diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh -index 9967f89..3179c3f 100644 ---- macros2/gnome-autogen.sh -+++ macros2/gnome-autogen.sh -@@ -325,13 +325,14 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - - case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; -- 1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; -- 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; -- 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; -- 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; -- 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;; -- 1.10*) automake_progs="automake-1.11 automake-1.10" ;; -- 1.11*) automake_progs="automake-1.11" ;; -+ 1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; -+ 1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; -+ 1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; -+ 1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; -+ 1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; -+ 1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;; -+ 1.11*) automake_progs="automake-1.12 automake-1.11" ;; -+ 1.12*) automake_progs="automake-1.12" ;; - esac - version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" --- -cgit v0.9.0.2 diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config deleted file mode 100644 index dc6703919abe..000000000000 --- a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=427432 -https://bugzilla.gnome.org/show_bug.cgi?id=680363 - ---- ./macros2/gnome-autogen.sh.orig 2009-05-27 23:29:07.000000000 +0200 -+++ ./macros2/gnome-autogen.sh 2012-07-24 10:29:13.064750613 +0200 -@@ -77,6 +77,7 @@ - vc_min_version=$4 - vc_source=$5 - vc_status=1 -+ vc_option="--version" - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then -@@ -89,11 +90,19 @@ - else - vc_comparator=">=" - fi -+ # The most reliable way to check pkg-config version is to query the actual -+ # virtual -+ # pkg-config package entry's modversion. This works in all known -+ # implementations. -+ -+ if test "x$vc_package" = "xpkg-config"; then -+ vc_option="--modversion pkg-config" -+ fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " $ECHO_C -- if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then -- vc_actual_version=`$vc_checkprog --version | head -n 1 | \ -+ if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then -+ vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" diff --git a/devel/gnome-common/pkg-plist b/devel/gnome-common/pkg-plist index 081a3d75ee4c..eb75c41be53e 100644 --- a/devel/gnome-common/pkg-plist +++ b/devel/gnome-common/pkg-plist @@ -1,5 +1,6 @@ bin/gnome-autogen.sh bin/gnome-doc-common +share/aclocal/gnome-code-coverage.m4 share/aclocal/gnome-common.m4 share/aclocal/gnome-compiler-flags.m4 %%DATADIR%%/data/omf.make diff --git a/devel/gnome-js-common/Makefile b/devel/gnome-js-common/Makefile index 519873add564..dd3ffc668f78 100644 --- a/devel/gnome-js-common/Makefile +++ b/devel/gnome-js-common/Makefile @@ -21,6 +21,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gnomehack intltool +USE_PKGCONFIG= build PORTDOCS= AUTHORS COPYING INSTALL NEWS README ChangeLog diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 82082129511f..c2b1f5284c3d 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -17,6 +17,7 @@ COMMENT= A preprocessor for making GObjects with inline C USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= glib20 +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 35312296c6e3..2015f253a605 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: gobject-introspection -# Date created: 19 July 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# +# Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/gobject-introspection/Makefile,v 1.39 2011/06/11 19:51:15 mezz Exp $ -# +# $MCom: ports/devel/gobject-introspection/Makefile,v 1.51 2013/02/18 22:07:40 kwm Exp $ PORTNAME= gobject-introspection -PORTVERSION= 0.10.8 -PORTREVISION= 3 +PORTVERSION= 1.34.2 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -16,12 +11,15 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Generate interface introspection data for GObject libraries +# we need cairo otherwise the generated Cairo gir is broken +BUILD_DEPENDS= cairo-trace:${PORTSDIR}/graphics/cairo LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi -USE_BZIP2= yes +USE_XZ= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack glib20 ltverhack +USE_GNOME= gnomehier gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_PYTHON= -2.7 USE_BISON= build USE_GETTEXT= yes @@ -37,15 +35,4 @@ MAKE_ENV= HOME=${WRKDIR} MAN1= g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1 - -post-patch: - @${REINPLACE_CMD} -e "s|'cc'|'${CC:Q:C/[[:space:]]+/', '/g}'|g" \ - ${WRKSRC}/giscanner/sourcescanner.py - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "arm" -BROKEN= Does not compile on arm -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index c1537f1494e8..c8a30b46dd2f 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gobject-introspection-0.10.8.tar.bz2) = 5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e -SIZE (gnome3/gobject-introspection-0.10.8.tar.bz2) = 1024874 +SHA256 (gnome3/gobject-introspection-1.34.2.tar.xz) = bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429 +SIZE (gnome3/gobject-introspection-1.34.2.tar.xz) = 1088768 diff --git a/devel/gobject-introspection/files/patch-Makefile.in b/devel/gobject-introspection/files/patch-Makefile.in index fea86b08b627..d35bf348b2d8 100644 --- a/devel/gobject-introspection/files/patch-Makefile.in +++ b/devel/gobject-introspection/files/patch-Makefile.in @@ -1,18 +1,16 @@ ---- Makefile.in.orig 2010-12-24 00:50:07.000000000 +0100 -+++ Makefile.in 2010-12-24 00:51:39.000000000 +0100 -@@ -864,13 +864,13 @@ +--- Makefile.in.orig 2012-10-02 11:01:03.000000000 +0000 ++++ Makefile.in 2012-10-02 11:02:59.000000000 +0000 +@@ -973,12 +973,11 @@ GLib_2_0_gir_PACKAGES = glib-2.0 GLib_2_0_gir_CFLAGS = \ -I$(GLIB_INCLUDEDIR) \ - -I$(GLIB_LIBDIR)/glib-2.0/include \ -+ -I$(GLIB_INCLUDEDIR)/.. \ -DGETTEXT_PACKAGE=Dummy \ -DGLIB_COMPILATION \ -D__G_I18N_LIB_H__ - GLib_2_0_gir_FILES = \ -- $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ -+ $(GLIB_INCLUDEDIR)/glibconfig.h \ +-GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ ++GLib_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/glibconfig.h \ $(GLIB_INCLUDEDIR)/glib/*.h \ - gir/glib-2.0.c - + $(GLIB_INCLUDEDIR)/gobject/glib-types.h gir/glib-2.0.c \ + $(am__append_4) diff --git a/devel/gobject-introspection/files/patch-configure b/devel/gobject-introspection/files/patch-configure index 7fbbcde68d78..d2838d890f5e 100644 --- a/devel/gobject-introspection/files/patch-configure +++ b/devel/gobject-introspection/files/patch-configure @@ -1,11 +1,29 @@ ---- configure.orig 2011-05-02 17:19:45.000000000 -0500 -+++ configure 2011-05-02 17:19:58.000000000 -0500 -@@ -15983,7 +15983,7 @@ +--- configure.orig 2011-09-23 11:49:54.000000000 +0200 ++++ configure 2011-09-23 11:50:31.000000000 +0200 +@@ -14400,10 +14400,10 @@ $as_echo_n "checking for headers required to compile python extensions... " >&6; } py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` --PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -+PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags` - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +-if test "x$PYTHON_INCLUDES" == x; then +- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" ++if test "x$PYTHON_INCLUDES" = x; then ++ PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags` + if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++ PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags` + fi fi + +@@ -14429,10 +14429,10 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5 + $as_echo_n "checking for libraries required to link against libpython... " >&6; } +-if test "x$PYTHON_LIBS" == x; then ++if test "x$PYTHON_LIBS" = x; then + PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" + fi +-if test "x$PYTHON_LIB_LOC" == x; then ++if test "x$PYTHON_LIB_LOC" = x; then + PYTHON_LIB_LOC="${py_prefix}/lib" + fi + diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist index c39c55aa80c4..2d400ec2ebe0 100644 --- a/devel/gobject-introspection/pkg-plist +++ b/devel/gobject-introspection/pkg-plist @@ -7,7 +7,6 @@ include/gobject-introspection-1.0/gibaseinfo.h include/gobject-introspection-1.0/gicallableinfo.h include/gobject-introspection-1.0/giconstantinfo.h include/gobject-introspection-1.0/gienuminfo.h -include/gobject-introspection-1.0/gierrordomaininfo.h include/gobject-introspection-1.0/gifieldinfo.h include/gobject-introspection-1.0/gifunctioninfo.h include/gobject-introspection-1.0/giinterfaceinfo.h @@ -51,6 +50,9 @@ lib/gobject-introspection/giscanner/annotationmain.pyo lib/gobject-introspection/giscanner/annotationparser.py lib/gobject-introspection/giscanner/annotationparser.pyc lib/gobject-introspection/giscanner/annotationparser.pyo +lib/gobject-introspection/giscanner/annotationpatterns.py +lib/gobject-introspection/giscanner/annotationpatterns.pyc +lib/gobject-introspection/giscanner/annotationpatterns.pyo lib/gobject-introspection/giscanner/ast.py lib/gobject-introspection/giscanner/ast.pyc lib/gobject-introspection/giscanner/ast.pyo @@ -60,9 +62,9 @@ lib/gobject-introspection/giscanner/cachestore.pyo lib/gobject-introspection/giscanner/codegen.py lib/gobject-introspection/giscanner/codegen.pyc lib/gobject-introspection/giscanner/codegen.pyo -lib/gobject-introspection/giscanner/config.py -lib/gobject-introspection/giscanner/config.pyc -lib/gobject-introspection/giscanner/config.pyo +lib/gobject-introspection/giscanner/docmain.py +lib/gobject-introspection/giscanner/docmain.pyc +lib/gobject-introspection/giscanner/docmain.pyo lib/gobject-introspection/giscanner/dumper.py lib/gobject-introspection/giscanner/dumper.pyc lib/gobject-introspection/giscanner/dumper.pyo @@ -84,6 +86,27 @@ lib/gobject-introspection/giscanner/libtoolimporter.pyo lib/gobject-introspection/giscanner/maintransformer.py lib/gobject-introspection/giscanner/maintransformer.pyc lib/gobject-introspection/giscanner/maintransformer.pyo +lib/gobject-introspection/giscanner/mallard-C-class.tmpl +lib/gobject-introspection/giscanner/mallard-C-default.tmpl +lib/gobject-introspection/giscanner/mallard-C-enum.tmpl +lib/gobject-introspection/giscanner/mallard-C-function.tmpl +lib/gobject-introspection/giscanner/mallard-C-namespace.tmpl +lib/gobject-introspection/giscanner/mallard-C-property.tmpl +lib/gobject-introspection/giscanner/mallard-C-record.tmpl +lib/gobject-introspection/giscanner/mallard-C-signal.tmpl +lib/gobject-introspection/giscanner/mallard-C-vfunc.tmpl +lib/gobject-introspection/giscanner/mallard-Python-class.tmpl +lib/gobject-introspection/giscanner/mallard-Python-default.tmpl +lib/gobject-introspection/giscanner/mallard-Python-enum.tmpl +lib/gobject-introspection/giscanner/mallard-Python-function.tmpl +lib/gobject-introspection/giscanner/mallard-Python-namespace.tmpl +lib/gobject-introspection/giscanner/mallard-Python-property.tmpl +lib/gobject-introspection/giscanner/mallard-Python-record.tmpl +lib/gobject-introspection/giscanner/mallard-Python-signal.tmpl +lib/gobject-introspection/giscanner/mallard-Python-vfunc.tmpl +lib/gobject-introspection/giscanner/mallardwriter.py +lib/gobject-introspection/giscanner/mallardwriter.pyc +lib/gobject-introspection/giscanner/mallardwriter.pyo lib/gobject-introspection/giscanner/message.py lib/gobject-introspection/giscanner/message.pyc lib/gobject-introspection/giscanner/message.pyo @@ -148,7 +171,6 @@ share/gtk-doc/html/gi/gi-GIBaseInfo.html share/gtk-doc/html/gi/gi-GICallableInfo.html share/gtk-doc/html/gi/gi-GIConstantInfo.html share/gtk-doc/html/gi/gi-GIEnumInfo.html -share/gtk-doc/html/gi/gi-GIErrorDomainInfo.html share/gtk-doc/html/gi/gi-GIFieldInfo.html share/gtk-doc/html/gi/gi-GIFunctionInfo.html share/gtk-doc/html/gi/gi-GIInterfaceInfo.html @@ -161,6 +183,7 @@ share/gtk-doc/html/gi/gi-GITypeInfo.html share/gtk-doc/html/gi/gi-GIUnionInfo.html share/gtk-doc/html/gi/gi-GIVFuncInfo.html share/gtk-doc/html/gi/gi-ffi.html +share/gtk-doc/html/gi/gi-gierrordomaininfo.html share/gtk-doc/html/gi/gi-gir-reference.html share/gtk-doc/html/gi/gi-gir.html share/gtk-doc/html/gi/gi-girepository.html @@ -171,7 +194,6 @@ share/gtk-doc/html/gi/gi-overview.html share/gtk-doc/html/gi/gi-repository-structs.html share/gtk-doc/html/gi/gi-struct-hierarchy.html share/gtk-doc/html/gi/gi-typelib.html -share/gtk-doc/html/gi/gi.devhelp share/gtk-doc/html/gi/gi.devhelp2 share/gtk-doc/html/gi/girepository.html share/gtk-doc/html/gi/glib.html @@ -188,8 +210,6 @@ share/gtk-doc/html/gi/up.png @dirrmtry share/gtk-doc @dirrm share/gobject-introspection-1.0/tests @dirrm share/gobject-introspection-1.0 -@dirrmtry share/gir-1.0 -@dirrmtry lib/girepository-1.0 @dirrm lib/gobject-introspection/giscanner @dirrm lib/gobject-introspection @dirrm include/gobject-introspection-1.0 diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile index c46e2c53f974..96aeacf2e02e 100644 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gsettings-desktop-schemas -# Date created: 14 Aug 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/gsettings-desktop-schemas/Makefile,v 1.13 2011/04/27 21:18:30 kwm Exp $ -# PORTNAME= gsettings-desktop-schemas PORTVERSION= 3.0.1 @@ -24,6 +20,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_PERL5_BUILD= yes USE_GNOME= gnomehack intltool glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile index 9c7f905fd285..34e14d5e3319 100644 --- a/devel/guikachu/Makefile +++ b/devel/guikachu/Makefile @@ -33,4 +33,8 @@ GCONF_SCHEMAS= guikachu-form-editor.schemas guikachu-interface.schemas \ # -e '/(UPDATE_MIME)/s|(mimedir)|(prefix)/share/mime|' \ # ${WRKSRC}/data/Makefile.in +post-patch: + @${REINPLACE_CMD} -e 's|glib/gwin32.h>|glib.h>|g' \ + ${WRKSRC}/src/ui.cc + .include <bsd.port.mk> diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 4d93e890610b..0e06ee0bbfce 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -1,24 +1,23 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.70 2011/01/31 19:06:42 kwm Exp $ -# +# $MCom: ports/devel/gvfs/Makefile,v 1.85 2012/12/14 16:09:28 kwm Exp $ PORTNAME= gvfs -PORTVERSION= 1.6.6 -PORTREVISION= 3 +PORTVERSION= 1.12.3 CATEGORIES= devel gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME virtual file system -LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ - soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ +LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ + soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \ + gcrypt:${PORTSDIR}/security/libgcrypt \ gnome-keyring:${PORTSDIR}/security/libgnome-keyring -USE_BZIP2= yes -USE_GNOME= glib20 gnomehack gnomeprefix intlhack gconf2 +USE_XZ= yes +USE_GNOME= glib20 gnomehack gnomeprefix intlhack intltool USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes @@ -27,16 +26,18 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-obexftp \ --disable-afc -OPTIONS= FUSE "Enable fuse" off \ - AVAHI "Enable AVAHI" on \ - SAMBA "Enable Samba" on \ - GPHOTO2 "Enable Gphoto 2 camera support (required HAL)" on \ - CDDA "Enable CDDA (required HAL)" on \ - HAL "Enable HAL" on -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= AVAHI SAMBA GPHOTO2 CDDA HAL FUSE +OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL +CDDA_DESC= CDDA (enables HAL) +GPHOTO2_DESC= Gphoto 2 camera support (enables HAL) +SAMBA_DESC= Samba support -.if defined(WITH_FUSE) +GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MFUSE} USES+= fuse PLIST_SUB+= FUSE="" .else @@ -44,40 +45,42 @@ CONFIGURE_ARGS+= --disable-fuse PLIST_SUB+= FUSE="@comment " .endif -.if defined(WITH_SAMBA) -LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +.if ${PORT_OPTIONS:MSAMBA} +LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient +GLIB_SCHEMAS+= org.gnome.system.smb.gschema.xml PLIST_SUB+= SMB="" .else CONFIGURE_ARGS+= --disable-samba PLIST_SUB+= SMB="@comment " .endif -.if defined(WITH_CDDA) && !defined(WITHOUT_HAL) -LIB_DEPENDS+= cdio_paranoia.1:${PORTSDIR}/sysutils/libcdio +.if ${PORT_OPTIONS:MCDDA} +LIB_DEPENDS+= cdio_paranoia:${PORTSDIR}/sysutils/libcdio PLIST_SUB+= CDDA="" .else CONFIGURE_ARGS+= --disable-cdda PLIST_SUB+= CDDA="@comment " .endif -.if defined(WITH_GPHOTO2) && !defined(WITHOUT_HAL) -LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 +.if ${PORT_OPTIONS:MGPHOTO2} +LIB_DEPENDS+= gphoto2:${PORTSDIR}/graphics/libgphoto2 PLIST_SUB+= GPHOTO2="" .else CONFIGURE_ARGS+= --disable-gphoto2 PLIST_SUB+= GPHOTO2="@comment " .endif -.if defined(WITH_AVAHI) -LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app +.if ${PORT_OPTIONS:MAVAHI} +LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app +GLIB_SCHEMAS+= org.gnome.system.dns_sd.gschema.xml PLIST_SUB+= AVAHI="" .else CONFIGURE_ARGS+=--disable-avahi PLIST_SUB+= AVAHI="@comment " .endif -.if defined(WITH_HAL) -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +.if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA} +LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount PLIST_SUB+= HAL="" .else @@ -85,8 +88,4 @@ CONFIGURE_ARGS+=--disable-hal PLIST_SUB+= HAL="@comment " .endif -post-patch: - @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ - ${WRKSRC}/gconf/Makefile.in - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo index 5cd6abd7ebc4..b58710e7609a 100644 --- a/devel/gvfs/distinfo +++ b/devel/gvfs/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gvfs-1.6.6.tar.bz2) = 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd -SIZE (gnome2/gvfs-1.6.6.tar.bz2) = 1387796 +SHA256 (gnome3/gvfs-1.12.3.tar.xz) = 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2 +SIZE (gnome3/gvfs-1.12.3.tar.xz) = 1361968 diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in index ffbfd5878dc1..1470cbce0ef6 100644 --- a/devel/gvfs/files/patch-client_Makefile.in +++ b/devel/gvfs/files/patch-client_Makefile.in @@ -1,11 +1,11 @@ ---- client/Makefile.in.orig 2008-02-11 20:05:14.000000000 -0500 -+++ client/Makefile.in 2008-02-11 20:05:42.000000000 -0500 -@@ -152,7 +152,7 @@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ +--- client/Makefile.in.orig 2010-12-26 18:25:46.000000000 +0100 ++++ client/Makefile.in 2010-12-26 18:26:12.000000000 +0100 +@@ -196,7 +196,7 @@ + EXPAT_LIBS = @EXPAT_LIBS@ + FGREP = @FGREP@ FUSE_CFLAGS = @FUSE_CFLAGS@ -FUSE_LIBS = @FUSE_LIBS@ +FUSE_LIBS = @FUSE_LIBS@ -lfuse - GCONF_CFLAGS = @GCONF_CFLAGS@ - GCONF_LIBS = @GCONF_LIBS@ + GDU_CFLAGS = @GDU_CFLAGS@ + GDU_LIBS = @GDU_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c index 2ea9b3330625..0d9c69189b48 100644 --- a/devel/gvfs/files/patch-client_gvfsfusedaemon.c +++ b/devel/gvfs/files/patch-client_gvfsfusedaemon.c @@ -1,17 +1,7 @@ ---- client/gvfsfusedaemon.c.orig 2010-11-12 16:42:49.000000000 +0100 -+++ client/gvfsfusedaemon.c 2010-11-21 18:23:36.000000000 +0100 -@@ -26,7 +26,9 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> -+#ifdef __linux__ - #include <sys/vfs.h> -+#endif - #include <sys/time.h> - #include <unistd.h> - #include <stdlib.h> -@@ -2340,7 +2342,9 @@ - subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL); +--- client/gvfsfusedaemon.c.orig 2012-05-15 20:01:49.000000000 +0200 ++++ client/gvfsfusedaemon.c 2012-05-31 14:00:26.000000000 +0200 +@@ -2361,7 +2361,9 @@ + subthread = g_thread_new ("gvfs-fuse-sub", (GThreadFunc) subthread_main, NULL); /* Indicate O_TRUNC support for open() */ +#ifdef FUSE_CAP_ATOMIC_O_TRUNC diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index bbc4ad1a7c89..5463953eabf4 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -3,6 +3,7 @@ bin/gvfs-copy bin/gvfs-info bin/gvfs-less bin/gvfs-ls +bin/gvfs-mime bin/gvfs-mkdir bin/gvfs-monitor-dir bin/gvfs-monitor-file @@ -18,8 +19,6 @@ bin/gvfs-tree etc/profile.d/gvfs-bash-completion.sh include/gvfs-client/gvfs/gvfsurimapper.h include/gvfs-client/gvfs/gvfsuriutils.h -lib/gio/modules/libgiogconf.la -lib/gio/modules/libgiogconf.so lib/gio/modules/libgioremote-volume-monitor.la lib/gio/modules/libgioremote-volume-monitor.so lib/gio/modules/libgvfsdbus.la @@ -30,6 +29,8 @@ lib/gio/modules/libgvfsdbus.so lib/libgvfscommon.la lib/libgvfscommon.so lib/libgvfscommon.so.0 +libexec/gvfsd-afp +libexec/gvfsd-afp-browse %%FUSE%%libexec/gvfs-fuse-daemon %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor %%HAL%%libexec/gvfs-hal-volume-monitor @@ -50,32 +51,37 @@ libexec/gvfsd-sftp %%SMB%%libexec/gvfsd-smb %%SMB%%libexec/gvfsd-smb-browse libexec/gvfsd-trash +%%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert +%%SMB%%share/GConf/gsettings/gvfs-smb.convert share/dbus-1/services/gvfs-daemon.service share/dbus-1/services/gvfs-metadata.service %%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service %%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service -share/gvfs/mounts/archive.mount -share/gvfs/mounts/burn.mount -%%CDDA%%share/gvfs/mounts/cdda.mount -share/gvfs/mounts/computer.mount -share/gvfs/mounts/dav.mount -%%AVAHI%%share/gvfs/mounts/dav+sd.mount -%%AVAHI%%share/gvfs/mounts/dns-sd.mount -share/gvfs/mounts/ftp.mount -%%GPHOTO2%%share/gvfs/mounts/gphoto2.mount -share/gvfs/mounts/http.mount -share/gvfs/mounts/localtest.mount -share/gvfs/mounts/network.mount -share/gvfs/mounts/sftp.mount -%%SMB%%share/gvfs/mounts/smb-browse.mount -%%SMB%%share/gvfs/mounts/smb.mount -share/gvfs/mounts/trash.mount -%%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor -%%HAL%%share/gvfs/remote-volume-monitors/hal.monitor +share/gvfs/mounts/afp-browse.mount +share/gvfs/mounts/afp.mount +%%DATADIR%%/mounts/archive.mount +%%DATADIR%%/mounts/burn.mount +%%CDDA%%%%DATADIR%%/mounts/cdda.mount +%%DATADIR%%/mounts/computer.mount +%%DATADIR%%/mounts/dav.mount +%%AVAHI%%%%DATADIR%%/mounts/dav+sd.mount +%%AVAHI%%%%DATADIR%%/mounts/dns-sd.mount +%%DATADIR%%/mounts/ftp.mount +%%GPHOTO2%%%%DATADIR%%/mounts/gphoto2.mount +%%DATADIR%%/mounts/http.mount +%%DATADIR%%/mounts/localtest.mount +%%DATADIR%%/mounts/network.mount +%%DATADIR%%/mounts/sftp.mount +%%SMB%%%%DATADIR%%/mounts/smb-browse.mount +%%SMB%%%%DATADIR%%/mounts/smb.mount +%%DATADIR%%/mounts/trash.mount +%%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor +%%HAL%%%%DATADIR%%/remote-volume-monitors/hal.monitor share/locale/af/LC_MESSAGES/gvfs.mo share/locale/ar/LC_MESSAGES/gvfs.mo share/locale/as/LC_MESSAGES/gvfs.mo share/locale/ast/LC_MESSAGES/gvfs.mo +share/locale/be/LC_MESSAGES/gvfs.mo share/locale/be@latin/LC_MESSAGES/gvfs.mo share/locale/bg/LC_MESSAGES/gvfs.mo share/locale/bn/LC_MESSAGES/gvfs.mo @@ -88,9 +94,11 @@ share/locale/de/LC_MESSAGES/gvfs.mo share/locale/el/LC_MESSAGES/gvfs.mo share/locale/en@shaw/LC_MESSAGES/gvfs.mo share/locale/en_GB/LC_MESSAGES/gvfs.mo +share/locale/eo/LC_MESSAGES/gvfs.mo share/locale/es/LC_MESSAGES/gvfs.mo share/locale/et/LC_MESSAGES/gvfs.mo share/locale/eu/LC_MESSAGES/gvfs.mo +share/locale/fa/LC_MESSAGES/gvfs.mo share/locale/fi/LC_MESSAGES/gvfs.mo share/locale/fr/LC_MESSAGES/gvfs.mo share/locale/ga/LC_MESSAGES/gvfs.mo @@ -139,9 +147,9 @@ share/locale/vi/LC_MESSAGES/gvfs.mo share/locale/zh_CN/LC_MESSAGES/gvfs.mo share/locale/zh_HK/LC_MESSAGES/gvfs.mo share/locale/zh_TW/LC_MESSAGES/gvfs.mo -@dirrm share/gvfs/remote-volume-monitors -@dirrm share/gvfs/mounts -@dirrm share/gvfs +@dirrm %%DATADIR%%/remote-volume-monitors +@dirrm %%DATADIR%%/mounts +@dirrm %%DATADIR%% @dirrm include/gvfs-client/gvfs @dirrm include/gvfs-client @dirrmtry etc/profile.d diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile index feb6d0a883c8..f9b843a2ab5e 100644 --- a/devel/hs-gio/Makefile +++ b/devel/hs-gio/Makefile @@ -14,6 +14,7 @@ FILE_LICENSE= COPYING CABAL_SETUP= Setup.hs USE_CABAL= glib>=0.12.0 mtl +USE_PKGCONFIG= build .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile index b9d8af9f6b4c..266282782ce8 100644 --- a/devel/hs-glib/Makefile +++ b/devel/hs-glib/Makefile @@ -15,6 +15,7 @@ CABAL_SETUP= Setup.hs USE_CABAL= gtk2hs-buildtools USE_GNOME= glib20 +USE_PKGCONFIG= build .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile index acc1af85405b..f77eb3b36ee7 100644 --- a/devel/json-glib/Makefile +++ b/devel/json-glib/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/json-glib/Makefile,v 1.17 2011/06/15 13:34:36 kwm Exp $ +# $MCom: ports/devel/json-glib/Makefile,v 1.22 2012/09/01 23:02:09 mezz Exp $ # PORTNAME= json-glib -PORTVERSION= 0.12.6 +PORTVERSION= 0.14.2 CATEGORIES= devel MASTER_SITES= GNOME @@ -20,6 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i USE_GMAKE= yes USE_XZ= yes USE_GNOME= glib20 gnomehack gnomeprefix ltverhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo index 627b0ca54574..7989ecafc6cb 100644 --- a/devel/json-glib/distinfo +++ b/devel/json-glib/distinfo @@ -1,2 +1,2 @@ -SHA256 (json-glib-0.12.6.tar.xz) = 4f670fc356e7a30121ade956e93236986952bb2601d6678e94eab7d87c8866ce -SIZE (json-glib-0.12.6.tar.xz) = 369036 +SHA256 (json-glib-0.14.2.tar.xz) = b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7 +SIZE (json-glib-0.14.2.tar.xz) = 445396 diff --git a/devel/json-glib/pkg-plist b/devel/json-glib/pkg-plist index 4a0bcfbde4f7..ce25133b80fe 100644 --- a/devel/json-glib/pkg-plist +++ b/devel/json-glib/pkg-plist @@ -3,7 +3,9 @@ include/json-glib-1.0/json-glib/json-enum-types.h include/json-glib-1.0/json-glib/json-generator.h include/json-glib-1.0/json-glib/json-glib.h include/json-glib-1.0/json-glib/json-gobject.h +include/json-glib-1.0/json-glib/json-gvariant.h include/json-glib-1.0/json-glib/json-parser.h +include/json-glib-1.0/json-glib/json-path.h include/json-glib-1.0/json-glib/json-reader.h include/json-glib-1.0/json-glib/json-types.h include/json-glib-1.0/json-glib/json-version.h @@ -16,6 +18,7 @@ libdata/pkgconfig/json-glib-1.0.pc %%DOCSDIR%%/JsonBuilder.html %%DOCSDIR%%/JsonGenerator.html %%DOCSDIR%%/JsonParser.html +%%DOCSDIR%%/JsonPath.html %%DOCSDIR%%/JsonReader.html %%DOCSDIR%%/annotation-glossary.html %%DOCSDIR%%/ch01.html @@ -32,16 +35,17 @@ libdata/pkgconfig/json-glib-1.0.pc %%DOCSDIR%%/ix05.html %%DOCSDIR%%/ix06.html %%DOCSDIR%%/ix07.html +%%DOCSDIR%%/ix08.html %%DOCSDIR%%/json-advanced.html %%DOCSDIR%%/json-base.html %%DOCSDIR%%/json-glib-Boxed-Types-Serialization.html %%DOCSDIR%%/json-glib-GObject-Serialization.html %%DOCSDIR%%/json-glib-JSON-Array.html +%%DOCSDIR%%/json-glib-JSON-GVariant-Integration.html %%DOCSDIR%%/json-glib-JSON-Node.html %%DOCSDIR%%/json-glib-JSON-Object.html %%DOCSDIR%%/json-glib-Serializable-Interface.html %%DOCSDIR%%/json-glib-Versioning-information.html -%%DOCSDIR%%/json-glib.devhelp %%DOCSDIR%%/json-glib.devhelp2 %%DOCSDIR%%/json-glib.html %%DOCSDIR%%/json-streams.html @@ -52,6 +56,7 @@ libdata/pkgconfig/json-glib-1.0.pc %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png share/gir-1.0/Json-1.0.gir +share/locale/pl/LC_MESSAGES/json-glib-1.0.mo @dirrm %%DOCSDIR%% @dirrm include/json-glib-1.0/json-glib @dirrm include/json-glib-1.0 diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile index 832c9f3119b2..bf587de16bcf 100644 --- a/devel/libIDL/Makefile +++ b/devel/libIDL/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libIDL -# Date Created: 12 February 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/libIDL/Makefile,v 1.7 2010/04/02 17:27:42 kwm Exp $ -# PORTNAME= libIDL PORTVERSION= 0.8.14 @@ -21,6 +17,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_BISON= build USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile index aa5c1f5bd444..192405a79cd6 100644 --- a/devel/libassetml/Makefile +++ b/devel/libassetml/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libassetml -# Date created: 2 Dec 2003 -# Whom: Alexander Nedotsukov <bland@FreeBSD.org> -# +# Created by: Alexander Nedotsukov <bland@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libassetml PORTVERSION= 1.2.1 @@ -14,12 +10,13 @@ MASTER_SITES= SF/ofset/${PORTNAME}/${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Devel Library to share image and audio files between projects -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html +LIB_DEPENDS= popt:${PORTSDIR}/devel/popt USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_GNOME= gnomehack lthack gnomeprefix glib20 libxml2 pkgconfig +USE_GNOME= gnomehack lthack gnomeprefix glib20 libxml2 +USE_PKGCONFIG= build USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 0742d8a46ee8..a5967f0ade47 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libbonobo -# Date Created: 14 February 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/libbonobo/Makefile,v 1.84 2010/09/26 20:57:33 kwm Exp $ -# PORTNAME= libbonobo PORTVERSION= 2.32.0 @@ -29,6 +25,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_PERL5= yes USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack +USE_PKGCONFIG= build CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/libg19draw/Makefile b/devel/libg19draw/Makefile index c020484adfe8..805798b3050d 100644 --- a/devel/libg19draw/Makefile +++ b/devel/libg19draw/Makefile @@ -20,6 +20,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -pthread" USE_LDCONFIG= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build PLIST_FILES= include/libg19draw.h \ lib/libg19draw.a \ diff --git a/devel/libgalago/Makefile b/devel/libgalago/Makefile index b056f7ca0546..bd6fc6d8f25f 100644 --- a/devel/libgalago/Makefile +++ b/devel/libgalago/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: libgalago -# Date created: Apr 27 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libgalago PORTVERSION= 0.5.2 @@ -19,7 +14,7 @@ LIB_PC_DEPENDS= dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_GETTEXT= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile index e44734eddb93..70dd8e3cf831 100644 --- a/devel/libgee/Makefile +++ b/devel/libgee/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: libgee -# Date created: 2010-03-14 -# Whom: Frank Steinborn <steinex@nognu.de> -# +# Created by: Frank Steinborn <steinex@nognu.de> # $FreeBSD$ -# +# $MCom: ports/devel/libgee/Makefile,v 1.13 2012/10/14 20:47:22 kwm Exp $ PORTNAME= libgee -PORTVERSION= 0.6.2.1 +PORTVERSION= 0.8.5 CATEGORIES= devel MASTER_SITES= GNOME @@ -19,7 +16,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-introspection=yes USE_GMAKE= yes USE_XZ= yes -USE_GNOME= glib20 gnomehack +USE_GNOME= glib20 gnomehier gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/libgee/distinfo b/devel/libgee/distinfo index c008ac21b2df..3ab1495fb632 100644 --- a/devel/libgee/distinfo +++ b/devel/libgee/distinfo @@ -1,2 +1,2 @@ -SHA256 (libgee-0.6.2.1.tar.xz) = 478f7daebe8369ad72bf83431d953db772af6865ff3aa21bf75bf6730f561389 -SIZE (libgee-0.6.2.1.tar.xz) = 400736 +SHA256 (libgee-0.8.5.tar.xz) = f1349ca82dc5da49c98ce14020f1ed7bd41d8826d4c72526d1a46f82d99e5c09 +SIZE (libgee-0.8.5.tar.xz) = 583804 diff --git a/devel/libgee/files/patch-gee_Makefile.in b/devel/libgee/files/patch-gee_Makefile.in deleted file mode 100644 index 6a506df72736..000000000000 --- a/devel/libgee/files/patch-gee_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gee/Makefile.in.orig 2010-08-08 13:36:58.000000000 +0200 -+++ gee/Makefile.in 2010-08-08 13:37:42.000000000 +0200 -@@ -872,7 +872,7 @@ - touch $@ - - @HAVE_INTROSPECTION_TRUE@Gee-1.0.typelib: Gee-1.0.gir --@HAVE_INTROSPECTION_TRUE@ @INTROSPECTION_COMPILER@ --shared-library=libgee -o $@ $^ -+@HAVE_INTROSPECTION_TRUE@ @INTROSPECTION_COMPILER@ --shared-library=libgee Gee-1.0.gir -o $@ $^ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/devel/libgee/pkg-plist b/devel/libgee/pkg-plist index 970a894ce808..262d9084dae1 100644 --- a/devel/libgee/pkg-plist +++ b/devel/libgee/pkg-plist @@ -1,13 +1,9 @@ -include/gee-1.0/gee.h -lib/libgee.la -lib/libgee.so -lib/libgee.so.2 -lib/girepository-1.0/Gee-1.0.typelib -libdata/pkgconfig/gee-1.0.pc -share/gir-1.0/Gee-1.0.gir -share/vala/vapi/gee-1.0.vapi -@dirrm share/vala/vapi -@dirrm share/vala -@dirrmtry share/gir-1.0 -@dirrmtry lib/girepository-1.0 -@dirrm include/gee-1.0 +include/gee-0.8/gee.h +lib/libgee-0.8.la +lib/libgee-0.8.so +lib/libgee-0.8.so.2 +lib/girepository-1.0/Gee-0.8.typelib +libdata/pkgconfig/gee-0.8.pc +share/gir-1.0/Gee-0.8.gir +share/vala/vapi/gee-0.8.vapi +@dirrm include/gee-0.8 diff --git a/devel/libgee06/Makefile b/devel/libgee06/Makefile new file mode 100644 index 000000000000..9c53f15af852 --- /dev/null +++ b/devel/libgee06/Makefile @@ -0,0 +1,24 @@ +# Created by: Frank Steinborn <steinex@nognu.de> +# $FreeBSD$ +# $MCom: ports/devel/libgee/Makefile,v 1.13 2012/10/14 20:47:22 kwm Exp $ + +PORTNAME= libgee +PORTVERSION= 0.6.8 +CATEGORIES= devel +MASTER_SITES= GNOME + +MAINTAINER= kwm@FreeBSD.org +COMMENT= GObject collection library + +BUILD_DEPENDS= gobject-introspection>=0.9.0:${PORTSDIR}/devel/gobject-introspection + +LATEST_LINK= ${PORTNAME}06 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-introspection=yes +USE_GMAKE= yes +USE_XZ= yes +USE_GNOME= glib20 gnomehier gnomehack +USE_PKGCONFIG= build +USE_LDCONFIG= yes + +.include <bsd.port.mk> diff --git a/devel/libgee06/distinfo b/devel/libgee06/distinfo new file mode 100644 index 000000000000..d7aa87d0f98f --- /dev/null +++ b/devel/libgee06/distinfo @@ -0,0 +1,2 @@ +SHA256 (libgee-0.6.8.tar.xz) = a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3 +SIZE (libgee-0.6.8.tar.xz) = 443060 diff --git a/devel/libgee06/pkg-descr b/devel/libgee06/pkg-descr new file mode 100644 index 000000000000..7123629509b3 --- /dev/null +++ b/devel/libgee06/pkg-descr @@ -0,0 +1,4 @@ +Libgee is a collection library providing GObject-based +interfaces and classes for commonly used data structures. + +WWW: http://live.gnome.org/Libgee diff --git a/devel/libgee06/pkg-plist b/devel/libgee06/pkg-plist new file mode 100644 index 000000000000..3a0a5f6368da --- /dev/null +++ b/devel/libgee06/pkg-plist @@ -0,0 +1,9 @@ +include/gee-1.0/gee.h +lib/libgee.la +lib/libgee.so +lib/libgee.so.2 +lib/girepository-1.0/Gee-1.0.typelib +libdata/pkgconfig/gee-1.0.pc +share/gir-1.0/Gee-1.0.gir +share/vala/vapi/gee-1.0.vapi +@dirrm include/gee-1.0 diff --git a/devel/libopensync/files/patch-opensync__opensync_list.c b/devel/libopensync/files/patch-opensync__opensync_list.c new file mode 100644 index 000000000000..620480ccffdb --- /dev/null +++ b/devel/libopensync/files/patch-opensync__opensync_list.c @@ -0,0 +1,11 @@ +--- opensync/opensync_list.c.orig 2013-02-05 21:45:11.000000000 +0000 ++++ opensync/opensync_list.c 2013-02-05 21:45:22.000000000 +0000 +@@ -30,7 +30,7 @@ + * MT safe + */ + +-#include <glib/gmem.h> ++#include <glib.h> + #include "opensync_list.h" + #include "opensync_internals.h" + diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile index ab2a8f6edc3b..47e5d355abfd 100644 --- a/devel/librcc/Makefile +++ b/devel/librcc/Makefile @@ -90,4 +90,8 @@ pre-everything:: .endif .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/external/rccexternal.c + .include <bsd.port.mk> diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile index 8bfb56ba5452..431b7d3b278e 100644 --- a/devel/libsigc++20/Makefile +++ b/devel/libsigc++20/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libsigc++2 -# Date created: 14 Feb 2004 -# Whom: Alexander Nedotsukov <bland@FreeBSD.org> -# +# Created by: Alexander Nedotsukov <bland@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/libsigc++20/Makefile,v 1.17 2011/07/25 09:19:14 kwm Exp $ -# PORTNAME= libsigc++ PORTVERSION= 2.2.10 @@ -22,7 +18,7 @@ USE_GMAKE= yes USE_PERL5_BUILD=yes LATEST_LINK= libsigc++20 USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes PLIST_SUB= VERSION="2.0" API_VERSION="2.0" diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index ed37b0d69ae3..7c097bad6d50 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: libsoup -# Date created: 12 March 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.106 2011/07/28 19:00:08 kwm Exp $ -# +# $MCom: ports/devel/libsoup/Makefile,v 1.116 2013/01/15 02:25:57 kwm Exp $ PORTNAME= libsoup -PORTVERSION= 2.34.3 +PORTVERSION= 2.40.3 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -16,31 +12,29 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A SOAP (Simple Object Access Protocol) implementation in C -USE_XZ= yes +BUILD_DEPENDS= glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking +LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt +RUN_DEPENDS= glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking -BUILD_DEPENDS= glib-networking>=2.28.4:${PORTSDIR}/net/glib-networking -LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt -RUN_DEPENDS= glib-networking>=2.28.4:${PORTSDIR}/net/glib-networking +USE_XZ= yes .if !defined(REFERENCE_PORT) -USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack +USE_GETTEXT= yes +USE_GNOME= gnomehier gnomehack glib20 libxml2 ltverhack referencehack \ + intltool USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="2.4" -.include <bsd.port.pre.mk> - .if defined(SOUP_SLAVE) -LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup \ - gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 +USE_SQLITE= yes +LIB_DEPENDS+= soup-2.4:${PORTSDIR}/devel/libsoup \ + gnome-keyring:${PORTSDIR}/security/libgnome-keyring CONFIGURE_ARGS+=--with-gnome .else BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection @@ -73,6 +67,6 @@ post-install: ${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index 8849804ccbe4..4d489f751be9 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/libsoup-2.34.3.tar.xz) = c43f8865a9f7016c618b481bea3dd9ea65d9200685d4a94cddc54f8663704a1c -SIZE (gnome2/libsoup-2.34.3.tar.xz) = 595916 +SHA256 (gnome2/libsoup-2.40.3.tar.xz) = 82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9 +SIZE (gnome2/libsoup-2.40.3.tar.xz) = 709124 diff --git a/devel/libsoup/files/patch-tests_coding-test.c b/devel/libsoup/files/patch-tests_coding-test.c new file mode 100644 index 000000000000..899c799bc71d --- /dev/null +++ b/devel/libsoup/files/patch-tests_coding-test.c @@ -0,0 +1,11 @@ +--- tests/coding-test.c.orig 2012-06-29 12:07:41.000000000 +0200 ++++ tests/coding-test.c 2012-06-29 12:47:16.000000000 +0200 +@@ -66,7 +66,7 @@ + } + } + if (file_path && encoding) { +- file = g_strdup_printf (file_path, path); ++ file = g_strdup_printf ("%s", path); + if (g_file_test (file, G_FILE_TEST_EXISTS)) { + soup_message_headers_append (msg->response_headers, + "Content-Encoding", diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 8b0a55444603..83bdbba6e77f 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -21,6 +21,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-message.h include/libsoup-%%VERSION%%/libsoup/soup-method.h include/libsoup-%%VERSION%%/libsoup/soup-misc.h include/libsoup-%%VERSION%%/libsoup/soup-multipart.h +include/libsoup-%%VERSION%%/libsoup/soup-multipart-input-stream.h include/libsoup-%%VERSION%%/libsoup/soup-password-manager.h include/libsoup-%%VERSION%%/libsoup/soup-portability.h include/libsoup-%%VERSION%%/libsoup/soup-proxy-resolver.h @@ -38,6 +39,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h include/libsoup-%%VERSION%%/libsoup/soup-session.h include/libsoup-%%VERSION%%/libsoup/soup-socket.h include/libsoup-%%VERSION%%/libsoup/soup-status.h +include/libsoup-%%VERSION%%/libsoup/soup-tld.h include/libsoup-%%VERSION%%/libsoup/soup-types.h include/libsoup-%%VERSION%%/libsoup/soup-uri.h include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h @@ -50,7 +52,131 @@ lib/libsoup-%%VERSION%%.so lib/libsoup-%%VERSION%%.so.1 libdata/pkgconfig/libsoup-%%VERSION%%.pc share/gir-1.0/Soup-%%VERSION%%.gir +share/gtk-doc/html/libsoup-%%VERSION%%/SoupAddress.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuth.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomain.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainBasic.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainDigest.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupCache.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentDecoder.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentSniffer.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookie.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJar.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarText.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupLogger.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessage.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageBody.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageHeaders.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipart.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipartInputStream.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyResolverDefault.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyURIResolver.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequest.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestData.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestFile.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestHTTP.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupServer.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupSession.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionAsync.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionFeature.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionSync.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupSocket.html +share/gtk-doc/html/libsoup-%%VERSION%%/SoupURI.html +share/gtk-doc/html/libsoup-%%VERSION%%/annotation-glossary.html +share/gtk-doc/html/libsoup-%%VERSION%%/ch01.html +share/gtk-doc/html/libsoup-%%VERSION%%/ch02.html +share/gtk-doc/html/libsoup-%%VERSION%%/ch03.html +share/gtk-doc/html/libsoup-%%VERSION%%/ch04.html +share/gtk-doc/html/libsoup-%%VERSION%%/ch05.html +share/gtk-doc/html/libsoup-%%VERSION%%/ch06.html +share/gtk-doc/html/libsoup-%%VERSION%%/ch07.html +share/gtk-doc/html/libsoup-%%VERSION%%/home.png +share/gtk-doc/html/libsoup-%%VERSION%%/index.html +share/gtk-doc/html/libsoup-%%VERSION%%/index.sgml +share/gtk-doc/html/libsoup-%%VERSION%%/ix01.html +share/gtk-doc/html/libsoup-%%VERSION%%/left.png +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-GValue-Support.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-HTML-Form-Support.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Soup-Miscellaneous-Utilities.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupCookieJarSqlite.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupRequester.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Top-Level-Domain-utils.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-XMLRPC-Support.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-gnome-features.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-method.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-status.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%.devhelp2 +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-build-howto.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-client-howto.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-howto.html +share/gtk-doc/html/libsoup-%%VERSION%%/right.png +share/gtk-doc/html/libsoup-%%VERSION%%/style.css +share/gtk-doc/html/libsoup-%%VERSION%%/up.png +share/locale/as/LC_MESSAGES/libsoup.mo +share/locale/be/LC_MESSAGES/libsoup.mo +share/locale/bg/LC_MESSAGES/libsoup.mo +share/locale/bn_IN/LC_MESSAGES/libsoup.mo +share/locale/ca/LC_MESSAGES/libsoup.mo +share/locale/ca@valencia/LC_MESSAGES/libsoup.mo +share/locale/cs/LC_MESSAGES/libsoup.mo +share/locale/da/LC_MESSAGES/libsoup.mo +share/locale/de/LC_MESSAGES/libsoup.mo +share/locale/el/LC_MESSAGES/libsoup.mo +share/locale/en_GB/LC_MESSAGES/libsoup.mo +share/locale/eo/LC_MESSAGES/libsoup.mo +share/locale/es/LC_MESSAGES/libsoup.mo +share/locale/et/LC_MESSAGES/libsoup.mo +share/locale/fa/LC_MESSAGES/libsoup.mo +share/locale/fr/LC_MESSAGES/libsoup.mo +share/locale/fur/LC_MESSAGES/libsoup.mo +share/locale/gl/LC_MESSAGES/libsoup.mo +share/locale/gu/LC_MESSAGES/libsoup.mo +share/locale/he/LC_MESSAGES/libsoup.mo +share/locale/hi/LC_MESSAGES/libsoup.mo +share/locale/hu/LC_MESSAGES/libsoup.mo +share/locale/id/LC_MESSAGES/libsoup.mo +share/locale/it/LC_MESSAGES/libsoup.mo +share/locale/ja/LC_MESSAGES/libsoup.mo +share/locale/kn/LC_MESSAGES/libsoup.mo +share/locale/ko/LC_MESSAGES/libsoup.mo +share/locale/lt/LC_MESSAGES/libsoup.mo +share/locale/lv/LC_MESSAGES/libsoup.mo +share/locale/ml/LC_MESSAGES/libsoup.mo +share/locale/mr/LC_MESSAGES/libsoup.mo +share/locale/nb/LC_MESSAGES/libsoup.mo +share/locale/or/LC_MESSAGES/libsoup.mo +share/locale/pa/LC_MESSAGES/libsoup.mo +share/locale/pl/LC_MESSAGES/libsoup.mo +share/locale/pt/LC_MESSAGES/libsoup.mo +share/locale/pt_BR/LC_MESSAGES/libsoup.mo +share/locale/ro/LC_MESSAGES/libsoup.mo +share/locale/ru/LC_MESSAGES/libsoup.mo +share/locale/sk/LC_MESSAGES/libsoup.mo +share/locale/sl/LC_MESSAGES/libsoup.mo +share/locale/sr/LC_MESSAGES/libsoup.mo +share/locale/sr@latin/LC_MESSAGES/libsoup.mo +share/locale/sv/LC_MESSAGES/libsoup.mo +share/locale/ta/LC_MESSAGES/libsoup.mo +share/locale/te/LC_MESSAGES/libsoup.mo +share/locale/th/LC_MESSAGES/libsoup.mo +share/locale/tr/LC_MESSAGES/libsoup.mo +share/locale/ug/LC_MESSAGES/libsoup.mo +share/locale/uk/LC_MESSAGES/libsoup.mo +share/locale/uz@cyrillic/LC_MESSAGES/libsoup.mo +share/locale/vi/LC_MESSAGES/libsoup.mo +share/locale/zh_CN/LC_MESSAGES/libsoup.mo +share/locale/zh_HK/LC_MESSAGES/libsoup.mo +share/locale/zh_TW/LC_MESSAGES/libsoup.mo +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia +@dirrm share/gtk-doc/html/libsoup-%%VERSION%% +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc/ @dirrm include/libsoup-%%VERSION%%/libsoup @dirrm include/libsoup-%%VERSION%% -@dirrmtry lib/girepository-1.0 -@dirrmtry share/gir-1.0 diff --git a/devel/libvolume_id/Makefile b/devel/libvolume_id/Makefile index c21747c1dbfa..4138583f9ced 100644 --- a/devel/libvolume_id/Makefile +++ b/devel/libvolume_id/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: libvolume_id -# Date created: 04 November 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ PORTNAME= libvolume_id @@ -14,7 +11,6 @@ COMMENT= Library to provide file system type information USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig USE_LDCONFIG= yes MAKE_ENV= E=${ECHO_MSG} RANLIB=${RANLIB} AR=${AR} Q=@ \ prefix=${PREFIX} diff --git a/devel/libwfut/Makefile b/devel/libwfut/Makefile index 7e5ce021e66a..cca8077aa7c7 100644 --- a/devel/libwfut/Makefile +++ b/devel/libwfut/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \ CONFIGURE_ARGS+=--without-python GNU_CONFIGURE= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAN1= wfut.1 diff --git a/devel/lua-lgi/Makefile b/devel/lua-lgi/Makefile index 76f2f5b8041c..8f1b5ef76e24 100644 --- a/devel/lua-lgi/Makefile +++ b/devel/lua-lgi/Makefile @@ -18,6 +18,7 @@ GH_ACCOUNT= pavouk USE_LUA= 5.1+ USE_GMAKE= yes +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include/${LUA_SUBDIR} diff --git a/devel/ndesk-dbus-glib/Makefile b/devel/ndesk-dbus-glib/Makefile index eb70eddcca8e..536ff969df41 100644 --- a/devel/ndesk-dbus-glib/Makefile +++ b/devel/ndesk-dbus-glib/Makefile @@ -19,6 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/deve RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus USE_GMAKE= yes +USE_PKGCONFIG= build USE_GNOME= gnomehack GNU_CONFIGURE= yes diff --git a/devel/ndesk-dbus/Makefile b/devel/ndesk-dbus/Makefile index 9cf56d3868c9..bf640f9f542c 100644 --- a/devel/ndesk-dbus/Makefile +++ b/devel/ndesk-dbus/Makefile @@ -19,6 +19,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono USE_GMAKE= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes DOCS= AUTHORS COPYING README diff --git a/devel/ndesk-options/Makefile b/devel/ndesk-options/Makefile index b311c3d30b3d..18ce94082129 100644 --- a/devel/ndesk-options/Makefile +++ b/devel/ndesk-options/Makefile @@ -12,6 +12,7 @@ BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono RUN_DEPENDS= mono:${PORTSDIR}/lang/mono GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes post-patch: diff --git a/devel/obby/Makefile b/devel/obby/Makefile index f1872186aab8..3526e561980e 100644 --- a/devel/obby/Makefile +++ b/devel/obby/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \ net6:${PORTSDIR}/net/net6 USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile index c23e7d730d2b..1f3a09966153 100644 --- a/devel/orbitcpp/Makefile +++ b/devel/orbitcpp/Makefile @@ -16,6 +16,7 @@ COMMENT= C++ bindings for ORBit, a CORBA 2.2-compliant ORB USE_BZIP2= yes USE_GNOME= gnomehack ltverhack orbit2 +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile index dc7d641d42cd..7760b5b6926e 100644 --- a/devel/ptlib26/Makefile +++ b/devel/ptlib26/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: pwlib -# Date created: Fri Aug 22 07:11:44 GMT 2003 -# Whom: Roger Hardiman <roger@freebsd.org> -# +# Created by: Roger Hardiman <roger@freebsd.org> # $FreeBSD$ -# PORTNAME= ptlib PORTVERSION= 2.6.7 @@ -25,7 +21,6 @@ USE_BZIP2= yes USE_BISON= build USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig WANT_GNOME= yes USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index df2b1df71cbe..e2d7c0334c09 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -1,10 +1,10 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/py-gobject/Makefile,v 1.52 2011/06/13 20:37:47 kwm Exp $ +# $MCom: ports/devel/py-gobject/Makefile,v 1.58 2012/12/30 18:15:16 mezz Exp $ PORTNAME= gobject PORTVERSION= 2.28.6 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -30,7 +30,7 @@ USE_PYTHON= 2.5+ USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-docs +CONFIGURE_ARGS= --disable-docs --disable-introspection CONFLICTS= py*-gtk-0* PLIST_SUB= PYTHON_VER="${PYTHON_VER}" diff --git a/devel/py-gobject/files/patch-gi_pygi-info.c b/devel/py-gobject/files/patch-gi_pygi-info.c new file mode 100644 index 000000000000..75ab80f5a515 --- /dev/null +++ b/devel/py-gobject/files/patch-gi_pygi-info.c @@ -0,0 +1,28 @@ +--- gi/pygi-info.c.orig 2011-09-17 10:24:16.000000000 +0200 ++++ gi/pygi-info.c 2011-09-17 10:24:40.000000000 +0200 +@@ -162,9 +162,6 @@ _pygi_info_new (GIBaseInfo *info) + case GI_INFO_TYPE_CONSTANT: + type = &PyGIConstantInfo_Type; + break; +- case GI_INFO_TYPE_ERROR_DOMAIN: +- type = &PyGIErrorDomainInfo_Type; +- break; + case GI_INFO_TYPE_UNION: + type = &PyGIUnionInfo_Type; + break; +@@ -481,7 +478,6 @@ _pygi_g_type_info_size (GITypeInfo *type + case GI_INFO_TYPE_INVALID: + case GI_INFO_TYPE_FUNCTION: + case GI_INFO_TYPE_CONSTANT: +- case GI_INFO_TYPE_ERROR_DOMAIN: + case GI_INFO_TYPE_VALUE: + case GI_INFO_TYPE_SIGNAL: + case GI_INFO_TYPE_PROPERTY: +@@ -860,7 +856,6 @@ pygi_g_struct_info_is_simple (GIStructIn + case GI_INFO_TYPE_INVALID: + case GI_INFO_TYPE_FUNCTION: + case GI_INFO_TYPE_CONSTANT: +- case GI_INFO_TYPE_ERROR_DOMAIN: + case GI_INFO_TYPE_VALUE: + case GI_INFO_TYPE_SIGNAL: + case GI_INFO_TYPE_PROPERTY: diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist index 5e9d89382561..771874406c0d 100644 --- a/devel/py-gobject/pkg-plist +++ b/devel/py-gobject/pkg-plist @@ -4,49 +4,6 @@ include/pygtk-2.0/pygobject.h lib/libpyglib-2.0-python%%PYTHON_VER%%.la lib/libpyglib-2.0-python%%PYTHON_VER%%.so lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0 -%%PYTHON_SITELIBDIR%%/gi/__init__.py -%%PYTHON_SITELIBDIR%%/gi/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/_gi.la -%%PYTHON_SITELIBDIR%%/gi/_gi.so -%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.la -%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so -%%PYTHON_SITELIBDIR%%/gi/importer.py -%%PYTHON_SITELIBDIR%%/gi/importer.pyc -%%PYTHON_SITELIBDIR%%/gi/importer.pyo -%%PYTHON_SITELIBDIR%%/gi/module.py -%%PYTHON_SITELIBDIR%%/gi/module.pyc -%%PYTHON_SITELIBDIR%%/gi/module.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyo -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/types.py -%%PYTHON_SITELIBDIR%%/gi/types.pyc -%%PYTHON_SITELIBDIR%%/gi/types.pyo %%PYTHON_SITELIBDIR%%/glib/__init__.py %%PYTHON_SITELIBDIR%%/glib/__init__.pyc %%PYTHON_SITELIBDIR%%/glib/__init__.pyo @@ -66,9 +23,6 @@ lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0 %%PYTHON_SITELIBDIR%%/gobject/propertyhelper.py %%PYTHON_SITELIBDIR%%/gobject/propertyhelper.pyc %%PYTHON_SITELIBDIR%%/gobject/propertyhelper.pyo -%%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/gio/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyo @@ -76,6 +30,9 @@ lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo %%PYTHON_SITELIBDIR%%/pygtk.pth %%PYTHON_SITELIBDIR%%/pygtk.py %%PYTHON_SITELIBDIR%%/pygtk.pyc @@ -228,11 +185,8 @@ share/pygobject/xsl/ref-html-style.xsl @dirrm share/pygobject/2.0 @dirrm share/pygobject @dirrm share/doc/pygobject -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio +@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0/gio @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0 -@dirrm %%PYTHON_SITELIBDIR%%/gobject -@dirrm %%PYTHON_SITELIBDIR%%/glib -@dirrm %%PYTHON_SITELIBDIR%%/gi/repository -@dirrm %%PYTHON_SITELIBDIR%%/gi/overrides -@dirrm %%PYTHON_SITELIBDIR%%/gi -@dirrmtry include/pygtk-2.0 +@dirrmtry %%PYTHON_SITELIBDIR%%/gobject +@dirrmtry %%PYTHON_SITELIBDIR%%/glib +@dirrm include/pygtk-2.0 diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile index c54a411af6ab..75a54dc9e209 100644 --- a/devel/py-orbit/Makefile +++ b/devel/py-orbit/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: py-orbit2 -# Date created: 04 March 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/devel/py-orbit/Makefile,v 1.1 2008/09/23 20:08:04 mezz Exp $ -# PORTNAME= orbit PORTVERSION= 2.24.0 @@ -23,6 +19,7 @@ CONFLICTS= py*-omniorb-[0-9]* USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack orbit2 +USE_PKGCONFIG= build USE_PYTHON= yes GNU_CONFIGURE= yes ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index a33d8ee8b6e6..e550c5cd846c 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -13,6 +13,7 @@ COMMENT= Qt core library LIB_DEPENDS= icui18n:${PORTSDIR}/devel/icu USE_GNOME= _glib20 +USE_PKGCONFIG= build USE_QT4= qmake_build moc_build QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile index 45d74fe37292..7f64c07313d5 100644 --- a/devel/regexxer/Makefile +++ b/devel/regexxer/Makefile @@ -32,4 +32,8 @@ INSTALLS_ICONS= regexxer.png x-generate-plist: (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${GREP} regexxer) > temp-pkg-plist +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/globalstrings.h ${WRKSRC}/src/translation.h + .include <bsd.port.mk> diff --git a/devel/seed/Makefile b/devel/seed/Makefile index bbd6152c5f2e..54ee5bfe655e 100644 --- a/devel/seed/Makefile +++ b/devel/seed/Makefile @@ -1,17 +1,12 @@ -# New ports collection makefile for: seed -# Date created: 19 July 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# +# Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/seed/Makefile,v 1.24 2010/09/19 15:06:42 kwm Exp $ -# +# $MCom: ports/devel/seed/Makefile,v 1.35 2013/01/29 16:33:10 kwm Exp $ # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release. # To do that, just replace imports.searchPaths with "." and ".." elements. -# PORTNAME= seed PORTVERSION= 2.31.91 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,11 +16,12 @@ COMMENT= GObject JavaScriptCore bridge BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-js-common.pc:${PORTSDIR}/devel/gnome-js-common LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi \ - webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ - girepository-1.0.1:${PORTSDIR}/devel/gobject-introspection \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 \ - mpfr.4:${PORTSDIR}/math/mpfr + webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \ + girepository-1.0:${PORTSDIR}/devel/gobject-introspection \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + mpfr:${PORTSDIR}/math/mpfr + +CONFLICTS= seed-3.[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes @@ -33,6 +29,7 @@ USE_GETTEXT= yes USE_GNOME= gnomehack gtk20 intltool libxml2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool +USE_SQLITE= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/devel/seed/files/patch-libseed_seed-gtype.c b/devel/seed/files/patch-libseed_seed-gtype.c new file mode 100644 index 000000000000..b9755d5e1b4d --- /dev/null +++ b/devel/seed/files/patch-libseed_seed-gtype.c @@ -0,0 +1,12 @@ +--- libseed/seed-gtype.c.orig 2010-08-30 21:37:38.000000000 +0000 ++++ libseed/seed-gtype.c 2012-02-07 15:33:05.000000000 +0000 +@@ -1032,9 +1032,6 @@ + + proto = seed_struct_prototype (ctx, objectclass_info); + +- paramspec_info = g_irepository_find_by_name (NULL, "GObject", "ParamSpec"); +- proto = seed_struct_prototype (ctx, paramspec_info); +- + seed_create_function (ctx, "get", &seed_param_getter_invoked, proto); + seed_create_function (ctx, "set", &seed_param_setter_invoked, proto); + } diff --git a/devel/valide/Makefile b/devel/valide/Makefile index d6d52878f82c..f42d6b68e3ce 100644 --- a/devel/valide/Makefile +++ b/devel/valide/Makefile @@ -18,6 +18,8 @@ LIB_DEPENDS= gdl-1:${PORTSDIR}/x11-toolkits/gdl BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala RUN_DEPENDS:= ${BUILD_DEPENDS} +BROKEN= Doesn't build with vala 0.12+ + INSTALLS_ICONS= yes USE_GETTEXT= yes USE_GNOME= gtk20 gtksourceview2 diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile index 447bc765bad8..ec7fa6288bf5 100644 --- a/devel/varconf/Makefile +++ b/devel/varconf/Makefile @@ -14,6 +14,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .include <bsd.port.options.mk> diff --git a/devel/vtg/Makefile b/devel/vtg/Makefile index cf42f69795f9..8070f6b94eb5 100644 --- a/devel/vtg/Makefile +++ b/devel/vtg/Makefile @@ -20,6 +20,8 @@ COMMENT= Vala Toys for gEdit BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala RUN_DEPENDS= valac:${PORTSDIR}/lang/vala +IGNORE= doesn't build with vala 0.18+ + CONFIGURE_ARGS= --disable-vtg-plugin --disable-gen-project CPPFLAGS= -I${LOCALBASE}/include GNU_CONFIGURE= yes diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile index 4a6d794918c0..a13614f3bf0c 100644 --- a/devel/xfce4-dev-tools/Makefile +++ b/devel/xfce4-dev-tools/Makefile @@ -20,5 +20,6 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined USE_GNOME= glib20 +USE_PKGCONFIG= build .include <bsd.port.mk> diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index f72679c6e40a..a2d254c501da 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -84,6 +84,11 @@ CONFIGURE_ARGS+= --disable-clipart PLIST_SUB+= CLIPART="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \ + ${WRKSRC}/src/af/util/xp/ut_go_file.h + post-install: @${MKDIR} ${PREFIX}/lib/${PORTNAME}-${ABIVERSION}/plugins @-update-desktop-database diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile index dfcabae2fe8a..6f5a9c96781e 100644 --- a/emulators/gxmame/Makefile +++ b/emulators/gxmame/Makefile @@ -38,5 +38,6 @@ MAN6= gxmame.6 post-patch: @${REINPLACE_CMD} -e 's|CFLAGS="-Wall.*||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|__GNUC___|__GNUC__|' ${WRKSRC}/src/common.h + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/gxmame.c .include <bsd.port.mk> diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index b3d683140b01..50494726fefd 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -21,6 +21,7 @@ BUILD_VER= 425873 WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER} GNU_CONFIGURE= yes USE_LDCONFIG= yes +CPPFLAGS+= -Wno-deprecated-declarations CONFIGURE_ARGS+= --without-procps --sysconfdir=${LOCALBASE}/etc .if defined(WITHOUT_X11) diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile index abee847cc3a9..b42df8fb08c8 100644 --- a/games/gtkradiant/Makefile +++ b/games/gtkradiant/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: GtkRadiant -# Date created: 9 May 2006 -# Whom: Alejandro Pulver <alepulver@FreeBSD.org> -# +# Created by: Alejandro Pulver <alepulver@FreeBSD.org> # $FreeBSD$ -# PORTNAME= gtkradiant PORTVERSION= 1.5.0 @@ -41,6 +37,18 @@ post-patch: @${GREP} -Rl 'defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -e \ 's/\(defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)\)/\1 || defined (__FreeBSD__)/' + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/libs/os/dir.h \ + ${WRKSRC}/libs/gtkutil/idledraw.h \ + ${WRKSRC}/libs/gtkutil/cursor.h \ + ${WRKSRC}/libs/convert.h \ + ${WRKSRC}/plugins/shaders/shaders.cpp \ + ${WRKSRC}/plugins/vfspk3/vfs.cpp \ + ${WRKSRC}/radiant/feedback.h \ + ${WRKSRC}/radiant/environment.cpp \ + ${WRKSRC}/radiant/patch.cpp \ + ${WRKSRC}/radiant/watchbsp.cpp \ + ${WRKSRC}/tools/quake3/common/inout.c post-build: cd ${WRKSRC} && ${PYTHON_CMD} install.py diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile index 9ec583d75318..6de843b35a4f 100644 --- a/games/monkeybubble/Makefile +++ b/games/monkeybubble/Makefile @@ -32,5 +32,9 @@ post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-g -O2||g ; \ s|-Werror||g' + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/net/message-handler.c \ + ${WRKSRC}/src/net/simple-server.c \ + ${WRKSRC}/src/ui/main.c .include <bsd.port.post.mk> diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile index 3e25760e676d..29809379412b 100644 --- a/games/mudmagic/Makefile +++ b/games/mudmagic/Makefile @@ -30,4 +30,16 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= mudmagic.1 +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/network/network.h \ + ${WRKSRC}/src/configuration/configuration.h \ + ${WRKSRC}/src/interface/tools.c \ + ${WRKSRC}/src/interface/theme_select.c \ + ${WRKSRC}/src/protocols/http.h \ + ${WRKSRC}/src/utils/gamelist.c \ + ${WRKSRC}/src/utils/muderr.h \ + ${WRKSRC}/src/utils/alias_triggers.c \ + ${WRKSRC}/src/utils/gamelist.h + .include <bsd.port.mk> diff --git a/games/nlarn/Makefile b/games/nlarn/Makefile index d5f0c7bd9c0a..a9c4616023a3 100644 --- a/games/nlarn/Makefile +++ b/games/nlarn/Makefile @@ -20,6 +20,7 @@ BUILD_DEPENDS= premake4:${PORTSDIR}/devel/premake4 WRKSRC= ${WRKDIR}/jaydg-nlarn-NLarn-${PORTVERSION}.0 USE_LUA= 5.1 USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GMAKE= yes do-configure: diff --git a/graphics/Makefile b/graphics/Makefile index 419bdb2ee363..d5bef0eb5b8e 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -94,6 +94,7 @@ SUBDIR += clutter SUBDIR += clutter-box2d SUBDIR += clutter-gtk + SUBDIR += colord SUBDIR += comical SUBDIR += comix SUBDIR += commons-utilities diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 8681562a5ff5..05b2660dad90 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: clutter -# Date created: 2008-12-25 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ # $MCom: ports/graphics/clutter/Makefile,v 1.34 2010/09/24 16:35:42 kwm Exp $ -# PORTNAME= clutter PORTVERSION= 1.4.0 @@ -16,15 +12,16 @@ MASTER_SITES= GNOME \ MAINTAINER= gnome@FreeBSD.org COMMENT= OpenGL based interactive canvas library -LIB_DEPENDS= json-glib-1.0.0:${PORTSDIR}/devel/json-glib +LIB_DEPENDS= json-glib-1.0:${PORTSDIR}/devel/json-glib LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING + USE_GMAKE= yes USE_GETTEXT= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango +USE_GNOME= gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango +USE_PKGCONFIG= build USE_GL= gl USE_XORG= glproto x11 xfixes xdamage xcomposite xi USE_LDCONFIG= yes @@ -33,4 +30,13 @@ CONFIGURE_ARGS= --with-x --enable-conformance=no CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +post-patch: + @${REINPLACE_CMD} -e 's|G_CONST_RETURN|const|g' \ + ${WRKSRC}/clutter/cally/*.c \ + ${WRKSRC}/clutter/*.[ch] \ + ${WRKSRC}/clutter/glx/*.c \ + ${WRKSRC}/clutter/x11/*.h \ + ${WRKSRC}/clutter/cogl/cogl/*.h \ + ${WRKSRC}/clutter/json/*.c + .include <bsd.port.mk> diff --git a/graphics/clutter/pkg-descr b/graphics/clutter/pkg-descr index 593f4afbc1db..347482b0cf49 100644 --- a/graphics/clutter/pkg-descr +++ b/graphics/clutter/pkg-descr @@ -1,4 +1,4 @@ Clutter it an open source software library for creating fast, visually rich and animated graphical user interfaces. -WWW: http://clutter-project.org/ +WWW: https://live.gnome.org/Clutter diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile new file mode 100644 index 000000000000..7fc3ff6e89c2 --- /dev/null +++ b/graphics/colord/Makefile @@ -0,0 +1,64 @@ +# Created by: Koop Mast <kwm@FreeBSD.org> +# $FreeBSD$ +# $MCom: ports/graphics/colord/Makefile,v 1.10 2012/12/17 23:50:40 kwm Exp $ + +PORTNAME= colord +PORTVERSION= 0.1.20 +PORTREVISION= 1 +CATEGORIES= graphics +MASTER_SITES= http://www.freedesktop.org/software/colord/releases/ + +MAINTAINER= kwm@FreeBSD.org +COMMENT= Manage color profiles to accurately color input/output devices + +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ + vala-vapigen>=0.13.0:${PORTSDIR}/lang/vala-vapigen +LIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + dbus-1:${PORTSDIR}/devel/dbus \ + lcms2:${PORTSDIR}/graphics/lcms2 + +USE_XZ= yes +USE_GNOME= gnomehier gnomehack glib20 intlhack +USE_GMAKE= yes +USE_GETTEXT= yes +USE_SQLITE= yes +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +MAKE_JOBS_UNSAFE=yes +CONFIGURE_ARGS= --disable-gudev --enable-gtk-doc-html=no --disable-gtk +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= USB_CFLAGS="-I/usr/include" \ + USB_LIBS="-L/usr/lib -lusb" + +OPTIONS_DEFINE= SANE MANPAGES + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSANE} +CONFIGURE_ARGS+=--disable-sane +.else +CONFGIURE_ARGS+=--enable-sane=yes +LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends +.endif + +.if ${PORT_OPTIONS:MMANPAGES} +BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ + ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 +MAN1= cd-create-profile.1 cd-fix-profile.1 colormgr.1 +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|-Wclobbered||g' \ + -e 's|-Wempty-body||g' \ + -e 's|-Wignored-qualifiers||g' \ + -e 's|-Wtype-limits||g' \ + -e 's|-Wmissing-parameter-type||g' \ + -e 's|LIBS="-lusb-1.0|LIBS="-lusb|g' \ + ${WRKSRC}/configure +.if empty(PORT_OPTIONS:MMANPAGES} + @${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \ + s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure +.endif + +.include <bsd.port.mk> diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo new file mode 100644 index 000000000000..2db4de59d601 --- /dev/null +++ b/graphics/colord/distinfo @@ -0,0 +1,2 @@ +SHA256 (colord-0.1.20.tar.xz) = 45d6e7e73c9eab9f3f3c0eec8d008fd96c147333aeb4a77a2c2695657e48ae58 +SIZE (colord-0.1.20.tar.xz) = 551408 diff --git a/graphics/colord/files/patch-Makefile.in b/graphics/colord/files/patch-Makefile.in new file mode 100644 index 000000000000..8adde68742b5 --- /dev/null +++ b/graphics/colord/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2012-05-15 23:46:55.000000000 +0200 ++++ Makefile.in 2012-05-15 23:47:27.000000000 +0200 +@@ -329,7 +329,7 @@ + # this needs libcolord and libcolord-gtk + + # this needs client/cd-create-profile +-SUBDIRS = etc policy man libcolord rules po $(am__append_1) client \ ++SUBDIRS = etc policy man libcolord po $(am__append_1) client \ + contrib doc examples src data + DISTCHECK_CONFIGURE_FLAGS = \ + --enable-introspection \ diff --git a/graphics/colord/files/patch-client_Makefile.in b/graphics/colord/files/patch-client_Makefile.in new file mode 100644 index 000000000000..4c832e9f1f11 --- /dev/null +++ b/graphics/colord/files/patch-client_Makefile.in @@ -0,0 +1,13 @@ +--- client/Makefile.in.orig 2012-05-16 20:35:37.000000000 +0200 ++++ client/Makefile.in 2012-05-16 20:35:57.000000000 +0200 +@@ -36,8 +36,8 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \ +- cd-fix-profile$(EXEEXT) ++@HAVE_GTK_TRUE@bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \ ++@HAVE_GTK_TRUE@ cd-fix-profile$(EXEEXT) + @HAVE_GTK_TRUE@noinst_PROGRAMS = colord-convert$(EXEEXT) + subdir = client + DIST_COMMON = $(dist_bashcompletion_DATA) $(srcdir)/Makefile.am \ diff --git a/graphics/colord/pkg-descr b/graphics/colord/pkg-descr new file mode 100644 index 000000000000..8d30a2bf0883 --- /dev/null +++ b/graphics/colord/pkg-descr @@ -0,0 +1,4 @@ +colord is a system service that makes it easy to manage, install and generate +color profiles to accurately color manage input and output devices. + +WWW: http://www.freedesktop.org/software/colord diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist new file mode 100644 index 000000000000..d48f60969fca --- /dev/null +++ b/graphics/colord/pkg-plist @@ -0,0 +1,119 @@ +etc/bash_completion.d/colormgr-completion.bash +etc/colord.conf +etc/dbus-1/system.d/org.freedesktop.ColorManager.conf +etc/dbus-1/system.d/org.freedesktop.colord-sane.conf +include/colord-1/colord.h +include/colord-1/colord-private.h +include/colord-1/colord/cd-client-sync.h +include/colord-1/colord/cd-client.h +include/colord-1/colord/cd-color.h +include/colord-1/colord/cd-device-sync.h +include/colord-1/colord/cd-device.h +include/colord-1/colord/cd-enum.h +include/colord-1/colord/cd-it8.h +include/colord-1/colord/cd-it8-utils.h +include/colord-1/colord/cd-math.h +include/colord-1/colord/cd-profile-sync.h +include/colord-1/colord/cd-profile.h +include/colord-1/colord/cd-sensor-sync.h +include/colord-1/colord/cd-sensor.h +include/colord-1/colord/cd-version.h +lib/colord-sensors/libcolord_sensor_dummy.a +lib/colord-sensors/libcolord_sensor_dummy.la +lib/colord-sensors/libcolord_sensor_dummy.so +lib/girepository-1.0/Colord-1.0.typelib +lib/libcolord.a +lib/libcolord.la +lib/libcolord.so +lib/libcolord.so.1 +libdata/pkgconfig/colord.pc +libexec/colord +share/color/icc/colord/crayons.icc +share/color/icc/colord/x11-colors.icc +share/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml +share/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml +share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml +share/dbus-1/interfaces/org.freedesktop.ColorManager.xml +share/dbus-1/interfaces/org.freedesktop.colord.sane.xml +share/dbus-1/system-services/org.freedesktop.ColorManager.service +share/dbus-1/system-services/org.freedesktop.colord-sane.service +share/gir-1.0/Colord-1.0.gir +share/locale/as/LC_MESSAGES/colord.mo +share/locale/bg/LC_MESSAGES/colord.mo +share/locale/bg_BG/LC_MESSAGES/colord.mo +share/locale/bn_IN/LC_MESSAGES/colord.mo +share/locale/ca/LC_MESSAGES/colord.mo +share/locale/cs/LC_MESSAGES/colord.mo +share/locale/da/LC_MESSAGES/colord.mo +share/locale/de/LC_MESSAGES/colord.mo +share/locale/el/LC_MESSAGES/colord.mo +share/locale/en_GB/LC_MESSAGES/colord.mo +share/locale/eo/LC_MESSAGES/colord.mo +share/locale/es/LC_MESSAGES/colord.mo +share/locale/eu/LC_MESSAGES/colord.mo +share/locale/fi/LC_MESSAGES/colord.mo +share/locale/fr/LC_MESSAGES/colord.mo +share/locale/ga/LC_MESSAGES/colord.mo +share/locale/gl/LC_MESSAGES/colord.mo +share/locale/gu/LC_MESSAGES/colord.mo +share/locale/he/LC_MESSAGES/colord.mo +share/locale/hi/LC_MESSAGES/colord.mo +share/locale/hu/LC_MESSAGES/colord.mo +share/locale/id/LC_MESSAGES/colord.mo +share/locale/it/LC_MESSAGES/colord.mo +share/locale/it_IT/LC_MESSAGES/colord.mo +share/locale/ja/LC_MESSAGES/colord.mo +share/locale/kk/LC_MESSAGES/colord.mo +share/locale/kn/LC_MESSAGES/colord.mo +share/locale/ko/LC_MESSAGES/colord.mo +share/locale/lt/LC_MESSAGES/colord.mo +share/locale/lv/LC_MESSAGES/colord.mo +share/locale/ml/LC_MESSAGES/colord.mo +share/locale/mr/LC_MESSAGES/colord.mo +share/locale/ms/LC_MESSAGES/colord.mo +share/locale/nb/LC_MESSAGES/colord.mo +share/locale/nl/LC_MESSAGES/colord.mo +share/locale/or/LC_MESSAGES/colord.mo +share/locale/pa/LC_MESSAGES/colord.mo +share/locale/pl/LC_MESSAGES/colord.mo +share/locale/pt/LC_MESSAGES/colord.mo +share/locale/pt_BR/LC_MESSAGES/colord.mo +share/locale/ro/LC_MESSAGES/colord.mo +share/locale/ru/LC_MESSAGES/colord.mo +share/locale/sk/LC_MESSAGES/colord.mo +share/locale/sl/LC_MESSAGES/colord.mo +share/locale/sr/LC_MESSAGES/colord.mo +share/locale/sr@latin/LC_MESSAGES/colord.mo +share/locale/sv/LC_MESSAGES/colord.mo +share/locale/ta/LC_MESSAGES/colord.mo +share/locale/te/LC_MESSAGES/colord.mo +share/locale/th/LC_MESSAGES/colord.mo +share/locale/tr/LC_MESSAGES/colord.mo +share/locale/uk/LC_MESSAGES/colord.mo +share/locale/zh_CN/LC_MESSAGES/colord.mo +share/locale/zh_TW/LC_MESSAGES/colord.mo +share/polkit-1/actions/org.freedesktop.color.policy +share/vala/vapi/colord.vapi +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk +@dirrmtry share/locale/it_IT/LC_MESSAGES +@dirrmtry share/locale/it_IT +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/bg_BG/LC_MESSAGES +@dirrmtry share/locale/bg_BG +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as +@dirrm share/color/icc/colord +@dirrm share/color/icc +@dirrm share/color +@dirrm lib/colord-sensors +@dirrm include/colord-1/colord +@dirrm include/colord-1 +@dirrmtry etc/bash_completion.d diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index c0dfb727ef80..b5b2b6824c21 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -71,6 +71,10 @@ PLIST_SUB+= GNOME="@comment " post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/lib/intl.c + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/objects/custom/shape_typeinfo.c \ + ${WRKSRC}/tests/test-objects.c \ + ${WRKSRC}/tests/test-boundingbox.c .if defined(NOPORTDOCS) @${FIND} ${WRKSRC}/doc -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|$$(examples)||g ; s|$$(mkinstalldirs) $$(sysdoc)/examples||g ; \ diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index b5acfb7dfce2..4efbce1e1ab5 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -53,6 +53,10 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/gtk/StockIcons.h + post-install: ${REINPLACE_CMD} -e 's,Icon.*,Icon=${DATADIR}/pixmaps/icon_epdfview-48.png,' ${WRKSRC}/data/${PORTNAME}.desktop ${MKDIR} ${PREFIX}/share/applications diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 73a127b0a42b..e855f934d806 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -1,17 +1,12 @@ -# New ports collection makefile for: gdk-pixbuf -# Date created: 5th October 1999 -# Whom: Ade Lovett <ade@lovett.com> -# +# Created by: Ade Lovett <ade@lovett.com> # $FreeBSD$ -# $MCom: ports/graphics/gdk-pixbuf2/Makefile,v 1.15 2011/06/27 21:10:23 kwm Exp $ +# $MCom: ports/graphics/gdk-pixbuf2/Makefile,v 1.28 2012/12/10 12:09:15 kwm Exp $ -PORTNAME?= gdk-pixbuf -PORTVERSION= 2.23.5 -PORTREVISION= 3 -CATEGORIES?= graphics +PORTNAME= gdk-pixbuf +PORTVERSION= 2.26.5 +CATEGORIES= graphics MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/gdk-pixbuf/${PORTVERSION:R} -DISTNAME= gdk-pixbuf-${PORTVERSION} +PKGNAMESUFFIX= 2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,49 +16,49 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LATEST_LINK= gdk-pixbuf2 USE_XZ= yes +USE_GETTEXT= yes USE_GMAKE= yes USE_XORG= xt xi x11 USE_AUTOTOOLS= libtool USE_GNOME+= gnomehack glib20 ltverhack USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS= --enable-introspection=yes +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --enable-introspection=yes --with-x11 MAN1= gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 -OPTIONS= JP2 "JPEG2000 support" ON \ - JPEG "JPEG support" ON \ - PNG "PNG support" ON \ - TIFF "TIFF support" ON +OPTIONS_DEFINE= JASPER JPEG PNG TIFF NLS +OPTIONS_DEFAULT=JASPER JPEG PNG TIFF NLS .include <bsd.port.options.mk> -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:M_NLS} +USE_GETTEXT= yes PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif -.if !defined(WITHOUT_JP2) -LIB_DEPENDS+= jasper.4:${PORTSDIR}/graphics/jasper +.if ${PORT_OPTIONS:MJASPER} +LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper CONFIGURE_ARGS+=--with-libjasper PLIST_SUB+= JP2="" .else PLIST_SUB+= JP2="@comment " .endif -.if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg +.if ${PORT_OPTIONS:MJPEG} +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+=--without-libjpeg PLIST_SUB+= JPEG="@comment " .endif -.if !defined(WITHOUT_PNG) +.if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else @@ -71,18 +66,15 @@ CONFIGURE_ARGS+=--without-libpng PLIST_SUB+= PNG="@comment " .endif -.if !defined(WITHOUT_TIFF) -LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff +.if ${PORT_OPTIONS:MTIFF} +LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff PLIST_SUB+= TIFF="" .else CONFIGURE_ARGS+=--without-libtiff PLIST_SUB+= TIFF="@comment " .endif -post-patch: - @${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure - post-install: - @cd ${WRKSRC}/docs/reference/gdk-pixbuf && gmake install-man1 + @cd ${WRKSRC}/docs/reference/gdk-pixbuf && ${GMAKE} install-man1 .include <bsd.port.mk> diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo index a63a71c51324..b694e8216b8e 100644 --- a/graphics/gdk-pixbuf2/distinfo +++ b/graphics/gdk-pixbuf2/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gdk-pixbuf-2.23.5.tar.xz) = 7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500 -SIZE (gnome2/gdk-pixbuf-2.23.5.tar.xz) = 1171372 +SHA256 (gnome2/gdk-pixbuf-2.26.5.tar.xz) = 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84 +SIZE (gnome2/gdk-pixbuf-2.26.5.tar.xz) = 1181336 diff --git a/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_io-xbm.c b/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_io-xbm.c deleted file mode 100644 index e2e0805a355c..000000000000 --- a/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_io-xbm.c +++ /dev/null @@ -1,44 +0,0 @@ -From 4f0f465f991cd454d03189497f923eb40c170c22 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Sat, 14 Apr 2012 18:21:09 +0000 -Subject: Avoid an integer overflow in the xbm loader - -At the same time, reject some silly input, such as negative -width or height. - -https://bugzilla.gnome.org/show_bug.cgi?id=672811 ---- -diff --git a/gdk-pixbuf/io-xbm.c b/gdk-pixbuf/io-xbm.c -index 46653b9..4f3e1e8 100644 ---- gdk-pixbuf/io-xbm.c -+++ gdk-pixbuf/io-xbm.c -@@ -183,10 +183,16 @@ read_bitmap_file_data (FILE *fstream, - type++; - } - -- if (!strcmp ("width", type)) -+ if (!strcmp ("width", type)) { -+ if (value <= 0) -+ RETURN (FALSE); - ww = (unsigned int) value; -- if (!strcmp ("height", type)) -+ } -+ if (!strcmp ("height", type)) { -+ if (value <= 0) -+ RETURN (FALSE); - hh = (unsigned int) value; -+ } - if (!strcmp ("hot", type)) { - if (type-- == name_and_type - || type-- == name_and_type) -@@ -231,6 +237,8 @@ read_bitmap_file_data (FILE *fstream, - bytes_per_line = (ww+7)/8 + padding; - - size = bytes_per_line * hh; -+ if (size / bytes_per_line != hh) /* overflow */ -+ RETURN (FALSE); - bits = g_malloc (size); - - if (version10p) { --- -cgit v0.9.0.2 diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist index b5f7a82a9998..f746a52fad9a 100644 --- a/graphics/gdk-pixbuf2/pkg-plist +++ b/graphics/gdk-pixbuf2/pkg-plist @@ -1,4 +1,5 @@ bin/gdk-pixbuf-csource +bin/gdk-pixbuf-pixdata bin/gdk-pixbuf-query-loaders include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h @@ -98,9 +99,9 @@ share/gir-1.0/GdkPixbuf-2.0.gir %%NLS%%share/locale/de/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/el/LC_MESSAGES/gdk-pixbuf.mo +%%NLS%%share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo -%%NLS%%share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/es/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/et/LC_MESSAGES/gdk-pixbuf.mo @@ -123,6 +124,7 @@ share/gir-1.0/GdkPixbuf-2.0.gir %%NLS%%share/locale/it/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo +%%NLS%%share/locale/km/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo @@ -178,7 +180,7 @@ share/gir-1.0/GdkPixbuf-2.0.gir %%NLS%%share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -@unexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache +@unexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>&1 >/dev/null || true %%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES %%NLS%%@dirrmtry share/locale/zh_HK %%NLS%%@dirrmtry share/locale/yi/LC_MESSAGES @@ -217,6 +219,8 @@ share/gir-1.0/GdkPixbuf-2.0.gir %%NLS%%@dirrmtry share/locale/mai %%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ku +%%NLS%%@dirrmtry share/locale/km/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/km %%NLS%%@dirrmtry share/locale/io/LC_MESSAGES %%NLS%%@dirrmtry share/locale/io %%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES @@ -241,11 +245,9 @@ share/gir-1.0/GdkPixbuf-2.0.gir %%NLS%%@dirrmtry share/locale/as %%NLS%%@dirrmtry share/locale/ang/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ang -@dirrmtry share/gir-1.0 -@dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/ +@dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders @dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%% @dirrm lib/gdk-pixbuf-2.0 -@dirrmtry lib/girepository-1.0 -@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf @dirrm include/gdk-pixbuf-2.0/gdk-pixbuf-xlib +@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf @dirrm include/gdk-pixbuf-2.0 diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile index 29895d3e281a..01b89a45b3af 100644 --- a/graphics/glitz/Makefile +++ b/graphics/glitz/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: glitz -# Date created: 2004-10-06 -# Whom: Michael Johnson <ahze@ahze.net> -# +# Created by: Michael Johnson <ahze@ahze.net> # $FreeBSD$ # $MCom: ports/graphics/glitz/Makefile,v 1.8 2006/09/10 00:51:10 mezz Exp $ -# PORTNAME= glitz PORTVERSION= 0.5.6 @@ -17,7 +13,7 @@ COMMENT= OpenGL image compositing library USE_GL= yes USE_XORG= xt -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile index f581765f6628..3254f198b5b5 100644 --- a/graphics/gtk-update-icon-cache/Makefile +++ b/graphics/gtk-update-icon-cache/Makefile @@ -1,37 +1,26 @@ -# New ports collection makefile for: gtk-update-icon-cache -# Date Created: 4 Mar 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/graphics/gtk-update-icon-cache/Makefile,v 1.6 2011/06/16 17:36:39 kwm Exp $ -# +# $MCom: ports/graphics/gtk-update-icon-cache/Makefile,v 1.18 2013/03/04 17:44:37 kwm Exp $ PORTNAME= gtk-update-icon-cache -PORTVERSION= 2.24.6 -PORTREVISION?= 1 +PORTVERSION= 2.24.17 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ - ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ - ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ - http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= gtk-update-icon-cache utility from the Gtk+ toolkit +COMMENT= Gtk-update-icon-cache utility from the Gtk+ toolkit LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING -USE_XZ= yes BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme +USE_XZ= yes USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_JOBS_UNSAFE= yes @@ -43,8 +32,7 @@ USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite PATCHDIR= ${.CURDIR}/../../x11-toolkits/gtk20/files CONFIGURE_ARGS= --enable-static --with-xinput=yes -CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \ - -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/gtk-update-icon-cache @@ -53,10 +41,10 @@ MAN1= gtk-update-icon-cache.1 .include <bsd.port.pre.mk> pre-configure: - @if [ ! -f ${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc ]; then \ - ${ECHO_CMD} "${PKGNAME}: Needs cairo built with X11 support."; \ - ${FALSE}; \ - fi +.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) + @${ECHO_CMD} "${PKGNAME}: Needs cairo with X11 support enabled." + @${FALSE} +.endif do-build: @cd ${WRKSRC}/gtk && ${GMAKE} gtk-update-icon-cache diff --git a/graphics/gtk-update-icon-cache/distinfo b/graphics/gtk-update-icon-cache/distinfo index 164f01198946..e95c6ae937b6 100644 --- a/graphics/gtk-update-icon-cache/distinfo +++ b/graphics/gtk-update-icon-cache/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gtk+-2.24.6.tar.xz) = 8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca -SIZE (gnome2/gtk+-2.24.6.tar.xz) = 13173032 +SHA256 (gnome2/gtk+-2.24.17.tar.xz) = e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415 +SIZE (gnome2/gtk+-2.24.17.tar.xz) = 13288028 diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile index 1c9fcd84801a..61c09f1737a5 100644 --- a/graphics/lensfun/Makefile +++ b/graphics/lensfun/Makefile @@ -16,6 +16,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_PYTHON_BUILD= yes diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile index ea7ec5274474..d2015e406f7e 100644 --- a/graphics/libart_lgpl/Makefile +++ b/graphics/libart_lgpl/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libart_lgpl2 -# Date created: 8 July 2001 -# Whom: Hye-Shik Chang <perky@python.or.kr> -# +# Created by: Hye-Shik Chang <perky@python.or.kr> # $FreeBSD$ -# PORTNAME= libart_lgpl PORTVERSION= 2.3.21 @@ -19,7 +15,7 @@ COMMENT= Library for high-performance 2D graphics USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile index b6c6cfe97a09..b10df0cfb240 100644 --- a/graphics/libchamplain/Makefile +++ b/graphics/libchamplain/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libchamplain -# Date Created: 04 Aug 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ # $MCom: ports/graphics/libchamplain/Makefile,v 1.23 2010/09/27 18:17:23 kwm Exp $ -# PORTNAME= libchamplain PORTVERSION= 0.8.1 @@ -22,7 +18,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USE_BZIP2= yes -USE_GNOME= gnomeprefix pkgconfig gtk20 gnomehack ltverhack:1 +USE_GNOME= gnomeprefix gtk20 gnomehack ltverhack:1 USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile index e2b4858b00df..1d43046ffecc 100644 --- a/graphics/libsvg-cairo/Makefile +++ b/graphics/libsvg-cairo/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: libsvg-cairo -# Date created: 2004-10-06 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ # $MCom: ports/graphics/libsvg-cairo/Makefile,v 1.5 2005/08/09 04:49:38 ahze Exp $ -# PORTNAME= libsvg-cairo PORTVERSION= 0.1.6 @@ -15,13 +11,13 @@ MASTER_SITES= http://cairographics.org/snapshots/ MAINTAINER= gnome@FreeBSD.org COMMENT= SVG rendering library -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - svg.1:${PORTSDIR}/graphics/libsvg \ - cairo.2:${PORTSDIR}/graphics/cairo +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ + svg:${PORTSDIR}/graphics/libsvg \ + cairo:${PORTSDIR}/graphics/cairo USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack USE_LDCONFIG= yes PLIST_FILES= include/svg-cairo.h \ lib/libsvg-cairo.a \ diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 76a5ce4d232a..ddd63acfa0f7 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -15,7 +15,7 @@ LICENSE= LGPL21 BUILD_DEPENDS= vala>=0.12.0:${PORTSDIR}/lang/vala LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \ dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - gee:${PORTSDIR}/devel/libgee \ + gee:${PORTSDIR}/devel/libgee06 \ json-glib-1.0:${PORTSDIR}/devel/json-glib \ soup-2.4:${PORTSDIR}/devel/libsoup \ gexiv2:${PORTSDIR}/graphics/gexiv2 \ diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile index 5be70a13e947..71cbba4d5e8d 100644 --- a/irc/irssi-devel/Makefile +++ b/irc/irssi-devel/Makefile @@ -17,6 +17,7 @@ CONFLICTS= irssi-0.8* GNU_CONFIGURE= yes USE_GMAKE= yes +USE_PKGCONFIG= build WANT_PERL= yes MAKE_JOBS_SAFE= yes diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 41fc673a03c4..1fd15a909fd6 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -17,6 +17,7 @@ CONFLICTS= irssi-devel-[0-9]* zh-irssi-[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes USE_NCURSES= yes WANT_PERL= yes diff --git a/irc/minbif/Makefile b/irc/minbif/Makefile index 95b6745e6f12..58e71510f543 100644 --- a/irc/minbif/Makefile +++ b/irc/minbif/Makefile @@ -86,6 +86,9 @@ post-patch: 's|"-lpthread -lstdc++"||' ${WRKSRC}/src/CMakeLists.txt @${REINPLACE_CMD} -e \ '/pam_misc.h/d' ${WRKSRC}/src/im/auth_pam.h + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/server_poll/daemon_fork.cpp \ + ${WRKSRC}/src/server_poll/inetd.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin diff --git a/irc/smartirc4net/Makefile b/irc/smartirc4net/Makefile index cd89e53bc0b3..50c178fb6764 100644 --- a/irc/smartirc4net/Makefile +++ b/irc/smartirc4net/Makefile @@ -17,6 +17,7 @@ BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono RUN_DEPENDS:= ${BUILD_DEPENDS} GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes USE_GNOME= gnomehack diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index bcd24fd6a91c..e5925bfbc2ac 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: xchat2 -# Date created: 17 Aug 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/irc/xchat/Makefile,v 1.7 2008/08/06 07:59:00 kwm Exp $ -# PORTNAME= xchat PORTVERSION= 2.8.8 @@ -14,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/ \ http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ MAINTAINER= gnome@FreeBSD.org -COMMENT= An X11 IRC client using the GTK+ 2 toolkit +COMMENT= X11 IRC client using the GTK+ 2 toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -31,23 +27,20 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --enable-ipv6 WANT_PERL= yes -OPTIONS= DBUS "Enable DBUS support" on \ - GTKSPELL "Enable spell check support using gtkspell" on \ - LIBSEXY "Enable spell check support using libsexy" off \ - NOTIFY "Depend on libnotify for notifications" off \ - PERL "Enable Perl support" on \ - PYTHON "Enable Python support" off \ - SOCKS "Build with socks5 support" off \ - TCL "Enable TCL support" off +OPTIONS_DEFINE= DBUS NOTIFY PERL PYTHON SOCKS TCL +OPTIONS_DEFAULT=DBUS GTKSPELL PERL +OPTIONS_RADIO= SPELL +OPTIONS_RADIO_SPELL= GTKSPELL LIBSEXY +GTKSPELL_DESC= Spell check support via gtkspell +LIBSEXY_DESC= Spell check support via libsexy .if defined(WITH_PYTHON) -USE_PYTHON= yes .endif -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_DBUS) -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +.if ${PORT_OPTIONS:MDBUS} +LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib CONFIGURE_ARGS+=--enable-dbus USE_GNOME+= gconf2 GCONF_SCHEMAS+= apps_xchat_url_handler.schemas @@ -57,42 +50,32 @@ CONFIGURE_ARGS+=--disable-dbus PLIST_SUB+= DBUS="@comment " .endif -.if defined(WITH_GTKSPELL) -.if defined(WITH_LIBSEXY) -BROKEN= You can select only one of GTKSPELL and LIBSEXY for spell check support -.endif -LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell +.if ${PORT_OPTIONS:MGTKSPELL} +LIB_DEPENDS+= gtkspell:${PORTSDIR}/textproc/gtkspell CONFIGURE_ARGS+=--enable-spell=gtkspell -.endif - -.if defined(WITH_LIBSEXY) -.if defined(WITH_GTKSPELL) -BROKEN= You can select only one of GTKSPELL and LIBSEXY for spell check support -.endif -LIB_DEPENDS+= sexy.2:${PORTSDIR}/x11-toolkits/libsexy +.elif ${PORT_OPTIONS:MLIBSEXY} +LIB_DEPENDS+= sexy:${PORTSDIR}/x11-toolkits/libsexy CONFIGURE_ARGS+=--enable-spell=libsexy -.endif - -.if !defined(WITH_GTKSPELL) && !defined(WITH_LIBSEXY) +.else CONFIGURE_ARGS+=--enable-spell=none .endif -.if defined(WITH_NOTIFY) +.if ${PORT_OPTIONS:MNOTIFY} RUN_DEPENDS+= notify-send:${PORTSDIR}/devel/libnotify \ ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon .endif -.if defined(WITHOUT_PERL) -CONFIGURE_ARGS+=--disable-perl -PLIST_SUB+= PERL="@comment " -.else +.if ${PORT_OPTIONS:MPERL} USE_PERL5= yes CONFIGURE_ARGS+=--enable-perl PLIST_SUB+= PERL="" +.else +CONFIGURE_ARGS+=--disable-perl +PLIST_SUB+= PERL="@comment " .endif -.if defined(WITH_PYTHON) -.include "${PORTSDIR}/Mk/bsd.python.mk" +.if ${PORT_OPTIONS:MPYTHON} +USE_PYTHON= yes CONFIGURE_ARGS+=--enable-python PLIST_SUB+= PYTHON="" .else @@ -100,14 +83,13 @@ CONFIGURE_ARGS+=--disable-python PLIST_SUB+= PYTHON="@comment " .endif -.if defined(WITH_SOCKS) -LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante +.if ${PORT_OPTIONS:MSOCKS} +LIB_DEPENDS+= socks:${PORTSDIR}/net/dante CONFIGURE_ARGS+=--enable-socks .endif -.if defined(WITH_TCL) +.if ${PORT_OPTIONS:MTCL} USE_TCL= 84+ -.include "${PORTSDIR}/Mk/bsd.tcl.mk" CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR} CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \ -L${TCL_LIBDIR}" @@ -122,9 +104,11 @@ PLIST_SUB+= TCL="@comment " post-patch: @${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/common/*.[ch] # Create plugins directory even when no plugins are installed post-install: @${MKDIR} ${PREFIX}/lib/xchat/plugins -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/libskk/Makefile b/japanese/libskk/Makefile index 3edb0ddf0a9e..32d97dea7f7a 100644 --- a/japanese/libskk/Makefile +++ b/japanese/libskk/Makefile @@ -7,6 +7,7 @@ PORTNAME= libskk PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= http://cloud.github.com/downloads/ueno/libskk/ @@ -14,12 +15,13 @@ MAINTAINER= hiroto.kagotani@gmail.com COMMENT= Library to deal with Japanese Kana-to-Kanji conversion method BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= gee:${PORTSDIR}/devel/libgee \ +LIB_DEPENDS= gee:${PORTSDIR}/devel/libgee06 \ json-glib-1.0:${PORTSDIR}/devel/json-glib USE_LDCONFIG= yes USE_GMAKE= yes USE_GNOME= intltool gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ENV+= DATADIRNAME=share MAN1= skk.1 diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index be3f86ed936d..446641d1db2b 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -27,6 +27,7 @@ USE_GMAKE= yes USE_ICONV= yes USE_PYTHON= yes USE_OPENSSL= yes +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile index 9be3124f8f37..eee555f433fe 100644 --- a/japanese/tomoe/Makefile +++ b/japanese/tomoe/Makefile @@ -120,4 +120,11 @@ post-extract: ${UNZIP_CMD} -qo ${DISTDIR}/Unihan.zip -d ${WRKSRC}/module/dict .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/ge.*\.h>|glib.h>|g' \ + -e 's|glib/ga.*\.h>|glib.h>|g' \ + ${WRKSRC}/lib/glib-compat-key-file.h \ + ${WRKSRC}/lib/tomoe.c \ + ${WRKSRC}/lib/glib-utils.h + .include <bsd.port.post.mk> diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index 573fd326572b..48b14a2e6f8b 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -1,43 +1,36 @@ -# New ports collection makefile for: gjs -# Date created: 14 Aug 2009 -# Whom: Pawel Worach <pawel.worach@gmail.com> -# +# Created by: Pawel Worach <pawel.worach@gmail.com> # $FreeBSD$ -# $MCom: ports/lang/gjs/Makefile,v 1.12 2010/11/15 20:14:53 kwm Exp $ -# +# $MCom: ports/lang/gjs/Makefile,v 1.28 2012/10/18 08:57:51 kwm Exp $ PORTNAME= gjs -PORTVERSION= 0.7.7 -PORTREVISION= 2 +PORTVERSION= 1.32.0 +PORTREVISION= 1 CATEGORIES= lang gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME JavaScript binding +COMMENT= GNOME Javascript binding -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ + spidermonkey185>=1.8.5:${PORTSDIR}/lang/spidermonkey185 +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + cairo:${PORTSDIR}/graphics/cairo \ + mozjs185:${PORTSDIR}/lang/spidermonkey185 -USE_GECKO= libxul19 -USE_BZIP2= yes +USE_XZ= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_PYTHON_BUILD= yes +USE_PYTHON_BUILD=yes USE_AUTOTOOLS= libtool USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack +USE_PKGCONFIG= build USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -BROKEN= does not link on 6.x -.endif - post-patch: ${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \ ${WRKSRC}/scripts/make-tests -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo index 77acc71b0400..a392b1e47c27 100644 --- a/lang/gjs/distinfo +++ b/lang/gjs/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gjs-0.7.7.tar.bz2) = 30fd38a589dc5520604718b416564f4db4f23c5821c46beaced35e4af0bf4318 -SIZE (gnome2/gjs-0.7.7.tar.bz2) = 485317 +SHA256 (gnome3/gjs-1.32.0.tar.xz) = b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0 +SIZE (gnome3/gjs-1.32.0.tar.xz) = 464372 diff --git a/lang/gjs/files/patch-modules_overrides_GLib.js b/lang/gjs/files/patch-modules_overrides_GLib.js new file mode 100644 index 000000000000..5bf70a844a74 --- /dev/null +++ b/lang/gjs/files/patch-modules_overrides_GLib.js @@ -0,0 +1,79 @@ +--- modules/overrides/GLib.js.orig 2011-12-15 16:10:34.000000000 +0100 ++++ modules/overrides/GLib.js 2011-12-15 16:23:47.000000000 +0100 +@@ -25,27 +25,27 @@ let originalVariantClass; + const SIMPLE_TYPES = ['b', 'y', 'n', 'q', 'i', 'u', 'x', 't', 'h', 'd', 's', 'o', 'g']; + + function _read_single_type(signature, forceSimple) { +- let char = signature.shift(); ++ let xchar = signature.shift(); + let isSimple = false; + +- if (SIMPLE_TYPES.indexOf(char) == -1) { ++ if (SIMPLE_TYPES.indexOf(xchar) == -1) { + if (forceSimple) + throw new TypeError('Invalid GVariant signature (a simple type was expected)'); + } else + isSimple = true; + +- if (char == 'm' || char == 'a') +- return [char].concat(_read_single_type(signature, false)); +- if (char == '{') { ++ if (xchar == 'm' || xchar == 'a') ++ return [xchar].concat(_read_single_type(signature, false)); ++ if (xchar == '{') { + let key = _read_single_type(signature, true); + let val = _read_single_type(signature, false); + let close = signature.shift(); + if (close != '}') + throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}"'); +- return [char].concat(key, val, close); ++ return [xchar].concat(key, val, close); + } +- if (char == '(') { +- let res = [char]; ++ if (xchar == '(') { ++ let res = [xchar]; + while (true) { + if (signature.length == 0) + throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")'); +@@ -60,10 +60,10 @@ function _read_single_type(signature, fo + } + + // Valid types are simple types, arrays, maybes, tuples, dictionary entries and variants +- if (!isSimple && char != 'v') +- throw new TypeError('Invalid GVariant signature (' + char + ' is not a valid type)'); ++ if (!isSimple && xchar != 'v') ++ throw new TypeError('Invalid GVariant signature (' + xchar + ' is not a valid type)'); + +- return [char]; ++ return [xchar]; + } + + +@@ -71,8 +71,8 @@ function _pack_variant(signature, value) + if (signature.length == 0) + throw new TypeError('GVariant signature cannot be empty'); + +- let char = signature.shift(); +- switch (char) { ++ let xchar = signature.shift(); ++ switch (xchar) { + case 'b': + return GLib.Variant.new_boolean(value); + case 'y': +@@ -160,7 +160,7 @@ function _pack_variant(signature, value) + + return GLib.Variant.new_dict_entry(key, child); + default: +- throw new TypeError('Invalid GVariant signature (unexpected character ' + char + ')'); ++ throw new TypeError('Invalid GVariant signature (unexpected character ' + xchar + ')'); + } + } + +@@ -258,4 +258,4 @@ function _init() { + this.Variant.prototype.toString = function() { + return '[object variant of type "' + this.get_type_string() + '"]'; + } +-} +\ No newline at end of file ++} diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist index 406b87203fa1..45599cf6975c 100644 --- a/lang/gjs/pkg-plist +++ b/lang/gjs/pkg-plist @@ -1,30 +1,32 @@ bin/gjs bin/gjs-console +include/gjs-1.0/gi/arg.h +include/gjs-1.0/gi/boxed.h +include/gjs-1.0/gi/closure.h +include/gjs-1.0/gi/enumeration.h +include/gjs-1.0/gi/foreign.h +include/gjs-1.0/gi/function.h +include/gjs-1.0/gi/gtype.h +include/gjs-1.0/gi/interface.h +include/gjs-1.0/gi/keep-alive.h +include/gjs-1.0/gi/ns.h +include/gjs-1.0/gi/object.h +include/gjs-1.0/gi/param.h +include/gjs-1.0/gi/repo.h +include/gjs-1.0/gi/union.h +include/gjs-1.0/gi/value.h include/gjs-1.0/gjs-dbus/dbus-proxy.h include/gjs-1.0/gjs-dbus/dbus.h include/gjs-1.0/gjs/byteArray.h include/gjs-1.0/gjs/compat.h include/gjs-1.0/gjs/context.h -include/gjs-1.0/gjs/gi/arg.h -include/gjs-1.0/gjs/gi/boxed.h -include/gjs-1.0/gjs/gi/closure.h -include/gjs-1.0/gjs/gi/enumeration.h -include/gjs-1.0/gjs/gi/foreign.h -include/gjs-1.0/gjs/gi/function.h -include/gjs-1.0/gjs/gi/gjs_gi_trace.h -include/gjs-1.0/gjs/gi/keep-alive.h -include/gjs-1.0/gjs/gi/ns.h -include/gjs-1.0/gjs/gi/object.h -include/gjs-1.0/gjs/gi/param.h -include/gjs-1.0/gjs/gi/repo.h -include/gjs-1.0/gjs/gi/union.h -include/gjs-1.0/gjs/gi/value.h include/gjs-1.0/gjs/gjs.h include/gjs-1.0/gjs/gjs-module.h include/gjs-1.0/gjs/importer.h include/gjs-1.0/gjs/jsapi-util.h include/gjs-1.0/gjs/mem.h include/gjs-1.0/gjs/native.h +lib/girepository-1.0/GjsDBus-1.0.typelib lib/gjs-1.0/cairoNative.a lib/gjs-1.0/cairoNative.la lib/gjs-1.0/cairoNative.so @@ -34,48 +36,55 @@ lib/gjs-1.0/console.so lib/gjs-1.0/dbusNative.a lib/gjs-1.0/dbusNative.la lib/gjs-1.0/dbusNative.so +lib/gjs-1.0/debugger.a +lib/gjs-1.0/debugger.la +lib/gjs-1.0/debugger.so lib/gjs-1.0/gettextNative.a lib/gjs-1.0/gettextNative.la lib/gjs-1.0/gettextNative.so -lib/gjs-1.0/gi.a -lib/gjs-1.0/gi.la -lib/gjs-1.0/gi.so lib/gjs-1.0/langNative.a lib/gjs-1.0/langNative.la lib/gjs-1.0/langNative.so lib/gjs-1.0/mainloop.a lib/gjs-1.0/mainloop.la lib/gjs-1.0/mainloop.so +lib/gjs-1.0/system.a +lib/gjs-1.0/system.la +lib/gjs-1.0/system.so lib/libgjs-dbus.a lib/libgjs-dbus.la lib/libgjs-dbus.so lib/libgjs-dbus.so.0 -lib/libgjs-gi.a -lib/libgjs-gi.la -lib/libgjs-gi.so -lib/libgjs-gi.so.0 +lib/libgjs-gdbus.a +lib/libgjs-gdbus.la +lib/libgjs-gdbus.so +lib/libgjs-gdbus.so.0 lib/libgjs.a lib/libgjs.la lib/libgjs.so lib/libgjs.so.0 libdata/pkgconfig/gjs-1.0.pc libdata/pkgconfig/gjs-dbus-1.0.pc -libdata/pkgconfig/gjs-gi-1.0.pc libdata/pkgconfig/gjs-internals-1.0.pc +share/gir-1.0/GjsDBus-1.0.gir share/gjs-1.0/cairo.js share/gjs-1.0/dbus.js share/gjs-1.0/gettext.js share/gjs-1.0/jsUnit.js share/gjs-1.0/lang.js +share/gjs-1.0/overrides/GLib.js +share/gjs-1.0/overrides/GObject.js +share/gjs-1.0/overrides/Gio.js share/gjs-1.0/promise.js share/gjs-1.0/signals.js share/gjs-1.0/tweener/equations.js share/gjs-1.0/tweener/tweenList.js share/gjs-1.0/tweener/tweener.js @dirrm share/gjs-1.0/tweener +@dirrm share/gjs-1.0/overrides @dirrm share/gjs-1.0 @dirrm lib/gjs-1.0 -@dirrm include/gjs-1.0/gjs/gi @dirrm include/gjs-1.0/gjs @dirrm include/gjs-1.0/gjs-dbus +@dirrm include/gjs-1.0/gi @dirrm include/gjs-1.0 diff --git a/lang/vala-vapigen/Makefile b/lang/vala-vapigen/Makefile index 568196e82620..4ad37acfb044 100644 --- a/lang/vala-vapigen/Makefile +++ b/lang/vala-vapigen/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: vala-vapigen -# Date created: -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/lang/vala-vapigen/Makefile,v 1.5 2011/04/30 20:43:19 mezz Exp $ -# +# $MCom: ports/lang/vala-vapigen/Makefile,v 1.7 2012/12/17 19:46:24 kwm Exp $ PORTREVISION= 0 CATEGORIES= devel gnome @@ -13,8 +9,6 @@ PKGNAMESUFFIX= -vapigen MAINTAINER= gnome@FreeBSD.org COMMENT= The vapigen program from vala -USE_GMAKE= yes - MASTERDIR= ${.CURDIR}/../vala BUILD_WRKSRC= ${WRKSRC}/vapigen INSTALL_WRKSRC= ${WRKSRC}/vapigen diff --git a/lang/vala-vapigen/pkg-plist b/lang/vala-vapigen/pkg-plist index 93136bd31515..b95270d07bbd 100644 --- a/lang/vala-vapigen/pkg-plist +++ b/lang/vala-vapigen/pkg-plist @@ -5,4 +5,8 @@ bin/vapicheck-%%VERSION%% bin/vapigen bin/vapigen-%%VERSION%% lib/vala-%%VERSION%%/gen-introspect-%%VERSION%% +libdata/pkgconfig/vapigen-%%VERSION%%.pc +libdata/pkgconfig/vapigen.pc +share/aclocal/vapigen.m4 +%%DATADIR%%/Makefile.vapigen @dirrm lib/vala-%%VERSION%% diff --git a/lang/vala/Makefile b/lang/vala/Makefile index d9f819fb55bf..d85c5f683980 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: vala -# Date created: 2007-07-09 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/lang/vala/Makefile,v 1.55 2011/06/02 12:10:13 kwm Exp $ -# +# $MCom: ports/lang/vala/Makefile,v 1.65 2012/12/17 19:46:24 kwm Exp $ PORTNAME= vala -PORTVERSION= 0.12.1 +PORTVERSION= 0.18.1 CATEGORIES= lang gnome MASTER_SITES= GNOME @@ -15,27 +11,28 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Programming language and compiler that converts Vala code into C code LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING + USE_XZ= yes USE_GNOME= gnomehack glib20 gnomeprefix libxslt +USE_GMAKE= yes +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_GETTEXT= yes -CPPFLAGS+= -I${LOCALBASE} +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_BISON= build USE_LDCONFIG= yes -MAN1?= valac.1 valac-0.12.1 - -PLIST_SUB= VERSION=0.12 +MAN1?= valac.1 valac-${VALA_VER}.1 +VALA_VER= 0.18 -.include <bsd.port.pre.mk> +PLIST_SUB= VERSION=${VALA_VER} .if defined(VALA_SLAVE) -LIB_DEPENDS+= vala-0.12.0:${PORTSDIR}/lang/vala +LIB_DEPENDS+= vala-${VALA_VER}.0:${PORTSDIR}/lang/vala CONFIGURE_ARGS+=--enable-vapigen -BUILD_DEPENDS+= p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML -RUN_DEPENDS+= p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML MAN1= vala-gen-introspect.1 vapigen.1 .else CONFIGURE_ARGS+=--disable-vapigen @@ -43,13 +40,13 @@ CONFIGURE_ARGS+=--disable-vapigen post-patch: # We cheat here, because vala records vapigen related stuff in its .pc file -# This makes the vapigen work again, although it might get weird when +# This makes vapigen work again, although it might get weird when # vala-vapigen isn't installed. - @${REINPLACE_CMD} -e 's|@vapigen_decl@|vapigen=$${bindir}/vapigen-0.12|g' \ - -e 's|@gen_introspect_decl@|gen_introspect=$${libdir}/vala-0.12/gen-introspect-0.12|g' \ - -e 's|@vala_gen_introspect_decl@|vala_gen_introspect=$${bindir}/vala-gen-introspect-0.12|g' \ + @${REINPLACE_CMD} -e 's|@vapigen_decl@|vapigen=$${bindir}/vapigen-${VALA_VER}|g' \ + -e 's|@gen_introspect_decl@|gen_introspect=$${libdir}/vala-${VALA_VER}/gen-introspect-${VALA_VER}|g' \ + -e 's|@vala_gen_introspect_decl@|vala_gen_introspect=$${bindir}/vala-gen-introspect-${VALA_VER}|g' \ ${WRKSRC}/libvala.pc.in - @${REINPLACE_CMD} -e 's|cp $$< $$@|cp libvala.pc libvala-0.12.pc|g' \ + @${REINPLACE_CMD} -e 's|cp $$< $$@|cp libvala.pc libvala-${VALA_VER}.pc|g' \ ${WRKSRC}/Makefile.in .if defined(VALA_SLAVE) @@ -63,10 +60,9 @@ post-install: @${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \ ${PREFIX}/man/man1/ .else -# want to see what will fail. post-install: - ${LN} -fs ${PREFIX}/libdata/pkgconfig/libvala-0.12.pc \ + ${LN} -fs ${PREFIX}/libdata/pkgconfig/libvala-${VALA_VER}.pc \ ${PREFIX}/libdata/pkgconfig/vala-1.0.pc .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/vala/distinfo b/lang/vala/distinfo index b401121601a4..a1be5a85260e 100644 --- a/lang/vala/distinfo +++ b/lang/vala/distinfo @@ -1,2 +1,2 @@ -SHA256 (vala-0.12.1.tar.xz) = f102bb64549ebe88955bb9fa0f502d974413aec71fec88e3544c65adfeb0afb4 -SIZE (vala-0.12.1.tar.xz) = 2286024 +SHA256 (vala-0.18.1.tar.xz) = 7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32 +SIZE (vala-0.18.1.tar.xz) = 2584924 diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist index c5013a835436..3aa18a907102 100644 --- a/lang/vala/pkg-plist +++ b/lang/vala/pkg-plist @@ -27,10 +27,11 @@ share/devhelp/books/vala-%%VERSION%%/overview.html share/devhelp/books/vala-%%VERSION%%/statements.html share/devhelp/books/vala-%%VERSION%%/structs.html share/devhelp/books/vala-%%VERSION%%/types.html -share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 +share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/alsa.deps %%DATADIR%%-%%VERSION%%/vapi/alsa.vapi %%DATADIR%%-%%VERSION%%/vapi/atk.vapi +%%DATADIR%%-%%VERSION%%/vapi/avahi-client.vapi %%DATADIR%%-%%VERSION%%/vapi/avahi-gobject.deps %%DATADIR%%-%%VERSION%%/vapi/avahi-gobject.vapi %%DATADIR%%-%%VERSION%%/vapi/bzlib.vapi @@ -40,6 +41,8 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/ccss-1.vapi %%DATADIR%%-%%VERSION%%/vapi/clutter-1.0.deps %%DATADIR%%-%%VERSION%%/vapi/clutter-1.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/clutter-gst-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/clutter-gst-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-0.10.vapi %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-1.0.deps @@ -47,8 +50,8 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/clutter-json-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/cogl-1.0.deps %%DATADIR%%-%%VERSION%%/vapi/cogl-1.0.vapi -%%DATADIR%%-%%VERSION%%/vapi/clutter-gst-1.0.deps -%%DATADIR%%-%%VERSION%%/vapi/clutter-gst-1.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/cogl-pango-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/cogl-pango-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/curses.vapi %%DATADIR%%-%%VERSION%%/vapi/dbus-glib-1.vapi %%DATADIR%%-%%VERSION%%/vapi/enchant.vapi @@ -59,20 +62,24 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gdk-3.0.deps %%DATADIR%%-%%VERSION%%/vapi/gdk-3.0.vapi -%%DATADIR%%-%%VERSION%%/vapi/gdl-1.0.deps -%%DATADIR%%-%%VERSION%%/vapi/gdl-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gdk-pixbuf-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/gdk-pixbuf-2.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gdk-x11-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/gdk-x11-2.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gdk-x11-3.0.deps %%DATADIR%%-%%VERSION%%/vapi/gdk-x11-3.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/gdl-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gdl-1.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/gdl-3.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gdl-3.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gdu-gtk.deps %%DATADIR%%-%%VERSION%%/vapi/gdu-gtk.vapi %%DATADIR%%-%%VERSION%%/vapi/gdu.deps %%DATADIR%%-%%VERSION%%/vapi/gdu.vapi %%DATADIR%%-%%VERSION%%/vapi/gedit-2.20.deps %%DATADIR%%-%%VERSION%%/vapi/gedit-2.20.vapi +%%DATADIR%%-%%VERSION%%/vapi/gedit.deps +%%DATADIR%%-%%VERSION%%/vapi/gedit.vapi %%DATADIR%%-%%VERSION%%/vapi/gio-2.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gio-unix-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/gio-unix-2.0.vapi @@ -86,47 +93,75 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/gnome-vfs-2.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gnutls.vapi %%DATADIR%%-%%VERSION%%/vapi/gobject-2.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/gobject-introspection-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/goocanvas.deps %%DATADIR%%-%%VERSION%%/vapi/goocanvas.vapi %%DATADIR%%-%%VERSION%%/vapi/gsl.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-app-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-app-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-app-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-app-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-audio-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-audio-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-audio-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-audio-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-base-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-base-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-base-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-base-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-cdda-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-cdda-0.10.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-check-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-check-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-check-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-check-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-controller-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-controller-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-controller-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-controller-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-dataprotocol-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-dataprotocol-0.10.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-fft-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-fft-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-fft-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-fft-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-interfaces-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-interfaces-0.10.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-net-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-net-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-net-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-net-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-netbuffer-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-netbuffer-0.10.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-pbutils-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-pbutils-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-pbutils-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-pbutils-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-riff-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-riff-0.10.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtp-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtp-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtp-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtp-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-sdp-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-sdp-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-sdp-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-sdp-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-tag-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-tag-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-tag-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-tag-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-video-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-video-0.10.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-video-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-video-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gtk+-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/gtk+-2.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gtk+-3.0.deps @@ -135,6 +170,8 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/gtkmozembed.vapi %%DATADIR%%-%%VERSION%%/vapi/gtksourceview-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/gtksourceview-2.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/gtksourceview-3.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gtksourceview-3.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gudev-1.0.deps %%DATADIR%%-%%VERSION%%/vapi/gudev-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/hal.deps @@ -162,6 +199,7 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/libglade-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/libglade-2.0.vapi %%DATADIR%%-%%VERSION%%/vapi/libgnome-2.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/libgnome-menu-3.0.vapi %%DATADIR%%-%%VERSION%%/vapi/libgnome-menu.vapi %%DATADIR%%-%%VERSION%%/vapi/libgnomeui-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/libgnomeui-2.0.vapi @@ -172,12 +210,16 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/libnl-1.vapi %%DATADIR%%-%%VERSION%%/vapi/libnl-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/libnl-2.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/libnl-3.0.deps +%%DATADIR%%-%%VERSION%%/vapi/libnl-3.0.vapi %%DATADIR%%-%%VERSION%%/vapi/libnotify.deps %%DATADIR%%-%%VERSION%%/vapi/libnotify.vapi %%DATADIR%%-%%VERSION%%/vapi/liboobs-1.vapi %%DATADIR%%-%%VERSION%%/vapi/libosso.vapi %%DATADIR%%-%%VERSION%%/vapi/libpanelapplet-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/libpanelapplet-2.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/libpeas-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/libpeas-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/libpq.vapi %%DATADIR%%-%%VERSION%%/vapi/librsvg-2.0.deps %%DATADIR%%-%%VERSION%%/vapi/librsvg-2.0.vapi @@ -192,6 +234,8 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/libvala-%%VERSION%%.vapi %%DATADIR%%-%%VERSION%%/vapi/libwnck-1.0.deps %%DATADIR%%-%%VERSION%%/vapi/libwnck-1.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/libwnck-3.0.deps +%%DATADIR%%-%%VERSION%%/vapi/libwnck-3.0.vapi %%DATADIR%%-%%VERSION%%/vapi/libxml-2.0.vapi %%DATADIR%%-%%VERSION%%/vapi/linux.deps %%DATADIR%%-%%VERSION%%/vapi/linux.vapi @@ -217,6 +261,8 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/readline.vapi %%DATADIR%%-%%VERSION%%/vapi/rest-0.6.deps %%DATADIR%%-%%VERSION%%/vapi/rest-0.6.vapi +%%DATADIR%%-%%VERSION%%/vapi/rest-0.7.deps +%%DATADIR%%-%%VERSION%%/vapi/rest-0.7.vapi %%DATADIR%%-%%VERSION%%/vapi/rest-extras-0.6.deps %%DATADIR%%-%%VERSION%%/vapi/rest-extras-0.6.vapi %%DATADIR%%-%%VERSION%%/vapi/sdl-gfx.deps @@ -237,15 +283,21 @@ share/devhelp/books/vala-%%VERSION%%/vala.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/tracker-indexer-module-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/twitter-glib-1.0.deps %%DATADIR%%-%%VERSION%%/vapi/twitter-glib-1.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/udisks2.deps +%%DATADIR%%-%%VERSION%%/vapi/udisks2.vapi %%DATADIR%%-%%VERSION%%/vapi/unique-1.0.deps %%DATADIR%%-%%VERSION%%/vapi/unique-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/v4l2.vapi +%%DATADIR%%-%%VERSION%%/vapi/vte-2.90.deps +%%DATADIR%%-%%VERSION%%/vapi/vte-2.90.vapi %%DATADIR%%-%%VERSION%%/vapi/vte.deps %%DATADIR%%-%%VERSION%%/vapi/vte.vapi %%DATADIR%%-%%VERSION%%/vapi/webkit-1.0.deps %%DATADIR%%-%%VERSION%%/vapi/webkit-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/x11.vapi %%DATADIR%%-%%VERSION%%/vapi/xcb.vapi +%%DATADIR%%-%%VERSION%%/vapi/xtst.deps +%%DATADIR%%-%%VERSION%%/vapi/xtst.vapi %%DATADIR%%-%%VERSION%%/vapi/zlib.vapi @dirrm %%DATADIR%%-%%VERSION%%/vapi @dirrm %%DATADIR%%-%%VERSION%% diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index 75273b7b9e05..c801dcf2fea0 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -3,12 +3,12 @@ # Whom: Adam Weinberger, based off kiesel's ximian-exchange port # # $FreeBSD$ -# $MCom: ports/mail/evolution-exchange/Makefile,v 1.166 2010/11/16 09:52:36 kwm Exp $ +# $MCom: ports/mail/evolution-exchange/Makefile,v 1.172 2012/09/20 23:06:27 kwm Exp $ # PORTNAME= evolution-exchange PORTVERSION= 2.32.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,6 +20,8 @@ EVO_PC_FILE= ${LOCALBASE}/libdata/pkgconfig/evolution-mail.pc BUILD_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution RUN_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution +CONFLICTS= evolution-exchange-3.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool @@ -65,6 +67,7 @@ post-patch: @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \ -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \ -e 's|-DGTK_DISABLE_DEPRECATED||g' \ + -e 's|-DG_DISABLE_DEPRECATED||g' \ -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 24a6feb062ca..873d8437ccae 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,24 +1,20 @@ -# New ports collection makefile for: evolution -# Date created: 28th June 2000 -# Whom: Ade Lovett <ade@FreeBSD.org> -# +# Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/mail/evolution/Makefile,v 1.237 2011/04/30 20:43:20 mezz Exp $ -# +# $MCom: ports/mail/evolution/Makefile,v 1.241 2012/09/01 23:02:10 mezz Exp $ PORTNAME= evolution PORTVERSION= 2.32.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= Integrated mail, calendar, and address book distributed suite +COMMENT= Integrated mail, calendar and address book distributed suite -LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview +LIB_DEPENDS= nss3:${PORTSDIR}/security/nss \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + gtkimageview:${PORTSDIR}/x11-toolkits/gtkimageview RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell CONFLICTS= evolution-3.[0-9]* @@ -109,6 +105,7 @@ post-patch: -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \ -e 's|-Wl,--no-undefined||g' \ -e 's|-DGTK_DISABLE_DEPRECATED||g' \ + -e 's|-DG_DISABLE_DEPRECATED||g' \ -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile index 462832c6db02..ea8b0a29763f 100644 --- a/mail/gnome-gmail-notifier/Makefile +++ b/mail/gnome-gmail-notifier/Makefile @@ -27,5 +27,7 @@ USE_GSTREAMER= good post-patch: @${REINPLACE_CMD} -e 's|@DATADIRNAME@|share|' ${WRKSRC}/po/Makefile.in.in + @${REINPLACE_CMD} -e 's|<glib/gthread.h>|<glib.h>|g' ${WRKSRC}/src/main.h + .include <bsd.port.mk> diff --git a/mail/masqmail/Makefile b/mail/masqmail/Makefile index 2bf7245a3aec..9f87ea1735d5 100644 --- a/mail/masqmail/Makefile +++ b/mail/masqmail/Makefile @@ -20,6 +20,7 @@ MAN8= masqmail.8 rmail.8 .endif USE_GNOME= glib20 +USE_PKGCONFIG= build USE_RC_SUBR= masqmail GNU_CONFIGURE= yes CFLAGS+= -Wno-trigraphs diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index 692cbf02716c..d08cebc61b6c 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24 \ talloc:${PORTSDIR}/devel/talloc HAS_CONFIGURE= yes +USE_PKGCONFIG= build CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile index 1d125e37413a..a466eee109cc 100644 --- a/mail/spmfilter/Makefile +++ b/mail/spmfilter/Makefile @@ -27,7 +27,7 @@ LICENSE= LGPL3 USE_CMAKE= yes CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ -DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib" - +USE_PKGCONFIG= build USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_RC_SUBR= ${PORTNAME} diff --git a/misc/amanda26-server/files/patch-common-src::glib-util.c b/misc/amanda26-server/files/patch-common-src::glib-util.c index 1d3b00558e0d..eb92dddcfc54 100644 --- a/misc/amanda26-server/files/patch-common-src::glib-util.c +++ b/misc/amanda26-server/files/patch-common-src::glib-util.c @@ -1,5 +1,5 @@ ---- common-src/glib-util.c.orig 2008-12-01 22:17:19.000000000 +0100 -+++ common-src/glib-util.c 2011-06-25 22:43:28.000000000 +0200 +--- common-src/glib-util.c.orig 2008-12-01 21:17:19.000000000 +0000 ++++ common-src/glib-util.c 2013-02-07 15:54:40.000000000 +0000 @@ -38,26 +38,15 @@ if (did_glib_init) return; did_glib_init = TRUE; @@ -46,7 +46,7 @@ } typedef enum { -@@ -107,29 +107,19 @@ +@@ -107,38 +107,19 @@ return to; } @@ -76,7 +76,16 @@ g_slist_free(list); } +- +-void g_queue_free_full(GQueue * queue) { +- while (!g_queue_is_empty(queue)) { +- gpointer data; +- data = g_queue_pop_head(queue); +- amfree(data); +- } +- g_queue_free(queue); +-} +#endif - void g_queue_free_full(GQueue * queue) { - while (!g_queue_is_empty(queue)) { + void g_ptr_array_free_full(GPtrArray * array) { + size_t i; diff --git a/misc/amanda26-server/files/patch-common-src_glib-util.h b/misc/amanda26-server/files/patch-common-src_glib-util.h index 7e26de023ff5..913e150674ee 100644 --- a/misc/amanda26-server/files/patch-common-src_glib-util.h +++ b/misc/amanda26-server/files/patch-common-src_glib-util.h @@ -1,6 +1,6 @@ ---- common-src/glib-util.h.orig 2011-06-25 22:39:20.000000000 +0200 -+++ common-src/glib-util.h 2011-06-25 22:40:39.000000000 +0200 -@@ -62,10 +62,16 @@ GValue* g_value_unset_init(GValue* val, +--- common-src/glib-util.h.orig 2008-12-01 21:17:19.000000000 +0000 ++++ common-src/glib-util.h 2013-02-07 15:54:27.000000000 +0000 +@@ -62,11 +62,16 @@ * Returns its second (reset) argument.*/ GValue* g_value_unset_copy(const GValue* from, GValue * to); @@ -16,6 +16,7 @@ * pointers in the container before free()ing the container itself. */ -void g_list_free_full(GList * list); -void g_slist_free_full(GSList * list); - void g_queue_free_full(GQueue * queue); +-void g_queue_free_full(GQueue * queue); void g_ptr_array_free_full(GPtrArray * array); + /* g_value_compare() does what you expect. It returns TRUE if and diff --git a/misc/amanda32-server/files/patch-common-src_glib-util.c b/misc/amanda32-server/files/patch-common-src_glib-util.c new file mode 100644 index 000000000000..c1261d15f6e2 --- /dev/null +++ b/misc/amanda32-server/files/patch-common-src_glib-util.c @@ -0,0 +1,18 @@ +--- common-src/glib-util.c.orig 2013-02-07 15:57:30.000000000 +0000 ++++ common-src/glib-util.c 2013-02-07 15:57:50.000000000 +0000 +@@ -120,15 +120,6 @@ + } + #endif + +-void g_queue_free_full(GQueue * queue) { +- while (!g_queue_is_empty(queue)) { +- gpointer data; +- data = g_queue_pop_head(queue); +- amfree(data); +- } +- g_queue_free(queue); +-} +- + void g_ptr_array_free_full(GPtrArray * array) { + size_t i; + diff --git a/misc/amanda32-server/files/patch-common-src_glib-util.h b/misc/amanda32-server/files/patch-common-src_glib-util.h new file mode 100644 index 000000000000..75839e8c75bf --- /dev/null +++ b/misc/amanda32-server/files/patch-common-src_glib-util.h @@ -0,0 +1,10 @@ +--- common-src/glib-util.h.orig 2013-02-07 15:57:26.000000000 +0000 ++++ common-src/glib-util.h 2013-02-07 15:57:54.000000000 +0000 +@@ -72,7 +72,6 @@ + + /* These functions all take a GLib container, and call free() on all the + * pointers in the container before free()ing the container itself. */ +-void g_queue_free_full(GQueue * queue); + void g_ptr_array_free_full(GPtrArray * array); + + /* g_value_compare() does what you expect. It returns TRUE if and diff --git a/misc/bigboard/Makefile b/misc/bigboard/Makefile index 413cfcca6a1e..07ce56b6cfec 100644 --- a/misc/bigboard/Makefile +++ b/misc/bigboard/Makefile @@ -38,5 +38,7 @@ GCONF_SCHEMAS= bigboard.schemas post-patch: @${FIND} ${WRKSRC} -type f -exec fgrep -l '%%LOCALBASE%%' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' -i .bak + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/bigboard/keybinder/tomboykeybinder.h .include <bsd.port.mk> diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile index f2ae701a85aa..f6a0cb3a1401 100644 --- a/misc/gnome-mime-data/Makefile +++ b/misc/gnome-mime-data/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: gnomemimedata -# Date created: 22 January 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ # $MCom: ports/misc/gnome-mime-data/Makefile,v 1.14 2007/05/22 04:59:18 marcus Exp $ @@ -19,7 +16,7 @@ COMMENT= A MIME and Application database for GNOME USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack pkgconfig +USE_GNOME= gnomeprefix gnomehack intlhack GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile index 8774c9c39048..226b807325bb 100644 --- a/misc/gnomehier/Makefile +++ b/misc/gnomehier/Makefile @@ -1,15 +1,10 @@ -# New ports collection makefile for: gnomehier -# Date created: 2 July 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/misc/gnomehier/Makefile,v 1.34 2009/04/09 03:24:08 mezz Exp $ -# +# $MCom: ports/misc/gnomehier/Makefile,v 1.39 2012/12/10 10:58:06 kwm Exp $ # !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!! PORTNAME= gnomehier -PORTVERSION= 2.3 -PORTREVISION= 12 +PORTVERSION= 3.0 CATEGORIES= misc gnome MASTER_SITES= # none DISTFILES= # none @@ -18,7 +13,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A utility port that creates the GNOME directory tree NO_BUILD= yes -PLIST?= ${WRKDIR}/pkg-plist +PLIST= ${WRKDIR}/pkg-plist PKGINSTALL= ${WRKDIR}/pkg-install GNOME_MTREE= BSD.gnome.dist @@ -44,8 +39,6 @@ pre-install: < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} pre-su-install: - ${CHGRP} games ${WRKSRC}/share/games - ${CHMOD} g=rwXs ${WRKSRC}/share/games cd ${WRKSRC} && \ ${MTREE_CMD} -U -d -n -i -c -k "uname, gname, mode" | \ ${SED} -e 's|uname=[A-Za-z0-9_]*|uname=root|' \ diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist index 9ef1b4c8f0f6..1e48a75d2eec 100644 --- a/misc/gnomehier/files/dirlist +++ b/misc/gnomehier/files/dirlist @@ -4,6 +4,9 @@ etc/X11 etc/X11/serverconfig etc/X11/starthere etc/X11/sysconfig +etc/dconf +etc/dconf/db +etc/dconf/profile etc/gconf etc/gconf/gconf.xml.defaults etc/gconf/gconf.xml.mandatory @@ -13,6 +16,11 @@ etc/gnome etc/gnome-vfs-2.0 etc/gnome-vfs-2.0/modules etc/gnome/config +etc/mateconf +etc/mateconf/mateconf.xml.defaults +etc/mateconf/mateconf.xml.mandatory +etc/mateconf/mateconf.xml.system +etc/mateconf/schemas etc/sound etc/sound/events etc/vfs @@ -26,12 +34,23 @@ lib/GConf lib/bonobo lib/bonobo/monikers lib/bonobo/plugin +lib/girepository-1.0 lib/gnome-vfs-2.0 lib/gnome-vfs-2.0/modules +lib/mate-vfs-2.0 +lib/mate-vfs-2.0/modules +lib/matecomponent +lib/matecomponent-2.0 +lib/matecomponent-2.0/samples +lib/matecomponent/monikers lib/vfs lib/vfs/modules libdata/bonobo libdata/bonobo/servers +libdata/matecomponent +libdata/matecomponent/servers +share/MateConf +share/MateConf/gsettings share/applets share/applets/Amusements share/applets/Clocks @@ -50,14 +69,16 @@ share/control-center/Peripherals share/control-center/Session share/control-center/capplets share/control-center/keybindings +share/control-center/keybindings/gtk-modules share/doc/libgda -share/games +share/gir-1.0 share/gnome share/gnome-2.0 share/gnome-2.0/ui share/gnome-about share/gnome-control-center share/gnome-control-center/keybindings +share/gnome-settings-daemon-3.0 share/gnome/apps share/gnome/apps/Applications share/gnome/apps/Audio @@ -85,6 +106,12 @@ share/gnome/panel share/gnome/ui share/gnome/wm-properties share/images +share/mate +share/mate-2.0 +share/mate-2.0/ui +share/mate-control-center +share/mate-control-center/keybindings +share/mate/help share/mc share/mc/templates share/mime-info diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile index ff4d28bc222c..deccf4912de9 100644 --- a/misc/metalink-tools/Makefile +++ b/misc/metalink-tools/Makefile @@ -25,6 +25,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_GNOME= glib20 GNU_CONFIGURE= yes +USE_PKGCONFIG= build CONFIGURE_ENV+= AWK="${AWK}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/misc/salias/Makefile b/misc/salias/Makefile index ea95ccec8207..2aa97175e2b9 100644 --- a/misc/salias/Makefile +++ b/misc/salias/Makefile @@ -17,6 +17,7 @@ COMMENT= A command-line tool to alias arguments of other programs USE_BZIP2= yes USE_GNOME= glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes MAN1= salias.1 diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 7df7c71e89e2..53ff1807869b 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-update-mimedb USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= glib20 libxml2 intltool gnomehack intlhack pkgconfig +USE_GNOME= glib20 libxml2 intltool gnomehack intlhack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile index 8581ed0cb31e..07ef2e8d8027 100644 --- a/misc/xdelta/Makefile +++ b/misc/xdelta/Makefile @@ -16,6 +16,7 @@ COMMENT= A diff/patch utility for binary files USE_AUTOTOOLS= libtool USE_GNOME= glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile index 2a7292e347ca..bdced7316062 100644 --- a/multimedia/bombono/Makefile +++ b/multimedia/bombono/Makefile @@ -43,6 +43,8 @@ MANDIR= ${MANPREFIX}/man/man1 post-patch: @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/mgui/author/gb_devices.c post-install: ${MKDIR} ${MANDIR} diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index b8a78fc4392b..f1c4c7aac6d8 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gstreamer plugins -# Date created: Wed Jul 10 23:38:01 UTC 2002 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# +# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # $FreeBSD$ # $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.125 2010/03/16 19:33:10 mezz Exp $ -# PORTNAME= gstreamer PORTVERSION?= ${BASE_PORTVERSION} @@ -25,8 +21,8 @@ COMMENT?= GStreamer written collection of plugins handling several media types BUILD_DEPENDS+= v4l_compat>=1.0.20110720:${PORTSDIR}/multimedia/v4l_compat \ gstreamer>=0.10.36:${PORTSDIR}/multimedia/gstreamer \ orc>=0.4.14:${PORTSDIR}/devel/orc -LIB_DEPENDS+= gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \ - orc-0.4.0:${PORTSDIR}/devel/orc +LIB_DEPENDS+= gstreamer-0.10:${PORTSDIR}/multimedia/gstreamer \ + orc-0.4:${PORTSDIR}/devel/orc CFLAGS:= ${CFLAGS} -O2 -Wno-format @@ -50,7 +46,8 @@ VERSION= ${GST_VERSION} WANT_GSTREAMER= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME+= gnomehack pkgconfig ltverhack ltasneededhack +USE_GNOME+= gnomehack ltverhack ltasneededhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool GST_PLUGIN?= base diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index f1e95d5a1e3e..d7113454e069 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gstreamer -# Date created: Tue Jul 9 20:24:02 UTC 2002 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# +# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # $FreeBSD$ # $MCom: ports/multimedia/gstreamer/Makefile,v 1.74 2010/03/09 10:11:45 kwm Exp $ -# PORTNAME= gstreamer PORTVERSION= 0.10.36 diff --git a/net-im/Makefile b/net-im/Makefile index 1e069ef0aed1..b4174aa87b11 100644 --- a/net-im/Makefile +++ b/net-im/Makefile @@ -26,6 +26,7 @@ SUBDIR += farsight2 SUBDIR += finch SUBDIR += folks + SUBDIR += folks04 SUBDIR += freetalk SUBDIR += fugu SUBDIR += gajim diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index ddf9c981d350..f8c3d7dca79a 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: empathy -# Date created: 2007-10-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/empathy/Makefile,v 1.76 2010/11/18 18:04:55 kwm Exp $ +# $MCom: ports/net-im/empathy/Makefile,v 1.90 2012/08/17 19:06:45 kwm Exp $ PORTNAME= empathy -PORTVERSION= 2.32.2 +PORTVERSION= 2.34.0 PORTREVISION= 3 CATEGORIES= net-im gnome MASTER_SITES= GNOME @@ -17,20 +14,22 @@ COMMENT= GNOME IM client based around telepathy BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control -LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ - telepathy.2:${PORTSDIR}/net-im/libtelepathy \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \ - telepathy-logger.1:${PORTSDIR}/net-im/telepathy-logger \ - folks-telepathy.16:${PORTSDIR}/net-im/folks \ - gcr.0:${PORTSDIR}/security/gnome-keyring \ - notify.4:${PORTSDIR}/devel/libnotify \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ + telepathy:${PORTSDIR}/net-im/libtelepathy \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + telepathy-farsight:${PORTSDIR}/net-im/telepathy-farsight \ + telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \ + folks-telepathy:${PORTSDIR}/net-im/folks04 \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + notify:${PORTSDIR}/devel/libnotify \ + gcr:${PORTSDIR}/security/gnome-keyring \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control +CONFLICTS= empathy-3.[0-9]* + USE_GMAKE= yes USE_BZIP2= yes USE_GETTEXT= yes @@ -51,39 +50,39 @@ GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml MAN1= empathy.1 empathy-accounts.1 -OPTIONS= JABBER "Enable jabber (XMPP) client support" on \ - MSN "Enable MSN client support" on \ - IRC "Enable IRC client support" on \ - SALUT "Enable link-local (serverless) XMPP support" off \ - HAZE "Enable libpurple protocol integration" off \ - WEBKIT "Enable Adium Message Style themes" on \ - NST "Enable Nautilus SendTo plugin" on \ - MAP "Enable graphical map support" on +OPTIONS_DEFINE= JABBER MSN IRC SALUT HAZE WEBKIT NST MAP +OPTIONS_DEFAULT=JABBER MSN IRC WEBKIT NST MAP +MSN_DESC= MSN client support +IRC_DESC= IRC client support +SALUT_DESC= Link-local (serverless) XMPP support +HAZE_DESC= Libpurple protocol integration +NST_DESC= Nautilus SendTo plugin +MAP_DESC= Graphical map support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_JABBER) +.if ${PORT_OPTIONS:MJABBER} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble .endif -.if defined(WITH_MSN) +.if ${PORT_OPTIONS:MMSN} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly .endif -.if defined(WITH_IRC) +.if ${PORT_OPTIONS:MIRC} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle .endif -.if !defined(WITHOUT_SALUT) +.if ${PORT_OPTIONS:MSALUT} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut .endif -.if !defined(WITHOUT_HAZE) +.if ${PORT_OPTIONS:MHAZE} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze .endif -.if defined(WITH_WEBKIT) -LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 +.if ${PORT_OPTIONS:MWEBKIT} +LIB_DEPENDS+= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 CONFIGURE_ARGS+=--enable-webkit PLIST_SUB+= ADIUM="" .else @@ -91,7 +90,7 @@ CONFIGURE_ARGS+=--disable-webkit PLIST_SUB+= ADIUM="@comment " .endif -.if defined(WITH_NST) +.if ${PORT_OPTIONS:MNST} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto CONFIGURE_ARGS+=--enable-nautilus-sendto=yes @@ -101,8 +100,8 @@ CONFIGURE_ARGS+=--enable-nautilus-sendto=no PLIST_SUB+= NST="@comment " .endif -.if !defined(WITHOUT_MAP) -LIB_DEPENDS+= champlain-0.8.1:${PORTSDIR}/graphics/libchamplain +.if ${PORT_OPTIONS:MMAP} +LIB_DEPENDS+= champlain-0.8:${PORTSDIR}/graphics/libchamplain CONFIGURE_ARGS+=--enable-map PLIST_SUB+= MAP="" .else @@ -110,4 +109,4 @@ CONFIGURE_ARGS+=--disable-map PLIST_SUB+= MAP="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo index aef3ef0e3e1f..1cfcc35b5f86 100644 --- a/net-im/empathy/distinfo +++ b/net-im/empathy/distinfo @@ -1,2 +1,2 @@ -SHA256 (empathy-2.32.2.tar.bz2) = f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861 -SIZE (empathy-2.32.2.tar.bz2) = 2936340 +SHA256 (empathy-2.34.0.tar.bz2) = 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 +SIZE (empathy-2.34.0.tar.bz2) = 3361496 diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure index 9bf98699b386..300f783e450a 100644 --- a/net-im/empathy/files/patch-configure +++ b/net-im/empathy/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2011-08-16 16:19:02.000000000 +0200 -+++ configure 2011-08-16 16:19:59.000000000 +0200 +--- configure.orig 2010-11-18 17:41:43.000000000 +0100 ++++ configure 2010-11-18 17:41:43.000000000 +0100 @@ -13390,8 +13390,8 @@ .SECONDARY: $(gsettings_SCHEMAS) @@ -11,74 +11,3 @@ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) @$(NORMAL_INSTALL) -@@ -14771,14 +14771,14 @@ - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED -- libnotify < 0.7\""; } >&5 -+ libnotify < 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7") 2>&5 -+ libnotify < 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7" 2>/dev/null` -+ libnotify < 0.9" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14790,14 +14790,14 @@ - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED -- libnotify < 0.7\""; } >&5 -+ libnotify < 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7") 2>&5 -+ libnotify < 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7" 2>/dev/null` -+ libnotify < 0.9" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14818,16 +14818,16 @@ - fi - if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7" 2>&1` -+ libnotify < 0.9" 2>&1` - else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7" 2>&1` -+ libnotify < 0.9" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBNOTIFY_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7) were not met: -+ libnotify < 0.9) were not met: - - $LIBNOTIFY_PKG_ERRORS - -@@ -15049,11 +15049,11 @@ - fi - - # Enable GSEAL checks if needed --if test $USE_MAINTAINER_MODE = yes; then -+#if test $USE_MAINTAINER_MODE = yes; then - --$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h -+#$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h - --fi -+#fi - - # ----------------------------------------------------------- - # Enable debug diff --git a/net-im/empathy/files/patch-libempathy_empathy-auth-factory.c b/net-im/empathy/files/patch-libempathy_empathy-auth-factory.c new file mode 100644 index 000000000000..879313c5b7c1 --- /dev/null +++ b/net-im/empathy/files/patch-libempathy_empathy-auth-factory.c @@ -0,0 +1,10 @@ +--- libempathy/empathy-auth-factory.c.orig 2011-12-07 17:19:17.000000000 +0000 ++++ libempathy/empathy-auth-factory.c 2011-12-07 17:19:45.000000000 +0000 +@@ -23,6 +23,7 @@ + #include <telepathy-glib/interfaces.h> + #include <telepathy-glib/simple-handler.h> + #include <telepathy-glib/util.h> ++#include <telepathy-glib/channel-dispatch-operation.h> + + #define DEBUG_FLAG EMPATHY_DEBUG_TLS + #include "empathy-debug.h" diff --git a/net-im/empathy/files/patch-src_empathy-chat-window.c b/net-im/empathy/files/patch-src_empathy-chat-window.c deleted file mode 100644 index a01730405e99..000000000000 --- a/net-im/empathy/files/patch-src_empathy-chat-window.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/empathy-chat-window.c.orig 2011-08-16 16:23:38.000000000 +0200 -+++ src/empathy-chat-window.c 2011-08-16 16:24:00.000000000 +0200 -@@ -1300,7 +1300,7 @@ chat_window_show_or_update_notification - to an existing notification with the same title. - In this way the previous message will not be lost: the new - message will appear below it, in the same notification */ -- notification = notify_notification_new (header, escaped, NULL, NULL); -+ notification = notify_notification_new (header, escaped, NULL); - - if (priv->notification == NULL) { - priv->notification = notification; diff --git a/net-im/empathy/files/patch-src_empathy-status-icon.c b/net-im/empathy/files/patch-src_empathy-status-icon.c deleted file mode 100644 index 354fa5a4e037..000000000000 --- a/net-im/empathy/files/patch-src_empathy-status-icon.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/empathy-status-icon.c.orig 2011-08-16 16:25:07.000000000 +0200 -+++ src/empathy-status-icon.c 2011-08-16 16:25:32.000000000 +0200 -@@ -206,8 +206,8 @@ status_icon_update_notification (Empathy - to an existing notification with the same title. - In this way the previous message will not be lost: the new - message will appear below it, in the same notification */ -- notification = notify_notification_new_with_status_icon -- (priv->event->header, message_esc, NULL, priv->icon); -+ notification = notify_notification_new -+ (priv->event->header, message_esc, NULL); - - if (priv->notification == NULL) { - priv->notification = notification; diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist index daa8228d30de..77cbcd0e4bca 100644 --- a/net-im/empathy/pkg-plist +++ b/net-im/empathy/pkg-plist @@ -11,6 +11,7 @@ share/applications/empathy-accounts.desktop share/applications/empathy.desktop share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.service +share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Call.service share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/Template.html %%DATADIR%%/codec-preferences @@ -32,6 +33,7 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/empathy-chat.ui %%DATADIR%%/empathy-chatroom-manager.dtd %%DATADIR%%/empathy-chatrooms-window.ui +%%DATADIR%%/empathy-contact-blocking-dialog.ui %%DATADIR%%/empathy-contact-dialogs.ui %%DATADIR%%/empathy-contact-groups.dtd %%DATADIR%%/empathy-contact-selector-dialog.ui @@ -1059,6 +1061,7 @@ share/gnome/help/empathy/zh_CN/video-call.page share/icons/hicolor/16x16/apps/empathy.png share/icons/hicolor/22x22/apps/empathy.png share/icons/hicolor/24x24/apps/empathy.png +share/icons/hicolor/256x256/apps/empathy.png share/icons/hicolor/32x32/apps/empathy.png share/icons/hicolor/48x48/apps/empathy.png share/icons/hicolor/scalable/apps/empathy.svg @@ -1142,6 +1145,7 @@ share/locale/zh_HK/LC_MESSAGES/empathy.mo share/locale/zh_TW/LC_MESSAGES/empathy.mo share/telepathy/clients/Empathy.AudioVideo.client share/telepathy/clients/Empathy.Auth.client +share/telepathy/clients/Empathy.Call.client share/telepathy/clients/Empathy.client @dirrmtry share/telepathy/clients @dirrmtry share/telepathy diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile index 135a1ede1794..1f5ee13c4744 100644 --- a/net-im/farsight2/Makefile +++ b/net-im/farsight2/Makefile @@ -1,36 +1,29 @@ -# New ports collection makefile for: farsight2 -# Date created: 27 February 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# +# $MCom: ports/net-im/farsight2/Makefile,v 1.10 2012/06/13 09:31:14 kwm Exp $ PORTNAME= farsight2 -PORTVERSION= 0.0.22 -PORTREVISION= 1 +PORTVERSION= 0.0.31 CATEGORIES= net-im devel MASTER_SITES= http://farsight.freedesktop.org/releases/farsight2/ MAINTAINER= gnome@FreeBSD.org COMMENT= Collection of GStreamer modules and libraries for videoconferencing -LIB_DEPENDS= nice.0:${PORTSDIR}/net-im/libnice +LIB_DEPENDS= nice:${PORTSDIR}/net-im/libnice +CONFLICTS= farstream-[0-9]* + +FETCH_ARGS= -Fpr USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_PYTHON= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack \ - pygtk2 +USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_GSTREAMER= core good bad python USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 702000 -BROKEN= does not build on FreeBSD 7.X prior 7.2 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/farsight2/distinfo b/net-im/farsight2/distinfo index b604007cbc31..07486ea0dd1a 100644 --- a/net-im/farsight2/distinfo +++ b/net-im/farsight2/distinfo @@ -1,2 +1,2 @@ -SHA256 (farsight2-0.0.22.tar.gz) = 3ae59aa61a8071c9fad111e5fd606aabc27961eb4192f8729987a27dae6b3974 -SIZE (farsight2-0.0.22.tar.gz) = 1117646 +SHA256 (farsight2-0.0.31.tar.gz) = 55ce219c67a93bc55bcf30d6a5bfcadf09e1c5349d179b2da9ccb74c42271f9b +SIZE (farsight2-0.0.31.tar.gz) = 1231416 diff --git a/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c b/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c deleted file mode 100644 index eb06175ea5a8..000000000000 --- a/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c +++ /dev/null @@ -1,12 +0,0 @@ ---- transmitters/shm/fs-shm-transmitter.c.orig 2010-11-26 23:51:31.000000000 -0500 -+++ transmitters/shm/fs-shm-transmitter.c 2010-11-26 23:50:40.000000000 -0500 -@@ -52,7 +52,9 @@ - # define close closesocket - #else /*G_OS_WIN32*/ - # include <netdb.h> -+# include <sys/types.h> - # include <sys/socket.h> -+# include <netinet/in.h> - # include <netinet/ip.h> - # include <arpa/inet.h> - #endif /*G_OS_WIN32*/ diff --git a/net-im/farsight2/pkg-plist b/net-im/farsight2/pkg-plist index 08365a4f44e8..36e9477ee231 100644 --- a/net-im/farsight2/pkg-plist +++ b/net-im/farsight2/pkg-plist @@ -7,10 +7,12 @@ include/gstreamer-0.10/gst/farsight/fs-enum-types.h include/gstreamer-0.10/gst/farsight/fs-interfaces.h include/gstreamer-0.10/gst/farsight/fs-participant.h include/gstreamer-0.10/gst/farsight/fs-plugin.h +include/gstreamer-0.10/gst/farsight/fs-rtp.h include/gstreamer-0.10/gst/farsight/fs-session.h include/gstreamer-0.10/gst/farsight/fs-stream-transmitter.h include/gstreamer-0.10/gst/farsight/fs-stream.h include/gstreamer-0.10/gst/farsight/fs-transmitter.h +include/gstreamer-0.10/gst/farsight/fs-utils.h lib/farsight2-0.0/libmulticast-transmitter.a lib/farsight2-0.0/libmulticast-transmitter.la lib/farsight2-0.0/libmulticast-transmitter.so @@ -29,6 +31,9 @@ lib/gstreamer-0.10/libfsfunnel.so lib/gstreamer-0.10/libfsmsnconference.a lib/gstreamer-0.10/libfsmsnconference.la lib/gstreamer-0.10/libfsmsnconference.so +lib/gstreamer-0.10/libfsrawconference.a +lib/gstreamer-0.10/libfsrawconference.la +lib/gstreamer-0.10/libfsrawconference.so lib/gstreamer-0.10/libfsrtcpfilter.a lib/gstreamer-0.10/libfsrtcpfilter.la lib/gstreamer-0.10/libfsrtcpfilter.so @@ -46,6 +51,8 @@ lib/libgstfarsight-0.10.so.0 %%PYTHON_SITELIBDIR%%/farsight.la %%PYTHON_SITELIBDIR%%/farsight.so libdata/pkgconfig/farsight2-0.10.pc +share/farsight2/0.0/fsrtpconference/default-codec-preferences +share/farsight2/0.0/fsrtpconference/default-element-properties share/gtk-doc/html/farsight2-libs-0.10/FsBaseConference.html share/gtk-doc/html/farsight2-libs-0.10/FsConference.html share/gtk-doc/html/farsight2-libs-0.10/FsElementAddedNotifier.html @@ -59,12 +66,15 @@ share/gtk-doc/html/farsight2-libs-0.10/ch03.html share/gtk-doc/html/farsight2-libs-0.10/ch04.html share/gtk-doc/html/farsight2-libs-0.10/ch05.html share/gtk-doc/html/farsight2-libs-0.10/ch06.html +share/gtk-doc/html/farsight2-libs-0.10/ch07.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp2 share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCandidate.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCodec.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsPlugin.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-Network-interfaces-discovery.html +share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-RTP-Specific-types.html +share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-Utility-functions.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-fs-session.html share/gtk-doc/html/farsight2-libs-0.10/home.png share/gtk-doc/html/farsight2-libs-0.10/index.html @@ -89,11 +99,16 @@ share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMsnSession.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMsnStream.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMulticastStreamTransmitter.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsNiceStreamTransmitter.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawConference.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawParticipant.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawSession.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawStream.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawUdpStreamTransmitter.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpConference.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpParticipant.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpSession.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpStream.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsShmStreamTransmitter.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-GstVideoanyrate.html share/gtk-doc/html/farsight2-plugins-0.10/home.png share/gtk-doc/html/farsight2-plugins-0.10/index.html @@ -109,5 +124,8 @@ share/gtk-doc/html/farsight2-plugins-0.10/up.png @dirrm share/gtk-doc/html/farsight2-libs-0.10 @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc +@dirrm share/farsight2/0.0/fsrtpconference +@dirrm share/farsight2/0.0 +@dirrm share/farsight2 @dirrm lib/farsight2-0.0 @dirrm include/gstreamer-0.10/gst/farsight diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile index fec8de126d2c..96abe0a587d6 100644 --- a/net-im/folks/Makefile +++ b/net-im/folks/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: folks -# Date created: 23 July 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/folks/Makefile,v 1.8 2010/10/26 08:47:55 kwm Exp $ -# +# $MCom: ports/net-im/folks/Makefile,v 1.29 2012/08/17 19:06:45 kwm Exp $ PORTNAME= folks -PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTVERSION= 0.7.0 CATEGORIES= net-im MASTER_SITES= GNOME @@ -17,17 +12,36 @@ COMMENT= library to aggregates people from multiple sources BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee \ +LIB_DEPENDS= gee:${PORTSDIR}/devel/libgee06 \ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib -USE_BZIP2= yes +CONFLICTS= folks-0.4.[0-9]* + +USE_XZ= yes +USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= gnomehack +USE_GNOME= gnomehier gnomehack intlhack ltverhack evolutiondataserver3 +USE_GETTEXT= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_SUB= VERSION=16 +PLIST_SUB= LIBVER=25 VERSION=33 + +#OPTIONS= SOCIALWEB "Enable social web backend" on + +#.include <bsd.port.options.mk> + +#.if defined(WITH_SOCIALWEB) +#LIB_DEPENDS+= socialweb.0:${PORTSDIR}/www/libsocialweb +#CONFIGURE_ARGS+=--enable-libsocialweb-backend=yes +#.else +CONFIGURE_ARGS+=--enable-libsocialweb-backend=no +#.endif + +post-patch: + @${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|g' \ + ${WRKDIR}/gnome-libtool .include <bsd.port.mk> diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo index 2422467dd045..65e986124ef7 100644 --- a/net-im/folks/distinfo +++ b/net-im/folks/distinfo @@ -1,2 +1,2 @@ -SHA256 (folks-0.2.1.tar.bz2) = f8eeeb6a6974416d4db1ab6b18187173fb6ff4ec7830bece379dfba9b25f2a29 -SIZE (folks-0.2.1.tar.bz2) = 465522 +SHA256 (folks-0.7.0.tar.xz) = 861da1007e859e6bad43388a3bee56c31b3e9d003329086a5038fa6b19c6abf7 +SIZE (folks-0.7.0.tar.xz) = 1415856 diff --git a/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala b/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala deleted file mode 100644 index 8e8e86cd2da2..000000000000 --- a/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala +++ /dev/null @@ -1,109 +0,0 @@ ---- backends/telepathy/lib/tpf-persona-store.vala.orig 2011-07-22 14:19:09.000000000 +0200 -+++ backends/telepathy/lib/tpf-persona-store.vala 2011-07-22 14:30:40.000000000 +0200 -@@ -22,7 +22,6 @@ - using GLib; - using Gee; - using TelepathyGLib; --using TelepathyGLib.ContactFeature; - using Folks; - - /** -@@ -36,6 +35,15 @@ public class Tpf.PersonaStore : Folks.Pe - { - private string[] undisplayed_groups = { "publish", "stored", "subscribe" }; - -+ private static ContactFeature[] _contact_features = -+ { -+ ContactFeature.ALIAS, -+ ContactFeature.AVATAR_DATA, -+ ContactFeature.AVATAR_TOKEN, -+ ContactFeature.CAPABILITIES, -+ ContactFeature.PRESENCE -+ }; -+ - private HashTable<string, Persona> _personas; - /* universal, contact owner handles (not channel-specific) */ - private HashMap<uint, Persona> handle_persona_map; -@@ -407,7 +415,7 @@ public class Tpf.PersonaStore : Folks.Pe - if (change_maps.size < 1) - return; - -- foreach (var entry in change_maps) -+ foreach (var entry in change_maps.entries) - { - var changes = entry.key; - -@@ -640,7 +648,7 @@ public class Tpf.PersonaStore : Folks.Pe - /* - * remove all persona-keyed entries - */ -- foreach (var entry in this.channel_group_personas_map) -+ foreach (var entry in this.channel_group_personas_map.entries) - { - var channel = (Channel) entry.key; - var members = this.channel_group_personas_map[channel]; -@@ -648,9 +656,8 @@ public class Tpf.PersonaStore : Folks.Pe - members.remove (persona); - } - -- foreach (var entry in this.group_outgoing_adds) -+ foreach (var name in this.group_outgoing_adds.keys) - { -- var name = (string) entry.key; - var members = this.group_outgoing_adds[name]; - if (members != null) - members.remove (persona); -@@ -866,14 +873,6 @@ public class Tpf.PersonaStore : Folks.Pe - Channel channel, - Array<uint> channel_handles) - { -- ContactFeature[] features = -- { -- ALIAS, -- AVATAR_DATA, -- AVATAR_TOKEN, -- PRESENCE -- }; -- - uint[] contact_handles = {}; - for (var i = 0; i < channel_handles.length; i++) - { -@@ -891,7 +890,7 @@ public class Tpf.PersonaStore : Folks.Pe - - GLib.List<TelepathyGLib.Contact> contacts = - yield this.ll.connection_get_contacts_by_handle_async ( -- this.conn, contact_handles, (uint[]) features); -+ this.conn, contact_handles, (uint[]) _contact_features); - - if (contacts == null || contacts.length () < 1) - return; -@@ -918,19 +917,11 @@ public class Tpf.PersonaStore : Folks.Pe - private async GLib.List<Tpf.Persona>? create_personas_from_contact_ids ( - string[] contact_ids) throws GLib.Error - { -- ContactFeature[] features = -- { -- ALIAS, -- AVATAR_DATA, -- AVATAR_TOKEN, -- PRESENCE -- }; -- - if (contact_ids.length > 0) - { - GLib.List<TelepathyGLib.Contact> contacts = - yield this.ll.connection_get_contacts_by_id_async ( -- this.conn, contact_ids, (uint[]) features); -+ this.conn, contact_ids, (uint[]) _contact_features); - - GLib.List<Persona> personas = new GLib.List<Persona> (); - uint err_count = 0; -@@ -1027,7 +1018,7 @@ public class Tpf.PersonaStore : Folks.Pe - - private void channel_groups_add_new_personas () - { -- foreach (var entry in this.channel_group_incoming_adds) -+ foreach (var entry in this.channel_group_incoming_adds.entries) - { - var channel = (Channel) entry.key; - var members_added = new GLib.List<Persona> (); diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist index a9cd7dbadde4..09989046be10 100644 --- a/net-im/folks/pkg-plist +++ b/net-im/folks/pkg-plist @@ -1,26 +1,50 @@ bin/folks-import +include/folks/folks-eds.h include/folks/folks-telepathy.h include/folks/folks.h -lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.la -lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.so -lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.la -lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.so +lib/folks/%%VERSION%%/backends/eds/eds.la +lib/folks/%%VERSION%%/backends/eds/eds.so +lib/folks/%%VERSION%%/backends/key-file/key-file.la +lib/folks/%%VERSION%%/backends/key-file/key-file.so +lib/folks/%%VERSION%%/backends/telepathy/telepathy.la +lib/folks/%%VERSION%%/backends/telepathy/telepathy.so +lib/girepository-1.0/Folks-0.6.typelib +lib/libfolks-eds.la +lib/libfolks-eds.so +lib/libfolks-eds.so.%%LIBVER%% lib/libfolks-telepathy.la lib/libfolks-telepathy.so -lib/libfolks-telepathy.so.%%VERSION%% +lib/libfolks-telepathy.so.%%LIBVER%% lib/libfolks.la lib/libfolks.so -lib/libfolks.so.%%VERSION%% +lib/libfolks.so.%%LIBVER%% +libdata/pkgconfig/folks-eds.pc libdata/pkgconfig/folks-telepathy.pc libdata/pkgconfig/folks.pc +share/gir-1.0/Folks-0.6.gir +share/locale/cs/LC_MESSAGES/folks.mo +share/locale/de/LC_MESSAGES/folks.mo +share/locale/en_GB/LC_MESSAGES/folks.mo +share/locale/eo/LC_MESSAGES/folks.mo +share/locale/es/LC_MESSAGES/folks.mo +share/locale/gl/LC_MESSAGES/folks.mo +share/locale/it/LC_MESSAGES/folks.mo +share/locale/nb/LC_MESSAGES/folks.mo +share/locale/pl/LC_MESSAGES/folks.mo +share/locale/pt_BR/LC_MESSAGES/folks.mo +share/locale/sl/LC_MESSAGES/folks.mo +share/locale/sv/LC_MESSAGES/folks.mo +share/locale/uk/LC_MESSAGES/folks.mo +share/locale/zh_CN/LC_MESSAGES/folks.mo +share/vala/vapi/folks-eds.deps +share/vala/vapi/folks-eds.vapi share/vala/vapi/folks-telepathy.deps share/vala/vapi/folks-telepathy.vapi share/vala/vapi/folks.deps share/vala/vapi/folks.vapi -@dirrmtry share/vala/vapi -@dirrmtry share/vala @dirrm lib/folks/%%VERSION%%/backends/telepathy @dirrm lib/folks/%%VERSION%%/backends/key-file +@dirrm lib/folks/%%VERSION%%/backends/eds @dirrm lib/folks/%%VERSION%%/backends @dirrm lib/folks/%%VERSION%% @dirrm lib/folks diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile new file mode 100644 index 000000000000..e69ceca1d134 --- /dev/null +++ b/net-im/folks04/Makefile @@ -0,0 +1,32 @@ +# Created by: Koop Mast <kwm@FreeBSD.org> +# $FreeBSD$ +# $MCom: ports/net-im/folks04/Makefile,v 1.2 2012/04/27 13:28:44 kwm Exp $ + +PORTNAME= folks +PORTVERSION= 0.4.3 +PORTREVISOIN= 1 +CATEGORIES= net-im +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= library to aggregates people from multiple sources + +BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \ + g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= gee:${PORTSDIR}/devel/libgee06 \ + telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib + +CONFLICTS= folks-0.[6-9].[0-9]* + +USE_BZIP2= yes +USE_LDCONFIG= yes +USE_GMAKE= yes +USE_GNOME= gnomehack intlhack gnomehier +USE_GETTEXT= yes +GNU_CONFIGURE= yes +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib + +PLIST_SUB= VERSION=22 + +.include <bsd.port.mk> diff --git a/net-im/folks04/distinfo b/net-im/folks04/distinfo new file mode 100644 index 000000000000..a309c99ef70c --- /dev/null +++ b/net-im/folks04/distinfo @@ -0,0 +1,2 @@ +SHA256 (folks-0.4.3.tar.bz2) = e5a5bbe1524130ff5b6400726db3e12299b12ffefa108bc89169509f343d925e +SIZE (folks-0.4.3.tar.bz2) = 635168 diff --git a/net-im/folks04/pkg-descr b/net-im/folks04/pkg-descr new file mode 100644 index 000000000000..21280dabf8d6 --- /dev/null +++ b/net-im/folks04/pkg-descr @@ -0,0 +1,7 @@ +libfolks is a library that aggregates people from multiple sources +(eg, Telepathy connection managers and eventually evolution data server, +Facebook, etc.) to create metacontacts. It's written in Vala (in part to +evaluate Vala). The initial goal is for GObject/C support, though the Vala +bindings should basically automatic. + +WWW: http://telepathy.freedesktop.org/wiki/Folks diff --git a/net-im/folks04/pkg-plist b/net-im/folks04/pkg-plist new file mode 100644 index 000000000000..56064f49711c --- /dev/null +++ b/net-im/folks04/pkg-plist @@ -0,0 +1,26 @@ +bin/folks-import +include/folks/folks-telepathy.h +include/folks/folks.h +lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.la +lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.so +lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.la +lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.so +lib/libfolks-telepathy.la +lib/libfolks-telepathy.so +lib/libfolks-telepathy.so.%%VERSION%% +lib/libfolks.la +lib/libfolks.so +lib/libfolks.so.%%VERSION%% +libdata/pkgconfig/folks-telepathy.pc +libdata/pkgconfig/folks.pc +share/locale/de/LC_MESSAGES/folks.mo +share/vala/vapi/folks-telepathy.deps +share/vala/vapi/folks-telepathy.vapi +share/vala/vapi/folks.deps +share/vala/vapi/folks.vapi +@dirrm lib/folks/%%VERSION%%/backends/telepathy +@dirrm lib/folks/%%VERSION%%/backends/key-file +@dirrm lib/folks/%%VERSION%%/backends +@dirrm lib/folks/%%VERSION%% +@dirrm lib/folks +@dirrm include/folks diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile index 8be2a43aaa4e..d0ec8679480f 100644 --- a/net-im/libnice/Makefile +++ b/net-im/libnice/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: libnice -# Date created: 27 February 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= libnice -PORTVERSION= 0.0.13 -PORTREVISION= 3 +PORTVERSION= 0.1.3 CATEGORIES= net-im devel MASTER_SITES= http://nice.freedesktop.org/releases/ @@ -17,25 +13,18 @@ COMMENT= Library and transmitter that implements ICE-19 USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_GSTREAMER= yes USE_AUTOTOOLS= libtool +CONFIGURE_ARGS= --without-gstreamer --with-gstreamer-0.10 CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GETIFADDRS LDFLAGS+= -L${LOCALBASE}/lib post-patch: - @${REINPLACE_CMD} -e 's|__BYTE_ORDER|_BYTE_ORDER|g ; \ - s|__BIG_ENDIAN|_BIG_ENDIAN|g' \ - ${WRKSRC}/stun/md5.c \ - ${WRKSRC}/stun/sha1.c @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|-Wno-missing-field-initializers|#|g' @${REINPLACE_CMD} -e 's|-Wno-missing-field-initializers|#|g' \ ${WRKSRC}/common.mk -post-configure: - @${TOUCH} -f ${WRKSRC}/config.h ${WRKSRC}/aclocal.m4 \ - ${WRKSRC}/configure ${WRKSRC}/Makefile.in \ - ${WRKSRC}/Makefile - .include <bsd.port.mk> diff --git a/net-im/libnice/distinfo b/net-im/libnice/distinfo index 7bedd8d7b330..fbc6a2d7b975 100644 --- a/net-im/libnice/distinfo +++ b/net-im/libnice/distinfo @@ -1,2 +1,2 @@ -SHA256 (libnice-0.0.13.tar.gz) = d8dd260c486a470a6052a5323920878a084e44a19df09b15728b85c9e3d6edf0 -SIZE (libnice-0.0.13.tar.gz) = 635783 +SHA256 (libnice-0.1.3.tar.gz) = 046ce11f66638b54f2e042e7b1fbcc537ec99c27185fb006edbfd80d7f990074 +SIZE (libnice-0.1.3.tar.gz) = 672174 diff --git a/net-im/libnice/files/patch-agent_interfaces.c b/net-im/libnice/files/patch-agent_interfaces.c deleted file mode 100644 index d3d33d3a376f..000000000000 --- a/net-im/libnice/files/patch-agent_interfaces.c +++ /dev/null @@ -1,19 +0,0 @@ ---- agent/interfaces.c.orig 2010-07-20 17:54:40.000000000 -0400 -+++ agent/interfaces.c 2010-07-24 20:24:19.000000000 -0400 -@@ -46,6 +46,7 @@ - #include <ifaddrs.h> - #endif - -+#include <netinet/in.h> - #include <net/if.h> - #include <net/if_arp.h> - #include <arpa/inet.h> -@@ -198,7 +199,7 @@ nice_interfaces_get_local_ips (gboolean - struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)ifa->ifa_addr; - - /* Skip link-local addresses, they require a scope */ -- if (IN6_IS_ADDR_LINKLOCAL (sa6->sin6_addr.s6_addr)) -+ if (IN6_IS_ADDR_LINKLOCAL (&sa6->sin6_addr)) - continue; - - if (inet_ntop (AF_INET6, &sa6->sin6_addr, addr_as_string, diff --git a/net-im/libnice/files/patch-stun_md5.c b/net-im/libnice/files/patch-stun_md5.c deleted file mode 100644 index 8f787548f7ea..000000000000 --- a/net-im/libnice/files/patch-stun_md5.c +++ /dev/null @@ -1,10 +0,0 @@ ---- stun/md5.c.orig 2009-02-27 23:04:31.000000000 -0500 -+++ stun/md5.c 2009-02-27 23:05:15.000000000 -0500 -@@ -13,6 +13,7 @@ - */ - - #include "md5.h" -+#include <sys/endian.h> - #include <string.h> - - /* ===== start - public domain MD5 implementation ===== */ diff --git a/net-im/libnice/files/patch-stun_sha1.c b/net-im/libnice/files/patch-stun_sha1.c deleted file mode 100644 index 33e3775b2981..000000000000 --- a/net-im/libnice/files/patch-stun_sha1.c +++ /dev/null @@ -1,10 +0,0 @@ ---- stun/sha1.c.orig 2009-02-27 23:05:24.000000000 -0500 -+++ stun/sha1.c 2009-02-27 23:05:33.000000000 -0500 -@@ -13,6 +13,7 @@ - */ - - #include "sha1.h" -+#include <sys/endian.h> - #include <string.h> - - diff --git a/net-im/libnice/pkg-plist b/net-im/libnice/pkg-plist index ea510f2bacf7..fd0cae2d3277 100644 --- a/net-im/libnice/pkg-plist +++ b/net-im/libnice/pkg-plist @@ -16,13 +16,13 @@ include/stun/usages/ice.h include/stun/usages/timer.h include/stun/usages/turn.h include/stun/win32_common.h -lib/gstreamer-0.10/libgstnice.a -lib/gstreamer-0.10/libgstnice.la -lib/gstreamer-0.10/libgstnice.so +lib/gstreamer-0.10/libgstnice010.a +lib/gstreamer-0.10/libgstnice010.la +lib/gstreamer-0.10/libgstnice010.so lib/libnice.a lib/libnice.la lib/libnice.so -lib/libnice.so.0 +lib/libnice.so.10 libdata/pkgconfig/nice.pc share/gtk-doc/html/libnice/NiceAgent.html share/gtk-doc/html/libnice/ch01.html @@ -45,7 +45,6 @@ share/gtk-doc/html/libnice/libnice-StunAgent.html share/gtk-doc/html/libnice/libnice-StunMessage.html share/gtk-doc/html/libnice/libnice-TURN.html share/gtk-doc/html/libnice/libnice-Timer.html -share/gtk-doc/html/libnice/libnice.devhelp share/gtk-doc/html/libnice/libnice.devhelp2 share/gtk-doc/html/libnice/pt01.html share/gtk-doc/html/libnice/pt02.html diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile index 213e01ba2853..5deea477290f 100644 --- a/net-im/libtelepathy/Makefile +++ b/net-im/libtelepathy/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: libtelepathy -# Date created: Apr 16 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# +# Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ # $MCom: ports/net-im/libtelepathy/Makefile,v 1.3 2008/02/27 14:00:06 ahze Exp $ @@ -24,7 +21,7 @@ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack USE_AUTOTOOLS= libtool .include <bsd.port.mk> diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile index ae26d4726e5a..ffc876b020ab 100644 --- a/net-im/loudmouth/Makefile +++ b/net-im/loudmouth/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: loudmouth -# Date created: 08 July 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# PORTNAME= loudmouth PORTVERSION= 1.4.3 @@ -14,7 +10,7 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight Jabber client library -LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn +LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn USE_BZIP2= yes USE_GMAKE= yes @@ -26,23 +22,24 @@ CONFIGURE_ARGS= --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib -OPTIONS= GNUTLS "Enable SSL (via GnuTLS) support" on \ - OPENSSL "Enable SSL (via OpenSSL) support" off +OPTIONS_DEFAULT=GNUTLS +OPTIONS_RADIO= SSL +OPTIONS_RADIO_SSL= GNUTLS OPENSSL -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_GNUTLS) -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls +.if ${PORT_OPTIONS:MGNUTLS} +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss .endif -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ssl=openssl RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss .endif -.if !defined(WITH_GNUTLS) && !defined(WITH_OPENSSL) +.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+=--without-ssl .endif @@ -50,4 +47,4 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/loudmouth/lm-ssl-gnutls.c -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/loudmouth/files/patch-loudmouth_lm-error.c b/net-im/loudmouth/files/patch-loudmouth_lm-error.c new file mode 100644 index 000000000000..61f65fce2447 --- /dev/null +++ b/net-im/loudmouth/files/patch-loudmouth_lm-error.c @@ -0,0 +1,11 @@ +--- loudmouth/lm-error.c.orig 2012-05-22 10:05:29.000000000 +0200 ++++ loudmouth/lm-error.c 2012-05-22 10:05:41.000000000 +0200 +@@ -19,7 +19,7 @@ + */ + + #include <config.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include "lm-error.h" + + /** diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile index a612f374ea94..8e08ef1957d9 100644 --- a/net-im/meanwhile/Makefile +++ b/net-im/meanwhile/Makefile @@ -7,7 +7,7 @@ PORTNAME= meanwhile PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= SF @@ -17,13 +17,18 @@ COMMENT= Open Source implementation of the Lotus Sametime protocol USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-doxygen=no \ --with-gmp-prefix=${LOCALBASE} -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-doc-${PORTVERSION} +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/samples/*.c ${WRKSRC}/src/*.[ch] + .include <bsd.port.mk> diff --git a/net-im/pidgin-bs/Makefile b/net-im/pidgin-bs/Makefile index 1137a67f3182..d6acb695e315 100644 --- a/net-im/pidgin-bs/Makefile +++ b/net-im/pidgin-bs/Makefile @@ -22,6 +22,7 @@ RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin GNU_CONFIGURE= yes USE_BZIP2= yes +USE_GMAKE= yes USE_GNOME= gtk20 USE_LDCONFIG= ${PREFIX}/lib/pidgin diff --git a/net-im/psimedia/Makefile b/net-im/psimedia/Makefile index 91f1ed78e4bc..504e33de74fb 100644 --- a/net-im/psimedia/Makefile +++ b/net-im/psimedia/Makefile @@ -36,6 +36,13 @@ CONFIGURE_ARGS+= --debug PLIST_SUB+= DEBUG="" .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/gstprovider/rwcontrol.h \ + ${WRKSRC}/gstprovider/gstthread.h \ + ${WRKSRC}/gstprovider/gstelements/static/gstelements.h \ + ${WRKSRC}/gstprovider/gstcustomelements/gstcustomelements.h + do-install: ${MKDIR} ${PREFIX}/${PSI_PLUGIN_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/gstprovider/libgstprovider.so \ diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile index 4293350dd27d..0f7f5c8c8299 100644 --- a/net-im/telepathy-farsight/Makefile +++ b/net-im/telepathy-farsight/Makefile @@ -1,35 +1,25 @@ -# New ports collection makefile for: telepathy-farsight -# Date created: 27 February 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= telepathy-farsight -PORTVERSION= 0.0.15 -PORTREVISION= 1 +PORTVERSION= 0.0.19 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Farsight Connection Manager for Telepathy Framework -LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ - dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \ - telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \ - farsight2-0.10.pc:${PORTSDIR}/net-im/farsight2 - -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt - -BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} -RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + gstfarsight-0.10:${PORTSDIR}/net-im/farsight2 GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_PYTHON= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack libxslt:build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} diff --git a/net-im/telepathy-farsight/distinfo b/net-im/telepathy-farsight/distinfo index c5f308b89eb2..05732589e893 100644 --- a/net-im/telepathy-farsight/distinfo +++ b/net-im/telepathy-farsight/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-farsight-0.0.15.tar.gz) = 3dc3d9cdb43fb9ef772d16917e50e3cc95f71b1585d26d740f3148f4fdb6eb0f -SIZE (telepathy-farsight-0.0.15.tar.gz) = 555835 +SHA256 (telepathy-farsight-0.0.19.tar.gz) = 2c89b8b259f91df33f93703eab1de493b193b163c32facb532ec2710b8f05269 +SIZE (telepathy-farsight-0.0.19.tar.gz) = 585743 diff --git a/net-im/telepathy-farsight/files/patch-telepathy-farsight_Makefile.in b/net-im/telepathy-farsight/files/patch-telepathy-farsight_Makefile.in deleted file mode 100644 index 1215ad50b91c..000000000000 --- a/net-im/telepathy-farsight/files/patch-telepathy-farsight_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- telepathy-farsight/Makefile.in.orig 2009-02-28 00:03:16.000000000 -0500 -+++ telepathy-farsight/Makefile.in 2009-02-28 00:03:37.000000000 -0500 -@@ -250,7 +250,7 @@ libtelepathy_farsight_la_SOURCES = \ - - nodist_libtelepathy_farsight_la_SOURCES = $(BUILT_SOURCES) - lib_LTLIBRARIES = libtelepathy-farsight.la --pkgconfigdir = ${libdir}/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = telepathy-farsight.pc - AM_CFLAGS = \ - $(ERROR_CFLAGS) \ diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile index 038b3f80ee36..1f0e057bb7d2 100644 --- a/net-im/telepathy-gabble/Makefile +++ b/net-im/telepathy-gabble/Makefile @@ -1,43 +1,37 @@ -# New ports collection makefile for: telepathy-gabble -# Date created: Apr 19 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.10 2010/11/14 16:18:09 marcus Exp $ +# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.22 2012/08/08 16:56:40 kwm Exp $ PORTNAME= telepathy-gabble -PORTVERSION= 0.10.4 +PORTVERSION= 0.16.1 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Jabber Connection Manager for Telepathy Framework -LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ - dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \ - nice.pc:${PORTSDIR}/net-im/libnice \ - uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid \ - telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \ - loudmouth-1.0.pc:${PORTSDIR}/net-im/loudmouth - -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt - -BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} -LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 -RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} +BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ + telepathy-glib>=0.18.0:${PORTSDIR}/net-im/telepathy-glib \ + ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \ + nice:${PORTSDIR}/net-im/libnice \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ + loudmouth-1:${PORTSDIR}/net-im/loudmouth +RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-Werror LDFLAGS+= ${PTHREAD_LIBS} USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig glib20 +USE_GNOME= gnomehack glib20 +USE_SQLITE= yes USE_OPENSSL= yes USE_PYTHON_BUILD= yes +CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt MAN8= telepathy-gabble.8 -.include <bsd.port.pre.mk> +PLIST_SUB= PVERSION=${PORTVERSION} .if defined(WITH_OPENSSL_BASE) CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" @@ -47,4 +41,4 @@ post-patch: @${REINPLACE_CMD} -e 's|-Werror||g' \ ${WRKSRC}/lib/ext/wocky/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/telepathy-gabble/distinfo b/net-im/telepathy-gabble/distinfo index 7f77130ac4aa..3bd9465407b1 100644 --- a/net-im/telepathy-gabble/distinfo +++ b/net-im/telepathy-gabble/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-gabble-0.10.4.tar.gz) = abdf07e833b934fa7cd0c9e34894a11da037adf03a4fdde4dc7818ed990a662c -SIZE (telepathy-gabble-0.10.4.tar.gz) = 2936168 +SHA256 (telepathy-gabble-0.16.1.tar.gz) = 77536d0ca6c040f1b1bd46c6f5914d0677a6dc6ecf1e858816c24fcf07e3f310 +SIZE (telepathy-gabble-0.16.1.tar.gz) = 2644994 diff --git a/net-im/telepathy-gabble/pkg-plist b/net-im/telepathy-gabble/pkg-plist index 2bd653be6e31..62bf393cab5e 100644 --- a/net-im/telepathy-gabble/pkg-plist +++ b/net-im/telepathy-gabble/pkg-plist @@ -1,6 +1,17 @@ +bin/telepathy-gabble-xmpp-console +lib/telepathy/gabble-0/lib/libgabble-plugins-%%PVERSION%%.so +lib/telepathy/gabble-0/lib/libgabble-plugins.a +lib/telepathy/gabble-0/lib/libgabble-plugins.la +lib/telepathy/gabble-0/lib/libgabble-plugins.so +lib/telepathy/gabble-0/lib/libwocky-telepathy-gabble-%%PVERSION%%.so +lib/telepathy/gabble-0/lib/libwocky.a +lib/telepathy/gabble-0/lib/libwocky.la +lib/telepathy/gabble-0/lib/libwocky.so +lib/telepathy/gabble-0/plugins/libconsole.la +lib/telepathy/gabble-0/plugins/libconsole.so +lib/telepathy/gabble-0/plugins/libgateways.la +lib/telepathy/gabble-0/plugins/libgateways.so libexec/telepathy-gabble -lib/telepathy/gabble-0/gateways.la -lib/telepathy/gabble-0/gateways.so share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service %%DOCSDIR%%/muc-bytestream.html %%DOCSDIR%%/olpc.html @@ -10,5 +21,7 @@ share/telepathy/managers/gabble.manager @dirrmtry share/telepathy/managers @dirrmtry share/telepathy @dirrm %%DOCSDIR%% -@dirrm lib/telepathy/gabble-0 +@dirrmtry lib/telepathy/gabble-0/plugins +@dirrmtry lib/telepathy/gabble-0/lib +@dirrmtry lib/telepathy/gabble-0 @dirrmtry lib/telepathy diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile index 7273ab234f2d..be3fcd84aaa1 100644 --- a/net-im/telepathy-glib/Makefile +++ b/net-im/telepathy-glib/Makefile @@ -1,42 +1,31 @@ -# New ports collection makefile for: telepathy-glib -# Date created: Apr 19 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.15 2010/10/21 17:35:24 kwm Exp $ +# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.38 2012/08/07 20:30:33 kwm Exp $ PORTNAME= telepathy-glib -PORTVERSION= 0.12.7 -PORTREVISION= 1 +PORTVERSION= 0.18.2 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= GLib utility library for the Telepathy framework -LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ - dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib - BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ - vapigen:${PORTSDIR}/lang/vala-vapigen \ + vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection - -BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} -RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \ - vapigen:${PORTSDIR}/lang/vala-vapigen +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib +RUN_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack gnomehier USE_PYTHON_BUILD= yes MAKE_JOBS_UNSAFE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-vala-bindings post-patch: @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/telepathy-glib/Makefile.in - @${REINPLACE_CMD} -e 's|datarootdir)/vala/vapi|datarootdir)/vala-0.12/vapi|g' \ - ${WRKSRC}/vala/Makefile.in .include <bsd.port.mk> diff --git a/net-im/telepathy-glib/distinfo b/net-im/telepathy-glib/distinfo index 89878457b359..83cbaecd20bb 100644 --- a/net-im/telepathy-glib/distinfo +++ b/net-im/telepathy-glib/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-glib-0.12.7.tar.gz) = 4c76b78c283620556c253bd9a483f8b6e1bbd014fb8a22de704e117eaa9e3c97 -SIZE (telepathy-glib-0.12.7.tar.gz) = 2572558 +SHA256 (telepathy-glib-0.18.2.tar.gz) = 372375578be8053398f9fb1e12188a8b472d6d897e0ac73b230d31e112c68b3f +SIZE (telepathy-glib-0.18.2.tar.gz) = 3539165 diff --git a/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in b/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in index d88266770456..e69de29bb2d1 100644 --- a/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in +++ b/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in @@ -1,22 +0,0 @@ ---- telepathy-glib/Makefile.in.orig 2011-07-22 13:41:13.000000000 +0200 -+++ telepathy-glib/Makefile.in 2011-07-22 14:00:23.000000000 +0200 -@@ -1649,7 +1649,7 @@ - @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \ - @HAVE_INTROSPECTION_TRUE@ --namespace TelepathyGLib \ - @HAVE_INTROSPECTION_TRUE@ --nsversion=0.12 \ --@HAVE_INTROSPECTION_TRUE@ $(gi_identifier_prefix_arg)=Tp \ -+@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=Tp \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir) \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) \ - @HAVE_INTROSPECTION_TRUE@ --include=GLib-2.0 \ -@@ -1658,7 +1658,9 @@ - @HAVE_INTROSPECTION_TRUE@ --library=libtelepathy-glib.la \ - @HAVE_INTROSPECTION_TRUE@ --pkg gio-2.0 \ - @HAVE_INTROSPECTION_TRUE@ --pkg dbus-glib-1 \ --@HAVE_INTROSPECTION_TRUE@ $(gi_warn_all_arg) \ -+@HAVE_INTROSPECTION_TRUE@ --pkg-export telepathy-glib \ -+@HAVE_INTROSPECTION_TRUE@ --c-include="telepathy-glib/telepathy-glib.h" \ -+@HAVE_INTROSPECTION_TRUE@ --warn-all \ - @HAVE_INTROSPECTION_TRUE@ --output _gen/$@.tmp \ - @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_FILES) - @HAVE_INTROSPECTION_TRUE@ @xsltproc $(srcdir)/kludge.xsl _gen/$@.tmp > $@ diff --git a/net-im/telepathy-glib/pkg-descr b/net-im/telepathy-glib/pkg-descr index f2fa32bf5b4d..49f70dbb2703 100644 --- a/net-im/telepathy-glib/pkg-descr +++ b/net-im/telepathy-glib/pkg-descr @@ -1,3 +1,6 @@ GLib utility library for the Telepathy framework. WWW: http://telepathy.freedesktop.org/ + +- Florent Thoumie +flz@FreeBSD.org diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist index 457fc925a6f1..afaaa0ac1b4a 100644 --- a/net-im/telepathy-glib/pkg-plist +++ b/net-im/telepathy-glib/pkg-plist @@ -5,6 +5,10 @@ include/telepathy-1.0/telepathy-glib/_gen/telepathy-enums.h include/telepathy-1.0/telepathy-glib/_gen/telepathy-interfaces.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-account-manager.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-account.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-content-media-description.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-content.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-stream-endpoint.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-stream.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-dispatcher.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-request.h @@ -19,6 +23,10 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-stream-handler.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-protocol.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account-manager.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-content-media-description.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-content.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-stream-endpoint.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-stream.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatcher.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-request.h @@ -36,11 +44,29 @@ include/telepathy-1.0/telepathy-glib/account-channel-request.h include/telepathy-1.0/telepathy-glib/account-manager.h include/telepathy-1.0/telepathy-glib/account.h include/telepathy-1.0/telepathy-glib/add-dispatch-operation-context.h +include/telepathy-1.0/telepathy-glib/automatic-client-factory.h +include/telepathy-1.0/telepathy-glib/automatic-proxy-factory.h +include/telepathy-1.0/telepathy-glib/base-call-channel.h +include/telepathy-1.0/telepathy-glib/base-call-content.h +include/telepathy-1.0/telepathy-glib/base-call-stream.h include/telepathy-1.0/telepathy-glib/base-channel.h include/telepathy-1.0/telepathy-glib/base-client.h include/telepathy-1.0/telepathy-glib/base-connection-manager.h include/telepathy-1.0/telepathy-glib/base-connection.h +include/telepathy-1.0/telepathy-glib/base-contact-list.h +include/telepathy-1.0/telepathy-glib/base-media-call-channel.h +include/telepathy-1.0/telepathy-glib/base-media-call-content.h +include/telepathy-1.0/telepathy-glib/base-media-call-stream.h +include/telepathy-1.0/telepathy-glib/base-password-channel.h include/telepathy-1.0/telepathy-glib/base-protocol.h +include/telepathy-1.0/telepathy-glib/base-room-config.h +include/telepathy-1.0/telepathy-glib/basic-proxy-factory.h +include/telepathy-1.0/telepathy-glib/call-channel.h +include/telepathy-1.0/telepathy-glib/call-content-media-description.h +include/telepathy-1.0/telepathy-glib/call-content.h +include/telepathy-1.0/telepathy-glib/call-misc.h +include/telepathy-1.0/telepathy-glib/call-stream-endpoint.h +include/telepathy-1.0/telepathy-glib/call-stream.h include/telepathy-1.0/telepathy-glib/capabilities.h include/telepathy-1.0/telepathy-glib/channel-dispatch-operation.h include/telepathy-1.0/telepathy-glib/channel-dispatcher.h @@ -49,21 +75,31 @@ include/telepathy-1.0/telepathy-glib/channel-iface.h include/telepathy-1.0/telepathy-glib/channel-manager.h include/telepathy-1.0/telepathy-glib/channel-request.h include/telepathy-1.0/telepathy-glib/channel.h +include/telepathy-1.0/telepathy-glib/client-channel-factory.h +include/telepathy-1.0/telepathy-glib/client-message.h include/telepathy-1.0/telepathy-glib/client.h +include/telepathy-1.0/telepathy-glib/cm-message.h +include/telepathy-1.0/telepathy-glib/connection-contact-list.h include/telepathy-1.0/telepathy-glib/connection-manager.h include/telepathy-1.0/telepathy-glib/connection.h -include/telepathy-1.0/telepathy-glib/contacts-mixin.h +include/telepathy-1.0/telepathy-glib/contact-operations.h +include/telepathy-1.0/telepathy-glib/contact-search-result.h +include/telepathy-1.0/telepathy-glib/contact-search.h include/telepathy-1.0/telepathy-glib/contact.h +include/telepathy-1.0/telepathy-glib/contacts-mixin.h include/telepathy-1.0/telepathy-glib/dbus-daemon.h include/telepathy-1.0/telepathy-glib/dbus-properties-mixin.h +include/telepathy-1.0/telepathy-glib/dbus-tube-channel.h include/telepathy-1.0/telepathy-glib/dbus.h include/telepathy-1.0/telepathy-glib/debug-ansi.h include/telepathy-1.0/telepathy-glib/debug-sender.h include/telepathy-1.0/telepathy-glib/debug.h include/telepathy-1.0/telepathy-glib/defs.h +include/telepathy-1.0/telepathy-glib/dtmf.h include/telepathy-1.0/telepathy-glib/enums.h include/telepathy-1.0/telepathy-glib/errors.h include/telepathy-1.0/telepathy-glib/exportable-channel.h +include/telepathy-1.0/telepathy-glib/file-transfer-channel.h include/telepathy-1.0/telepathy-glib/gnio-util.h include/telepathy-1.0/telepathy-glib/group-mixin.h include/telepathy-1.0/telepathy-glib/gtypes.h @@ -77,6 +113,7 @@ include/telepathy-1.0/telepathy-glib/interfaces.h include/telepathy-1.0/telepathy-glib/intset.h include/telepathy-1.0/telepathy-glib/media-interfaces.h include/telepathy-1.0/telepathy-glib/message-mixin.h +include/telepathy-1.0/telepathy-glib/message.h include/telepathy-1.0/telepathy-glib/observe-channels-context.h include/telepathy-1.0/telepathy-glib/presence-mixin.h include/telepathy-1.0/telepathy-glib/properties-mixin.h @@ -84,11 +121,17 @@ include/telepathy-1.0/telepathy-glib/protocol.h include/telepathy-1.0/telepathy-glib/proxy-subclass.h include/telepathy-1.0/telepathy-glib/proxy.h include/telepathy-1.0/telepathy-glib/run.h +include/telepathy-1.0/telepathy-glib/signalled-message.h include/telepathy-1.0/telepathy-glib/simple-approver.h +include/telepathy-1.0/telepathy-glib/simple-client-factory.h include/telepathy-1.0/telepathy-glib/simple-handler.h include/telepathy-1.0/telepathy-glib/simple-observer.h +include/telepathy-1.0/telepathy-glib/simple-password-manager.h +include/telepathy-1.0/telepathy-glib/stream-tube-channel.h +include/telepathy-1.0/telepathy-glib/stream-tube-connection.h include/telepathy-1.0/telepathy-glib/svc-account-manager.h include/telepathy-1.0/telepathy-glib/svc-account.h +include/telepathy-1.0/telepathy-glib/svc-call.h include/telepathy-1.0/telepathy-glib/svc-channel-dispatch-operation.h include/telepathy-1.0/telepathy-glib/svc-channel-dispatcher.h include/telepathy-1.0/telepathy-glib/svc-channel-request.h @@ -103,6 +146,7 @@ include/telepathy-1.0/telepathy-glib/svc-properties-interface.h include/telepathy-1.0/telepathy-glib/svc-protocol.h include/telepathy-1.0/telepathy-glib/svc-tls.h include/telepathy-1.0/telepathy-glib/telepathy-glib.h +include/telepathy-1.0/telepathy-glib/text-channel.h include/telepathy-1.0/telepathy-glib/text-mixin.h include/telepathy-1.0/telepathy-glib/util.h include/telepathy-1.0/telepathy-glib/verify.h @@ -113,18 +157,33 @@ lib/libtelepathy-glib.so lib/libtelepathy-glib.so.0 libdata/pkgconfig/telepathy-glib.pc share/gir-1.0/TelepathyGLib-0.12.gir +share/gtk-doc/html/telepathy-glib/TpBaseCallChannel.html +share/gtk-doc/html/telepathy-glib/TpBaseCallContent.html +share/gtk-doc/html/telepathy-glib/TpBaseCallStream.html share/gtk-doc/html/telepathy-glib/TpBaseChannel.html share/gtk-doc/html/telepathy-glib/TpBaseConnection.html share/gtk-doc/html/telepathy-glib/TpBaseConnectionManager.html +share/gtk-doc/html/telepathy-glib/TpBaseMediaCallChannel.html +share/gtk-doc/html/telepathy-glib/TpBaseMediaCallContent.html +share/gtk-doc/html/telepathy-glib/TpBaseMediaCallStream.html +share/gtk-doc/html/telepathy-glib/TpBaseRoomConfig.html +share/gtk-doc/html/telepathy-glib/TpCMMessage.html +share/gtk-doc/html/telepathy-glib/TpCallContentMediaDescription.html +share/gtk-doc/html/telepathy-glib/TpCallStreamEndpoint.html share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html share/gtk-doc/html/telepathy-glib/TpChannelIface.html share/gtk-doc/html/telepathy-glib/TpChannelManager.html -share/gtk-doc/html/telepathy-glib/TpExportableChannel.html +share/gtk-doc/html/telepathy-glib/TpClientMessage.html share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html +share/gtk-doc/html/telepathy-glib/TpExportableChannel.html +share/gtk-doc/html/telepathy-glib/TpIntset.html +share/gtk-doc/html/telepathy-glib/TpMessage.html +share/gtk-doc/html/telepathy-glib/TpSignalledMessage.html share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html share/gtk-doc/html/telepathy-glib/annotation-glossary.html share/gtk-doc/html/telepathy-glib/ch-client.html share/gtk-doc/html/telepathy-glib/ch-dbus.html +share/gtk-doc/html/telepathy-glib/ch-obsolete.html share/gtk-doc/html/telepathy-glib/ch-protocol.html share/gtk-doc/html/telepathy-glib/ch-service-base.html share/gtk-doc/html/telepathy-glib/ch-service-dbus.html @@ -139,19 +198,28 @@ share/gtk-doc/html/telepathy-glib/style.css share/gtk-doc/html/telepathy-glib/telepathy-glib-TpContactsMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpGroupMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpHeap.html -share/gtk-doc/html/telepathy-glib/telepathy-glib-TpIntset.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpMessageMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPresenceMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPropertiesMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpTextMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account-channel-request.html -share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html -share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account-manager.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-automatic-client-factory.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-automatic-proxy-factory.html share/gtk-doc/html/telepathy-glib/telepathy-glib-base-client.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-base-contact-list.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-base-password-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-base-protocol.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-basic-proxy-factory.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-call-channel.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-call-content.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-call-misc.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-call-stream.html share/gtk-doc/html/telepathy-glib/telepathy-glib-capabilities.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-auth.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-contactsearch.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatch-operation.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatcher.html @@ -159,36 +227,52 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-file-transfer.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-group.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-media.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-request.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-room.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-roomlist.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tube.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tubes.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-anonymity.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-channel.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-content.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-misc.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-stream.html share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-service-point.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-client-channel-factory.html share/gtk-doc/html/telepathy-glib/telepathy-glib-client.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-addressing.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-aliasing.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-avatars.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-balance.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-caps.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-cellular.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-client-types.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contact-info.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contact-list.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contacts.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-location.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-mail.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-manager.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-powersaving.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-presence.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-requests.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-simple-presence.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-contact-search-result.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-contact-search.html share/gtk-doc/html/telepathy-glib/telepathy-glib-contact.html share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus-properties-mixin.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus-tube-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus.html share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-ansi.html share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-sender.html share/gtk-doc/html/telepathy-glib/telepathy-glib-debug.html share/gtk-doc/html/telepathy-glib/telepathy-glib-defs.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-dtmf.html share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html share/gtk-doc/html/telepathy-glib/telepathy-glib-errors.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-file-transfer-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-gnio-util.html share/gtk-doc/html/telepathy-glib/telepathy-glib-gtypes.html share/gtk-doc/html/telepathy-glib/telepathy-glib-handle-channels-context.html @@ -204,20 +288,29 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-tp-properties.html share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy.html share/gtk-doc/html/telepathy-glib/telepathy-glib-run.html share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-approver.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-client-factory.html share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-handler.html share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-observer.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-password-manager.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-stream-tube-channel.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-stream-tube-connection.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account-manager.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-anonymity.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-auth.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-call.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactlist.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactsearch.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatch-operation.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatcher.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-file-transfer.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-ft-metadata.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-group.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-media.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-request.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-room.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-roomlist.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-securable.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-text.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-tube.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-tubes.html @@ -228,21 +321,19 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-debug.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-generic.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-media-interfaces.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-service-point.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-tls.html -share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-text-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-util.html -share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2 share/gtk-doc/html/telepathy-glib/up.png -share/vala-0.12/vapi/telepathy-glib.deps -share/vala-0.12/vapi/telepathy-glib.vapi +share/vala/vapi/telepathy-glib.deps +share/vala/vapi/telepathy-glib.vapi @dirrm share/gtk-doc/html/telepathy-glib @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc @dirrm include/telepathy-1.0/telepathy-glib/_gen @dirrm include/telepathy-1.0/telepathy-glib @dirrmtry include/telepathy-1.0 -@dirrmtry lib/girepository-1.0 -@dirrmtry share/gir-1.0 diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile index 3db35fa9993f..e77616021ad2 100644 --- a/net-im/telepathy-haze/Makefile +++ b/net-im/telepathy-haze/Makefile @@ -1,29 +1,22 @@ -# New ports collection makefile for: telepathy-haze -# Date created: 2007-10-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/telepathy-haze/Makefile,v 1.3 2008/03/02 19:50:45 marcus Exp $ +# $MCom: ports/net-im/telepathy-haze/Makefile,v 1.7 2012/06/13 00:59:50 mezz Exp $ -PORTNAME= haze -PORTVERSION= 0.4.0 -PORTREVISION= 5 +PORTNAME= telepathy-haze +PORTVERSION= 0.6.0 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-haze/ -PKGNAMEPREFIX= telepathy- -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Libpurple connection manager for telepathy BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= purple.10:${PORTSDIR}/net-im/libpurple \ - idn.17:${PORTSDIR}/dns/libidn \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib +LIB_DEPENDS= purple:${PORTSDIR}/net-im/libpurple \ + idn:${PORTSDIR}/dns/libidn \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib -USE_GNOME= pkgconfig CPPFLAGS+= -I${LOCALBASE}/include -WRKSRC= ${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION} +WRKSRC= ${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net-im/telepathy-haze/distinfo b/net-im/telepathy-haze/distinfo index 2e64f11d0c9d..29a2001ae072 100644 --- a/net-im/telepathy-haze/distinfo +++ b/net-im/telepathy-haze/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-haze-0.4.0.tar.gz) = f699e4e127d710ab30ac34c60acfdb2b3b7fd19b9c7d4fa6970ac6fe45172353 -SIZE (telepathy-haze-0.4.0.tar.gz) = 465716 +SHA256 (telepathy-haze-0.6.0.tar.gz) = e267c54aef8f85746899e365ae344fe9ec73c1aec04298bedad6a88732ab2fe3 +SIZE (telepathy-haze-0.6.0.tar.gz) = 558413 diff --git a/net-im/telepathy-haze/pkg-plist b/net-im/telepathy-haze/pkg-plist index 37a9a039f8a0..2af48b6c689b 100644 --- a/net-im/telepathy-haze/pkg-plist +++ b/net-im/telepathy-haze/pkg-plist @@ -1,5 +1,2 @@ libexec/telepathy-haze share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.haze.service -share/telepathy/managers/haze.manager -@dirrmtry share/telepathy/managers -@dirrmtry share/telepathy diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile index f3f99eeb3802..7e5aaa63b195 100644 --- a/net-im/telepathy-idle/Makefile +++ b/net-im/telepathy-idle/Makefile @@ -1,47 +1,41 @@ -# New ports collection makefile for: telepathy-idle -# Date created: Apr 19 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# +# $MCom: ports/net-im/telepathy-idle/Makefile,v 1.6 2012/08/17 19:06:45 kwm Exp $ PORTNAME= telepathy-idle -PORTVERSION= 0.1.7 +PORTVERSION= 0.1.11 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= IRC Connection Manager for Telepathy Framework -LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ - dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \ - telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib - -BUILD_DEPENDS= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \ - xsltproc:${PORTSDIR}/textproc/libxslt -RUN_DEPENDS= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} - -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo +BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib GNU_CONFIGURE= yes USE_OPENSSL= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig glib20 +USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build MAN8= telepathy-idle.8 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> - -.if defined(WITH_OPENSSL_BASE) +#.if defined(WITH_OPENSSL_BASE) CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto" OPENSSL_CFLAGS="-I/usr/include" -.endif +#.endif +# OPENSSL_CFLAGS +# C compiler flags for OPENSSL, overriding pkg-config +# OPENSSL_LIBS +# linker flags for OPENSSL, overriding pkg-config post-patch: @${REINPLACE_CMD} -e 's|strnlen(\([^,]*\), [^)]*)|strlen(\1)|' \ ${WRKSRC}/src/idle-connection.c \ ${WRKSRC}/src/idle-parser.c -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/telepathy-idle/distinfo b/net-im/telepathy-idle/distinfo index 072fbc8430f1..effb00700203 100644 --- a/net-im/telepathy-idle/distinfo +++ b/net-im/telepathy-idle/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-idle-0.1.7.tar.gz) = b65df4f8ebdf1039e1f1e406f53cc7b6106fab6c4d8e784e360709f8d85df0c3 -SIZE (telepathy-idle-0.1.7.tar.gz) = 482415 +SHA256 (telepathy-idle-0.1.11.tar.gz) = 047ccbec0b91ac187467ede5a90966f9ec881df56fd8c80cb3bce3710f66fda0 +SIZE (telepathy-idle-0.1.11.tar.gz) = 505354 diff --git a/net-im/telepathy-idle/files/patch-src_idle-server-connection.c b/net-im/telepathy-idle/files/patch-src_idle-server-connection.c index 1715d87320a8..e69de29bb2d1 100644 --- a/net-im/telepathy-idle/files/patch-src_idle-server-connection.c +++ b/net-im/telepathy-idle/files/patch-src_idle-server-connection.c @@ -1,14 +0,0 @@ ---- src/idle-server-connection.c.orig 2009-02-23 01:02:04.000000000 -0500 -+++ src/idle-server-connection.c 2009-02-23 01:05:04.000000000 -0500 -@@ -28,9 +28,10 @@ - - #include <arpa/inet.h> - #include <fcntl.h> --#include <netinet/tcp.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> -+#include <netinet/tcp.h> - #include <unistd.h> - - #define IDLE_DEBUG_FLAG IDLE_DEBUG_NETWORK diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile index 39a04c63c5a6..a38da11d3192 100644 --- a/net-im/telepathy-logger/Makefile +++ b/net-im/telepathy-logger/Makefile @@ -1,35 +1,34 @@ -# New ports collection makefile for: telepathy-logger -# Date created: 23 July 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/telepathy-logger/Makefile,v 1.3 2010/09/01 23:50:23 avl Exp $ +# $MCom: ports/net-im/telepathy-logger/Makefile,v 1.14 2012/08/17 19:06:45 kwm Exp $ PORTNAME= telepathy-logger -PORTVERSION= 0.1.7 +PORTVERSION= 0.4.0 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Logger utility library for the Telepathy framework -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - xml2.5:${PORTSDIR}/textproc/libxml2 \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib + +LICENSE= LGPL21 USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 intltool gnomedocutils ltverhack +USE_GNOME= gnomehack glib20 intltool gnomedocutils ltverhack libxml2 \ + libxslt:build +USE_PKGCONFIG= build +USE_SQLITE= yes USE_PYTHON_BUILD= yes -#MAKE_JOBS_UNSAFE= yes GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml -#post-patch: -# @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \ -# ${WRKSRC}/telepathy-glib/Makefile.in +post-patch: + @${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \ + ${WRKSRC}/tools/*.py .include <bsd.port.mk> diff --git a/net-im/telepathy-logger/distinfo b/net-im/telepathy-logger/distinfo index 4e53cd3ef96f..35dcf03c5d53 100644 --- a/net-im/telepathy-logger/distinfo +++ b/net-im/telepathy-logger/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-logger-0.1.7.tar.bz2) = 5466350fee82cbd75194ffe06591a03a75904d15c6b3d4d2db9b005734dd33d1 -SIZE (telepathy-logger-0.1.7.tar.bz2) = 452362 +SHA256 (telepathy-logger-0.4.0.tar.bz2) = 06b5ab0616afd7572a1bbda58e6a9487bb305f69358c85985a8999f26f4465e5 +SIZE (telepathy-logger-0.4.0.tar.bz2) = 523642 diff --git a/net-im/telepathy-logger/pkg-plist b/net-im/telepathy-logger/pkg-plist index 983770d4dd69..874268543d86 100644 --- a/net-im/telepathy-logger/pkg-plist +++ b/net-im/telepathy-logger/pkg-plist @@ -1,18 +1,23 @@ -include/telepathy-logger-0.1/telepathy-logger/entity.h -include/telepathy-logger-0.1/telepathy-logger/entry-text.h -include/telepathy-logger-0.1/telepathy-logger/entry.h -include/telepathy-logger-0.1/telepathy-logger/log-manager.h -include/telepathy-logger-0.1/telepathy-logger/telepathy-logger.h +include/telepathy-logger-0.2/telepathy-logger/call-event.h +include/telepathy-logger-0.2/telepathy-logger/entity.h +include/telepathy-logger-0.2/telepathy-logger/event.h +include/telepathy-logger-0.2/telepathy-logger/log-manager.h +include/telepathy-logger-0.2/telepathy-logger/telepathy-logger.h +include/telepathy-logger-0.2/telepathy-logger/text-event.h +lib/girepository-1.0/TelepathyLogger-0.2.typelib lib/libtelepathy-logger.a lib/libtelepathy-logger.la lib/libtelepathy-logger.so -lib/libtelepathy-logger.so.1 -libdata/pkgconfig/telepathy-logger-0.1.pc +lib/libtelepathy-logger.so.2 +libdata/pkgconfig/telepathy-logger-0.2.pc libexec/telepathy-logger share/dbus-1/services/org.freedesktop.Telepathy.Client.Logger.service share/dbus-1/services/org.freedesktop.Telepathy.Logger.service -share/gtk-doc/html/telepathy-logger/TplEntry.html -share/gtk-doc/html/telepathy-logger/TplEntryText.html +share/gir-1.0/TelepathyLogger-0.2.gir +share/gtk-doc/html/telepathy-logger/TplEntity.html +share/gtk-doc/html/telepathy-logger/TplEvent.html +share/gtk-doc/html/telepathy-logger/TplLogManager.html +share/gtk-doc/html/telepathy-logger/TplTextEvent.html share/gtk-doc/html/telepathy-logger/ch-public.html share/gtk-doc/html/telepathy-logger/home.png share/gtk-doc/html/telepathy-logger/index.html @@ -20,9 +25,6 @@ share/gtk-doc/html/telepathy-logger/index.sgml share/gtk-doc/html/telepathy-logger/left.png share/gtk-doc/html/telepathy-logger/right.png share/gtk-doc/html/telepathy-logger/style.css -share/gtk-doc/html/telepathy-logger/telepathy-logger-TplEntity.html -share/gtk-doc/html/telepathy-logger/telepathy-logger-TplLogManager.html -share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp2 share/gtk-doc/html/telepathy-logger/up.png share/telepathy/clients/Logger.client @@ -31,5 +33,5 @@ share/telepathy/clients/Logger.client @dirrm share/gtk-doc/html/telepathy-logger @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc -@dirrm include/telepathy-logger-0.1/telepathy-logger -@dirrm include/telepathy-logger-0.1 +@dirrm include/telepathy-logger-0.2/telepathy-logger +@dirrm include/telepathy-logger-0.2 diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile index 6386e5f4451e..200774ab47ec 100644 --- a/net-im/telepathy-mission-control/Makefile +++ b/net-im/telepathy-mission-control/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: telepathy-mission-control -# Date created: 2007-10-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.14 2010/09/22 12:13:31 avl Exp $ +# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.23 2012/08/17 19:06:46 kwm Exp $ PORTNAME= telepathy-mission-control -PORTVERSION= 5.6.1 -PORTREVISION= 1 +PORTVERSION= 5.12.0 CATEGORIES= net-im devel MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/ @@ -17,13 +13,13 @@ COMMENT= Telepathy component to apps to abstract details of connection managers LIB_DEPENDS= telepathy.2:${PORTSDIR}/net-im/libtelepathy \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -USE_GNOME= gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack +USE_GNOME= gnomeprefix libxslt gnomehack ltverhack USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes USE_LDCONFIG= yes -MAKE_JOBS_UNSAFE=yes +GLIB_SCHEMAS= im.telepathy.MissionControl.FromEmpathy.gschema.xml MAN1= mc-tool.1 mc-wait-for-name.1 MAN8= mission-control-5.8 diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo index bdf58c05d156..17624836d670 100644 --- a/net-im/telepathy-mission-control/distinfo +++ b/net-im/telepathy-mission-control/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-mission-control-5.6.1.tar.gz) = 4b3b45eed5e6ffab36957c529ed75e88e0db3b59dc17f2e7288d5c9dd8d0b19a -SIZE (telepathy-mission-control-5.6.1.tar.gz) = 1302051 +SHA256 (telepathy-mission-control-5.12.0.tar.gz) = 660aeb65543e1b029dfde6a895934cb20b766644bae2a68c0030052aa6645e77 +SIZE (telepathy-mission-control-5.12.0.tar.gz) = 1014502 diff --git a/net-im/telepathy-mission-control/pkg-plist b/net-im/telepathy-mission-control/pkg-plist index 2185201acab3..cef8b825d38a 100644 --- a/net-im/telepathy-mission-control/pkg-plist +++ b/net-im/telepathy-mission-control/pkg-plist @@ -3,6 +3,7 @@ bin/mc-wait-for-name include/mission-control-5.5/mission-control-plugins/account-storage.h include/mission-control-5.5/mission-control-plugins/account.h include/mission-control-5.5/mission-control-plugins/dbus-acl.h +include/mission-control-5.5/mission-control-plugins/debug.h include/mission-control-5.5/mission-control-plugins/dispatch-operation-policy.h include/mission-control-5.5/mission-control-plugins/dispatch-operation.h include/mission-control-5.5/mission-control-plugins/loader.h @@ -18,11 +19,10 @@ libdata/pkgconfig/mission-control-plugins.pc libexec/mission-control-5 share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service -share/doc/mission-control-plugins/McpAccountStorage.html +share/doc/mission-control-plugins/McpAccountManager.html share/doc/mission-control-plugins/McpDispatchOperation.html -share/doc/mission-control-plugins/McpDispatchOperationPolicy.html share/doc/mission-control-plugins/McpRequest.html -share/doc/mission-control-plugins/McpRequestPolicy.html +share/doc/mission-control-plugins/annotation-glossary.html share/doc/mission-control-plugins/api-index-full.html share/doc/mission-control-plugins/ch01.html share/doc/mission-control-plugins/ch02.html @@ -32,9 +32,10 @@ share/doc/mission-control-plugins/home.png share/doc/mission-control-plugins/index.html share/doc/mission-control-plugins/index.sgml share/doc/mission-control-plugins/left.png +share/doc/mission-control-plugins/mission-control-plugins-McpAccountStorage.html +share/doc/mission-control-plugins/mission-control-plugins-McpDispatchOperationPolicy.html +share/doc/mission-control-plugins/mission-control-plugins-McpRequestPolicy.html share/doc/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html -share/doc/mission-control-plugins/mission-control-plugins-account.html -share/doc/mission-control-plugins/mission-control-plugins.devhelp share/doc/mission-control-plugins/mission-control-plugins.devhelp2 share/doc/mission-control-plugins/object-tree.html share/doc/mission-control-plugins/right.png @@ -43,4 +44,3 @@ share/doc/mission-control-plugins/up.png @dirrm share/doc/mission-control-plugins @dirrm include/mission-control-5.5/mission-control-plugins @dirrm include/mission-control-5.5 -@dirrmtry lib/mission-control-plugins.0 diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile index 16a4a6c12d11..3e6e39709bb3 100644 --- a/net-im/telepathy-salut/Makefile +++ b/net-im/telepathy-salut/Makefile @@ -1,36 +1,28 @@ -# New ports collection makefile for: telepathy-salut -# Date created: Apr 16 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# $MCom: ports/net-im/telepathy-salut/Makefile,v 1.4 2009/01/08 07:12:15 marcus Exp $ -# +# $MCom: ports/net-im/telepathy-salut/Makefile,v 1.9 2012/08/17 19:06:46 kwm Exp $ PORTNAME= telepathy-salut -PORTVERSION= 0.4.0 +PORTVERSION= 0.8.0 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Link-local Connection Manager for Telepathy Framework -LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ - avahi-glib.pc:${PORTSDIR}/net/avahi-app \ - telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \ - libsoup-2.4.pc:${PORTSDIR}/devel/libsoup - -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt - -BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} -RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} +LIB_DEPENDS= avahi-glib.1:${PORTSDIR}/net/avahi-app \ + telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ + soup-2.4.1:${PORTSDIR}/devel/libsoup GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack glib20 libxslt:build +USE_PKGCONFIG= build USE_OPENSSL= yes USE_PYTHON_BUILD= yes -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" +USE_SQLITE= 3 +CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} MAN8= telepathy-salut.8 diff --git a/net-im/telepathy-salut/distinfo b/net-im/telepathy-salut/distinfo index 85e54116a36b..555f29083631 100644 --- a/net-im/telepathy-salut/distinfo +++ b/net-im/telepathy-salut/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-salut-0.4.0.tar.gz) = f87dfe3d1b54243ac4f8eff5ca6aa8b39e9a06be5ad6be79e68599bd324bc9c8 -SIZE (telepathy-salut-0.4.0.tar.gz) = 1174079 +SHA256 (telepathy-salut-0.8.0.tar.gz) = f504faf472e81c17c2707696124d4219fe869c83d7cdbbe53a035eb724bfb5ce +SIZE (telepathy-salut-0.8.0.tar.gz) = 1822511 diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c deleted file mode 100644 index 842337118809..000000000000 --- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/gibber/gibber-xmpp-connection-listener.c.orig 2010-05-20 06:10:39.000000000 -0400 -+++ lib/gibber/gibber-xmpp-connection-listener.c 2010-07-24 20:48:34.000000000 -0400 -@@ -23,6 +23,7 @@ - #include <string.h> - #include <time.h> - #include <sys/types.h> -+#include <netinet/in.h> - #include <unistd.h> - #include <errno.h> - diff --git a/net-im/telepathy-salut/files/patch-src_salut-contact.h b/net-im/telepathy-salut/files/patch-src_salut-contact.h deleted file mode 100644 index b27d1b466ebc..000000000000 --- a/net-im/telepathy-salut/files/patch-src_salut-contact.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/salut-contact.h.orig Thu Apr 19 17:06:44 2007 -+++ src/salut-contact.h Thu Apr 19 17:08:20 2007 -@@ -20,6 +20,8 @@ - #ifndef __SALUT_CONTACT_H__ - #define __SALUT_CONTACT_H__ - -+#include <sys/socket.h> -+ - #include <netinet/in.h> - #include <glib-object.h> - diff --git a/net-im/telepathy-salut/files/patch-src_salut-self.c b/net-im/telepathy-salut/files/patch-src_salut-self.c deleted file mode 100644 index 27bb5b5a7163..000000000000 --- a/net-im/telepathy-salut/files/patch-src_salut-self.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/salut-self.c.orig Thu Apr 19 17:09:13 2007 -+++ src/salut-self.c Thu Apr 19 17:10:24 2007 -@@ -24,6 +24,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <netdb.h> - #include <errno.h> - diff --git a/net-im/telepathy-salut/pkg-plist b/net-im/telepathy-salut/pkg-plist index fba720fb7c8c..9e7944e82d2e 100644 --- a/net-im/telepathy-salut/pkg-plist +++ b/net-im/telepathy-salut/pkg-plist @@ -1,7 +1,18 @@ +lib/telepathy/salut-0/lib/libsalut-plugins-0.8.0.so +lib/telepathy/salut-0/lib/libsalut-plugins.la +lib/telepathy/salut-0/lib/libsalut-plugins.so +lib/telepathy/salut-0/lib/libwocky-telepathy-salut-0.8.0.so +lib/telepathy/salut-0/lib/libwocky.a +lib/telepathy/salut-0/lib/libwocky.la +lib/telepathy/salut-0/lib/libwocky.so libexec/telepathy-salut -share/telepathy/managers/salut.manager share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service %%DOCSDIR%%/clique.html +share/telepathy/managers/salut.manager @dirrmtry share/telepathy/managers @dirrmtry share/telepathy @dirrm %%DOCSDIR%% +@dirrmtry lib/telepathy/salut-0/plugins +@dirrmtry lib/telepathy/salut-0/lib +@dirrmtry lib/telepathy/salut-0 +@dirrmtry lib/telepathy diff --git a/net-mgmt/gsnmp/Makefile b/net-mgmt/gsnmp/Makefile index f78e2088e413..e47c5fdf43e4 100644 --- a/net-mgmt/gsnmp/Makefile +++ b/net-mgmt/gsnmp/Makefile @@ -19,6 +19,7 @@ COMMENT= SNMP library written on top of glib and gnet2 LIB_DEPENDS= gnet:${PORTSDIR}/net/gnet2 USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net-mgmt/jnettop/Makefile b/net-mgmt/jnettop/Makefile index 9240b916ca52..413a3bfda826 100644 --- a/net-mgmt/jnettop/Makefile +++ b/net-mgmt/jnettop/Makefile @@ -17,6 +17,7 @@ MAN8= jnettop.8 GNU_CONFIGURE= yes USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GMAKE= yes LICENSE= GPLv2 diff --git a/net-p2p/rtorrent-devel/Makefile b/net-p2p/rtorrent-devel/Makefile index 7107f9c2b744..f89c8ed706a2 100644 --- a/net-p2p/rtorrent-devel/Makefile +++ b/net-p2p/rtorrent-devel/Makefile @@ -20,6 +20,7 @@ CONFLICTS= rtorrent-[0-9]* USE_GCC= 4.2+ GNU_CONFIGURE= yes +USE_PKGCONFIG= build LDFLAGS+= -pthread CONFIGURE_ARGS= --disable-debug diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile index ab3279df43d2..1bb970ea7417 100644 --- a/net-p2p/rtorrent/Makefile +++ b/net-p2p/rtorrent/Makefile @@ -18,6 +18,7 @@ CONFLICTS= rtorrent-devel-[0-9]* USE_GCC= 4.2+ GNU_CONFIGURE= yes +USE_PKGCONFIG= build LDFLAGS+= -pthread CONFIGURE_ARGS= --disable-debug diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile index 1e16d045597a..9b14850a958a 100644 --- a/net/glib-networking/Makefile +++ b/net/glib-networking/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: glib-networking -# Date Created: 06 Jan 2011 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net/glib-networking/Makefile,v 1.12 2011/08/11 09:10:32 kwm Exp $ -# +# $MCom: ports/net/glib-networking/Makefile,v 1.20 2012/12/10 11:17:13 kwm Exp $ PORTNAME= glib-networking -PORTVERSION= 2.28.7 -PORTREVISION= 5 +PORTVERSION= 2.34.2 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,23 +13,21 @@ COMMENT= Network-related giomodules for glib BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas -LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls \ - gcrypt.18:${PORTSDIR}/security/libgcrypt \ - dbus-1.3:${PORTSDIR}/devel/dbus \ - proxy.1:${PORTSDIR}/net/libproxy +LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ + gcrypt:${PORTSDIR}/security/libgcrypt \ + dbus-1:${PORTSDIR}/devel/dbus \ + proxy:${PORTSDIR}/net/libproxy RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas -USE_BZIP2= yes +USE_XZ= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig glib20 intltool +USE_GNOME= gnomehack glib20 intltool USE_GETTEXT= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" LDFLAGS+= -L${LOCALBASE}/lib post-patch: diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo index 9e274437856a..c1f8b8ccd4e6 100644 --- a/net/glib-networking/distinfo +++ b/net/glib-networking/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-networking-2.28.7.tar.bz2) = 98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c -SIZE (gnome2/glib-networking-2.28.7.tar.bz2) = 319260 +SHA256 (gnome2/glib-networking-2.34.2.tar.xz) = 00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde +SIZE (gnome2/glib-networking-2.34.2.tar.xz) = 346828 diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c new file mode 100644 index 000000000000..728e24401f33 --- /dev/null +++ b/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c @@ -0,0 +1,11 @@ +--- tls/gnutls/gtlsconnection-gnutls.c.orig 2012-12-09 01:05:02.000000000 +0000 ++++ tls/gnutls/gtlsconnection-gnutls.c 2012-12-09 01:14:46.000000000 +0000 +@@ -752,7 +752,7 @@ + if (error) + { + g_set_error (error, G_TLS_ERROR, G_TLS_ERROR_MISC, +- errmsg, gnutls_strerror (status)); ++ "%s, %s", errmsg, gnutls_strerror (status)); + } + return status; + } diff --git a/net/glib-networking/pkg-descr b/net/glib-networking/pkg-descr index aa77e641a5ce..550492c7bcdb 100644 --- a/net/glib-networking/pkg-descr +++ b/net/glib-networking/pkg-descr @@ -1,10 +1,10 @@ Network-related giomodules for glib. -Glib-networking contains the implementations of certain GLib networking +Glib-networking contains the implementations of certain GLib networking features that cannot be implemented directly in GLib itself because of their dependencies. -Currently it contains a GNUTLS-based implementation of GTlsBackend, -a libproxy-based implementation of GProxyResolver, and a GNOME GProxyResolver -that uses the proxy information from the GSettings schemas in +Currently it contains a GNUTLS-based implementation of GTlsBackend, +a libproxy-based implementation of GProxyResolver, and a GNOME GProxyResolver +that uses the proxy information from the GSettings schemas in gsettings-desktop-schemas. diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist index 568a160a6e8f..37fc07295423 100644 --- a/net/glib-networking/pkg-plist +++ b/net/glib-networking/pkg-plist @@ -9,10 +9,13 @@ lib/gio/modules/libgiolibproxy.la lib/gio/modules/libgiolibproxy.so libexec/glib-pacrunner share/dbus-1/services/org.gtk.GLib.PACRunner.service +share/locale/ar/LC_MESSAGES/glib-networking.mo share/locale/as/LC_MESSAGES/glib-networking.mo +share/locale/be/LC_MESSAGES/glib-networking.mo share/locale/bg/LC_MESSAGES/glib-networking.mo share/locale/bn_IN/LC_MESSAGES/glib-networking.mo share/locale/ca/LC_MESSAGES/glib-networking.mo +share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo share/locale/cs/LC_MESSAGES/glib-networking.mo share/locale/da/LC_MESSAGES/glib-networking.mo share/locale/de/LC_MESSAGES/glib-networking.mo @@ -23,6 +26,8 @@ share/locale/eo/LC_MESSAGES/glib-networking.mo share/locale/es/LC_MESSAGES/glib-networking.mo share/locale/et/LC_MESSAGES/glib-networking.mo share/locale/eu/LC_MESSAGES/glib-networking.mo +share/locale/fa/LC_MESSAGES/glib-networking.mo +share/locale/fi/LC_MESSAGES/glib-networking.mo share/locale/fr/LC_MESSAGES/glib-networking.mo share/locale/gl/LC_MESSAGES/glib-networking.mo share/locale/gu/LC_MESSAGES/glib-networking.mo @@ -32,9 +37,12 @@ share/locale/hu/LC_MESSAGES/glib-networking.mo share/locale/id/LC_MESSAGES/glib-networking.mo share/locale/it/LC_MESSAGES/glib-networking.mo share/locale/ja/LC_MESSAGES/glib-networking.mo +share/locale/km/LC_MESSAGES/glib-networking.mo share/locale/kn/LC_MESSAGES/glib-networking.mo share/locale/ko/LC_MESSAGES/glib-networking.mo +share/locale/lt/LC_MESSAGES/glib-networking.mo share/locale/lv/LC_MESSAGES/glib-networking.mo +share/locale/ml/LC_MESSAGES/glib-networking.mo share/locale/mr/LC_MESSAGES/glib-networking.mo share/locale/nb/LC_MESSAGES/glib-networking.mo share/locale/nl/LC_MESSAGES/glib-networking.mo @@ -45,10 +53,14 @@ share/locale/pt/LC_MESSAGES/glib-networking.mo share/locale/pt_BR/LC_MESSAGES/glib-networking.mo share/locale/ro/LC_MESSAGES/glib-networking.mo share/locale/ru/LC_MESSAGES/glib-networking.mo +share/locale/sk/LC_MESSAGES/glib-networking.mo share/locale/sl/LC_MESSAGES/glib-networking.mo share/locale/sr/LC_MESSAGES/glib-networking.mo share/locale/sr@latin/LC_MESSAGES/glib-networking.mo share/locale/sv/LC_MESSAGES/glib-networking.mo +share/locale/ta/LC_MESSAGES/glib-networking.mo +share/locale/te/LC_MESSAGES/glib-networking.mo +share/locale/th/LC_MESSAGES/glib-networking.mo share/locale/tr/LC_MESSAGES/glib-networking.mo share/locale/ug/LC_MESSAGES/glib-networking.mo share/locale/uk/LC_MESSAGES/glib-networking.mo @@ -56,17 +68,23 @@ share/locale/vi/LC_MESSAGES/glib-networking.mo share/locale/zh_CN/LC_MESSAGES/glib-networking.mo share/locale/zh_HK/LC_MESSAGES/glib-networking.mo share/locale/zh_TW/LC_MESSAGES/glib-networking.mo -@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true -@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true +@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile index dbe2b14f7a7c..958529284339 100644 --- a/net/gnet2/Makefile +++ b/net/gnet2/Makefile @@ -17,6 +17,7 @@ COMMENT= A simple network library built upon Glib-2 USE_AUTOTOOLS= libtool USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/net/gq/Makefile b/net/gq/Makefile index 927242bc6928..360f575d88b2 100644 --- a/net/gq/Makefile +++ b/net/gq/Makefile @@ -39,4 +39,13 @@ CONFIGURE_ARGS+= --enable-browser-dnd CONFIGURE_ARGS+= --enable-cache .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/syntax.h \ + ${WRKSRC}/src/glib-helpers.[ch] \ + ${WRKSRC}/src/gq-hash.h \ + ${WRKSRC}/src/gq-main-loop.h \ + ${WRKSRC}/src/gq-stack.[ch] \ + ${WRKSRC}/src/gq-tab.h + .include <bsd.port.mk> diff --git a/net/gq/files/patch-src::state.c b/net/gq/files/patch-src::state.c index 4e80d0bcbfd3..edc09cdb8360 100644 --- a/net/gq/files/patch-src::state.c +++ b/net/gq/files/patch-src::state.c @@ -1,6 +1,15 @@ ---- src/state.c.orig Thu Jul 29 09:44:27 2004 -+++ src/state.c Thu Jul 29 09:44:51 2004 -@@ -754,7 +754,7 @@ +--- src/state.c.orig 2008-01-09 16:35:12.000000000 +0000 ++++ src/state.c 2013-03-06 13:32:20.000000000 +0000 +@@ -36,7 +36,7 @@ + #include <errno.h> + + #include <glib/gi18n.h> +-#include <glib/gmessages.h> ++#include <glib.h> + #include <gtk/gtk.h> + + #include "configfile.h" +@@ -806,7 +806,7 @@ } } @@ -8,4 +17,4 @@ + if (n != NULL && v!=NULL && v->type != 0) { char *ep; - assert(v); + g_assert(v); diff --git a/net/gsk/Makefile b/net/gsk/Makefile index c6242d8230f0..5c5eca1779ed 100644 --- a/net/gsk/Makefile +++ b/net/gsk/Makefile @@ -14,6 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A C library for writing servers USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_OPENSSL= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-gtk-doc diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index 466f59dcf0e4..9a957d4952b0 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: gtk-vnc -# Date created: 16 December 2007 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# PORTNAME= gtk-vnc PORTVERSION= 0.3.10 @@ -15,9 +11,11 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= VNC viewer widget for GTK+ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ - gcrypt.18:${PORTSDIR}/security/libgcrypt \ + gcrypt:${PORTSDIR}/security/libgcrypt \ sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext + gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext + +CONFLICTS= gtk-vnc-0.4.[0-9]* USE_GNOME= pygtk2 gnomehack USE_GMAKE= yes diff --git a/net/libfixbuf/Makefile b/net/libfixbuf/Makefile index 0b57cd35e3fc..f7fbd3ab0e68 100644 --- a/net/libfixbuf/Makefile +++ b/net/libfixbuf/Makefile @@ -16,6 +16,7 @@ COMMENT= Library for using the IP Flow Information Export protocol GNU_CONFIGURE= yes USE_GNOME= glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes post-patch: diff --git a/net/libnids/Makefile b/net/libnids/Makefile index ebffc2449aa5..589181ddf29a 100644 --- a/net/libnids/Makefile +++ b/net/libnids/Makefile @@ -21,6 +21,7 @@ GLIB2_DESC= Use GLIB2 for multiprocessing support OPTIONS_DEFAULT= LIBNET GLIB2 WANT_GNOME= yes +USE_PKGCONFIG= build GNU_CONFIGURE= yes MAN3= libnids.3 diff --git a/net/linc/Makefile b/net/linc/Makefile index bd339495df59..55d6b31ecf3b 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -21,11 +21,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION LDFLAGS+= -L${LOCALBASE}/lib post-patch: diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile index a8381cb4b136..1a7aee6c8583 100644 --- a/net/nbd-server/Makefile +++ b/net/nbd-server/Makefile @@ -14,6 +14,7 @@ COMMENT= Server for the Linux network block device (nbd) USE_BZIP2= yes USE_GNOME= glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --enable-lfs --enable-syslog diff --git a/net/packter-agent/Makefile b/net/packter-agent/Makefile index 18411ff46fab..81ab0eeaa8bc 100644 --- a/net/packter-agent/Makefile +++ b/net/packter-agent/Makefile @@ -19,6 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes USE_GNOME= glib20 +USE_PKGCONFIG= build PORTDOCS= AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile index f95367daa1c2..b8d08f1cbaf9 100644 --- a/net/silc-client/Makefile +++ b/net/silc-client/Makefile @@ -28,6 +28,7 @@ MAKE_JOBS_SAFE= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GMAKE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --docdir=${DOCSDIR} \ @@ -74,6 +75,8 @@ post-patch: @${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \ ${WRKSRC}/lib/silccrypt/Makefile.in @${REINPLACE_CMD} -e 's/^MODULESDIR="$$silc_prefix/MODULESDIR="$$silc_prefix\/share\/silc/' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|glib/.*\.h|glib.h|g' \ + ${WRKSRC}/apps/irssi/src/silc/core/silc-core.c post-install: .ifndef(IRSSI_PLUGIN) diff --git a/net/sofia-sip/Makefile b/net/sofia-sip/Makefile index 8e05fa688130..58b975b07011 100644 --- a/net/sofia-sip/Makefile +++ b/net/sofia-sip/Makefile @@ -11,6 +11,7 @@ COMMENT= Open-source SIP User-Agent library GNU_CONFIGURE= yes USE_OPENSSL= yes USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build MAN1= sip-date.1 \ sip-options.1 \ diff --git a/news/pan/Makefile b/news/pan/Makefile index 1795f7669274..9edd9728561e 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: pan2 -# Date created: 19 August 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/news/pan/Makefile,v 1.7 2008/01/19 22:45:42 mezz Exp $ -# PORTNAME= pan -PORTVERSION= 0.135 -PORTREVISION= 3 +PORTVERSION= 0.139 CATEGORIES= news gnome MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/ DIST_SUBDIR= gnome2 @@ -18,8 +13,8 @@ COMMENT= Threaded GTK+ newsreader based on Agent for Windows LICENSE= GPLv2 -LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre \ - gmime-2.4.6:${PORTSDIR}/mail/gmime24 +LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \ + gmime-2.4:${PORTSDIR}/mail/gmime24 USE_BZIP2= yes USE_GMAKE= yes @@ -29,12 +24,14 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lgnuregex -OPTIONS= GTKSPELL "Enable spell checking support (gtk+2 only)" on \ - GTK3 "Build with gtk+3 based UI instead of gtk+2" off +OPTIONS_DEFINE= GTKSPELL GTK3 +OPTIONS_DEFAULT=GTKSPELL +GTKSPELL_DESC= Spell checking support (gtk+2 only) +GTK3_DESC= Use gtk+3 based UI instead of gtk+2 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_GTK3) +.if ${PORT_OPTIONS:MGTK3} USE_GNOME+= gtk20 CONFIGURE_ARGS+=--without-gtk3 .else @@ -42,10 +39,10 @@ USE_GNOME+= gtk30 CONFIGURE_ARGS+=--with-gtk3 .endif -.if defined(WITHOUT_GTKSPELL) || defined(WITH_GTK3) +.if !${PORT_OPTIONS:MGTKSPELL} || ${PORT_OPTIONS:MGTK3} CONFIGURE_ARGS+= --without-gtkspell .else -LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell +LIB_DEPENDS+= gtkspell:${PORTSDIR}/textproc/gtkspell CONFIGURE_ARGS+= --with-gtkspell .endif @@ -53,4 +50,4 @@ post-patch: @${FIND} ${WRKSRC} -name "Makefile.in"| ${XARGS} ${REINPLACE_CMD} -e \ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/news/pan/distinfo b/news/pan/distinfo index d4142348d2d4..a754784bc14d 100644 --- a/news/pan/distinfo +++ b/news/pan/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/pan-0.135.tar.bz2) = ba73fb8b1f867f9d18ec5ecf19d60e902041b4fcb1584d49a320037de93bc929 -SIZE (gnome2/pan-0.135.tar.bz2) = 1404420 +SHA256 (gnome2/pan-0.139.tar.bz2) = bf5f320f997f582d7ac823e3e854393307161a92e7014d2135e6e2674d144bb9 +SIZE (gnome2/pan-0.139.tar.bz2) = 1523907 diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile index 71f13a039e66..5a31900d5f21 100644 --- a/polish/gnugadu2/Makefile +++ b/polish/gnugadu2/Makefile @@ -162,6 +162,7 @@ post-patch: @${REINPLACE_CMD} -e 's,=.*},=${PREFIX},' ${WRKSRC}/src/plugins/dbus/org.freedesktop.im.GG.service @${REINPLACE_CMD} -e 's, -ldl,, ; s,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' ${WRKSRC}/lib/Makefile.in @${REINPLACE_CMD} -e 's,(datadir)/pixmaps,(datadir)/icons/hicolor/48x48/apps,' ${WRKSRC}/pixmaps/Makefile.in + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/plugins/GUI/gtkimhtml.c post-install: @${MKDIR} ${PREFIX}/share/applications diff --git a/ports-mgmt/bpm/Makefile b/ports-mgmt/bpm/Makefile index f5348b29a1b5..aea9b838a9a6 100644 --- a/ports-mgmt/bpm/Makefile +++ b/ports-mgmt/bpm/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: bpm -# Date created: 23 July 2004 -# Whom: sethk -# +# Created by: sethk # $FreeBSD$ -# PORTNAME= bpm PORTVERSION= 0.4.1b @@ -31,6 +27,8 @@ post-patch: # GnomeVFS needs pthread; bpm may use GnomeVFS (via GtkFileChooser) @${REINPLACE_CMD} -e 's|^CFLAGS+=|& ${PTHREAD_CFLAGS}|; \ s|^LDLIBS+=|& ${PTHREAD_LIBS}|' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's|<glib/.*.h>|<glib.h>|g' \ + ${WRKSRC}/src/*.h post-install: ${INSTALL_DATA} ${WRKDIR}/bpm.desktop ${PREFIX}/share/applications/bpm.desktop diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index f23f41e39f93..4b78b5f1f0f8 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -23,7 +23,7 @@ MAKE_JOBS_SAFE= yes MAKE_ENV= TOP="" USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig ltverhack:9 +USE_GNOME= ltverhack:9 LIBTOOLFILES= builds/unix/configure CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile index 6870baa9015b..3b40b565f9ab 100644 --- a/print/gnome-cups-manager/Makefile +++ b/print/gnome-cups-manager/Makefile @@ -40,6 +40,12 @@ post-patch: 's|-D.*_DISABLE_DEPRECATED||g' @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \ ${WRKSRC}/libgnomecups/gnome-cups-ui-driver.c + @${REINPLACE_CMD} -e 's|glib/gmacros.h>|glib.h>|g' \ + -e 's|glib/gstrfuncs.h>|glib.h>|g' \ + ${WRKSRC}/libgnomecups/gnome-cups-ui-init.h \ + ${WRKSRC}/libgnomecups/gnome-cups-ui-print.h \ + ${WRKSRC}/libgnomecups/gnome-cups-i18n.c \ + ${WRKSRC}/libgnomecups/gnome-cups-ui-driver.c post-install: ${MKDIR} ${PREFIX}/share/applications diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile index c825b3d33126..9c7bc4a6f47f 100644 --- a/print/libgnomecups/Makefile +++ b/print/libgnomecups/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: libgnomecups -# Date created: 14 Jul 2003 -# Whom: Glenn Johnson <glennpj@charter.net> -# +# Created by: Glenn Johnson <glennpj@charter.net> # $FreeBSD$ -# PORTNAME= libgnomecups PORTVERSION= 0.2.3 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= print gnome MASTER_SITES= GNOME @@ -16,11 +12,12 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Support library for gnome cups administration -LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client +LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack ltverhack glib20 +USE_PKGCONFIG= build USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool diff --git a/print/libgnomecups/files/patch-libgnomecups_gnome-cups-i18n.c b/print/libgnomecups/files/patch-libgnomecups_gnome-cups-i18n.c new file mode 100644 index 000000000000..bfe8c876b34e --- /dev/null +++ b/print/libgnomecups/files/patch-libgnomecups_gnome-cups-i18n.c @@ -0,0 +1,9 @@ +--- libgnomecups/gnome-cups-i18n.c.orig 2012-06-07 10:55:30.000000000 +0200 ++++ libgnomecups/gnome-cups-i18n.c 2012-06-07 10:55:37.000000000 +0200 +@@ -1,5 +1,5 @@ + #include <config.h> +-#include <glib/gmacros.h> ++#include <glib.h> + #include "gnome-cups-i18n.h" + + #ifdef ENABLE_NLS diff --git a/print/libgnomecups/files/patch-libgnomecups_gnome-cups-init.h b/print/libgnomecups/files/patch-libgnomecups_gnome-cups-init.h new file mode 100644 index 000000000000..688ddc36c315 --- /dev/null +++ b/print/libgnomecups/files/patch-libgnomecups_gnome-cups-init.h @@ -0,0 +1,12 @@ +--- libgnomecups/gnome-cups-init.h.orig 2012-06-07 10:56:20.000000000 +0200 ++++ libgnomecups/gnome-cups-init.h 2012-06-07 10:56:30.000000000 +0200 +@@ -1,8 +1,7 @@ + #ifndef GNOME_CUPS_INIT + #define GNOME_CUPS_INIT + +-#include <glib/gtypes.h> +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/print/p5-Font-FreeType/Makefile b/print/p5-Font-FreeType/Makefile index 3ea18c298ae3..39d1b376606e 100644 --- a/print/p5-Font-FreeType/Makefile +++ b/print/p5-Font-FreeType/Makefile @@ -17,6 +17,7 @@ COMMENT= Perl extension to read font files and render glyphs using FreeType2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 PERL_CONFIGURE= yes +USE_PKGCONFIG= build MAN3= Font::FreeType.3 \ Font::FreeType::Face.3 \ diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile index 0adb4163a0e9..4d8c4d3cbf8f 100644 --- a/print/ttf2pt1/Makefile +++ b/print/ttf2pt1/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: ttf2pt1 -# Date created: Aug 11, 2001 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= ttf2pt1 PORTVERSION= 3.4.4 @@ -19,6 +14,7 @@ COMMENT= True Type Font to Postscript Type 1 Converter LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 RUN_DEPENDS= t1asm:${PORTSDIR}/print/t1utils +USE_PKGCONFIG= build USE_PERL5= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" \ INSTDIR="${PREFIX}" LIBXDIR="${PREFIX}/bin" diff --git a/security/gpass/Makefile b/security/gpass/Makefile index 9cb6068e208e..f612814b00bd 100644 --- a/security/gpass/Makefile +++ b/security/gpass/Makefile @@ -29,6 +29,9 @@ GCONF_SCHEMAS= gpass.schemas post-patch: @${REINPLACE_CMD} -e 's|{packageprefix}/share|{datadir}|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/include/gpass/error.h \ + ${WRKSRC}/src/helper.h post-install: @-update-desktop-database diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile index 7f11182cceaa..adaf5ac50743 100644 --- a/security/gtkpasman/Makefile +++ b/security/gtkpasman/Makefile @@ -33,6 +33,9 @@ ACLOCAL_ARGS?= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal PORTDOCS= README gpasman4.sample .endif +post-patch: + @${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/src/Makefile.* + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/gtkpasman ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/data/gtkpasman.desktop \ diff --git a/security/lasso/files/patch-lasso_errors.c b/security/lasso/files/patch-lasso_errors.c new file mode 100644 index 000000000000..adc329e68cb4 --- /dev/null +++ b/security/lasso/files/patch-lasso_errors.c @@ -0,0 +1,11 @@ +--- lasso/errors.c.orig 2013-02-07 16:40:45.000000000 +0000 ++++ lasso/errors.c 2013-02-07 16:40:54.000000000 +0000 +@@ -22,7 +22,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include <glib/gstrfuncs.h> ++#include <glib.h> + #include <lasso/errors.h> + #include <lasso/xml/xml.h> + diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile index 0754f8b6ec4b..22c5a05d393c 100644 --- a/security/pidgin-encryption/Makefile +++ b/security/pidgin-encryption/Makefile @@ -43,5 +43,6 @@ PLIST_SUB+= NLS="@comment " post-extract: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|glib/.*\.h"|glib.h"|g' ${WRKSRC}/rsa_nss.c .include <bsd.port.mk> diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile index 1191bfe6e1e9..294aa4f5f584 100644 --- a/sysutils/fusefs-cryptofs/Makefile +++ b/sysutils/fusefs-cryptofs/Makefile @@ -16,6 +16,7 @@ LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt \ USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USES= fuse PLIST_FILES= bin/cryptofs diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile index 1bf3b51af337..16aa6255596a 100644 --- a/sysutils/fusefs-sshfs/Makefile +++ b/sysutils/fusefs-sshfs/Makefile @@ -16,6 +16,7 @@ KMODDIR?= ${LOCALBASE}/modules GNU_CONFIGURE= yes USES= fuse USE_GNOME= glib20 +USE_PKGCONFIG= build MAN1= sshfs.1 diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile index 05298dfcb539..846480697466 100644 --- a/sysutils/fusefs-wdfs/Makefile +++ b/sysutils/fusefs-wdfs/Makefile @@ -16,6 +16,7 @@ LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29 GNU_CONFIGURE= yes USES= fuse USE_GNOME= glib20 +USE_PKGCONFIG= build PLIST_FILES= bin/wdfs diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 9296e0c53f11..28d090a7f0c9 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: gnomesystemmonitor -# Date created: 09 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.141 2010/09/29 13:44:33 kwm Exp $ -# +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.147 2012/10/02 15:10:10 kwm Exp $ PORTNAME= gnome-system-monitor PORTVERSION= 2.28.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,6 +17,8 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme +CONFLICTS= gnome-system-monitor-3.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes @@ -28,9 +26,15 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \ librsvg2 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lutil" CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lutil GCONF_SCHEMAS= gnome-system-monitor.schemas +post-patch: + @${REINPLACE_CMD} -e 's|<glib/gtypes.h>|<glib.h>|g' \ + -e 's|<glib/gmacros.h>|<glib.h>|g' \ + -e 's|<glib/gstring.h>|<glib.h>|g' \ + ${WRKSRC}/src/*.[ch] ${WRKSRC}/src/*.cpp + .include <bsd.port.mk> diff --git a/sysutils/gnome-system-monitor/files/patch-src_interface.h b/sysutils/gnome-system-monitor/files/patch-src_interface.h new file mode 100644 index 000000000000..3e8eea33973d --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_interface.h @@ -0,0 +1,11 @@ +--- src/interface.h.orig 2012-06-12 22:10:02.000000000 +0200 ++++ src/interface.h 2012-06-12 22:10:12.000000000 +0200 +@@ -20,7 +20,7 @@ + #ifndef _PROCMAN_INTERFACE_H_ + #define _PROCMAN_INTERFACE_H_ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <gtk/gtk.h> + #include "procman.h" + diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile index 2152afa09c8f..cd6628728d17 100644 --- a/sysutils/goaccess/Makefile +++ b/sysutils/goaccess/Makefile @@ -22,6 +22,7 @@ LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \ GNU_CONFIGURE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= build CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile index 712600a2961b..7047e8b8f30a 100644 --- a/sysutils/hdup/Makefile +++ b/sysutils/hdup/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= glib20 +USE_PKGCONFIG= build USE_AUTOTOOLS= autoconf MAN1= hdup.1 diff --git a/sysutils/heartbeat/files/patch-include__clplumbing__c1_uuid.h b/sysutils/heartbeat/files/patch-include__clplumbing__c1_uuid.h new file mode 100644 index 000000000000..400545b83bba --- /dev/null +++ b/sysutils/heartbeat/files/patch-include__clplumbing__c1_uuid.h @@ -0,0 +1,11 @@ +--- include/clplumbing/cl_uuid.h.orig 2013-02-07 16:26:11.000000000 +0000 ++++ include/clplumbing/cl_uuid.h 2013-02-07 16:26:18.000000000 +0000 +@@ -16,7 +16,7 @@ + + #ifndef _CL_UUID_H_ + #define _CL_UUID_H_ +-#include <glib/gtypes.h> ++#include <glib.h> + + typedef struct cl_uuid_s{ + unsigned char uuid[16]; diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index dce8d0634d60..04eff4638924 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: nautilus-cd-burner -# Date created: 13 April 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.149 2009/09/25 18:40:01 kwm Exp $ -# PORTNAME= nautilus-cd-burner PORTVERSION= 2.24.0 @@ -36,16 +32,24 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= nautilus-cd-burner.schemas -OPTIONS= DVD "Enable DVD support" on +OPTIONS_DEFINE= DVD +OPTIONS_DEFAULT=DVD +DVD_DESC= DVD support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_DVD) +.if ${PORT_OPTIONS:MDVD} RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/g.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/nautilus-burn.h \ + ${WRKSRC}/src/nautilus-burn-init.h \ + ${WRKSRC}/src/nautilus-cd-burner.h + post-install: -@update-desktop-database @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile index c85caf479c82..7e2c2385f6b3 100644 --- a/sysutils/polkit-gnome/Makefile +++ b/sysutils/polkit-gnome/Makefile @@ -1,29 +1,25 @@ -# New ports collection makefile for: polkit-gnome -# Date Created: 30 Juli 2009 -# Whom: Koop Mast<kwm@FreeBSD.org> -# +# Created by: Koop Mast<kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.14 2010/09/19 20:17:19 kwm Exp $ -# +# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.20 2012/12/18 13:05:11 kwm Exp $ PORTNAME= polkit-gnome -PORTVERSION= 0.99 -PORTREVISION= 1 +PORTVERSION= 0.102 CATEGORIES= sysutils gnome -MASTER_SITES= http://hal.freedesktop.org/releases/ +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME frontend to the PolicyKit framework -LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit +LIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gnomehack gnomeprefix gtk20 intlhack GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ + --with-gtk=2.0 \ --localstatedir=/var CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/sysutils/polkit-gnome/distinfo b/sysutils/polkit-gnome/distinfo index 91a07efcaa3e..ecbe1371ff31 100644 --- a/sysutils/polkit-gnome/distinfo +++ b/sysutils/polkit-gnome/distinfo @@ -1,2 +1,2 @@ -SHA256 (polkit-gnome-0.99.tar.bz2) = 73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba -SIZE (polkit-gnome-0.99.tar.bz2) = 388069 +SHA256 (polkit-gnome-0.102.tar.xz) = c78cee0001128dc1b00248ed11ffd23988d9cd0ce78c8b00eb36880b289e7598 +SIZE (polkit-gnome-0.102.tar.xz) = 335144 diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist index 97158f9e5f5e..8a83b404ae4b 100644 --- a/sysutils/polkit-gnome/pkg-plist +++ b/sysutils/polkit-gnome/pkg-plist @@ -1,4 +1,3 @@ -etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop include/polkit-gtk-1/polkitgtk/polkitgtk.h include/polkit-gtk-1/polkitgtk/polkitgtktypes.h include/polkit-gtk-1/polkitgtk/polkitlockbutton.h @@ -14,11 +13,13 @@ share/locale/ar/LC_MESSAGES/polkit-gnome-1.mo share/locale/be/LC_MESSAGES/polkit-gnome-1.mo share/locale/bn_IN/LC_MESSAGES/polkit-gnome-1.mo share/locale/ca/LC_MESSAGES/polkit-gnome-1.mo +share/locale/ca@valencia/LC_MESSAGES/polkit-gnome-1.mo share/locale/cs/LC_MESSAGES/polkit-gnome-1.mo share/locale/da/LC_MESSAGES/polkit-gnome-1.mo share/locale/de/LC_MESSAGES/polkit-gnome-1.mo share/locale/el/LC_MESSAGES/polkit-gnome-1.mo share/locale/en_GB/LC_MESSAGES/polkit-gnome-1.mo +share/locale/eo/LC_MESSAGES/polkit-gnome-1.mo share/locale/es/LC_MESSAGES/polkit-gnome-1.mo share/locale/eu/LC_MESSAGES/polkit-gnome-1.mo share/locale/fi/LC_MESSAGES/polkit-gnome-1.mo @@ -44,11 +45,15 @@ share/locale/ro/LC_MESSAGES/polkit-gnome-1.mo share/locale/ru/LC_MESSAGES/polkit-gnome-1.mo share/locale/sk/LC_MESSAGES/polkit-gnome-1.mo share/locale/sl/LC_MESSAGES/polkit-gnome-1.mo +share/locale/sr/LC_MESSAGES/polkit-gnome-1.mo +share/locale/sr@latin/LC_MESSAGES/polkit-gnome-1.mo share/locale/sv/LC_MESSAGES/polkit-gnome-1.mo share/locale/ta/LC_MESSAGES/polkit-gnome-1.mo share/locale/te/LC_MESSAGES/polkit-gnome-1.mo share/locale/th/LC_MESSAGES/polkit-gnome-1.mo +share/locale/tr/LC_MESSAGES/polkit-gnome-1.mo share/locale/uk/LC_MESSAGES/polkit-gnome-1.mo +share/locale/vi/LC_MESSAGES/polkit-gnome-1.mo share/locale/zh_CN/LC_MESSAGES/polkit-gnome-1.mo share/locale/zh_HK/LC_MESSAGES/polkit-gnome-1.mo share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo @@ -58,5 +63,9 @@ share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 3408391bfee3..3feb9dda3cc5 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -1,48 +1,51 @@ -# New ports collection makefile for: polkit -# Date Created: 30 Juli 2009 -# Whom: Koop Mast<kwm@FreeBSD.org> -# +# Created by: Koop Mast<kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/sysutils/polkit/Makefile,v 1.10 2010/09/16 02:09:43 avl Exp $ -# +# $MCom: ports/sysutils/polkit/Makefile,v 1.23 2012/12/18 13:01:54 kwm Exp $ PORTNAME= polkit -PORTVERSION= 0.99 +PORTVERSION= 0.105 +PORTREVISION= 1 CATEGORIES= sysutils gnome -MASTER_SITES= http://hal.freedesktop.org/releases/ +MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for controlling access to system-wide components BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= eggdbus-1.0:${PORTSDIR}/devel/eggdbus \ - expat.6:${PORTSDIR}/textproc/expat2 -RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 +RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ + dbus-launch:${PORTSDIR}/devel/dbus -USE_GNOME= gnomehack glib20 intlhack +USE_GNOME= gnomehack glib20 intlhack gnomehier USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ --with-authfw=pam \ --with-pam-include=system \ --with-os-type=freebsd \ + --disable-systemd \ --enable-introspection \ --localstatedir=/var CONFIGURE_ENV= GTKDOC="false" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if defined(NO_INSTALL_MANPAGES) -CONFIGURE_ARGS+=--disable-man-pages -.else +OPTIONS_DEFINE= MANPAGES + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl -MAN1= pkaction.1 pkcheck.1 pkexec.1 +MAN1= pkaction.1 pkcheck.1 pkexec.1 pkttyagent.1 MAN8= pklocalauthority.8 polkit.8 polkitd.8 +.else +CONFIGURE_ARGS+=--disable-man-pages .endif post-patch: diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo index bfcebc08b41e..bd125cce13d9 100644 --- a/sysutils/polkit/distinfo +++ b/sysutils/polkit/distinfo @@ -1,2 +1,2 @@ -SHA256 (polkit-0.99.tar.gz) = f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f -SIZE (polkit-0.99.tar.gz) = 1042461 +SHA256 (polkit-0.105.tar.gz) = 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df +SIZE (polkit-0.105.tar.gz) = 1431080 diff --git a/sysutils/polkit/files/patch-Makefile.in b/sysutils/polkit/files/patch-Makefile.in new file mode 100644 index 000000000000..665c13c7d361 --- /dev/null +++ b/sysutils/polkit/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2012-05-15 22:09:33.000000000 +0200 ++++ Makefile.in 2012-05-15 22:10:16.000000000 +0200 +@@ -292,7 +292,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = actions data src docs po test ++SUBDIRS = actions data src docs po + NULL = + EXTRA_DIST = \ + HACKING \ diff --git a/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c b/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c new file mode 100644 index 000000000000..c5c5bd8dade8 --- /dev/null +++ b/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c @@ -0,0 +1,12 @@ +--- src/polkitagent/polkitagenthelperprivate.c.orig 2011-02-23 18:18:11.000000000 +0000 ++++ src/polkitagent/polkitagenthelperprivate.c 2011-02-23 18:18:41.000000000 +0000 +@@ -103,7 +103,7 @@ flush_and_wait () + { + fflush (stdout); + fflush (stderr); +- fdatasync (fileno(stdout)); +- fdatasync (fileno(stderr)); ++ fsync (fileno(stdout)); ++ fsync (fileno(stderr)); + usleep (100 * 1000); + } diff --git a/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c new file mode 100644 index 000000000000..76a08f711bcc --- /dev/null +++ b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c @@ -0,0 +1,11 @@ +--- src/polkitbackend/polkitbackendinteractiveauthority.c.orig 2012-05-15 21:52:38.000000000 +0200 ++++ src/polkitbackend/polkitbackendinteractiveauthority.c 2012-05-15 21:52:49.000000000 +0200 +@@ -279,7 +279,7 @@ + static volatile GQuark domain = 0; + + /* Force registering error domain */ +- domain = POLKIT_ERROR; domain; ++ domain = POLKIT_ERROR; + + priv = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_PRIVATE (authority); + diff --git a/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c new file mode 100644 index 000000000000..f4a57022e5f9 --- /dev/null +++ b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c @@ -0,0 +1,23 @@ +--- src/polkitbackend/polkitbackendlocalauthority.c.orig 2012-05-15 21:52:35.000000000 +0200 ++++ src/polkitbackend/polkitbackendlocalauthority.c 2012-05-15 21:53:07.000000000 +0200 +@@ -700,11 +700,7 @@ + ret = NULL; + name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); + +- if (setnetgrent (name) == 0) +- { +- g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno)); +- goto out; +- } ++ setnetgrent (name); + + for (;;) + { +@@ -737,7 +733,6 @@ + + ret = g_list_reverse (ret); + +- out: + endnetgrent (); + return ret; + } diff --git a/sysutils/polkit/files/patch-src_programs_pkexec.c b/sysutils/polkit/files/patch-src_programs_pkexec.c deleted file mode 100644 index 620ebae15918..000000000000 --- a/sysutils/polkit/files/patch-src_programs_pkexec.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/programs/pkexec.c.orig 2010-01-18 02:52:40.000000000 -0500 -+++ src/programs/pkexec.c 2010-01-18 03:06:57.000000000 -0500 -@@ -438,7 +438,7 @@ main (int argc, char *argv[]) - goto out; - } - -- original_cwd = g_strdup (get_current_dir_name ()); -+ original_cwd = g_strdup (getcwd (NULL, 0)); - if (original_cwd == NULL) - { - g_printerr ("Error getting cwd.\n"); diff --git a/sysutils/polkit/pkg-descr b/sysutils/polkit/pkg-descr index 9746a6470c1d..4f0b6a299e16 100644 --- a/sysutils/polkit/pkg-descr +++ b/sysutils/polkit/pkg-descr @@ -1,4 +1,4 @@ PolicyKit is a framework for defining policy for system-wide components and for desktop pieces to configure it. It is used by HAL. -WWW: http://www.freedesktop.org/wiki/Software/PolicyKit +WWW: http://www.freedesktop.org/wiki/Software/polkit diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist index 5f7672022836..e30e9a7d7e01 100644 --- a/sysutils/polkit/pkg-plist +++ b/sysutils/polkit/pkg-plist @@ -1,6 +1,8 @@ +bin/pk-example-frobnicate bin/pkaction bin/pkcheck bin/pkexec +bin/pkttyagent @unexec if cmp -s %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist; then rm -f %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; fi etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist @exec [ -f %B/org.freedesktop.PolicyKit1.conf ] || cp %B/%f %B/org.freedesktop.PolicyKit1.conf @@ -25,6 +27,7 @@ include/polkit-1/polkit/polkitsystembusname.h include/polkit-1/polkit/polkittemporaryauthorization.h include/polkit-1/polkit/polkittypes.h include/polkit-1/polkit/polkitunixgroup.h +include/polkit-1/polkit/polkitunixnetgroup.h include/polkit-1/polkit/polkitunixprocess.h include/polkit-1/polkit/polkitunixsession.h include/polkit-1/polkit/polkitunixuser.h @@ -41,6 +44,7 @@ include/polkit-1/polkitbackend/polkitbackendinteractiveauthority.h include/polkit-1/polkitbackend/polkitbackendlocalauthority.h include/polkit-1/polkitbackend/polkitbackendtypes.h lib/girepository-1.0/Polkit-1.0.typelib +lib/girepository-1.0/PolkitAgent-1.0.typelib lib/libpolkit-agent-1.a lib/libpolkit-agent-1.la lib/libpolkit-agent-1.so @@ -56,9 +60,6 @@ lib/libpolkit-gobject-1.so.0 lib/polkit-1/extensions/libnullbackend.a lib/polkit-1/extensions/libnullbackend.la lib/polkit-1/extensions/libnullbackend.so -lib/polkit-1/extensions/libpkexec-action-lookup.a -lib/polkit-1/extensions/libpkexec-action-lookup.la -lib/polkit-1/extensions/libpkexec-action-lookup.so libdata/pkgconfig/polkit-agent-1.pc libdata/pkgconfig/polkit-backend-1.pc libdata/pkgconfig/polkit-gobject-1.pc @@ -66,7 +67,9 @@ libexec/polkit-agent-helper-1 libexec/polkitd share/dbus-1/system-services/org.freedesktop.PolicyKit1.service share/gir-1.0/Polkit-1.0.gir +share/gir-1.0/PolkitAgent-1.0.gir share/locale/da/LC_MESSAGES/polkit-1.mo +share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy share/polkit-1/actions/org.freedesktop.policykit.policy @dirrmtry share/polkit-1/actions @dirrmtry share/polkit-1 diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile index addcd2c6f103..894fef57d4ed 100644 --- a/sysutils/rdup/Makefile +++ b/sysutils/rdup/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \ USE_BZIP2= yes USE_AUTOTOOLS= autoconf +USE_PKGCONFIG= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile index 4f76bd1db871..b5301d92334e 100644 --- a/textproc/enchant/Makefile +++ b/textproc/enchant/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: enchant -# Date created: 03 January 2004 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ # $MCom: ports-stable/textproc/enchant/Makefile,v 1.3 2010/07/20 07:48:41 kwm Exp $ -# PORTNAME= enchant PORTVERSION= 1.6.0 @@ -19,6 +15,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build CONFIGURE_ARGS= --disable-uspell \ --disable-voikko MAKE_JOBS_SAFE= yes diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile index 42e3e679c4b9..fa0c38a119fa 100644 --- a/textproc/libcroco/Makefile +++ b/textproc/libcroco/Makefile @@ -1,26 +1,29 @@ -# New ports collection makefile for: libcroco -# Date created: 08 July 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libcroco -PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTVERSION= 0.6.8 CATEGORIES= textproc gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= CSS2 parsing library -USE_BZIP2= yes +USE_XZ= yes USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GNOME= gnomehack glib20 libxml2 ltverhack +USE_PKGCONFIG= build +CONFIGURE_ARGS= --disable-gtk-doc-html PLIST_SUB= VERSION="0.6" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 900035 +CONFIGURE_ARGS+=--disable-Bsymbolic +.endif + +.include <bsd.port.post.mk> diff --git a/textproc/libcroco/distinfo b/textproc/libcroco/distinfo index 6babe5e87a68..2a235aef5680 100644 --- a/textproc/libcroco/distinfo +++ b/textproc/libcroco/distinfo @@ -1,2 +1,2 @@ -SHA256 (libcroco-0.6.2.tar.bz2) = be24853f64c09b63d39e563fb0222e29bae1a33c3d9f6cbffc0bc27669371749 -SIZE (libcroco-0.6.2.tar.bz2) = 415492 +SHA256 (libcroco-0.6.8.tar.xz) = ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570 +SIZE (libcroco-0.6.8.tar.xz) = 464992 diff --git a/textproc/libcroco/pkg-plist b/textproc/libcroco/pkg-plist index 940a8ca6099e..1dc5ecc8e3e5 100644 --- a/textproc/libcroco/pkg-plist +++ b/textproc/libcroco/pkg-plist @@ -33,5 +33,44 @@ lib/libcroco-%%VERSION%%.la lib/libcroco-%%VERSION%%.so lib/libcroco-%%VERSION%%.so.3 libdata/pkgconfig/libcroco-%%VERSION%%.pc +share/gtk-doc/html/libcroco/ch01.html +share/gtk-doc/html/libcroco/home.png +share/gtk-doc/html/libcroco/index.html +share/gtk-doc/html/libcroco/index.sgml +share/gtk-doc/html/libcroco/left.png +share/gtk-doc/html/libcroco/libcroco-cr-additional-sel.html +share/gtk-doc/html/libcroco/libcroco-cr-attr-sel.html +share/gtk-doc/html/libcroco/libcroco-cr-cascade.html +share/gtk-doc/html/libcroco/libcroco-cr-declaration.html +share/gtk-doc/html/libcroco/libcroco-cr-doc-handler.html +share/gtk-doc/html/libcroco/libcroco-cr-enc-handler.html +share/gtk-doc/html/libcroco/libcroco-cr-fonts.html +share/gtk-doc/html/libcroco/libcroco-cr-input.html +share/gtk-doc/html/libcroco/libcroco-cr-num.html +share/gtk-doc/html/libcroco/libcroco-cr-om-parser.html +share/gtk-doc/html/libcroco/libcroco-cr-parser.html +share/gtk-doc/html/libcroco/libcroco-cr-parsing-location.html +share/gtk-doc/html/libcroco/libcroco-cr-prop-list.html +share/gtk-doc/html/libcroco/libcroco-cr-pseudo.html +share/gtk-doc/html/libcroco/libcroco-cr-rgb.html +share/gtk-doc/html/libcroco/libcroco-cr-sel-eng.html +share/gtk-doc/html/libcroco/libcroco-cr-selector.html +share/gtk-doc/html/libcroco/libcroco-cr-simple-sel.html +share/gtk-doc/html/libcroco/libcroco-cr-statement.html +share/gtk-doc/html/libcroco/libcroco-cr-string.html +share/gtk-doc/html/libcroco/libcroco-cr-style.html +share/gtk-doc/html/libcroco/libcroco-cr-stylesheet.html +share/gtk-doc/html/libcroco/libcroco-cr-term.html +share/gtk-doc/html/libcroco/libcroco-cr-tknzr.html +share/gtk-doc/html/libcroco/libcroco-cr-token.html +share/gtk-doc/html/libcroco/libcroco-cr-utils.html +share/gtk-doc/html/libcroco/libcroco-libcroco-config.html +share/gtk-doc/html/libcroco/libcroco.devhelp2 +share/gtk-doc/html/libcroco/right.png +share/gtk-doc/html/libcroco/style.css +share/gtk-doc/html/libcroco/up.png +@dirrm share/gtk-doc/html/libcroco +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc @dirrm include/libcroco-%%VERSION%%/libcroco @dirrm include/libcroco-%%VERSION%% diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index af7e47900799..b0a5bb903cb8 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libxml -# Date created: 28 September 1998 -# Whom: Yukihiro Nakai <Nakai@technologist.com> -# +# Created by: Yukihiro Nakai <Nakai@technologist.com> # $FreeBSD$ -# PORTNAME= libxml PORTVERSION= 1.8.17 @@ -18,7 +14,6 @@ DEPRECATED= Last release in 2002, unsupported by developers USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_GNOME= pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile index 324ffe85c085..b883442df245 100644 --- a/textproc/link-grammar/Makefile +++ b/textproc/link-grammar/Makefile @@ -8,9 +8,9 @@ MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/ MAINTAINER= gnome@FreeBSD.org COMMENT= A grammar checking library -LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell +LIB_DEPENDS= pspell:${PORTSDIR}/textproc/aspell -USE_GNOME= gnomehack ltverhack pkgconfig +USE_GNOME= gnomehack ltverhack USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile index 7285253f89c9..147f8b9d2170 100644 --- a/textproc/qstardict/Makefile +++ b/textproc/qstardict/Makefile @@ -46,6 +46,7 @@ post-patch: ${WRKSRC}/qstardict.pro .endif @${REINPLACE_CMD} -e "s|/usr/share/stardict/dic|${DICPATH}|g" \ + -e "s|glib.*\.h|glib.h|g" \ ${WRKSRC}/plugins/stardict/stardict.cpp do-configure: diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile index f598dea347ee..ddbb36d7b0aa 100644 --- a/textproc/sagasu/Makefile +++ b/textproc/sagasu/Makefile @@ -28,6 +28,7 @@ post-patch: 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|-D.*_DISABLE_DEPRECATED||g' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/util.h post-install: .if !defined(NOPORTDOCS) diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile index d52e436e6bc5..7a8a70ac7900 100644 --- a/textproc/sary/Makefile +++ b/textproc/sary/Makefile @@ -15,6 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A suffix array library and tools, which provide fast full-text search USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile index 18c49bc80542..6a5ab1e092bf 100644 --- a/textproc/sdcv/Makefile +++ b/textproc/sdcv/Makefile @@ -18,6 +18,7 @@ USE_ICONV= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool USE_GNOME= glib20 +USE_PKGCONFIG= build SUB_FILES= pkg-message .if !defined(WITHOUT_NLS) diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile index c4205b0e713c..9528679ea16a 100644 --- a/textproc/xmlroff/Makefile +++ b/textproc/xmlroff/Makefile @@ -27,4 +27,8 @@ CONFIGURE_ARGS= --disable-gtk-doc \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/libfo/fo-libfo-basic.h + .include <bsd.port.mk> diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 7f4149457717..ad797c34aaf6 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -1,10 +1,6 @@ -# Ports collection Makefile for: epiphany-extensions -# Date created: 30 December 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.132 2010/09/19 15:40:33 kwm Exp $ -# +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.140 2012/12/13 20:33:05 kwm Exp $ PORTNAME= epiphany-extensions PORTVERSION= 2.30.2 @@ -17,10 +13,12 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A set of add-ons for the Epiphany web browser BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany -LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre \ - webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \ + webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany +CONFLICTS= epiphany-extensions-3.[0-9]* + USE_GETTEXT= yes USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack intlhack @@ -29,17 +27,19 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -pthread" CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} EPHY_EXTENSIONS=really-all EPHY_VERSION= ${PORTVERSION:R} PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION} -OPTIONS= OPENSP "Enable OpenSP SGML support" off +OPTIONS_DEFINE= OPENSP +OPENSP_DESC= OpenSP SGML support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_OPENSP) +.if ${PORT_OPTIONS:MOPENSP} CONFIGURE_ARGS+= --enable-opensp=yes LIB_DEPENDS+= osp.5:${PORTSDIR}/textproc/opensp .else @@ -54,4 +54,4 @@ post-patch: -e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile index 5be61479a68a..2d76c70a2520 100644 --- a/www/nspluginwrapper/Makefile +++ b/www/nspluginwrapper/Makefile @@ -58,6 +58,9 @@ HOST_ARCH= ${ARCH} post-patch: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/src/npw-config.c + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/npruntime.c ${WRKSRC}/src/npw-player.c \ + ${WRKSRC}/src/utils.c post-install: ${MKDIR} ${LIBDIR}/i386/linux diff --git a/www/screem/Makefile b/www/screem/Makefile index 14365a87c4ec..979ecc3afcb9 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -49,5 +49,30 @@ post-patch: s|-DGTK_DISABLE_DEPRECATED||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' \ ${WRKSRC}/tests/Makefile.in + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/include/screem-markup.h \ + ${WRKSRC}/include/screem-mdi.h \ + ${WRKSRC}/include/screem-tagtree.h \ + ${WRKSRC}/libegg/util/egg-macros.h \ + ${WRKSRC}/src/screem-cvs.c \ + ${WRKSRC}/src/screem-dtd-db.c \ + ${WRKSRC}/src/screem-file-browser.c \ + ${WRKSRC}/src/screem-markup.c \ + ${WRKSRC}/src/screem-site-parse.c + @${REINPLACE_CMD} -e 's|glib/glist.h>|glib.h>|g' \ + -e 's|glib/gconvert.h>|glib.h>|g' \ + -e 's|glib/gunicode.h>|glib.h>|g' \ + -e 's|glib/gstrfuncs.h>|glib.h>|g' \ + -e 's|glib/gfileutils.h>|glib.h>|g' \ + -e 's|glib/ghash.h>|glib.h>|g' \ + ${WRKSRC}/plugins/entityWizard/entityWizard.c \ + ${WRKSRC}/src/screem-mdi.c \ + ${WRKSRC}/src/screem-page.c \ + ${WRKSRC}/src/screem-search.c \ + ${WRKSRC}/src/screem-site-ui.c \ + ${WRKSRC}/src/screem-site.c \ + ${WRKSRC}/src/screem-window-menus.c \ + ${WRKSRC}/src/fileops.c \ + ${WRKSRC}/src/support.c .include <bsd.port.mk> diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index afa6bf637b8c..58c9a5264acc 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -28,6 +28,7 @@ USE_BISON= build USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_GNOME= gtk20 libxslt ltverhack +USE_PKGCONFIG= build USE_PERL5= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_gobject_GTypedefs.h b/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_gobject_GTypedefs.h new file mode 100644 index 000000000000..d684456fb74d --- /dev/null +++ b/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_gobject_GTypedefs.h @@ -0,0 +1,11 @@ +--- Source/JavaScriptCore/wtf/gobject/GTypedefs.h.orig 2013-01-27 14:57:47.000000000 +0000 ++++ Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2013-01-27 14:57:56.000000000 +0000 +@@ -52,7 +52,7 @@ + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 5df1a13a162a..1efe9d05b038 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: fontconfig -# Date created: 06 October 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.29 2011/04/30 20:43:31 mezz Exp $ -# PORTNAME= fontconfig PORTVERSION= 2.9.0 @@ -18,13 +14,13 @@ COMMENT= An XML-based font configuration API for X Windows .if !defined(REFERENCE_PORT) -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - expat.6:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ + expat:${PORTSDIR}/textproc/expat2 USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig ltverhack +USE_GNOME= gnomehack ltverhack CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ --with-expat-lib=${LOCALBASE}/lib \ diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile index 59c585617359..b3225311c9f5 100644 --- a/x11-toolkits/gtk-sharp10/Makefile +++ b/x11-toolkits/gtk-sharp10/Makefile @@ -34,6 +34,8 @@ post-patch: @${REINPLACE_CMD} -e 's|enable_gda=yes|enable_gda=no|g ; \ s|enable_gnomedb=yes|enable_gnomedb=no|g ; \ s|libgtkhtml-3.8|libgtkhtml-3.14|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/glib/glue/slist.c ${WRKSRC}/glib/glue/list.c pre-su-install: ${MKDIR} ${LOCALBASE}/share/gapi diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile index cd3cb1ca7b38..9e2f8b5f9589 100644 --- a/x11-toolkits/gtk-sharp20/Makefile +++ b/x11-toolkits/gtk-sharp20/Makefile @@ -30,6 +30,8 @@ USE_GNOME= gnomehack gtk20 libglade2 post-patch: @${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \ 's|^#!/usr/bin/perl|#!${PERL}|' + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/glib/glue/*.c .include "${.CURDIR}/../../lang/mono/bsd.mono.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 581ea098bd00..f5be83f1c297 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -1,24 +1,14 @@ -# New ports collection makefile for: gtk13 -# Date Created: 28 Sep 1997 -# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> -# +# Created by: Vanilla I. Shu <vanilla@MinJe.com.TW> # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.224 2011/06/16 17:36:39 kwm Exp $ -# +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.237 2013/03/04 17:44:38 kwm Exp $ # Remember to update graphics/gtk-update-icon-cache too. PORTNAME= gtk -PORTVERSION= 2.24.6 -PORTREVISION?= 2 +PORTVERSION= 2.24.17 +PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ - ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ - ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ - http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,10 +16,12 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (previous stable version) LICENSE= LGPL20 -LICENSE_FILE= ${WRKSRC}/COPYING + USE_XZ= yes LATEST_LINK= gtk20 +PORTSCOUT= limitw:0,even + .if !defined(REFERENCE_PORT) BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection @@ -52,16 +44,13 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= gtk-query-immodules-2.0.1 -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=yes -.endif - -OPTIONS= CUPS "Enable cups printing support" on +OPTIONS_DEFINE= CUPS DEBUG +OPTIONS_DEFAULT=CUPS .include <bsd.port.options.mk> -.if defined(WITH_CUPS) -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client +.if ${PORT_OPTIONS:MCUPS} +LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+=--enable-cups=auto PLIST_SUB+= CUPS:="" .else @@ -69,6 +58,10 @@ CONFIGURE_ARGS+=--disable-cups PLIST_SUB+= CUPS:="@comment " .endif +.if ${PORT_OPTIONS:MDEBUG} +CONFIGURE_ARGS+=--enable-debug=yes +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @@ -80,7 +73,7 @@ post-patch: pre-configure: .if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) - @${ECHO_CMD} "${PKGNAME}: Needs cairo build with X11 support." + @${ECHO_CMD} "${PKGNAME}: Needs cairo with X11 support enabled." @${FALSE} .endif @@ -93,6 +86,7 @@ post-install: @${MKDIR} ${PREFIX}/lib/gtk-2.0/modules @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders + @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/modules ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \ ${PREFIX}/man/man1 diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 164f01198946..e95c6ae937b6 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gtk+-2.24.6.tar.xz) = 8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca -SIZE (gnome2/gtk+-2.24.6.tar.xz) = 13173032 +SHA256 (gnome2/gtk+-2.24.17.tar.xz) = e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415 +SIZE (gnome2/gtk+-2.24.17.tar.xz) = 13288028 diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in index 9846a2751331..87071ff8df9f 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -1,9 +1,5 @@ -Stock icons. This was removed in 2.21.x, however it is used by atleast firefox. - -https://bugzilla.gnome.org/show_bug.cgi?id=629878 - ---- gtk/Makefile.in.orig 2011-03-04 12:02:32.000000000 +0100 -+++ gtk/Makefile.in 2011-03-04 12:03:28.000000000 +0100 +--- gtk/Makefile.in.orig 2012-01-24 23:53:56.800847574 -0500 ++++ gtk/Makefile.in 2012-01-24 23:53:56.889849878 -0500 @@ -71,8 +71,7 @@ @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = --add-include-path=$(top_builddir)/gdk/x11 @HAVE_INTROSPECTION_TRUE@am__append_16 = Gtk-2.0.gir @@ -14,277 +10,3 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878 @OS_WIN32_TRUE@am__append_18 = \ @OS_WIN32_TRUE@ $(GTK_UPDATE_ICON_CACHE_MANIFEST) -@@ -1358,9 +1357,9 @@ - # gtk-update-icon-cache.exe doesn't require any special privileges. - @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest - gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) --gtk_query_immodules_2_0_LDADD = $(LDADDS) -+gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) - gtk_query_immodules_2_0_SOURCES = queryimmodules.c --gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) -+gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) - gtk_update_icon_cache_SOURCES = updateiconcache.c - STOCK_ICONS = \ - stock-icons/16/document-open-recent.png \ -@@ -1601,7 +1600,171 @@ - stock-icons/24/folder-remote.png \ - stock-icons/24/user-home.png \ - stock-icons/24/user-desktop.png \ -- stock-icons/24/text-x-generic.png -+ stock-icons/24/text-x-generic.png \ -+ stock-icons/16/gtk-quit.png \ -+ stock-icons/16/gtk-info.png \ -+ stock-icons/16/gtk-file.png \ -+ stock-icons/16/gtk-open.png \ -+ stock-icons/16/gtk-print-preview.png \ -+ stock-icons/16/gtk-print.png \ -+ stock-icons/16/gtk-properties.png \ -+ stock-icons/16/gtk-revert-to-saved-ltr.png \ -+ stock-icons/16/gtk-revert-to-saved-rtl.png \ -+ stock-icons/16/gtk-save-as.png \ -+ stock-icons/16/gtk-new.png \ -+ stock-icons/16/gtk-harddisk.png \ -+ stock-icons/16/gtk-clear.png \ -+ stock-icons/16/gtk-copy.png \ -+ stock-icons/16/gtk-cut.png \ -+ stock-icons/16/gtk-delete.png \ -+ stock-icons/16/gtk-find-and-replace.png \ -+ stock-icons/16/gtk-find.png \ -+ stock-icons/16/gtk-paste.png \ -+ stock-icons/16/gtk-redo-ltr.png \ -+ stock-icons/16/gtk-redo-rtl.png \ -+ stock-icons/16/gtk-select-all.png \ -+ stock-icons/16/gtk-undo-ltr.png \ -+ stock-icons/16/gtk-undo-rtl.png \ -+ stock-icons/16/gtk-directory.png \ -+ stock-icons/16/gtk-unindent-ltr.png \ -+ stock-icons/16/gtk-unindent-rtl.png \ -+ stock-icons/16/gtk-indent-ltr.png \ -+ stock-icons/16/gtk-indent-rtl.png \ -+ stock-icons/16/gtk-justify-center.png \ -+ stock-icons/16/gtk-justify-fill.png \ -+ stock-icons/16/gtk-justify-left.png \ -+ stock-icons/16/gtk-justify-right.png \ -+ stock-icons/16/gtk-bold.png \ -+ stock-icons/16/gtk-italic.png \ -+ stock-icons/16/gtk-strikethrough.png \ -+ stock-icons/16/gtk-underline.png \ -+ stock-icons/16/gtk-goto-bottom.png \ -+ stock-icons/16/gtk-go-down.png \ -+ stock-icons/16/gtk-goto-first-ltr.png \ -+ stock-icons/16/gtk-home.png \ -+ stock-icons/16/gtk-jump-to-ltr.png \ -+ stock-icons/16/gtk-jump-to-rtl.png \ -+ stock-icons/16/gtk-goto-last-ltr.png \ -+ stock-icons/16/gtk-go-forward-ltr.png \ -+ stock-icons/16/gtk-go-back-ltr.png \ -+ stock-icons/16/gtk-goto-top.png \ -+ stock-icons/16/gtk-go-up.png \ -+ stock-icons/16/gtk-about.png \ -+ stock-icons/16/gtk-help.png \ -+ stock-icons/16/gtk-missing-image.png \ -+ stock-icons/16/gtk-add.png \ -+ stock-icons/16/gtk-remove.png \ -+ stock-icons/16/gtk-floppy.png \ -+ stock-icons/16/gtk-cdrom.png \ -+ stock-icons/16/gtk-media-pause.png \ -+ stock-icons/16/gtk-media-play-ltr.png \ -+ stock-icons/16/gtk-media-play-rtl.png \ -+ stock-icons/16/gtk-media-stop.png \ -+ stock-icons/16/gtk-media-record.png \ -+ stock-icons/16/gtk-media-rewind-ltr.png \ -+ stock-icons/16/gtk-media-forward-ltr.png \ -+ stock-icons/16/gtk-media-previous-ltr.png \ -+ stock-icons/16/gtk-media-next-ltr.png \ -+ stock-icons/16/gtk-network.png \ -+ stock-icons/16/gtk-print-error.png \ -+ stock-icons/16/gtk-print-report.png \ -+ stock-icons/16/gtk-print-paused.png \ -+ stock-icons/16/gtk-print-warning.png \ -+ stock-icons/16/gtk-stop.png \ -+ stock-icons/16/gtk-execute.png \ -+ stock-icons/16/gtk-spell-check.png \ -+ stock-icons/16/gtk-fullscreen.png \ -+ stock-icons/16/gtk-refresh.png \ -+ stock-icons/16/gtk-leave-fullscreen.png \ -+ stock-icons/16/gtk-sort-ascending.png \ -+ stock-icons/16/gtk-sort-descending.png \ -+ stock-icons/16/gtk-close.png \ -+ stock-icons/16/gtk-zoom-fit.png \ -+ stock-icons/16/gtk-zoom-in.png \ -+ stock-icons/16/gtk-zoom-100.png \ -+ stock-icons/16/gtk-zoom-out.png \ -+ stock-icons/24/gtk-quit.png \ -+ stock-icons/24/gtk-info.png \ -+ stock-icons/24/gtk-file.png \ -+ stock-icons/24/gtk-open.png \ -+ stock-icons/24/gtk-print-preview.png \ -+ stock-icons/24/gtk-print.png \ -+ stock-icons/24/gtk-properties.png \ -+ stock-icons/24/gtk-revert-to-saved-ltr.png \ -+ stock-icons/24/gtk-revert-to-saved-rtl.png \ -+ stock-icons/24/gtk-save-as.png \ -+ stock-icons/24/gtk-new.png \ -+ stock-icons/24/gtk-harddisk.png \ -+ stock-icons/24/gtk-clear.png \ -+ stock-icons/24/gtk-copy.png \ -+ stock-icons/24/gtk-cut.png \ -+ stock-icons/24/gtk-delete.png \ -+ stock-icons/24/gtk-find-and-replace.png \ -+ stock-icons/24/gtk-find.png \ -+ stock-icons/24/gtk-paste.png \ -+ stock-icons/24/gtk-redo-ltr.png \ -+ stock-icons/24/gtk-redo-rtl.png \ -+ stock-icons/24/gtk-select-all.png \ -+ stock-icons/24/gtk-undo-ltr.png \ -+ stock-icons/24/gtk-undo-rtl.png \ -+ stock-icons/24/gtk-directory.png \ -+ stock-icons/24/gtk-unindent-ltr.png \ -+ stock-icons/24/gtk-unindent-rtl.png \ -+ stock-icons/24/gtk-indent-ltr.png \ -+ stock-icons/24/gtk-indent-rtl.png \ -+ stock-icons/24/gtk-justify-center.png \ -+ stock-icons/24/gtk-justify-fill.png \ -+ stock-icons/24/gtk-justify-left.png \ -+ stock-icons/24/gtk-justify-right.png \ -+ stock-icons/24/gtk-bold.png \ -+ stock-icons/24/gtk-italic.png \ -+ stock-icons/24/gtk-strikethrough.png \ -+ stock-icons/24/gtk-underline.png \ -+ stock-icons/24/gtk-goto-bottom.png \ -+ stock-icons/24/gtk-go-down.png \ -+ stock-icons/24/gtk-goto-first-ltr.png \ -+ stock-icons/24/gtk-home.png \ -+ stock-icons/24/gtk-jump-to-ltr.png \ -+ stock-icons/24/gtk-jump-to-rtl.png \ -+ stock-icons/24/gtk-goto-last-ltr.png \ -+ stock-icons/24/gtk-go-forward-ltr.png \ -+ stock-icons/24/gtk-go-back-ltr.png \ -+ stock-icons/24/gtk-goto-top.png \ -+ stock-icons/24/gtk-go-up.png \ -+ stock-icons/24/gtk-about.png \ -+ stock-icons/24/gtk-help.png \ -+ stock-icons/24/gtk-missing-image.png \ -+ stock-icons/24/gtk-add.png \ -+ stock-icons/24/gtk-remove.png \ -+ stock-icons/24/gtk-floppy.png \ -+ stock-icons/24/gtk-cdrom.png \ -+ stock-icons/24/gtk-media-pause.png \ -+ stock-icons/24/gtk-media-play-ltr.png \ -+ stock-icons/24/gtk-media-play-rtl.png \ -+ stock-icons/24/gtk-media-stop.png \ -+ stock-icons/24/gtk-media-record.png \ -+ stock-icons/24/gtk-media-rewind-ltr.png \ -+ stock-icons/24/gtk-media-forward-ltr.png \ -+ stock-icons/24/gtk-media-previous-ltr.png \ -+ stock-icons/24/gtk-media-next-ltr.png \ -+ stock-icons/24/gtk-network.png \ -+ stock-icons/24/gtk-print-error.png \ -+ stock-icons/24/gtk-print-report.png \ -+ stock-icons/24/gtk-print-paused.png \ -+ stock-icons/24/gtk-print-warning.png \ -+ stock-icons/24/gtk-stop.png \ -+ stock-icons/24/gtk-execute.png \ -+ stock-icons/24/gtk-spell-check.png \ -+ stock-icons/24/gtk-fullscreen.png \ -+ stock-icons/24/gtk-refresh.png \ -+ stock-icons/24/gtk-leave-fullscreen.png \ -+ stock-icons/24/gtk-sort-ascending.png \ -+ stock-icons/24/gtk-sort-descending.png \ -+ stock-icons/24/gtk-close.png \ -+ stock-icons/24/gtk-zoom-fit.png \ -+ stock-icons/24/gtk-zoom-in.png \ -+ stock-icons/24/gtk-zoom-100.png \ -+ stock-icons/24/gtk-zoom-out.png - - @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ - @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -@@ -2873,6 +3036,88 @@ - && $(LN_S) folder.png user-desktop.png \ - && $(RM) user-home.png.png \ - && $(LN_S) folder.png user-home.png \ -+ && $(LN_S) application-exit.png gtk-quit.png \ -+ && $(LN_S) dialog-info.png gtk-info.png \ -+ && $(LN_S) document-new.png gtk-file.png \ -+ && $(LN_S) document-open.png gtk-open.png \ -+ && $(LN_S) document-print-preview.png gtk-print-preview.png \ -+ && $(LN_S) document-print.png gtk-print.png \ -+ && $(LN_S) document-properties.png gtk-properties.png \ -+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ -+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ -+ && $(LN_S) document-save-as.png gtk-save-as.png \ -+ && $(LN_S) document-x-generic.png gtk-new.png \ -+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ -+ && $(LN_S) edit-clear.png gtk-clear.png \ -+ && $(LN_S) edit-copy.png gtk-copy.png \ -+ && $(LN_S) edit-cut.png gtk-cut.png \ -+ && $(LN_S) edit-delete.png gtk-delete.png \ -+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ -+ && $(LN_S) edit-find.png gtk-find.png \ -+ && $(LN_S) edit-paste.png gtk-paste.png \ -+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ -+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ -+ && $(LN_S) edit-select-all.png gtk-select-all.png \ -+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ -+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ -+ && $(LN_S) folder.png gtk-directory.png \ -+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ -+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ -+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ -+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ -+ && $(LN_S) format-justify-center.png gtk-justify-center.png \ -+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ -+ && $(LN_S) format-justify-left.png gtk-justify-left.png \ -+ && $(LN_S) format-justify-right.png gtk-justify-right.png \ -+ && $(LN_S) format-text-bold.png gtk-bold.png \ -+ && $(LN_S) format-text-italic.png gtk-italic.png \ -+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ -+ && $(LN_S) format-text-underline.png gtk-underline.png \ -+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ -+ && $(LN_S) go-down.png gtk-go-down.png \ -+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ -+ && $(LN_S) go-home.png gtk-home.png \ -+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ -+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ -+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ -+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ -+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ -+ && $(LN_S) go-top.png gtk-goto-top.png \ -+ && $(LN_S) go-up.png gtk-go-up.png \ -+ && $(LN_S) help-about.png gtk-about.png \ -+ && $(LN_S) help-contents.png gtk-help.png \ -+ && $(LN_S) image-missing.png gtk-missing-image.png \ -+ && $(LN_S) list-add.png gtk-add.png \ -+ && $(LN_S) list-remove.png gtk-remove.png \ -+ && $(LN_S) media-floppy.png gtk-floppy.png \ -+ && $(LN_S) media-optical.png gtk-cdrom.png \ -+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ -+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ -+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ -+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ -+ && $(LN_S) media-record.png gtk-media-record.png \ -+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ -+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ -+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ -+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ -+ && $(LN_S) network-idle.png gtk-network.png \ -+ && $(LN_S) printer-error.png gtk-print-error.png \ -+ && $(LN_S) printer-info.png gtk-print-report.png \ -+ && $(LN_S) printer-paused.png gtk-print-paused.png \ -+ && $(LN_S) printer-warning.png gtk-print-warning.png \ -+ && $(LN_S) process-stop.png gtk-stop.png \ -+ && $(LN_S) system-run.png gtk-execute.png \ -+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ -+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ -+ && $(LN_S) view-refresh.png gtk-refresh.png \ -+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ -+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ -+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ -+ && $(LN_S) window-close.png gtk-close.png \ -+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ -+ && $(LN_S) zoom-in.png gtk-zoom-in.png \ -+ && $(LN_S) zoom-original.png gtk-zoom-100.png \ -+ && $(LN_S) zoom-out.png gtk-zoom-out.png \ - ) done \ - && touch stamp-icons - diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index a4ac7f4e6b0f..61b5c73f8dce 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -627,6 +627,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/modules @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders +@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/modules @dirrmtry lib/gtk-2.0/modules @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/printbackends @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index cc1cd9385d17..158df3b0e5ca 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,23 +1,13 @@ -# New ports collection makefile for: gtk13 -# Date Created: 28 Sep 1997 -# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> -# +# Created by: Vanilla I. Shu <vanilla@MinJe.com.TW> # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.35 2011/06/07 13:19:12 kwm Exp $ -# +# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.53 2013/01/07 13:35:02 kwm Exp $ PORTNAME= gtk -PORTVERSION= 3.0.12 -PORTREVISION?= 2 +PORTVERSION= 3.6.4 +PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ - ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ - ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ - http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome3 @@ -25,15 +15,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LICENSE= LGPL20 -LICENSE_FILE= ${WRKSRC}/COPYING + USE_XZ= yes LATEST_LINK= gtk30 .if !defined(REFERENCE_PORT) -BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ - ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ + ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk USE_GMAKE= yes USE_PERL5_BUILD=yes @@ -44,27 +36,26 @@ USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --enable-static --enable-xinput=yes -CONFIGURE_ARGS+=--enable-gtk2-dependency -CONFIGURE_ENV= INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0` ac_cv_path_SED="${SED}" -CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \ - -I${LOCALBASE}/include +CONFIGURE_ARGS= --enable-static +CONFIGURE_ARGS+=--enable-gtk2-dependency --disable-packagekit +CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0` ac_cv_path_SED="${SED}" -GLIB_SCHEMAS= org.gtk.Settings.FileChooser.gschema.xml +GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ + org.gtk.Settings.ColorChooser.gschema.xml \ + org.gtk.Settings.FileChooser.gschema.xml MAN1= gtk-query-immodules-3.0.1 -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=yes -.endif - -OPTIONS= CUPS "Enable cups printing support" on +OPTIONS_DEFINE= CUPS COLORD DEBUG +OPTIONS_DEFAULT=CUPS COLORD +COLORD_DESC= Color profile support .include <bsd.port.options.mk> -.if defined(WITH_CUPS) -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client +.if ${PORT_OPTIONS:MCUPS} +LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+=--enable-cups=auto PLIST_SUB+= CUPS="" .else @@ -72,6 +63,17 @@ CONFIGURE_ARGS+=--disable-cups PLIST_SUB+= CUPS="@comment " .endif +.if ${PORT_OPTIONS:MDEBUG} +CONFIGURE_ARGS+= --enable-debug=yes +.endif + +.if ${PORT_OPTIONS:MCOLORD} +LIB_DEPENDS+= colord:${PORTSDIR}/graphics/colord +CONFIGURE_ARGS+=--enable-colord +.else +CONFIGURE_ARGS+=--disable-colord +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @@ -83,7 +85,7 @@ post-patch: pre-configure: .if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) - @${ECHO_CMD} "${PKGNAME}: Needs cairo build with X11 support." + @${ECHO_CMD} "${PKGNAME}: Needs cairo with X11 support enabled." @${FALSE} .endif diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 756ce8730956..ce56379d420d 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gtk+-3.0.12.tar.xz) = 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9 -SIZE (gnome3/gtk+-3.0.12.tar.xz) = 13104092 +SHA256 (gnome3/gtk+-3.6.4.tar.xz) = dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1 +SIZE (gnome3/gtk+-3.6.4.tar.xz) = 13275488 diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in index 8f328a491e85..610efe8e57b7 100644 --- a/x11-toolkits/gtk30/files/patch-Makefile.in +++ b/x11-toolkits/gtk30/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2011-02-02 00:09:55.000000000 +0000 -+++ Makefile.in 2011-02-02 00:10:16.000000000 +0000 -@@ -418,7 +418,7 @@ +--- Makefile.in.orig 2011-09-15 18:04:34.000000000 +0200 ++++ Makefile.in 2011-09-15 18:05:12.000000000 +0200 +@@ -422,7 +422,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY --SRC_SUBDIRS = gdk gtk modules demos tests perf examples -+SRC_SUBDIRS = gdk gtk modules demos perf examples +-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples ++SRC_SUBDIRS = gdk gtk libgail-util modules demos perf examples SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} MAINTAINERCLEANFILES = \ diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure deleted file mode 100644 index 2e625d30e19a..000000000000 --- a/x11-toolkits/gtk30/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.orig 2011-03-21 20:08:47.000000000 +0100 -+++ configure 2011-03-21 20:10:50.000000000 +0100 -@@ -23728,9 +23728,9 @@ - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} -+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} -+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in index 281bb69f5ddd..6eefe2bc7016 100644 --- a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in @@ -1,12 +1,10 @@ ---- docs/reference/gtk/Makefile.in.orig 2011-02-01 22:06:23.000000000 +0000 -+++ docs/reference/gtk/Makefile.in 2011-02-01 22:07:12.000000000 +0000 -@@ -735,8 +735,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_F - +--- docs/reference/gtk/Makefile.in.orig 2012-09-25 07:07:36.000000000 +0000 ++++ docs/reference/gtk/Makefile.in 2012-09-25 07:08:14.000000000 +0000 +@@ -822,7 +822,6 @@ ######################################################################## man_MANS = \ -- gtk-query-immodules-3.0.1 \ -- gtk-update-icon-cache.1 -+ gtk-query-immodules-3.0.1 + gtk-query-immodules-3.0.1 \ +- gtk-update-icon-cache.1 \ + gtk-launch.1 - MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES) - all: all-am + @ENABLE_MAN_TRUE@XSLTPROC_FLAGS = \ diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 53b8c9e7043f..a7b16ff8af33 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -1,7 +1,9 @@ +bin/gtk-launch bin/gtk-query-immodules-3.0 bin/gtk3-demo +bin/gtk3-demo-application +bin/gtk3-widget-factory etc/gtk-3.0/im-multipress.conf -include/gail-3.0/gail/gailwidget.h include/gail-3.0/libgail-util/gail-util.h include/gail-3.0/libgail-util/gailmisc.h include/gail-3.0/libgail-util/gailtextutil.h @@ -33,17 +35,18 @@ include/gtk-3.0/gdk/gdkselection.h include/gtk-3.0/gdk/gdktestutils.h include/gtk-3.0/gdk/gdkthreads.h include/gtk-3.0/gdk/gdktypes.h +include/gtk-3.0/gdk/gdkversionmacros.h include/gtk-3.0/gdk/gdkvisual.h include/gtk-3.0/gdk/gdkwindow.h include/gtk-3.0/gdk/gdkx.h include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h include/gtk-3.0/gdk/x11/gdkx11cursor.h include/gtk-3.0/gdk/x11/gdkx11device-core.h -include/gtk-3.0/gdk/x11/gdkx11device-xi.h include/gtk-3.0/gdk/x11/gdkx11device-xi2.h +include/gtk-3.0/gdk/x11/gdkx11device.h include/gtk-3.0/gdk/x11/gdkx11devicemanager-core.h -include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi.h include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi2.h +include/gtk-3.0/gdk/x11/gdkx11devicemanager.h include/gtk-3.0/gdk/x11/gdkx11display.h include/gtk-3.0/gdk/x11/gdkx11displaymanager.h include/gtk-3.0/gdk/x11/gdkx11dnd.h @@ -54,9 +57,27 @@ include/gtk-3.0/gdk/x11/gdkx11selection.h include/gtk-3.0/gdk/x11/gdkx11utils.h include/gtk-3.0/gdk/x11/gdkx11visual.h include/gtk-3.0/gdk/x11/gdkx11window.h -include/gtk-3.0/gtk/gtkcellarea.h -include/gtk-3.0/gtk/gtkcellareabox.h -include/gtk-3.0/gtk/gtkcellareacontext.h +include/gtk-3.0/gtk/deprecated/gtkcolorsel.h +include/gtk-3.0/gtk/deprecated/gtkcolorseldialog.h +include/gtk-3.0/gtk/deprecated/gtkfontsel.h +include/gtk-3.0/gtk/deprecated/gtkhandlebox.h +include/gtk-3.0/gtk/deprecated/gtkhbbox.h +include/gtk-3.0/gtk/deprecated/gtkhbox.h +include/gtk-3.0/gtk/deprecated/gtkhpaned.h +include/gtk-3.0/gtk/deprecated/gtkhscale.h +include/gtk-3.0/gtk/deprecated/gtkhscrollbar.h +include/gtk-3.0/gtk/deprecated/gtkhseparator.h +include/gtk-3.0/gtk/deprecated/gtkhsv.h +include/gtk-3.0/gtk/deprecated/gtkrc.h +include/gtk-3.0/gtk/deprecated/gtkstyle.h +include/gtk-3.0/gtk/deprecated/gtktable.h +include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h +include/gtk-3.0/gtk/deprecated/gtkvbbox.h +include/gtk-3.0/gtk/deprecated/gtkvbox.h +include/gtk-3.0/gtk/deprecated/gtkvpaned.h +include/gtk-3.0/gtk/deprecated/gtkvscale.h +include/gtk-3.0/gtk/deprecated/gtkvscrollbar.h +include/gtk-3.0/gtk/deprecated/gtkvseparator.h include/gtk-3.0/gtk/gtk.h include/gtk-3.0/gtk/gtkaboutdialog.h include/gtk-3.0/gtk/gtkaccelgroup.h @@ -64,6 +85,7 @@ include/gtk-3.0/gtk/gtkaccellabel.h include/gtk-3.0/gtk/gtkaccelmap.h include/gtk-3.0/gtk/gtkaccessible.h include/gtk-3.0/gtk/gtkaction.h +include/gtk-3.0/gtk/gtkactionable.h include/gtk-3.0/gtk/gtkactiongroup.h include/gtk-3.0/gtk/gtkactivatable.h include/gtk-3.0/gtk/gtkadjustment.h @@ -73,6 +95,7 @@ include/gtk-3.0/gtk/gtkappchooserbutton.h include/gtk-3.0/gtk/gtkappchooserdialog.h include/gtk-3.0/gtk/gtkappchooserwidget.h include/gtk-3.0/gtk/gtkapplication.h +include/gtk-3.0/gtk/gtkapplicationwindow.h include/gtk-3.0/gtk/gtkarrow.h include/gtk-3.0/gtk/gtkaspectframe.h include/gtk-3.0/gtk/gtkassistant.h @@ -85,6 +108,9 @@ include/gtk-3.0/gtk/gtkbuildable.h include/gtk-3.0/gtk/gtkbuilder.h include/gtk-3.0/gtk/gtkbutton.h include/gtk-3.0/gtk/gtkcalendar.h +include/gtk-3.0/gtk/gtkcellarea.h +include/gtk-3.0/gtk/gtkcellareabox.h +include/gtk-3.0/gtk/gtkcellareacontext.h include/gtk-3.0/gtk/gtkcelleditable.h include/gtk-3.0/gtk/gtkcelllayout.h include/gtk-3.0/gtk/gtkcellrenderer.h @@ -101,12 +127,15 @@ include/gtk-3.0/gtk/gtkcheckbutton.h include/gtk-3.0/gtk/gtkcheckmenuitem.h include/gtk-3.0/gtk/gtkclipboard.h include/gtk-3.0/gtk/gtkcolorbutton.h -include/gtk-3.0/gtk/gtkcolorsel.h -include/gtk-3.0/gtk/gtkcolorseldialog.h +include/gtk-3.0/gtk/gtkcolorchooser.h +include/gtk-3.0/gtk/gtkcolorchooserdialog.h +include/gtk-3.0/gtk/gtkcolorchooserwidget.h +include/gtk-3.0/gtk/gtkcolorutils.h include/gtk-3.0/gtk/gtkcombobox.h include/gtk-3.0/gtk/gtkcomboboxtext.h include/gtk-3.0/gtk/gtkcontainer.h include/gtk-3.0/gtk/gtkcssprovider.h +include/gtk-3.0/gtk/gtkcsssection.h include/gtk-3.0/gtk/gtkdebug.h include/gtk-3.0/gtk/gtkdialog.h include/gtk-3.0/gtk/gtkdnd.h @@ -125,36 +154,34 @@ include/gtk-3.0/gtk/gtkfilechooserwidget.h include/gtk-3.0/gtk/gtkfilefilter.h include/gtk-3.0/gtk/gtkfixed.h include/gtk-3.0/gtk/gtkfontbutton.h -include/gtk-3.0/gtk/gtkfontsel.h +include/gtk-3.0/gtk/gtkfontchooser.h +include/gtk-3.0/gtk/gtkfontchooserdialog.h +include/gtk-3.0/gtk/gtkfontchooserwidget.h include/gtk-3.0/gtk/gtkframe.h include/gtk-3.0/gtk/gtkgradient.h include/gtk-3.0/gtk/gtkgrid.h -include/gtk-3.0/gtk/gtkhandlebox.h -include/gtk-3.0/gtk/gtkhbbox.h -include/gtk-3.0/gtk/gtkhbox.h -include/gtk-3.0/gtk/gtkhpaned.h -include/gtk-3.0/gtk/gtkhscale.h -include/gtk-3.0/gtk/gtkhscrollbar.h -include/gtk-3.0/gtk/gtkhseparator.h -include/gtk-3.0/gtk/gtkhsv.h include/gtk-3.0/gtk/gtkiconfactory.h include/gtk-3.0/gtk/gtkicontheme.h include/gtk-3.0/gtk/gtkiconview.h -include/gtk-3.0/gtk/gtkinfobar.h include/gtk-3.0/gtk/gtkimage.h include/gtk-3.0/gtk/gtkimagemenuitem.h include/gtk-3.0/gtk/gtkimcontext.h +include/gtk-3.0/gtk/gtkimcontextinfo.h include/gtk-3.0/gtk/gtkimcontextsimple.h include/gtk-3.0/gtk/gtkimmodule.h include/gtk-3.0/gtk/gtkimmulticontext.h +include/gtk-3.0/gtk/gtkinfobar.h include/gtk-3.0/gtk/gtkinvisible.h include/gtk-3.0/gtk/gtklabel.h include/gtk-3.0/gtk/gtklayout.h +include/gtk-3.0/gtk/gtklevelbar.h include/gtk-3.0/gtk/gtklinkbutton.h include/gtk-3.0/gtk/gtkliststore.h +include/gtk-3.0/gtk/gtklockbutton.h include/gtk-3.0/gtk/gtkmain.h include/gtk-3.0/gtk/gtkmenu.h include/gtk-3.0/gtk/gtkmenubar.h +include/gtk-3.0/gtk/gtkmenubutton.h include/gtk-3.0/gtk/gtkmenuitem.h include/gtk-3.0/gtk/gtkmenushell.h include/gtk-3.0/gtk/gtkmenutoolbutton.h @@ -166,6 +193,7 @@ include/gtk-3.0/gtk/gtknotebook.h include/gtk-3.0/gtk/gtknumerableicon.h include/gtk-3.0/gtk/gtkoffscreenwindow.h include/gtk-3.0/gtk/gtkorientable.h +include/gtk-3.0/gtk/gtkoverlay.h include/gtk-3.0/gtk/gtkpagesetup.h include/gtk-3.0/gtk/gtkpaned.h include/gtk-3.0/gtk/gtkpapersize.h @@ -180,7 +208,6 @@ include/gtk-3.0/gtk/gtkradiobutton.h include/gtk-3.0/gtk/gtkradiomenuitem.h include/gtk-3.0/gtk/gtkradiotoolbutton.h include/gtk-3.0/gtk/gtkrange.h -include/gtk-3.0/gtk/gtkrc.h include/gtk-3.0/gtk/gtkrecentaction.h include/gtk-3.0/gtk/gtkrecentchooser.h include/gtk-3.0/gtk/gtkrecentchooserdialog.h @@ -193,6 +220,7 @@ include/gtk-3.0/gtk/gtkscalebutton.h include/gtk-3.0/gtk/gtkscrollable.h include/gtk-3.0/gtk/gtkscrollbar.h include/gtk-3.0/gtk/gtkscrolledwindow.h +include/gtk-3.0/gtk/gtksearchentry.h include/gtk-3.0/gtk/gtkselection.h include/gtk-3.0/gtk/gtkseparator.h include/gtk-3.0/gtk/gtkseparatormenuitem.h @@ -207,14 +235,11 @@ include/gtk-3.0/gtk/gtkspinner.h include/gtk-3.0/gtk/gtkstatusbar.h include/gtk-3.0/gtk/gtkstatusicon.h include/gtk-3.0/gtk/gtkstock.h -include/gtk-3.0/gtk/gtkstyle.h include/gtk-3.0/gtk/gtkstylecontext.h include/gtk-3.0/gtk/gtkstyleproperties.h include/gtk-3.0/gtk/gtkstyleprovider.h include/gtk-3.0/gtk/gtkswitch.h include/gtk-3.0/gtk/gtksymboliccolor.h -include/gtk-3.0/gtk/gtktable.h -include/gtk-3.0/gtk/gtktearoffmenuitem.h include/gtk-3.0/gtk/gtktestutils.h include/gtk-3.0/gtk/gtktextattributes.h include/gtk-3.0/gtk/gtktextbuffer.h @@ -248,16 +273,11 @@ include/gtk-3.0/gtk/gtktreestore.h include/gtk-3.0/gtk/gtktreeview.h include/gtk-3.0/gtk/gtktreeviewcolumn.h include/gtk-3.0/gtk/gtktypebuiltins.h +include/gtk-3.0/gtk/gtktypes.h include/gtk-3.0/gtk/gtkuimanager.h -include/gtk-3.0/gtk/gtkvbbox.h -include/gtk-3.0/gtk/gtkvbox.h include/gtk-3.0/gtk/gtkversion.h include/gtk-3.0/gtk/gtkviewport.h include/gtk-3.0/gtk/gtkvolumebutton.h -include/gtk-3.0/gtk/gtkvpaned.h -include/gtk-3.0/gtk/gtkvscale.h -include/gtk-3.0/gtk/gtkvscrollbar.h -include/gtk-3.0/gtk/gtkvseparator.h include/gtk-3.0/gtk/gtkwidget.h include/gtk-3.0/gtk/gtkwidgetpath.h include/gtk-3.0/gtk/gtkwindow.h @@ -270,9 +290,6 @@ include/gtk-3.0/unix-print/gtk/gtkunixprint.h lib/girepository-1.0/Gdk-3.0.typelib lib/girepository-1.0/GdkX11-3.0.typelib lib/girepository-1.0/Gtk-3.0.typelib -@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.a -@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.la -@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.so lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.a lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.la lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.so @@ -316,12 +333,6 @@ lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.a lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.la lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so -lib/gtk-3.0/modules/libferret.a -lib/gtk-3.0/modules/libferret.la -lib/gtk-3.0/modules/libferret.so -lib/gtk-3.0/modules/libgail.a -lib/gtk-3.0/modules/libgail.la -lib/gtk-3.0/modules/libgail.so lib/libgailutil-3.a lib/libgailutil-3.la lib/libgailutil-3.so @@ -346,6 +357,8 @@ share/gir-1.0/GdkX11-3.0.gir share/gir-1.0/Gtk-3.0.gir share/gtk-3.0/demo/alphatest.png share/gtk-3.0/demo/apple-red.png +share/gtk-3.0/demo/application.c +share/gtk-3.0/demo/application.ui share/gtk-3.0/demo/appwindow.c share/gtk-3.0/demo/assistant.c share/gtk-3.0/demo/background.jpg @@ -355,6 +368,17 @@ share/gtk-3.0/demo/changedisplay.c share/gtk-3.0/demo/clipboard.c share/gtk-3.0/demo/colorsel.c share/gtk-3.0/demo/combobox.c +share/gtk-3.0/demo/css_accordion.c +share/gtk-3.0/demo/css_accordion.css +share/gtk-3.0/demo/css_basics.c +share/gtk-3.0/demo/css_basics.css +share/gtk-3.0/demo/css_multiplebgs.c +share/gtk-3.0/demo/css_multiplebgs.css +share/gtk-3.0/demo/css_pixbufs.c +share/gtk-3.0/demo/css_pixbufs.css +share/gtk-3.0/demo/css_shadows.c +share/gtk-3.0/demo/css_shadows.css +share/gtk-3.0/demo/cssview.css share/gtk-3.0/demo/demo.ui share/gtk-3.0/demo/dialog.c share/gtk-3.0/demo/drawingarea.c @@ -362,6 +386,7 @@ share/gtk-3.0/demo/editable_cells.c share/gtk-3.0/demo/entry_buffer.c share/gtk-3.0/demo/entry_completion.c share/gtk-3.0/demo/expander.c +share/gtk-3.0/demo/fancy.css share/gtk-3.0/demo/floppybuddy.gif share/gtk-3.0/demo/gnome-applets.png share/gtk-3.0/demo/gnome-calendar.png @@ -372,21 +397,26 @@ share/gtk-3.0/demo/gnome-gimp.png share/gtk-3.0/demo/gnome-gmush.png share/gtk-3.0/demo/gnome-gsame.png share/gtk-3.0/demo/gnu-keys.png +share/gtk-3.0/demo/gtk-logo-24.png +share/gtk-3.0/demo/gtk-logo-48.png share/gtk-3.0/demo/gtk-logo-rgb.gif share/gtk-3.0/demo/hypertext.c share/gtk-3.0/demo/iconview.c share/gtk-3.0/demo/iconview_edit.c share/gtk-3.0/demo/images.c share/gtk-3.0/demo/infobar.c -share/gtk-3.0/demo/list_store.c share/gtk-3.0/demo/links.c +share/gtk-3.0/demo/list_store.c share/gtk-3.0/demo/menus.c +share/gtk-3.0/demo/menus.ui share/gtk-3.0/demo/offscreen_window.c share/gtk-3.0/demo/offscreen_window2.c +share/gtk-3.0/demo/overlay.c share/gtk-3.0/demo/panes.c share/gtk-3.0/demo/pickers.c share/gtk-3.0/demo/pixbufs.c share/gtk-3.0/demo/printing.c +share/gtk-3.0/demo/reset.css share/gtk-3.0/demo/rotated_text.c share/gtk-3.0/demo/search_entry.c share/gtk-3.0/demo/sizegroup.c @@ -394,9 +424,14 @@ share/gtk-3.0/demo/spinner.c share/gtk-3.0/demo/stock_browser.c share/gtk-3.0/demo/textscroll.c share/gtk-3.0/demo/textview.c +share/gtk-3.0/demo/theming_custom_css.c +share/gtk-3.0/demo/theming_style_classes.c +share/gtk-3.0/demo/theming.ui share/gtk-3.0/demo/toolpalette.c +share/gtk-3.0/demo/transparent.c share/gtk-3.0/demo/tree_store.c share/gtk-3.0/demo/ui_manager.c +share/gtk-3.0/gtkbuilder.rng share/locale/af/LC_MESSAGES/gtk30-properties.mo share/locale/af/LC_MESSAGES/gtk30.mo share/locale/am/LC_MESSAGES/gtk30-properties.mo @@ -447,6 +482,8 @@ share/locale/el/LC_MESSAGES/gtk30-properties.mo share/locale/el/LC_MESSAGES/gtk30.mo share/locale/en/LC_MESSAGES/gtk30-properties.mo share/locale/en/LC_MESSAGES/gtk30.mo +share/locale/en@shaw/LC_MESSAGES/gtk30-properties.mo +share/locale/en@shaw/LC_MESSAGES/gtk30.mo share/locale/en_CA/LC_MESSAGES/gtk30-properties.mo share/locale/en_CA/LC_MESSAGES/gtk30.mo share/locale/en_GB/LC_MESSAGES/gtk30-properties.mo @@ -499,12 +536,16 @@ share/locale/kg/LC_MESSAGES/gtk30-properties.mo share/locale/kg/LC_MESSAGES/gtk30.mo share/locale/kk/LC_MESSAGES/gtk30-properties.mo share/locale/kk/LC_MESSAGES/gtk30.mo +share/locale/km/LC_MESSAGES/gtk30-properties.mo +share/locale/km/LC_MESSAGES/gtk30.mo share/locale/kn/LC_MESSAGES/gtk30-properties.mo share/locale/kn/LC_MESSAGES/gtk30.mo share/locale/ko/LC_MESSAGES/gtk30-properties.mo share/locale/ko/LC_MESSAGES/gtk30.mo share/locale/ku/LC_MESSAGES/gtk30-properties.mo share/locale/ku/LC_MESSAGES/gtk30.mo +share/locale/ky/LC_MESSAGES/gtk30-properties.mo +share/locale/ky/LC_MESSAGES/gtk30.mo share/locale/lg/LC_MESSAGES/gtk30-properties.mo share/locale/lg/LC_MESSAGES/gtk30.mo share/locale/li/LC_MESSAGES/gtk30-properties.mo @@ -615,40 +656,13 @@ share/locale/zh_TW/LC_MESSAGES/gtk30-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk30.mo share/themes/Default/gtk-3.0/gtk-keys.css share/themes/Emacs/gtk-3.0/gtk-keys.css -share/themes/Raleigh/gtk-3.0/gtk.css @exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true @unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true -@dirrm share/themes/Raleigh/gtk-3.0 -@dirrmtry share/themes/Raleigh @dirrm share/themes/Emacs/gtk-3.0 @dirrmtry share/themes/Emacs @dirrm share/themes/Default/gtk-3.0 @dirrmtry share/themes/Default @dirrmtry share/themes -@dirrm share/gtk-3.0/demo -@dirrm share/gtk-3.0 -@dirrm include/gtk-3.0/unix-print/gtk -@dirrm include/gtk-3.0/unix-print -@dirrm include/gtk-3.0/gtk -@dirrm include/gtk-3.0/gdk/x11 -@dirrm include/gtk-3.0/gdk -@dirrm include/gtk-3.0 -@dirrm include/gail-3.0/libgail-util -@dirrm include/gail-3.0/gail -@dirrm include/gail-3.0 -@dirrm etc/gtk-3.0 -@exec /bin/mkdir -p %D/lib/gtk-3.0/modules -@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines -@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/loaders -@dirrmtry lib/gtk-3.0/modules -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/printbackends -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/modules -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/loaders -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/immodules -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/engines -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%% -@dirrmtry lib/gtk-3.0 -@exec %D/bin/gtk-query-immodules-3.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @@ -691,8 +705,12 @@ share/themes/Raleigh/gtk-3.0/gtk.css @dirrmtry share/locale/mai @dirrmtry share/locale/lg/LC_MESSAGES @dirrmtry share/locale/lg +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk @dirrmtry share/locale/kg/LC_MESSAGES @@ -703,6 +721,8 @@ share/themes/Raleigh/gtk-3.0/gtk.css @dirrmtry share/locale/ia @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES @@ -721,3 +741,26 @@ share/themes/Raleigh/gtk-3.0/gtk.css @dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang +@dirrm share/gtk-3.0/demo +@dirrm share/gtk-3.0 +@exec /bin/mkdir -p %D/lib/gtk-3.0/modules +@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines +@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/loaders +@dirrm lib/gtk-3.0/modules +@dirrm lib/gtk-3.0/%%GTK3_VERSION%%/printbackends +@dirrm lib/gtk-3.0/%%GTK3_VERSION%%/loaders +@dirrm lib/gtk-3.0/%%GTK3_VERSION%%/immodules +@dirrm lib/gtk-3.0/%%GTK3_VERSION%%/engines +@dirrm lib/gtk-3.0/%%GTK3_VERSION%% +@dirrm lib/gtk-3.0 +@exec %D/bin/gtk-query-immodules-3.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache 2>/dev/null || /usr/bin/true +@dirrm include/gtk-3.0/unix-print/gtk +@dirrm include/gtk-3.0/unix-print +@dirrm include/gtk-3.0/gtk/deprecated +@dirrm include/gtk-3.0/gtk +@dirrm include/gtk-3.0/gdk/x11 +@dirrm include/gtk-3.0/gdk +@dirrm include/gtk-3.0 +@dirrm include/gail-3.0/libgail-util +@dirrm include/gail-3.0 +@dirrm etc/gtk-3.0 diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile index cc1fdc2be78c..bbe10a47a549 100644 --- a/x11-toolkits/gtkada/Makefile +++ b/x11-toolkits/gtkada/Makefile @@ -27,4 +27,7 @@ CC= gnatgcc CONFIGURE_ARGS+= --disable-nls +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/misc.c + .include <bsd.port.mk> diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile index 727847a7dfd7..036716e87606 100644 --- a/x11-toolkits/gtkextra2/Makefile +++ b/x11-toolkits/gtkextra2/Makefile @@ -31,6 +31,8 @@ PORTDOCS= * post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/gtkextra/gtkcharsel.c post-install: .if ${PORT_OPTIONS:MDOCS} diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile index ced7785a2a60..bd4a384b0c8c 100644 --- a/x11-toolkits/gtkmm20/Makefile +++ b/x11-toolkits/gtkmm20/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: gtkmm2 -# Date created: 30 September 2002 -# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> -# +# Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # $FreeBSD$ # $MCom: ports/x11-toolkits/gtkmm20/Makefile,v 1.11 2006/09/10 00:51:17 mezz Exp $ @@ -36,6 +33,9 @@ post-patch: ${WRKSRC}/glib/src/*.ccg ${WRKSRC}/glib/glibmm/*.* \ ${WRKSRC}/gtk/src/*.* ${WRKSRC}/gtk/gtkmm/*.* \ ${WRKSRC}/demos/gtk-demo/*.cc + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/glib/glibmm/*.cc ${WRKSRC}/glib/glibmm/*.h \ + ${WRKSRC}/gtk/gtkmm/textbuffer.cc .for d in docs examples tests @${REINPLACE_CMD} -e '/^SUBDIRS =/s/${d}//' ${WRKSRC}/Makefile.in .endfor diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 6e378a0ebe62..16fc24d6995a 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gtkmm2 -# Date created: 30 September 2002 -# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> -# +# Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # $FreeBSD$ # $MCom: ports/x11-toolkits/gtkmm30/Makefile,v 1.16 2011/05/09 18:18:38 kwm Exp $ -# PORTNAME= gtkmm PORTVERSION= 3.0.1 @@ -21,10 +17,6 @@ LATEST_LINK= gtkmm30 .if !defined(REFERENCE_PORT) -LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \ - cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \ - atkmm-1.6.2:${PORTSDIR}/accessibility/atkmm \ - pangomm-1.4.1:${PORTSDIR}/x11-toolkits/pangomm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes @@ -32,7 +24,7 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack gtk30 ltverhack +USE_GNOME= gnomehack gtk30 ltverhack atkmm pangomm CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-documentation \ diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile index b62d6218ea03..19d2b8c68a39 100644 --- a/x11-toolkits/libgtk-java/Makefile +++ b/x11-toolkits/libgtk-java/Makefile @@ -36,9 +36,10 @@ MAKE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} post-patch: @${REINPLACE_CMD} -e 's|sed -i|${SED} -i.bak -e|' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|
||' ${WRKSRC}/gtk2-java.pc.in @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/jni/org_gnu_gtk_Gtk.c do-install: ${MKDIR} ${PREFIX}/lib diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile index 5dbe37bc0d6d..9a06b35c8f7f 100644 --- a/x11-toolkits/libgtksourceviewmm/Makefile +++ b/x11-toolkits/libgtksourceviewmm/Makefile @@ -25,4 +25,9 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBAS}/lib CONFIGURE_ARGS= --disable-docs +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/gtksourceview/gtksourceviewmm/sourceiter.cc \ + ${WRKSRC}/tests/test-search.cpp + .include <bsd.port.mk> diff --git a/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c b/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c index e777a6c7a823..ade97c5add94 100644 --- a/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c +++ b/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c @@ -1,10 +1,13 @@ ---- libzvt/gnome-pty-helper.c -+++ libzvt/gnome-pty-helper.c -@@ -50,7 +50,6 @@ +--- libzvt/gnome-pty-helper.c.orig 2002-06-05 06:07:33.000000000 +0000 ++++ libzvt/gnome-pty-helper.c 2013-03-06 13:40:00.000000000 +0000 +@@ -50,9 +50,8 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <utmp.h> #include <grp.h> - #include <glib/galloca.h> +-#include <glib/galloca.h> ++#include <glib.h> #include "gnome-pty.h" + #include "gnome-login-support.h" + diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 98a5fcbd92ca..d22134d2b2e8 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -1,23 +1,18 @@ -# New ports collection makefile for: pango -# Date Created: 18 July 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.163 2011/04/05 17:29:19 kwm Exp $ -# +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.167 2012/06/06 21:18:48 kwm Exp $ PORTNAME= pango -PORTVERSION= 1.28.4 -PORTREVISION?= 1 +PORTVERSION= 1.30.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= GNOME \ - ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An open-source framework for the layout and rendering of i18n text -USE_BZIP2= yes +USE_XZ= yes .if !defined(REFERENCE_PORT) @@ -34,13 +29,10 @@ MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack glib20 ltverhack referencehack -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --enable-static -# Hmm.. tough one. Found this one when I had graphics/hdf installed -# (which installs glist.h) which is picked up before the glib-2.0 -# stuff, with Bad Results[tm] -# -GLIB2_CFLAGS= `pkg-config glib-2.0 --cflags` +USE_PKGCONFIG= build +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + PLIST_SUB= VERSION="1.6.0" FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf @@ -48,26 +40,19 @@ FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir MAN1= pango-view.1 pango-querymodules.1 -.if defined(WITHOUT_X11) -CONFIGURE_ARGS+= --with-x=no -CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \ - ${GLIB2_CFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -PLIST_SUB+= X11="@comment " -.else +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MX11} USE_XORG+= xft xrender -CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \ - ${GLIB2_CFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= X11="" +.else +CONFIGURE_ARGS+= --with-x=no +PLIST_SUB+= X11="@comment " .endif -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e 's|have_introspection=true|have_introspection=false|g' \ - ${WRKSRC}/configure - -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 1adfc864270d..4d62edcdb228 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/pango-1.28.4.tar.bz2) = 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f -SIZE (gnome2/pango-1.28.4.tar.bz2) = 1503441 +SHA256 (gnome2/pango-1.30.1.tar.xz) = 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe +SIZE (gnome2/pango-1.30.1.tar.xz) = 1162828 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index a85d35545893..09ff8cfe5c43 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -105,6 +105,72 @@ share/gir-1.0/Pango-1.0.gir share/gir-1.0/PangoCairo-1.0.gir share/gir-1.0/PangoFT2-1.0.gir %%X11%%share/gir-1.0/PangoXft-1.0.gir +share/gtk-doc/html/pango/PangoEngineLang.html +share/gtk-doc/html/pango/PangoEngineShape.html +share/gtk-doc/html/pango/PangoFcDecoder.html +share/gtk-doc/html/pango/PangoFcFont.html +share/gtk-doc/html/pango/PangoFcFontMap.html +share/gtk-doc/html/pango/PangoMarkupFormat.html +share/gtk-doc/html/pango/annotation-glossary.html +share/gtk-doc/html/pango/api-index-1-10.html +share/gtk-doc/html/pango/api-index-1-12.html +share/gtk-doc/html/pango/api-index-1-14.html +share/gtk-doc/html/pango/api-index-1-16.html +share/gtk-doc/html/pango/api-index-1-18.html +share/gtk-doc/html/pango/api-index-1-2.html +share/gtk-doc/html/pango/api-index-1-20.html +share/gtk-doc/html/pango/api-index-1-22.html +share/gtk-doc/html/pango/api-index-1-24.html +share/gtk-doc/html/pango/api-index-1-26.html +share/gtk-doc/html/pango/api-index-1-28.html +share/gtk-doc/html/pango/api-index-1-30.html +share/gtk-doc/html/pango/api-index-1-4.html +share/gtk-doc/html/pango/api-index-1-6.html +share/gtk-doc/html/pango/api-index-1-8.html +share/gtk-doc/html/pango/api-index-deprecated.html +share/gtk-doc/html/pango/api-index-full.html +share/gtk-doc/html/pango/home.png +share/gtk-doc/html/pango/index.html +share/gtk-doc/html/pango/index.sgml +share/gtk-doc/html/pango/layout.gif +share/gtk-doc/html/pango/left.png +share/gtk-doc/html/pango/lowlevel.html +share/gtk-doc/html/pango/pango-ATSUI-Fonts.html +share/gtk-doc/html/pango/pango-Bidirectional-Text.html +share/gtk-doc/html/pango/pango-Cairo-Rendering.html +share/gtk-doc/html/pango/pango-CoreText-Fonts.html +share/gtk-doc/html/pango/pango-Coverage-Maps.html +share/gtk-doc/html/pango/pango-Engines.html +share/gtk-doc/html/pango/pango-Fonts.html +share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html +share/gtk-doc/html/pango/pango-Glyph-Storage.html +share/gtk-doc/html/pango/pango-Layout-Objects.html +share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html +share/gtk-doc/html/pango/pango-Modules.html +share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html +share/gtk-doc/html/pango/pango-Scripts-and-Languages.html +share/gtk-doc/html/pango/pango-Tab-Stops.html +share/gtk-doc/html/pango/pango-Text-Attributes.html +share/gtk-doc/html/pango/pango-Text-Processing.html +share/gtk-doc/html/pango/pango-Version-Checking.html +share/gtk-doc/html/pango/pango-Vertical-Text.html +share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html +share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html +share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html +share/gtk-doc/html/pango/pango-hierarchy.html +share/gtk-doc/html/pango/pango-pango-renderer.html +share/gtk-doc/html/pango/pango-querymodules.html +share/gtk-doc/html/pango/pango.devhelp2 +share/gtk-doc/html/pango/pango.html +share/gtk-doc/html/pango/rendering.html +share/gtk-doc/html/pango/right.png +share/gtk-doc/html/pango/rotated-text.png +share/gtk-doc/html/pango/style.css +share/gtk-doc/html/pango/tools.html +share/gtk-doc/html/pango/up.png +@dirrm share/gtk-doc/html/pango +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc @dirrm lib/pango/%%VERSION%%/modules @dirrm lib/pango/%%VERSION%% @dirrm lib/pango diff --git a/x11-toolkits/phat/Makefile b/x11-toolkits/phat/Makefile index d09db58a0d2d..aefa4656fa42 100644 --- a/x11-toolkits/phat/Makefile +++ b/x11-toolkits/phat/Makefile @@ -23,6 +23,7 @@ USE_PKGCONFIG= build post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ + -e 's|-Werror||g' \ ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index bdd7346a9cd1..000c5628d861 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: py-gnome-desktop -# Date created: 20 January 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.103 2010/09/30 06:27:40 kwm Exp $ -# PORTNAME= gnome-desktop PORTVERSION= 2.32.0 @@ -19,7 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A set of Python bindings used by modules in the GNOME Desktop -BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy +BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy \ + metacity<2.34.0:${PORTSDIR}/x11-wm/metacity LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index ce237d8b6efb..8deaca866685 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -19,6 +19,7 @@ QT_DIST= yes MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= ${PREFIX}/lib/qt4 USE_XORG= xrender xrandr xinerama inputproto xfixes \ sm xcursor xext x11 ice xi xt diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist index 40e3119e269a..c2a9f67f590c 100644 --- a/x11-wm/xfce4-session/pkg-plist +++ b/x11-wm/xfce4-session/pkg-plist @@ -144,7 +144,5 @@ share/themes/Default/balou/themerc @dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml @dirrmtry etc/xdg/xfce4/xfconf @dirrmtry etc/xdg/xfce4 -@dirrmtry etc/xdg/autostart -@dirrmtry etc/xdg @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile index a3cb2b7003f6..a3ce575a97d8 100644 --- a/x11/avant-window-navigator/Makefile +++ b/x11/avant-window-navigator/Makefile @@ -69,5 +69,11 @@ post-patch: ${WRKSRC}/awn-manager/awnManager.py @${REINPLACE_CMD} -e '1 s|bash|sh|' \ ${WRKSRC}/awn-manager/awn-launcher-editor.in + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/libawn/egg/eggchecksum.h \ + ${WRKSRC}/libawn/awn-config-client-shared.c \ + ${WRKSRC}/libawn/awn-config-client-gconf.c + @${REINPLACE_CMD} -e 's|glib/gutils.h>|glib.h>|g' \ + ${WRKSRC}/libawn/awn-config-client-gkeyfile.c .include <bsd.port.post.mk> diff --git a/x11/babl/Makefile b/x11/babl/Makefile index caa2c03aaf58..a76ffe6d5516 100644 --- a/x11/babl/Makefile +++ b/x11/babl/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: babl -# Date created: 2008-04-14 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# PORTNAME= babl PORTVERSION= 0.1.6 @@ -25,7 +21,8 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USE_LDCONFIG= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig gnomehack ltverhack +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build USE_GMAKE= yes MAKE_JOBS_UNSAFE=yes diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 421bd0f3cf53..ffbe19424391 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gnome-menus -# Date created: 30 November 2004 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/x11/gnome-menus/Makefile,v 1.110 2010/11/17 11:29:19 kwm Exp $ -# PORTNAME= gnome-menus PORTVERSION= 2.30.5 @@ -22,6 +18,7 @@ USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile index 41e7a69a62dc..c93af92a348f 100644 --- a/x11/gnome-pie/Makefile +++ b/x11/gnome-pie/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnome-pie PORTVERSION= 0.5.2 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 # Waiting for a tag on the GitHub repository https://github.com/Simmesimme/Gnome-Pie... MASTER_SITES= LOCAL/nivit/${PORTNAME}/ @@ -18,7 +18,7 @@ RUN_DEPENDS= gnome-icons-elementary>=2.5:${PORTSDIR}/x11-themes/gnome-icons-elem gnome-settings-daemon>=2.32.1_4:${PORTSDIR}/sysutils/gnome-settings-daemon LIB_DEPENDS= Xtst:${PORTSDIR}/x11/libXtst \ cairo:${PORTSDIR}/graphics/cairo \ - gee:${PORTSDIR}/devel/libgee \ + gee:${PORTSDIR}/devel/libgee06 \ unique:${PORTSDIR}/x11-toolkits/unique INSTALLS_ICONS= yes diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 168d57aae805..13054f9e35d6 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: startup-notification -# Date created: 14 November 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/x11/startup-notification/Makefile,v 1.10 2010/07/21 18:04:43 mezz Exp $ -# PORTNAME= startup-notification PORTVERSION= 0.12 @@ -21,7 +17,7 @@ LIB_DEPENDS= xcb-util:${PORTSDIR}/x11/xcb-util USE_XORG= x11 USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig ltasneededhack +USE_GNOME= gnomehack ltasneededhack GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile index a7e9eb239a8d..42977c4c2b7c 100644 --- a/x11/tilda/Makefile +++ b/x11/tilda/Makefile @@ -25,6 +25,8 @@ DOCS= AUTHORS ChangeLog README TODO post-patch: @${REINPLACE_CMD} -e 's|ps -C tilda -o pid=|pgrep tilda|' \ ${WRKSRC}/src/tilda.c + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/tomboykeybinder.h post-install: .if !defined (NOPORTDOCS) |