diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-09 03:00:11 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-09 03:00:11 +0800 |
| commit | e800e9c87c60af384eaf64c4cf7fff2047317292 (patch) | |
| tree | f7ecb8ef5b6afaea226319f9547c5cfa6780ed3b /devel | |
| parent | cbc19dcec20f01ebe895dd70a2dadd9d25f1be2f (diff) | |
| download | marcuscom-ports-e800e9c87c60af384eaf64c4cf7fff2047317292.tar marcuscom-ports-e800e9c87c60af384eaf64c4cf7fff2047317292.tar.gz marcuscom-ports-e800e9c87c60af384eaf64c4cf7fff2047317292.tar.bz2 marcuscom-ports-e800e9c87c60af384eaf64c4cf7fff2047317292.tar.lz marcuscom-ports-e800e9c87c60af384eaf64c4cf7fff2047317292.tar.xz marcuscom-ports-e800e9c87c60af384eaf64c4cf7fff2047317292.tar.zst marcuscom-ports-e800e9c87c60af384eaf64c4cf7fff2047317292.zip | |
* 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
Diffstat (limited to 'devel')
4 files changed, 30 insertions, 18 deletions
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 <bsd.port.pre.mk> @@ -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 @@ <MergeDir>/usr/share/gnome/apps/</MergeDir> <!-- Merge dirs optional --> -- <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/</MergeDir> +- <MergeDir>/usr/local/share/applnk/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> <!-- Root folder --> <Folder> 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 <bsd.port.pre.mk> @@ -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 @@ <MergeDir>/usr/share/gnome/apps/</MergeDir> <!-- Merge dirs optional --> -- <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/</MergeDir> +- <MergeDir>/usr/local/share/applnk/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> ++ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> <!-- Root folder --> <Folder> |