From 2a2c671056bb85321ec9459f860304c0313642e4 Mon Sep 17 00:00:00 2001
From: itetcu <itetcu@FreeBSD.org>
Date: Wed, 12 Jul 2006 20:19:49 +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/100112
Submited by: maintainer
---
x11/e17-module-deskshow/Makefile | 3 +++
x11/e17-module-deskshow/files/patch-configure | 11 -----------
x11/e17-module-deskshow/pkg-plist | 7 ++++---
3 files changed, 7 insertions(+), 14 deletions(-)
delete mode 100644 x11/e17-module-deskshow/files/patch-configure
(limited to 'x11')
diff --git a/x11/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile
index fea4c81f1c7a..c916051c2adf 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/e17-module-deskshow/Makefile
@@ -7,6 +7,7 @@
PORTNAME= deskshow
PORTVERSION= 20060707
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://mbsd.msk.ru/dist/
PKGNAMEPREFIX= e17-module-
@@ -25,4 +26,6 @@ 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 --git a/x11/e17-module-deskshow/files/patch-configure b/x11/e17-module-deskshow/files/patch-configure
deleted file mode 100644
index bc913371e95e..000000000000
--- a/x11/e17-module-deskshow/files/patch-configure
+++ /dev/null
@@ -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 --git a/x11/e17-module-deskshow/pkg-plist b/x11/e17-module-deskshow/pkg-plist
index 1740d7473880..69ac90bece65 100644
--- a/x11/e17-module-deskshow/pkg-plist
+++ b/x11/e17-module-deskshow/pkg-plist
@@ -5,9 +5,10 @@ lib/enlightenment/modules/deskshow/e17_titlebar_glint2.png
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
+@dirrm lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/deskshow
--
cgit