From stas@310.ru  Tue Jul 11 21:08:09 2006
Return-Path: <stas@310.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CBA9316A4DA
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Jul 2006 21:08:09 +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 2512243D67
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Jul 2006 21:08:09 +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 <stas@310.ru>)
	id 1G0PaI-0007Dz-5o
	for FreeBSD-gnats-submit@freebsd.org; Wed, 12 Jul 2006 01:16:01 +0400
Received: from fonon.realnet (localhost [127.0.0.1])
	by fonon.realnet (8.13.6/8.13.6) with ESMTP id k6BL7fHG020098
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Jul 2006 01:07:43 +0400 (MSD)
	(envelope-from stas@fonon.realnet)
Received: (from stas@localhost)
	by fonon.realnet (8.13.6/8.13.6/Submit) id k6BL7eTi020097;
	Wed, 12 Jul 2006 01:07:40 +0400 (MSD)
	(envelope-from stas)
Message-Id: <200607112107.k6BL7eTi020097@fonon.realnet>
Date: Wed, 12 Jul 2006 01:07:40 +0400 (MSD)
From: Stanislav Sedov <ssedov@mbsd.msk.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER PATCH] x11/e17-module-snow fix MODULE_ARCH
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         100121
>Category:       ports
>Synopsis:       [MAINTAINER PATCH] x11/e17-module-snow 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:22 GMT 2006
>Closed-Date:    Wed Jul 12 20:25:08 GMT 2006
>Last-Modified:  Wed Jul 12 20:25:08 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-snow 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-snow.diff begins here ---
diff -ruN e17-module-snow.orig/Makefile e17-module-snow/Makefile
--- e17-module-snow.orig/Makefile	Tue Jul 11 23:55:04 2006
+++ e17-module-snow/Makefile	Wed Jul 12 00:29:11 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	snow
 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-snow.orig/files/patch-configure e17-module-snow/files/patch-configure
--- e17-module-snow.orig/files/patch-configure	Tue Jul 11 23:55:04 2006
+++ e17-module-snow/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-snow.orig/pkg-plist e17-module-snow/pkg-plist
--- e17-module-snow.orig/pkg-plist	Tue Jul 11 23:55:04 2006
+++ e17-module-snow/pkg-plist	Wed Jul 12 00:23:07 2006
@@ -1,10 +1,10 @@
 lib/enlightenment/modules/snow/flake-l.png
 lib/enlightenment/modules/snow/flake-m.png
 lib/enlightenment/modules/snow/flake-s.png
-lib/enlightenment/modules/snow/module.a
+lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.a
 lib/enlightenment/modules/snow/module.eap
-lib/enlightenment/modules/snow/module.la
-lib/enlightenment/modules/snow/module.so
+lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.la
+lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.so
 lib/enlightenment/modules/snow/module_icon.png
 lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
@@ -13,4 +13,5 @@
 %%NLS%%share/locale/it/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
+@dirrm lib/enlightenment/modules/snow/%%MODULE_ARCH%%
 @dirrm lib/enlightenment/modules/snow
--- e17-module-snow.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:58:27 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100121 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Wed Jul 12 20:25:06 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100121 
>Unformatted:
