From stas@310.ru Tue Jul 11 21:07:33 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 476C116A4DD for ; Tue, 11 Jul 2006 21:07:33 +0000 (UTC) (envelope-from stas@310.ru) Received: from com1.ht-systems.ru (com1.ht-systems.ru [83.97.104.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B6A943D5F for ; Tue, 11 Jul 2006 21:07:32 +0000 (GMT) (envelope-from stas@310.ru) Received: from [213.87.72.70] (helo=fonon.realnet) by com1.ht-systems.ru with esmtpa (Exim 4.62) (envelope-from ) id 1G0PZh-00076p-Au for FreeBSD-gnats-submit@freebsd.org; Wed, 12 Jul 2006 01:15:24 +0400 Received: from fonon.realnet (localhost [127.0.0.1]) by fonon.realnet (8.13.6/8.13.6) with ESMTP id k6BL7291019733 for ; Wed, 12 Jul 2006 01:07:04 +0400 (MSD) (envelope-from stas@fonon.realnet) Received: (from stas@localhost) by fonon.realnet (8.13.6/8.13.6/Submit) id k6BL70qU019732; Wed, 12 Jul 2006 01:07:00 +0400 (MSD) (envelope-from stas) Message-Id: <200607112107.k6BL70qU019732@fonon.realnet> Date: Wed, 12 Jul 2006 01:07:00 +0400 (MSD) From: Stanislav Sedov To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [MAINTAINER PATCH] x11/e17-module-flame fix MODULE_ARCH X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 100114 >Category: ports >Synopsis: [MAINTAINER PATCH] x11/e17-module-flame fix MODULE_ARCH >Confidential: no >Severity: critical >Priority: high >Responsible: itetcu >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 11 21:10:18 GMT 2006 >Closed-Date: Wed Jul 12 20:25:49 GMT 2006 >Last-Modified: Wed Jul 12 20:25:49 GMT 2006 >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006 root@fonon.realnet:/work/src/fbsd-cur/src/sys/i386/compile/FONON i386 >Description: In coordination with enlightenment-devel maintainer (vanilla@freebsd.org) MODULE_ARCH was changed to freebsd${OSREL}-${ARCH}. Appropriate patches for evas and enlightenment-devel have been commited. This patch fixes e17-module-flame to work with current version of enlightenment-devel. We should change module location directory in order to account this MODULE_ARCH changes. Note: files/patch-configure file has been deleted. >How-To-Repeat: >Fix: --- e17-module-flame.diff begins here --- diff -ruN e17-module-flame.orig/Makefile e17-module-flame/Makefile --- e17-module-flame.orig/Makefile Tue Jul 11 23:55:04 2006 +++ e17-module-flame/Makefile Wed Jul 12 00:29:11 2006 @@ -7,6 +7,7 @@ PORTNAME= flame PORTVERSION= 20060707 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://mbsd.msk.ru/dist/ PKGNAMEPREFIX= e17-module- @@ -24,6 +25,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + +PLIST_SUB+= MODULE_ARCH=freebsd${OSREL}-${ARCH} .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff -ruN e17-module-flame.orig/files/patch-configure e17-module-flame/files/patch-configure --- e17-module-flame.orig/files/patch-configure Tue Jul 11 23:55:04 2006 +++ e17-module-flame/files/patch-configure Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Fri Jun 23 16:14:40 2006 -+++ configure Fri Jun 23 16:14:53 2006 -@@ -21497,7 +21497,7 @@ - - - --MODULE_ARCH="$host_os-$host_cpu" -+MODULE_ARCH="" - - - cat >>confdefs.h <<_ACEOF diff -ruN e17-module-flame.orig/pkg-plist e17-module-flame/pkg-plist --- e17-module-flame.orig/pkg-plist Tue Jul 11 23:55:04 2006 +++ e17-module-flame/pkg-plist Wed Jul 12 00:21:26 2006 @@ -1,10 +1,11 @@ -lib/enlightenment/modules/flame/module.a +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.a lib/enlightenment/modules/flame/module.eap -lib/enlightenment/modules/flame/module.la -lib/enlightenment/modules/flame/module.so +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.la +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.so lib/enlightenment/modules/flame/module_icon.png %%NLS%%share/locale/eo/LC_MESSAGES/flame.mo %%NLS%%share/locale/fi/LC_MESSAGES/flame.mo %%NLS%%share/locale/it/LC_MESSAGES/flame.mo %%NLS%%share/locale/ja/LC_MESSAGES/flame.mo +@dirrm lib/enlightenment/modules/flame/%%MODULE_ARCH%% @dirrm lib/enlightenment/modules/flame --- e17-module-flame.diff ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->itetcu Responsible-Changed-By: itetcu Responsible-Changed-When: Wed Jul 12 01:57:29 UTC 2006 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=100114 State-Changed-From-To: open->closed State-Changed-By: itetcu State-Changed-When: Wed Jul 12 20:25:47 UTC 2006 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=100114 >Unformatted: