In coordination with enlightenment-devel maintainer MODULE_ARCH was changed to

freebsd${OSREL}-${ARCH}. Appropriate patches for evas and enlightenment-devel
have been commited. Track this.

PR:		ports/100110
Submited by:	maintainer

6 files changed, 14 insertions, 30 deletions

diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index 720cd6886157..a0c387313007 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	calendar
 PORTVERSION=	23062006
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://mbsd.msk.ru/dist/
 PKGNAMEPREFIX=	e17-module-
@@ -26,6 +26,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
 PLIST_SUB+=	NLS=""
diff --git a/x11-wm/e17-module-calendar/files/patch-configure b/x11-wm/e17-module-calendar/files/patch-configure
deleted file mode 100644
index f699d297dc52..000000000000
--- a/x11-wm/e17-module-calendar/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Jun 23 16:03:16 2006
-+++ configure	Fri Jun 23 16:03:40 2006
-@@ -23394,7 +23394,7 @@
- 
- 
- 
--MODULE_ARCH="$host_os-$host_cpu"
-+MODULE_ARCH=""
- 
- 
- cat >>confdefs.h <<_ACEOF
diff --git a/x11-wm/e17-module-calendar/pkg-plist b/x11-wm/e17-module-calendar/pkg-plist
index 2032666f74b9..e74419126e29 100644
--- a/x11-wm/e17-module-calendar/pkg-plist
+++ b/x11-wm/e17-module-calendar/pkg-plist
@@ -3,10 +3,10 @@ lib/enlightenment/modules/calendar/arrow.edj
 lib/enlightenment/modules/calendar/backimage.edj
 lib/enlightenment/modules/calendar/calendar.edj
 lib/enlightenment/modules/calendar/label.edj
-lib/enlightenment/modules/calendar/module.a
+lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.a
 lib/enlightenment/modules/calendar/module.eap
-lib/enlightenment/modules/calendar/module.la
-lib/enlightenment/modules/calendar/module.so
+lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.la
+lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.so
 lib/enlightenment/modules/calendar/module_icon.png
 lib/enlightenment/modules/calendar/today.edj
 lib/enlightenment/modules/calendar/topimage.edj
@@ -19,4 +19,5 @@ lib/enlightenment/modules/calendar/weekend.edj
 %%NLS%%share/locale/ja/LC_MESSAGES/calendar.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/calendar.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/calendar.mo
+@dirrm lib/enlightenment/modules/calendar/%%MODULE_ARCH%%
 @dirrm lib/enlightenment/modules/calendar
diff --git a/x11/e17-module-calendar/Makefile b/x11/e17-module-calendar/Makefile
index 720cd6886157..a0c387313007 100644
--- a/x11/e17-module-calendar/Makefile
+++ b/x11/e17-module-calendar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	calendar
 PORTVERSION=	23062006
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://mbsd.msk.ru/dist/
 PKGNAMEPREFIX=	e17-module-
@@ -26,6 +26,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
 PLIST_SUB+=	NLS=""
diff --git a/x11/e17-module-calendar/files/patch-configure b/x11/e17-module-calendar/files/patch-configure
deleted file mode 100644
index f699d297dc52..000000000000
--- a/x11/e17-module-calendar/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Jun 23 16:03:16 2006
-+++ configure	Fri Jun 23 16:03:40 2006
-@@ -23394,7 +23394,7 @@
- 
- 
- 
--MODULE_ARCH="$host_os-$host_cpu"
-+MODULE_ARCH=""
- 
- 
- cat >>confdefs.h <<_ACEOF
diff --git a/x11/e17-module-calendar/pkg-plist b/x11/e17-module-calendar/pkg-plist
index 2032666f74b9..e74419126e29 100644
--- a/x11/e17-module-calendar/pkg-plist
+++ b/x11/e17-module-calendar/pkg-plist
@@ -3,10 +3,10 @@ lib/enlightenment/modules/calendar/arrow.edj
 lib/enlightenment/modules/calendar/backimage.edj
 lib/enlightenment/modules/calendar/calendar.edj
 lib/enlightenment/modules/calendar/label.edj
-lib/enlightenment/modules/calendar/module.a
+lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.a
 lib/enlightenment/modules/calendar/module.eap
-lib/enlightenment/modules/calendar/module.la
-lib/enlightenment/modules/calendar/module.so
+lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.la
+lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.so
 lib/enlightenment/modules/calendar/module_icon.png
 lib/enlightenment/modules/calendar/today.edj
 lib/enlightenment/modules/calendar/topimage.edj
@@ -19,4 +19,5 @@ lib/enlightenment/modules/calendar/weekend.edj
 %%NLS%%share/locale/ja/LC_MESSAGES/calendar.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/calendar.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/calendar.mo
+@dirrm lib/enlightenment/modules/calendar/%%MODULE_ARCH%%
 @dirrm lib/enlightenment/modules/calendar