From 35640371dd97c65cc1a06224806827a4b7179887 Mon Sep 17 00:00:00 2001
From: Ion-Mihai Tetcu <itetcu@FreeBSD.org>
Date: Wed, 12 Jul 2006 20:20:57 +0000
Subject: 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/100116
Submited by:    maintainer
---
 x11/e17-module-mem/Makefile              |  4 +++-
 x11/e17-module-mem/files/patch-configure | 11 -----------
 x11/e17-module-mem/pkg-plist             |  7 ++++---
 3 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 x11/e17-module-mem/files/patch-configure

(limited to 'x11')

diff --git a/x11/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index f66abd0817a1..ae7c42ca79ed 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/e17-module-mem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mem
 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-mem/files/patch-configure b/x11/e17-module-mem/files/patch-configure
deleted file mode 100644
index 6c90622c5b13..000000000000
--- a/x11/e17-module-mem/files/patch-configure
+++ /dev/null
@@ -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 --git a/x11/e17-module-mem/pkg-plist b/x11/e17-module-mem/pkg-plist
index 8462c820b7f1..6614afa2ae08 100644
--- a/x11/e17-module-mem/pkg-plist
+++ b/x11/e17-module-mem/pkg-plist
@@ -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 @@ lib/enlightenment/modules/mem/swap_10.png
 %%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
-- 
cgit v1.2.3