ports/100116: [MAINTAINER PATCH] x11/e17-module-mem fix MODULE_ARCH

[Stanislav Sedov]

>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 at fonon.realnet:/work/src/fbsd-cur/src/sys/i386/compile/FONON i386


	
>Description:
	In coordination with enlightenment-devel maintainer
	(vanilla at 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
+ at dirrm lib/enlightenment/modules/mem/%%MODULE_ARCH%%
 @dirrm lib/enlightenment/modules/mem
--- e17-module-mem.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: