Date: Mon, 29 Dec 2003 15:03:55 -0500 From: Joe Marcus Clarke <marcus@marcuscom.com> To: Franz Klammer <klammer@webonaut.com> Cc: FreeBSD GNOME Users <gnome@freebsd.org> Subject: Re: gnomevfs2 -> WITHOUT_KDE_MENUS knob Message-ID: <1072728235.762.29.camel@gyros> In-Reply-To: <3FF07882.2010307@webonaut.com> References: <3FF07882.2010307@webonaut.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-+jMXWBYqjTsOf1wenJ1n
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
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=20
> it filles up
> the menu-bar with too many entries i only need as kde-user.
>=20
> attached a patch for gnomevfs2 with adds a WITHOUT_KDE_MENUS knob and
> if not set EXTRA_PATCHES is used to apply the patch.
>=20
> also it changes xargs to ${XARGS} to make portlint more happy.
Committed, thanks!
Joe
>=20
> franz.
>=20
>=20
> ______________________________________________________________________
> 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 @@
> =20
> .include <bsd.port.pre.mk>
> =20
> +.if !defined(WITHOUT_KDE_MENUS)
> +EXTRA_PATCHES=3D ${FILESDIR}/modules_vfolder_applications-all-users.vfol=
der-info.in
> +.endif
> +
> .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
> WITH_CDPARANOIA=3D yes
> .endif
> @@ -48,7 +52,7 @@
> .endif
> =20
> 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.vfo=
lder-info.in gnomevfs2/files/modules_vfolder_applications-all-users.vfolder=
-info.in
> --- gnomevfs2.orig/files/modules_vfolder_applications-all-users.vfolder-i=
nfo.in Thu Jan 1 01:00:00 1970
> +++ gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.i=
n 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>
> +=20
> + <!-- Merge dirs optional -->
> +- <MergeDir>/etc/X11/applnk/</MergeDir>
> ++ <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir>
> +=20
> + <!-- Root folder -->
> + <Folder>
> diff -Nur gnomevfs2.orig/files/patch-modules_vfolder_applications-all-use=
rs.vfolder-info.in gnomevfs2/files/patch-modules_vfolder_applications-all-u=
sers.vfolder-info.in
> --- gnomevfs2.orig/files/patch-modules_vfolder_applications-all-users.vfo=
lder-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>
> -=20
> - <!-- Merge dirs optional -->
> -- <MergeDir>/etc/X11/applnk/</MergeDir>
> -+ <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir>
> -=20
> - <!-- Root folder -->
> - <Folder>
>=20
> ______________________________________________________________________
> _______________________________________________
> freebsd-gnome@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org"
--=20
PGP Key : http://www.marcuscom.com/pgp.asc
--=-+jMXWBYqjTsOf1wenJ1n
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQA/8Iirb2iPiv4Uz4cRAsbhAJ9J4gwgXD8eGRyM0xJRJ1w8XlH+QACgp11a
xW7bn/GNkCmHTd8W6vU6EZU=
=fNS9
-----END PGP SIGNATURE-----
--=-+jMXWBYqjTsOf1wenJ1n--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1072728235.762.29.camel>