Add MODULE_ARCH to PLIST_SUB, and make portlint happy.

Submitted by:	ssedov at mbsd.msk.ru

3 files changed, 69 insertions, 62 deletions

diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 6cf7237ee2a3..468d977e9082 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	evas
 PORTVERSION=	0.9.9.029
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://enlightenment.freedesktop.org/files/
 
@@ -23,14 +23,16 @@ GNU_CONFIGURE=	yes
 USE_FREETYPE2=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 OPTIONS=	GL "Enable GL support" off
 
+PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GL)                                                           
+.if defined(WITH_GL)
 CONFIGURE_ARGS+=	--enable-gl-x11
 PLIST_SUB+=	WITH_GL=""
 USE_GL=		yes
diff --git a/graphics/evas/files/patch-configure b/graphics/evas/files/patch-configure
deleted file mode 100644
index a399a00dc1dd..000000000000
--- a/graphics/evas/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Mar 16 14:51:32 2006
-+++ configure	Thu Mar 16 14:51:47 2006
-@@ -20148,7 +20148,7 @@
- fi
- 
- 
--MODULE_ARCH="$host_os-$host_cpu"
-+MODULE_ARCH=""
- 
- 
- cat >>confdefs.h <<_ACEOF
diff --git a/graphics/evas/pkg-plist b/graphics/evas/pkg-plist
index fec4164d8ac0..4a103b171268 100644
--- a/graphics/evas/pkg-plist
+++ b/graphics/evas/pkg-plist
@@ -14,54 +14,54 @@ lib/libevas.a
 lib/libevas.la
 lib/libevas.so
 lib/libevas.so.1
-lib/evas/modules/engines/buffer/module.a
-lib/evas/modules/engines/buffer/module.la
-lib/evas/modules/engines/buffer/module.so
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/module.a
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/module.la
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/module.so
-lib/evas/modules/engines/software_generic/module.a
-lib/evas/modules/engines/software_generic/module.la
-lib/evas/modules/engines/software_generic/module.so
-lib/evas/modules/engines/software_x11/module.a
-lib/evas/modules/engines/software_x11/module.la
-lib/evas/modules/engines/software_x11/module.so
-lib/evas/modules/engines/xrender_x11/module.a
-lib/evas/modules/engines/xrender_x11/module.la
-lib/evas/modules/engines/xrender_x11/module.so
-lib/evas/modules/loaders/edb/module.a
-lib/evas/modules/loaders/edb/module.la
-lib/evas/modules/loaders/edb/module.so
-lib/evas/modules/loaders/eet/module.a
-lib/evas/modules/loaders/eet/module.la
-lib/evas/modules/loaders/eet/module.so
-lib/evas/modules/loaders/gif/module.a
-lib/evas/modules/loaders/gif/module.la
-lib/evas/modules/loaders/gif/module.so
-lib/evas/modules/loaders/jpeg/module.a
-lib/evas/modules/loaders/jpeg/module.la
-lib/evas/modules/loaders/jpeg/module.so
-lib/evas/modules/loaders/png/module.a
-lib/evas/modules/loaders/png/module.la
-lib/evas/modules/loaders/png/module.so
-lib/evas/modules/loaders/tiff/module.a
-lib/evas/modules/loaders/tiff/module.la
-lib/evas/modules/loaders/tiff/module.so
-lib/evas/modules/savers/edb/module.a
-lib/evas/modules/savers/edb/module.la
-lib/evas/modules/savers/edb/module.so
-lib/evas/modules/savers/eet/module.a
-lib/evas/modules/savers/eet/module.la
-lib/evas/modules/savers/eet/module.so
-lib/evas/modules/savers/jpeg/module.a
-lib/evas/modules/savers/jpeg/module.la
-lib/evas/modules/savers/jpeg/module.so
-lib/evas/modules/savers/png/module.a
-lib/evas/modules/savers/png/module.la
-lib/evas/modules/savers/png/module.so
-lib/evas/modules/savers/tiff/module.a
-lib/evas/modules/savers/tiff/module.la
-lib/evas/modules/savers/tiff/module.so
+lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.a
+lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.la
+lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.so
+%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.a
+%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.la
+%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.so
+lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.a
+lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.la
+lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.so
+lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.a
+lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.la
+lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.so
+lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.a
+lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.la
+lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.so
+lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.a
+lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.la
+lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.so
+lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.a
+lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.la
+lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.so
+lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.a
+lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.la
+lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.so
+lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.a
+lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.la
+lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.so
+lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.a
+lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.la
+lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.so
+lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.a
+lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.la
+lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.so
+lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.a
+lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.la
+lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.so
+lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.a
+lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.la
+lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.so
+lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.a
+lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.la
+lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.so
+lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.a
+lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.la
+lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.so
+lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.a
+lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.la
+lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.so
 libdata/pkgconfig/evas.pc
 %%DATADIR%%/Vera.ttf
 %%DATADIR%%/VeraBI.ttf
@@ -85,23 +85,39 @@ libdata/pkgconfig/evas.pc
 %%DATADIR%%/t2.png
 %%DATADIR%%/test_pattern.png
 @dirrm %%DATADIR%%
+@dirrm lib/evas/modules/savers/tiff/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/savers/tiff
+@dirrm lib/evas/modules/savers/png/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/savers/png
+@dirrm lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/savers/jpeg
+@dirrm lib/evas/modules/savers/eet/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/savers/eet
+@dirrm lib/evas/modules/savers/edb/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/savers/edb
 @dirrm lib/evas/modules/savers
+@dirrm lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/loaders/tiff
+@dirrm lib/evas/modules/loaders/png/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/loaders/png
+@dirrm lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/loaders/jpeg
+@dirrm lib/evas/modules/loaders/gif/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/loaders/gif
+@dirrm lib/evas/modules/loaders/eet/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/loaders/eet
+@dirrm lib/evas/modules/loaders/edb/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/loaders/edb
 @dirrm lib/evas/modules/loaders
+@dirrm lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/engines/xrender_x11
+@dirrm lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/engines/software_x11
+@dirrm lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/engines/software_generic
+%%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%
 %%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11
+@dirrm lib/evas/modules/engines/buffer/%%MODULE_ARCH%%
 @dirrm lib/evas/modules/engines/buffer
 @dirrm lib/evas/modules/engines
 @dirrm lib/evas/modules