ports/100112: [MAINTAINER PATCH] x11/e17-module-deskshow fix MODULE_ARCH

[Stanislav Sedov]

>Number:         100112
>Category:       ports
>Synopsis:       [MAINTAINER PATCH] x11/e17-module-deskshow 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:16 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-deskshow 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-deskshow.diff begins here ---
diff -ruN e17-module-deskshow.orig/Makefile e17-module-deskshow/Makefile
--- e17-module-deskshow.orig/Makefile	Tue Jul 11 23:55:04 2006
+++ e17-module-deskshow/Makefile	Wed Jul 12 00:29:11 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	deskshow
 PORTVERSION=	20060707
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://mbsd.msk.ru/dist/
 PKGNAMEPREFIX=	e17-module-
@@ -24,5 +25,7 @@
 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}
 
 .include <bsd.port.mk>
diff -ruN e17-module-deskshow.orig/files/patch-configure e17-module-deskshow/files/patch-configure
--- e17-module-deskshow.orig/files/patch-configure	Tue Jul 11 23:55:04 2006
+++ e17-module-deskshow/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-deskshow.orig/pkg-plist e17-module-deskshow/pkg-plist
--- e17-module-deskshow.orig/pkg-plist	Tue Jul 11 23:55:04 2006
+++ e17-module-deskshow/pkg-plist	Wed Jul 12 00:20:51 2006
@@ -5,9 +5,10 @@
 lib/enlightenment/modules/deskshow/e17_titlebar_glint3.png
 lib/enlightenment/modules/deskshow/e17_titlebar_shadow1.png
 lib/enlightenment/modules/deskshow/e17_titlebar_shadow2.png
-lib/enlightenment/modules/deskshow/module.a
+lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.a
 lib/enlightenment/modules/deskshow/module.eap
-lib/enlightenment/modules/deskshow/module.la
-lib/enlightenment/modules/deskshow/module.so
+lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.la
+lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.so
 lib/enlightenment/modules/deskshow/module_icon.png
+ at dirrm lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%
 @dirrm lib/enlightenment/modules/deskshow
--- e17-module-deskshow.diff ends here ---

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