From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 11 21:11:05 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2404616A4DA for ; Tue, 11 Jul 2006 21:11:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1336843DB1 for ; Tue, 11 Jul 2006 21:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6BLAKLj006455 for ; Tue, 11 Jul 2006 21:10:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6BLAKPH006452; Tue, 11 Jul 2006 21:10:20 GMT (envelope-from gnats) Resent-Date: Tue, 11 Jul 2006 21:10:20 GMT Resent-Message-Id: <200607112110.k6BLAKPH006452@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Stanislav Sedov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B2B516A4E6 for ; Tue, 11 Jul 2006 21:07:43 +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 F1A0043D55 for ; Tue, 11 Jul 2006 21:07:42 +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 1G0PZr-00077q-WC for FreeBSD-gnats-submit@freebsd.org; Wed, 12 Jul 2006 01:15:34 +0400 Received: from fonon.realnet (localhost [127.0.0.1]) by fonon.realnet (8.13.6/8.13.6) with ESMTP id k6BL7F3D019837 for ; Wed, 12 Jul 2006 01:07:17 +0400 (MSD) (envelope-from stas@fonon.realnet) Received: (from stas@localhost) by fonon.realnet (8.13.6/8.13.6/Submit) id k6BL7DgJ019836; Wed, 12 Jul 2006 01:07:13 +0400 (MSD) (envelope-from stas) Message-Id: <200607112107.k6BL7DgJ019836@fonon.realnet> Date: Wed, 12 Jul 2006 01:07:13 +0400 (MSD) From: Stanislav Sedov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/100116: [MAINTAINER PATCH] x11/e17-module-mem fix MODULE_ARCH X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jul 2006 21:11:05 -0000 >Number: 100116 >Category: ports >Synopsis: [MAINTAINER PATCH] x11/e17-module-mem fix MODULE_ARCH >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 11 21:10:19 GMT 2006 >Closed-Date: >Last-Modified: >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-mem 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-mem.diff begins here --- diff -ruN e17-module-mem.orig/Makefile e17-module-mem/Makefile --- e17-module-mem.orig/Makefile Tue Jul 11 23:55:04 2006 +++ e17-module-mem/Makefile Wed Jul 12 00:29:11 2006 @@ -7,7 +7,7 @@ PORTNAME= mem PORTVERSION= 23062006 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://mbsd.msk.ru/dist/ PKGNAMEPREFIX= e17-module- @@ -25,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-mem.orig/files/patch-configure e17-module-mem/files/patch-configure --- e17-module-mem.orig/files/patch-configure Tue Jul 11 23:55:04 2006 +++ e17-module-mem/files/patch-configure Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Fri Jun 23 16:49:21 2006 -+++ configure Fri Jun 23 16:49:32 2006 -@@ -23390,7 +23390,7 @@ - - - --MODULE_ARCH="$host_os-$host_cpu" -+MODULE_ARCH="" - - - cat >>confdefs.h <<_ACEOF diff -ruN e17-module-mem.orig/pkg-plist e17-module-mem/pkg-plist --- e17-module-mem.orig/pkg-plist Tue Jul 11 23:55:04 2006 +++ e17-module-mem/pkg-plist Wed Jul 12 00:22:00 2006 @@ -1,10 +1,10 @@ lib/enlightenment/modules/mem/DejaVuSansMono.ttf lib/enlightenment/modules/mem/mem.edc lib/enlightenment/modules/mem/mem.edj -lib/enlightenment/modules/mem/module.a +lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.a lib/enlightenment/modules/mem/module.eap -lib/enlightenment/modules/mem/module.la -lib/enlightenment/modules/mem/module.so +lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.la +lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.so lib/enlightenment/modules/mem/module_icon.png lib/enlightenment/modules/mem/real_00.png lib/enlightenment/modules/mem/real_01.png @@ -34,4 +34,5 @@ %%NLS%%share/locale/ja/LC_MESSAGES/mem.mo %%NLS%%share/locale/ru/LC_MESSAGES/mem.mo %%NLS%%share/locale/sv/LC_MESSAGES/mem.mo +@dirrm lib/enlightenment/modules/mem/%%MODULE_ARCH%% @dirrm lib/enlightenment/modules/mem --- e17-module-mem.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: