gnomevfs2 -> WITHOUT_KDE_MENUS knob

[Joe Marcus Clarke]

On Mon, 2003-12-29 at 13:54, Franz Klammer wrote:
> i don't like to merge the kde-application-menus into the gnome because 
> it filles up
> the menu-bar with too many entries i only need as kde-user.
> 
> attached a patch for gnomevfs2 with adds a WITHOUT_KDE_MENUS knob and
> if not set EXTRA_PATCHES is used to apply the patch.
> 
> also it changes xargs to ${XARGS} to make portlint more happy.

Committed, thanks!

Joe

> 
> franz.
> 
> 
> ______________________________________________________________________
> diff -Nur gnomevfs2.orig/Makefile gnomevfs2/Makefile
> --- gnomevfs2.orig/Makefile	Mon Dec 29 10:28:47 2003
> +++ gnomevfs2/Makefile	Mon Dec 29 19:52:02 2003
> @@ -30,6 +30,10 @@
>  
>  .include <bsd.port.pre.mk>
>  
> +.if !defined(WITHOUT_KDE_MENUS)
> +EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
> +.endif
> +
>  .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
>  WITH_CDPARANOIA=        yes
>  .endif
> @@ -48,7 +52,7 @@
>  .endif
>  
>  post-patch:
> -	@${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
> +	@${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 \
> diff -Nur gnomevfs2.orig/files/modules_vfolder_applications-all-users.vfolder-info.in gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
> --- gnomevfs2.orig/files/modules_vfolder_applications-all-users.vfolder-info.in	Thu Jan  1 01:00:00 1970
> +++ gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in	Thu Oct 23 22:36:24 2003
> @@ -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 -Nur gnomevfs2.orig/files/patch-modules_vfolder_applications-all-users.vfolder-info.in gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in
> --- gnomevfs2.orig/files/patch-modules_vfolder_applications-all-users.vfolder-info.in	Thu Oct 23 22:36:24 2003
> +++ gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in	Thu Jan  1 01:00:00 1970
> @@ -1,11 +0,0 @@
> ---- 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>
> 
> ______________________________________________________________________
> _______________________________________________
> freebsd-gnome at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe at freebsd.org"
-- 
PGP Key : http://www.marcuscom.com/pgp.asc


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/freebsd-gnome/attachments/20031229/34a648cb/attachment.bin