Date: 11 Feb 2003 21:44:32 +0100 From: Franz Klammer <klammer@webonaut.com> To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: FreeBSD GNOME Users <gnome@FreeBSD.org> Subject: Re: HEADS UP: Removing GNOMENG Message-ID: <1044996271.644.97.camel@ds9.webonaut.com> In-Reply-To: <1044991950.305.36.camel@gyros> References: <1044991950.305.36.camel@gyros>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-Gkoy5phIn8xbAofEo8aS
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Am Di, 2003-02-11 um 20.32 schrieb Joe Marcus Clarke:
> Okay, here is my release candidate diff for removing need for the
> GNOMENG keyword, and adding GNOME 2 support to the new GNOME porting
> infrastructure. This patch applies directly to ports/Mk/bsd.gnome.mk,
> and removes the need for the bsd.gnomeng.mk file.
>
> I'd like to commit this tomorrow if possible. Please let me know if you
> see of foresee any problems. Thanks.
>
work well for me with file_menu_applet.
i've deleted the older mails about this (maybe you have written about)
but why you don't include a kind of auto detection as additional safety.
eg:
(ok! i know, that's not the correct syntax ;)
if !defined(WITH_GNOME_DESKTOP); then
if exists ../libpanelapplet-2.0.pc; then
WITH_GNOME_DESKTOP=2
else
WITH_GNOME_DESKTOP=1
endif
endif
sorry if this mail is a "argh! we already discussed about that!".
i was too lazy to look into the archive.
attached the patch that removes GNOMENG and the gnome1-check
from file_menu_applet.
franz.
> Joe
--
--=-Gkoy5phIn8xbAofEo8aS
Content-Disposition: attachment; filename=file_menu_applet.diff
Content-Type: text/x-patch; name=file_menu_applet.diff; charset=ISO8859-1
Content-Transfer-Encoding: 7bit
diff -ruN file_menu_applet.orig/Makefile file_menu_applet/Makefile
--- file_menu_applet.orig/Makefile Mon Nov 18 22:23:48 2002
+++ file_menu_applet/Makefile Tue Feb 11 21:38:03 2003
@@ -14,11 +14,7 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOMENG= yes
USE_GNOME= gnomeprefix gnomehack libpanel gnomevfs libglade
GNU_CONFIGURE= yes
-
-pre-everything::
- @${SH} ${PKGINSTALL} ${PKGNAME} ${PREFIX}
.include <bsd.port.mk>
diff -ruN file_menu_applet.orig/pkg-install file_menu_applet/pkg-install
--- file_menu_applet.orig/pkg-install Sat Aug 24 00:29:58 2002
+++ file_menu_applet/pkg-install Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ -n "${PACKAGE_BUILDING}" ]; then
- exit 0
-fi
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
-export PATH
-
-if [ ! -f ${2}/libdata/pkgconfig/libpanelapplet-2.0.pc ]; then
- exit 0
-fi
-
-echo "================================================================"
-echo ""
-echo "The GNOME 2.0 package libpanelapplet was detected on the system."
-echo "file_menu_applet works only with the GNOME 1.0 panel."
-echo ""
-echo "================================================================"
-false
--=-Gkoy5phIn8xbAofEo8aS--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1044996271.644.97.camel>