summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-06-06 02:00:23 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-06-06 02:00:23 +0800
commit0eb9a90fb58951f0f996195c077a256e19a4c43d (patch)
treef97050b17221d32340e2cb90b6c8ac2c3feceed1
parentc3a4f80ff0952cbc36fca4ca728e2a5b85249445 (diff)
downloadmarcuscom-ports-0eb9a90fb58951f0f996195c077a256e19a4c43d.tar
marcuscom-ports-0eb9a90fb58951f0f996195c077a256e19a4c43d.tar.gz
marcuscom-ports-0eb9a90fb58951f0f996195c077a256e19a4c43d.tar.bz2
marcuscom-ports-0eb9a90fb58951f0f996195c077a256e19a4c43d.tar.lz
marcuscom-ports-0eb9a90fb58951f0f996195c077a256e19a4c43d.tar.xz
marcuscom-ports-0eb9a90fb58951f0f996195c077a256e19a4c43d.tar.zst
marcuscom-ports-0eb9a90fb58951f0f996195c077a256e19a4c43d.zip
nautilus gir files now shipped by nautilus.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14176 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--RMPORTS1
-rw-r--r--devel/gir-repository/Makefile3
-rw-r--r--devel/gir-repository/bsd.gir.mk10
3 files changed, 2 insertions, 12 deletions
diff --git a/RMPORTS b/RMPORTS
index 317cf6c5d..542ea132c 100644
--- a/RMPORTS
+++ b/RMPORTS
@@ -1 +1,2 @@
devel/gir-repository-gconf2|devel/gconf2|%DATA%|merged into gconf2
+x11-fm/gir-repository-nautilus|x11-fm/nautilus|%DATA%|merged into nautilus
diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile
index 4423c5ff2..3f8b8073c 100644
--- a/devel/gir-repository/Makefile
+++ b/devel/gir-repository/Makefile
@@ -3,7 +3,7 @@
# Whom: Pawel Worach <pawel.worach@gmail.com>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/devel/gir-repository/Makefile,v 1.18 2010/05/28 08:47:45 kwm Exp $
#
MASTER_SITES= # Empty
@@ -20,7 +20,6 @@ RUN_DEPENDS= ${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-re
${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \
${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \
${GIRDIR}/${babl_GIR}.gir:${PORTSDIR}/${babl_CATEGORY}/gir-repository-babl \
- ${GIRDIR}/${nautilus_GIR}.gir:${PORTSDIR}/${nautilus_CATEGORY}/gir-repository-nautilus \
${GIRDIR}/${gnomekeyring_GIR}.gir:${PORTSDIR}/${gnomekeyring_CATEGORY}/gir-repository-gnome-keyring \
${GIRDIR}/${libnotify_GIR}.gir:${PORTSDIR}/${libnotify_CATEGORY}/gir-repository-libnotify \
${GIRDIR}/${gtksourceview2_GIR}.gir:${PORTSDIR}/${gtksourceview2_CATEGORY}/gir-repository-gtksourceview2 \
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index bb78b4290..c6b1f959a 100644
--- a/devel/gir-repository/bsd.gir.mk
+++ b/devel/gir-repository/bsd.gir.mk
@@ -19,9 +19,6 @@ dbus_GIR= DBus-1.0
babl_CATEGORY= x11
babl_GIR= Babl-0.1
-nautilus_CATEGORY= x11-fm
-nautilus_GIR= Nautilus-1.0
-
gnomekeyring_CATEGORY= security
gnomekeyring_GIR= GnomeKeyring-2.0
@@ -88,13 +85,6 @@ LIB_DEPENDS+= babl-0.1.0:${PORTSDIR}/x11/babl
GIR_FILES= Babl-0.1
.endif
-.if ${GIR_NAME} == "nautilus"
-USE_GNOME+= nautilus2
-GIR_FILES= Nautilus-1.0
-DEP_NAMES= nautilusextension
-CLEAR_DEPS+= Gtk-2.0
-.endif
-
.if ${GIR_NAME} == "gnomekeyring"
LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
GIR_FILES= GnomeKeyring-2.0