summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-04-28 09:49:43 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-04-28 09:49:43 +0800
commitc86b3cbc8f9247d7f4a7c5d50588fba010fa3dfc (patch)
tree852aa888c27553cb99a1b3560fd53d31bd256d95
parent085028ae18dfab353e82db126d222679ee9cfc43 (diff)
downloadmarcuscom-ports-c86b3cbc8f9247d7f4a7c5d50588fba010fa3dfc.tar
marcuscom-ports-c86b3cbc8f9247d7f4a7c5d50588fba010fa3dfc.tar.gz
marcuscom-ports-c86b3cbc8f9247d7f4a7c5d50588fba010fa3dfc.tar.bz2
marcuscom-ports-c86b3cbc8f9247d7f4a7c5d50588fba010fa3dfc.tar.lz
marcuscom-ports-c86b3cbc8f9247d7f4a7c5d50588fba010fa3dfc.tar.xz
marcuscom-ports-c86b3cbc8f9247d7f4a7c5d50588fba010fa3dfc.tar.zst
marcuscom-ports-c86b3cbc8f9247d7f4a7c5d50588fba010fa3dfc.zip
Move the gconf2 dependency to libgsf-gnome since it is now optional for
libgsf. Requested vy: crsd on #freebsd-gnome git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14108 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--Mk/bsd.gnome.mk6
-rw-r--r--devel/libgsf-gnome/Makefile4
2 files changed, 5 insertions, 5 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index c1029920b..bdb26afe4 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.489 2010/03/14 17:58:55 marcus Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.490 2010/03/14 18:13:44 marcus Exp $
#
# Please view me with 4 column tabs!
@@ -440,11 +440,11 @@ pkgconfig_RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
libgsf_LIB_DEPENDS= gsf-1.114:${PORTSDIR}/devel/libgsf
libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc
-libgsf_USE_GNOME_IMPL= gconf2 glib20 libxml2
+libgsf_USE_GNOME_IMPL= glib20 libxml2
libgsf_gnome_LIB_DEPENDS= gsf-gnome-1.114:${PORTSDIR}/devel/libgsf-gnome
libgsf_gnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-gnome-1.pc
-libgsf_gnome_USE_GNOME_IMPL= libgsf gnomevfs2
+libgsf_gnome_USE_GNOME_IMPL= gconf2 libgsf gnomevfs2
pygtk2_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc
pygtk2_BUILD_DEPENDS= ${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index c56bb6365..cba0ebe15 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.12 2008/09/09 00:08:35 kwm Exp $
+# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.14 2010/04/10 08:51:16 kwm Exp $
#
PORTREVISION= 0
@@ -19,7 +19,7 @@ INSTALL_WRKSRC= ${WRKSRC}/gsf-gnome
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USE_GNOME= gnomehack libgsf gnomevfs2 libbonobo ltverhack intlhack
+USE_GNOME= gnomehack libgsf gnomevfs2 libbonobo ltverhack intlhack gconf2
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \
--with-bz2 --with-gnome-vfs --with-gio
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \