From owner-freebsd-gnome Tue Feb 11 12:37:24 2003 Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3E7637B401; Tue, 11 Feb 2003 12:37:21 -0800 (PST) Received: from sv02.webonaut.com (kirk.webonaut.com [212.41.243.26]) by mx1.FreeBSD.org (Postfix) with ESMTP id C03B343F85; Tue, 11 Feb 2003 12:37:20 -0800 (PST) (envelope-from klammer@webonaut.com) Received: from [212.41.243.28] (sisko.webonaut.com [212.41.243.28]) by sv02.webonaut.com (Postfix) with ESMTP id 2A8C6766F0; Tue, 11 Feb 2003 21:37:18 +0100 (CET) Subject: Re: HEADS UP: Removing GNOMENG From: Franz Klammer To: Joe Marcus Clarke Cc: FreeBSD GNOME Users In-Reply-To: <1044991950.305.36.camel@gyros> References: <1044991950.305.36.camel@gyros> Content-Type: multipart/mixed; boundary="=-Gkoy5phIn8xbAofEo8aS" Organization: Message-Id: <1044996271.644.97.camel@ds9.webonaut.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 Date: 11 Feb 2003 21:44:32 +0100 Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-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 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