Index: head/devel/gir-repository/bsd.gir.mk =================================================================== --- head/devel/gir-repository/bsd.gir.mk (revision 251442) +++ head/devel/gir-repository/bsd.gir.mk (revision 251443) @@ -1,254 +1,254 @@ PORTNAME= gir-repository PORTVERSION= 0.6.5 PORTREVISION?= 3 MAINTAINER= gnome@FreeBSD.org GIRDIR= ${LOCALBASE}/share/gir-1.0 atk_CATEGORY= accessibility atk_GIR= Atk-1.0 pango_CATEGORY= x11-toolkits pango_GIR= Pango-1.0 poppler_CATEGORY= graphics poppler_GIR= Poppler-0.8 gtk20_CATEGORY= x11-toolkits gtk20_GIR= Gtk-2.0 gtk20_GIR_TMPL= gtk webkit_CATEGORY= www webkit_GIR= WebKit-1.0 libsoup_CATEGORY= devel libsoup_GIR= Soup-2.4 libsoup_GIR_TMPL= soup dbus_CATEGORY= devel dbus_GIR= DBus-1.0 gconf2_CATEGORY= devel gconf2_GIR= GConf-2.0 babl_CATEGORY= x11 -babl_GIR= Babl-0.0 +babl_GIR= Babl-0.1 nautilus_CATEGORY= x11-fm nautilus_GIR= Nautilus-1.0 gnomekeyring_CATEGORY= security gnomekeyring_GIR= GnomeKeyring-2.0 libnotify_CATEGORY= devel libnotify_GIR= Notify-0.4 gtksourceview2_CATEGORY= x11-toolkits gtksourceview2_GIR= GtkSource-2.2 vte_CATEGORY= x11-toolkits vte_GIR= Vte-1.0 avahi_CATEGORY= net avahi_GIR= Avahi-0.6 gnomemenus_CATEGORY= x11 gnomemenus_GIR= GMenu-2.0 libwnck_CATEGORY= x11-toolkits libwnck_GIR= Wnck-1.0 goocanvas_CATEGORY= graphics goocanvas_GIR= GooCanvas-0.10 .if defined(PKGNAMESUFFIX) MASTER_SITES= GNOME DIST_SUBDIR= gnome2 COMMENT?= Introspection information for ${GIR_NAME} BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection RUN_DEPENDS= ${GIRDIR}/Everything-1.0.gir:${PORTSDIR}/devel/gobject-introspection USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig GIR_NAME= ${PKGNAMESUFFIX:S/-//g} DEP_NAMES= ${GIR_NAME} GIRDIR_REL= ${GIRDIR:S,^${LOCALBASE}/,,} TYPELIBDIR_REL= lib/girepository-1.0 PLIST= ${NONEXISTENT} # This list is used to enable/disable gir modules in the configure script. # So all girs should be here even if we don't use them. _USE_GIR_ALL= dbus atk pango pangoxft poppler gtk gconf soup babl nautilusextension \ gnomekeyring webkit notify gnio clutter clutter_gtk clutter_cairo \ gstreamer gstbufferlist_h gstreamer_plugins_base gtksourceview vte \ goocanvas gssdp gupnp avahi unique gmenu wnck .if ${GIR_NAME} == "atk" USE_GNOME+= atk GIR_FILES= Atk-1.0 .endif .if ${GIR_NAME} == "pango" USE_GNOME+= pango GIR_FILES= Pango-1.0 PangoFT2-1.0 PangoCairo-1.0 PangoX-1.0 PangoXft-1.0 DEP_NAMES+= pangoxft .endif .if ${GIR_NAME} == "poppler" LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk USE_GIR= gtk20 pango GIR_FILES= Poppler-0.8 CLEAR_DEPS+= Gdk-2.0 .endif .if ${GIR_NAME} == "gtk20" USE_GNOME+= gtk20 USE_GIR= atk pango GIR_FILES= Gdk-2.0 Gtk-2.0 GdkPixbuf-2.0 LIB_FILES= Gdk Gtk DEP_NAMES= gtk .endif .if ${GIR_NAME} == "webkit" LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 USE_GIR= gtk20 libsoup GIR_FILES= WebKit-1.0 JSCore-1.0 .endif .if ${GIR_NAME} == "libsoup" LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup GIR_FILES= Soup-2.4 DEP_NAMES= soup .endif .if ${GIR_NAME} == "gconf2" USE_GNOME+= gconf2 GIR_FILES= GConf-2.0 DEP_NAMES= gconf .endif .if ${GIR_NAME} == "babl" -LIB_DEPENDS+= babl-0.0.0:${PORTSDIR}/x11/babl -GIR_FILES= Babl-0.0 +LIB_DEPENDS+= babl-0.1.0:${PORTSDIR}/x11/babl +GIR_FILES= Babl-0.1 .endif .if ${GIR_NAME} == "nautilus" USE_GNOME+= nautilus2 USE_GIR= gtk20 GIR_FILES= Nautilus-1.0 DEP_NAMES= nautilusextension .endif .if ${GIR_NAME} == "gnomekeyring" LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring GIR_FILES= GnomeKeyring-2.0 .endif .if ${GIR_NAME} == "libnotify" LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify USE_GIR= gtk20 GIR_FILES= Notify-0.4 DEP_NAMES= notify .endif .if ${GIR_NAME} == "dbus" LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib GIR_FILES= DBus-1.0 LIB_FILES= DBus .endif .if ${GIR_NAME} == "gtksourceview2" USE_GNOME+= gtksourceview2 USE_GIR= gtk20 GIR_FILES= GtkSource-2.2 DEP_NAMES= gtksourceview .endif .if ${GIR_NAME} == "vte" USE_GNOME+= vte USE_GIR= gtk20 GIR_FILES= Vte-1.0 .endif .if ${GIR_NAME} == "avahi" LIB_DEPENDS+= avahi-gobject.0:${PORTSDIR}/net/avahi-app GIR_FILES= Avahi-0.6 AvahiCore-0.6 .endif .if ${GIR_NAME} == "gnomemenus" USE_GNOME+= gnomemenus USE_GIR= gtk20 GIR_FILES= GMenu-2.0 DEP_NAMES= gmenu .endif .if ${GIR_NAME} == "libwnck" USE_GNOME+= libwnck USE_GIR= gtk20 GIR_FILES= Wnck-1.0 DEP_NAMES= wnck .endif .if ${GIR_NAME} == "goocanvas" LIB_DEPENDS+= goocanvas.3:${PORTSDIR}/graphics/goocanvas USE_GIR= gtk20 GIR_FILES= GooCanvas-0.10 .endif . for component in ${USE_GIR:C/^([^:]+).*/\1/} CLEAR_DEPS+= ${${component}_GIR} BUILD_DEPENDS+= ${GIRDIR}/${${component}_GIR}.gir:${PORTSDIR}/${${component}_CATEGORY}/gir-repository-${component} RUN_DEPENDS+= ${GIRDIR}/${${component}_GIR}.gir:${PORTSDIR}/${${component}_CATEGORY}/gir-repository-${component} . endfor pre-patch: # disable all components .for component in ${_USE_GIR_ALL} @${REINPLACE_CMD} -e 's|have_${component}=true|have_${component}=false|g' \ ${WRKSRC}/configure .endfor .if defined(DEP_NAMES) # enable components .for component in ${DEP_NAMES} @${REINPLACE_CMD} -e 's|have_${component}=false|have_${component}=true|g' \ ${WRKSRC}/configure .endfor .endif post-configure: .if defined(CLEAR_DEPS) # clear Makefile targets . for dep in ${CLEAR_DEPS} @${REINPLACE_CMD} -e 's|${dep}.gir||g' \ ${WRKSRC}/gir/Makefile . endfor .endif .if !target(post-install-script) post-install-script: # build plist .for gir in ${GIR_FILES} @${ECHO} ${TYPELIBDIR_REL}/${gir}.typelib >> ${TMPPLIST} @${ECHO} ${GIRDIR_REL}/${gir}.gir >> ${TMPPLIST} .endfor .for lib in ${LIB_FILES} @${ECHO} lib/libgirepo-${lib}-custom.a >> ${TMPPLIST} @${ECHO} lib/libgirepo-${lib}-custom.la >> ${TMPPLIST} @${ECHO} lib/libgirepo-${lib}-custom.so >> ${TMPPLIST} .endfor @${ECHO_CMD} "@unexec rmdir %D/${TYPELIBDIR_REL} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/${GIRDIR_REL} 2>/dev/null || true" >> ${TMPPLIST} .endif .endif .include Property changes on: head/devel/gir-repository/bsd.gir.mk ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/gir-repository/files/patch-gir_Makefile.in =================================================================== --- head/devel/gir-repository/files/patch-gir_Makefile.in (revision 251442) +++ head/devel/gir-repository/files/patch-gir_Makefile.in (revision 251443) @@ -1,39 +1,72 @@ ---- gir/Makefile.in.orig 2009-09-10 16:15:05.000000000 -0400 -+++ gir/Makefile.in 2009-09-10 17:32:05.000000000 -0400 +--- gir/Makefile.in.orig 2010-03-24 14:45:41.000000000 +0100 ++++ gir/Makefile.in 2010-03-24 14:45:41.000000000 +0100 +@@ -86,7 +86,7 @@ host_triplet = @host@ + @BUILD_GSSDP_TRUE@am__append_33 = GSSDP-1.0.gir + @BUILD_GUPNP_TRUE@am__append_34 = GUPnP-1.0.gir + @BUILD_AVAHI_TRUE@am__append_35 = Avahi-0.6.gir +-@BUILD_BABL_TRUE@am__append_36 = Babl-0.0.gir ++@BUILD_BABL_TRUE@am__append_36 = Babl-0.1.gir + @BUILD_UNIQUE_TRUE@am__append_37 = Unique-1.0.gir + @BUILD_NAUTILUS_TRUE@am__append_38 = Nautilus-1.0.gir + @BUILD_WNCK_TRUE@am__append_39 = Wnck-1.0.gir @@ -413,7 +413,7 @@ libgirepo_DBus_custom_la_SOURCES = \ @BUILD_GCONF_TRUE@GCONF_INCLUDEDIR = `pkg-config --variable=includedir gconf-2.0`/gconf/2 @BUILD_SOUP_TRUE@SOUP_INCLUDEDIR = `pkg-config --variable=includedir libsoup-2.4`/libsoup-2.4 -@BUILD_SOUP_TRUE@SOUP_HDRS = $(shell echo $(SOUP_INCLUDEDIR)/libsoup/*.h | sed -re 's,[^ \t]+/soup-(gnome[a-z-]*|cookie-jar-sqlite)\.h[ \t]?,,g') +@BUILD_SOUP_TRUE@SOUP_HDRS = $(shell echo $(SOUP_INCLUDEDIR)/libsoup/*.h | sed -Ee 's,[^ \t]+/soup-(gnome[a-z-]*|cookie-jar-sqlite)\.h[ \t]?,,g') @BUILD_GNOMEKEYRING_TRUE@GNOMEKEYRING_INCLUDEDIR = `pkg-config --variable=includedir gnome-keyring-1`/gnome-keyring-1 # pango +@@ -549,7 +549,7 @@ libgirepo_Clutter_custom_la_SOURCES = \ + @BUILD_GSSDP_TRUE@GSSDP_INCLUDEDIR = `pkg-config --variable=includedir gssdp-1.0`/gssdp-1.0 + @BUILD_GUPNP_TRUE@GUPNP_INCLUDEDIR = `pkg-config --variable=includedir gupnp-1.0`/gupnp-1.0 + @BUILD_AVAHI_TRUE@AVAHI_INCLUDEDIR = `pkg-config --variable=includedir avahi-gobject`/avahi-gobject +-@BUILD_BABL_TRUE@BABL_INCLUDEDIR = `pkg-config --variable=includedir babl`/babl-0.0 ++@BUILD_BABL_TRUE@BABL_INCLUDEDIR = `pkg-config --variable=includedir babl`/babl-0.1 + @BUILD_UNIQUE_TRUE@UNIQUE_INCLUDEDIR = `pkg-config --variable=includedir unique-1.0`/unique-1.0/unique + @BUILD_NAUTILUS_TRUE@NAUTILUS_INCLUDEDIR = `pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension + @BUILD_WNCK_TRUE@WNCK_INCLUDEDIR = `pkg-config --variable=includedir libwnck-1.0`/libwnck-1.0/libwnck @@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --output $@ \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTFFT_INCLUDEDIR)/gst/fft/*h @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstInterfaces-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER) -@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstInterfaces --nsversion=0.10 \ +@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(DEBUG) csh -c "$(INTROSPECTION_SCANNER) -v --namespace GstInterfaces --nsversion=0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --include=Gst-0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --library=gstinterfaces-0.10 \ -@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --libtool="$(LIBTOOL)" \ +@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --libtool=\"$(LIBTOOL)\" \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gobject-2.0 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gstreamer-0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gstreamer-interfaces-0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --output $@ \ -@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTINTERFACES_INCLUDEDIR)/gst/interfaces/{colorbalance,colorbalancechannel,interfaces-enumtypes,mixer,mixeroptions,mixertrack,navigation,propertyprobe,tuner,tunerchannel,tunernorm,videoorientation,xoverlay}*h +@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTINTERFACES_INCLUDEDIR)/gst/interfaces/{colorbalance,colorbalancechannel,interfaces-enumtypes,mixer,mixeroptions,mixertrack,navigation,propertyprobe,tuner,tunerchannel,tunernorm,videoorientation,xoverlay}*h" @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstNetbuffer-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER) @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer --nsversion=0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \ @@ -1479,6 +1479,7 @@ uninstall-am: uninstall-dist_girDATA uni @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --include=Gst-0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --include=GstBase-0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --library=gstvideo-0.10 \ +@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --library=gstbasevideo-0.10 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --libtool="$(LIBTOOL)" \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gobject-2.0 \ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gstreamer-0.10 \ +@@ -1529,11 +1530,11 @@ uninstall-am: uninstall-dist_girDATA uni + @BUILD_AVAHI_TRUE@ --output $@ \ + @BUILD_AVAHI_TRUE@ --pkg avahi-gobject \ + @BUILD_AVAHI_TRUE@ $(AVAHI_INCLUDEDIR)/*.h +-@BUILD_BABL_TRUE@Babl-0.0.gir: $(INTROSPECTION_SCANNER) +-@BUILD_BABL_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=0.0 \ ++@BUILD_BABL_TRUE@Babl-0.1.gir: $(INTROSPECTION_SCANNER) ++@BUILD_BABL_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=0.1 \ + @BUILD_BABL_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \ + @BUILD_BABL_TRUE@ --include=GObject-2.0 \ +-@BUILD_BABL_TRUE@ --library=babl-0.0 \ ++@BUILD_BABL_TRUE@ --library=babl-0.1 \ + @BUILD_BABL_TRUE@ --libtool="$(LIBTOOL)" \ + @BUILD_BABL_TRUE@ --output $@ \ + @BUILD_BABL_TRUE@ --pkg babl \ Property changes on: head/devel/gir-repository/files/patch-gir_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11/gir-repository-babl/Makefile =================================================================== --- head/x11/gir-repository-babl/Makefile (revision 251442) +++ head/x11/gir-repository-babl/Makefile (revision 251443) @@ -1,15 +1,16 @@ # New ports collection makefile for: gir-repository-babl # Date created: 12 September 2009 # Whom: Alexander Logvinov # # $FreeBSD$ # $MCom: ports/x11/gir-repository-babl/Makefile,v 1.1 2009/09/16 02:05:12 avl Exp $ # CATEGORIES= x11 +PORTREVISION= 4 MASTERDIR= ${.CURDIR}/../../devel/gir-repository PKGNAMESUFFIX= -babl .include "${MASTERDIR}/bsd.gir.mk" Property changes on: head/x11/gir-repository-babl/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property