diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-18 23:15:49 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-18 23:15:49 +0000 |
| commit | 098bcaec91685aad7c617a0f7c2f97b0076aefdd (patch) | |
| tree | b23f9d73b6f6afb6ca7d9c79a00d2930fcc785e8 | |
| parent | Add www.gtlib.cc.gatech.edu to DEBIAN, GNOME, GNU, MOZILLA, NETBSD, (diff) | |
Make sure to merge the KDE applnk directory (if it exists) into the list
of application directories.
Notes
Notes:
svn path=/head/; revision=91605
4 files changed, 28 insertions, 2 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index e07acd7be585..194622e7791e 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.4 @@ -50,7 +51,8 @@ post-patch: @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/libgnomevfs/Makefile.in + ${WRKSRC}/libgnomevfs/Makefile.in \ + ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in new file mode 100644 index 000000000000..13ce7838798d --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in @@ -0,0 +1,11 @@ +--- 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 @@ + <MergeDir>/usr/share/gnome/apps/</MergeDir> + + <!-- Merge dirs optional --> +- <MergeDir>/etc/X11/applnk/</MergeDir> ++ <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir> + + <!-- Root folder --> + <Folder> diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index e07acd7be585..194622e7791e 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.4 @@ -50,7 +51,8 @@ post-patch: @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/libgnomevfs/Makefile.in + ${WRKSRC}/libgnomevfs/Makefile.in \ + ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in new file mode 100644 index 000000000000..13ce7838798d --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in @@ -0,0 +1,11 @@ +--- 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 @@ + <MergeDir>/usr/share/gnome/apps/</MergeDir> + + <!-- Merge dirs optional --> +- <MergeDir>/etc/X11/applnk/</MergeDir> ++ <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir> + + <!-- Root folder --> + <Folder> |