From e800e9c87c60af384eaf64c4cf7fff2047317292 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 8 Feb 2004 19:00:11 +0000 Subject: * Move FAM out of OPTIONS sicn it will be enabled if found anyway * Fix up the KDE directories so we avoid merging useless entries into the GNOME Panel git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1799 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnome-vfs/Makefile | 7 +++---- ...dules_vfolder_applications-all-users.vfolder-info.in | 17 ++++++++++++----- devel/gnomevfs2/Makefile | 7 +++---- ...dules_vfolder_applications-all-users.vfolder-info.in | 17 ++++++++++++----- 4 files changed, 30 insertions(+), 18 deletions(-) (limited to 'devel') diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 4af5ab77f..98c66d11e 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.5.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.5 @@ -31,8 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} -OPTIONS= KDE_MENUS "Integrated KDE menu picks" on \ - FAM "Dynamic file system updates" on +OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .include @@ -62,7 +61,7 @@ PLIST_SUB+= CDPARANOIA="" PLIST_SUB+= CDPARANOIA="@comment " .endif -.if !defined(WITHOUT_FAM) +.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in index e12976533..3e3ae981e 100644 --- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in +++ b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -1,11 +1,18 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003 -@@ -19,7 +19,7 @@ +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Sun Feb 8 14:02:33 2004 ++++ modules/vfolder/applications-all-users.vfolder-info.in Sun Feb 8 14:00:32 2004 +@@ -19,7 +19,14 @@ /usr/share/gnome/apps/ -- /etc/X11/applnk/ -+ /usr/local/share/applnk/ +- /usr/local/share/applnk/ ++ /usr/local/share/applnk/Toys/ ++ /usr/local/share/applnk/Utilities/ ++ /usr/local/share/applnk/Internet/ ++ /usr/local/share/applnk/Office/ ++ /usr/local/share/applnk/Applications/ ++ /usr/local/share/applnk/Development/ ++ /usr/local/share/applnk/Games/ ++ /usr/local/share/applnk/Multimedia/ diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 4af5ab77f..98c66d11e 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.5.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.5 @@ -31,8 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} -OPTIONS= KDE_MENUS "Integrated KDE menu picks" on \ - FAM "Dynamic file system updates" on +OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .include @@ -62,7 +61,7 @@ PLIST_SUB+= CDPARANOIA="" PLIST_SUB+= CDPARANOIA="@comment " .endif -.if !defined(WITHOUT_FAM) +.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in index e12976533..3e3ae981e 100644 --- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in +++ b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -1,11 +1,18 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sat Oct 18 19:04:37 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sat Oct 18 19:05:18 2003 -@@ -19,7 +19,7 @@ +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Sun Feb 8 14:02:33 2004 ++++ modules/vfolder/applications-all-users.vfolder-info.in Sun Feb 8 14:00:32 2004 +@@ -19,7 +19,14 @@ /usr/share/gnome/apps/ -- /etc/X11/applnk/ -+ /usr/local/share/applnk/ +- /usr/local/share/applnk/ ++ /usr/local/share/applnk/Toys/ ++ /usr/local/share/applnk/Utilities/ ++ /usr/local/share/applnk/Internet/ ++ /usr/local/share/applnk/Office/ ++ /usr/local/share/applnk/Applications/ ++ /usr/local/share/applnk/Development/ ++ /usr/local/share/applnk/Games/ ++ /usr/local/share/applnk/Multimedia/ -- cgit v1.2.3