Add a PRINT_PLIST_AWK fragment matching the PLIST_SUBST and update the

common base value. Reflect that change in the PLIST files.

16 files changed, 39 insertions, 37 deletions

diff --git a/graphics/evas-buffer/PLIST b/graphics/evas-buffer/PLIST
index cd8ca9a0ec3..dbcc84b99c3 100644
--- a/graphics/evas-buffer/PLIST
+++ b/graphics/evas-buffer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:07 joerg Exp $
 include/Evas_Engine_Buffer.h
-lib/evas/modules/engines/buffer/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+lib/evas/modules/engines/buffer/${MODULE_ARCH}/module.la
 lib/pkgconfig/evas-software-buffer.pc
diff --git a/graphics/evas-edb/PLIST b/graphics/evas-edb/PLIST
index b9486c54af9..845f5dab3e1 100644
--- a/graphics/evas-edb/PLIST
+++ b/graphics/evas-edb/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
-lib/evas/modules/loaders/edb/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
-lib/evas/modules/savers/edb/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:07 joerg Exp $
+lib/evas/modules/loaders/edb/${MODULE_ARCH}/module.la
+lib/evas/modules/savers/edb/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-eet/PLIST b/graphics/evas-eet/PLIST
index 162a333e596..360995d6c6f 100644
--- a/graphics/evas-eet/PLIST
+++ b/graphics/evas-eet/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
-lib/evas/modules/loaders/eet/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
-lib/evas/modules/savers/eet/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:07 joerg Exp $
+lib/evas/modules/loaders/eet/${MODULE_ARCH}/module.la
+lib/evas/modules/savers/eet/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-gif/PLIST b/graphics/evas-gif/PLIST
index d0778662e8a..55e18b931d2 100644
--- a/graphics/evas-gif/PLIST
+++ b/graphics/evas-gif/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
-lib/evas/modules/loaders/gif/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:07 joerg Exp $
+lib/evas/modules/loaders/gif/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-jpeg/PLIST b/graphics/evas-jpeg/PLIST
index f414ab39aef..620b67b6620 100644
--- a/graphics/evas-jpeg/PLIST
+++ b/graphics/evas-jpeg/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
-lib/evas/modules/loaders/jpeg/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
-lib/evas/modules/savers/jpeg/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
+lib/evas/modules/loaders/jpeg/${MODULE_ARCH}/module.la
+lib/evas/modules/savers/jpeg/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-pmaps/PLIST b/graphics/evas-pmaps/PLIST
index a94f14a4e36..36b42083c31 100644
--- a/graphics/evas-pmaps/PLIST
+++ b/graphics/evas-pmaps/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
-lib/evas/modules/loaders/pmaps/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
+lib/evas/modules/loaders/pmaps/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-png/PLIST b/graphics/evas-png/PLIST
index c6decac5a99..78f130ff009 100644
--- a/graphics/evas-png/PLIST
+++ b/graphics/evas-png/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
-lib/evas/modules/loaders/png/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
-lib/evas/modules/savers/png/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
+lib/evas/modules/loaders/png/${MODULE_ARCH}/module.la
+lib/evas/modules/savers/png/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-sdl-16/PLIST b/graphics/evas-sdl-16/PLIST
index 254289423f1..83d22253777 100644
--- a/graphics/evas-sdl-16/PLIST
+++ b/graphics/evas-sdl-16/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
 include/Evas_Engine_SDL_16.h
-lib/evas/modules/engines/software_16_sdl/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+lib/evas/modules/engines/software_16_sdl/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-sdl/PLIST b/graphics/evas-sdl/PLIST
index cd240f2da6c..9418db23e8f 100644
--- a/graphics/evas-sdl/PLIST
+++ b/graphics/evas-sdl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
 include/Evas_Engine_SDL.h
-lib/evas/modules/engines/software_sdl/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+lib/evas/modules/engines/software_sdl/${MODULE_ARCH}/module.la
 lib/pkgconfig/evas-software-sdl.pc
diff --git a/graphics/evas-software-x11/PLIST b/graphics/evas-software-x11/PLIST
index 82442972eb4..bf8b9640448 100644
--- a/graphics/evas-software-x11/PLIST
+++ b/graphics/evas-software-x11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
 include/Evas_Engine_Software_X11.h
-lib/evas/modules/engines/software_x11/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+lib/evas/modules/engines/software_x11/${MODULE_ARCH}/module.la
 lib/pkgconfig/evas-software-x11.pc
diff --git a/graphics/evas-svg/PLIST b/graphics/evas-svg/PLIST
index 217e22987a9..b49a3a14e32 100644
--- a/graphics/evas-svg/PLIST
+++ b/graphics/evas-svg/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:45 joerg Exp $
-lib/evas/modules/loaders/svg/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
+lib/evas/modules/loaders/svg/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-tiff/PLIST b/graphics/evas-tiff/PLIST
index 0aaae82072d..b9dbac71d70 100644
--- a/graphics/evas-tiff/PLIST
+++ b/graphics/evas-tiff/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:45 joerg Exp $
-lib/evas/modules/loaders/tiff/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
-lib/evas/modules/savers/tiff/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
+lib/evas/modules/loaders/tiff/${MODULE_ARCH}/module.la
+lib/evas/modules/savers/tiff/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-xpm/PLIST b/graphics/evas-xpm/PLIST
index e912f9c2404..85826b2bf41 100644
--- a/graphics/evas-xpm/PLIST
+++ b/graphics/evas-xpm/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:45 joerg Exp $
-lib/evas/modules/loaders/xpm/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
+lib/evas/modules/loaders/xpm/${MODULE_ARCH}/module.la
diff --git a/graphics/evas-xrender-x11/PLIST b/graphics/evas-xrender-x11/PLIST
index 8ff1001d3f9..c02ec16ea1a 100644
--- a/graphics/evas-xrender-x11/PLIST
+++ b/graphics/evas-xrender-x11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/17 00:48:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $
 include/Evas_Engine_XRender_X11.h
-lib/evas/modules/engines/xrender_x11/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+lib/evas/modules/engines/xrender_x11/${MODULE_ARCH}/module.la
 lib/pkgconfig/evas-xrender-x11.pc
diff --git a/graphics/evas/Makefile.common b/graphics/evas/Makefile.common
index 7a83b6d20d5..4a286ab14dd 100644
--- a/graphics/evas/Makefile.common
+++ b/graphics/evas/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2009/12/17 00:48:43 joerg Exp $
+# $NetBSD: Makefile.common,v 1.8 2010/01/09 15:33:07 joerg Exp $
 
 DISTNAME=	evas-0.9.9.063
 CATEGORIES=	graphics
@@ -41,4 +41,6 @@ CONFIGURE_ARGS+=	--disable-image-loader-${mod}
 CONFIGURE_ARGS+=	--enable-cpu-altivec
 .endif
 
-PLIST_SUBST=	MODULE_ARCH=${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}-${LOWER_ARCH}-ver-svn-03
+MODULE_ARCH=	${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}-${LOWER_ARCH}-ver-svn-05
+PLIST_SUBST=	MODULE_ARCH=${MODULE_ARCH}
+PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
diff --git a/graphics/evas/PLIST b/graphics/evas/PLIST
index fb34b940b78..e9769bd7ca4 100644
--- a/graphics/evas/PLIST
+++ b/graphics/evas/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2009/12/17 00:48:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/01/09 15:33:07 joerg Exp $
 include/Evas.h
-lib/evas/modules/engines/software_generic/${LOWER_OPSYS}-${MACHINE_ARCH}-ver-svn-05/module.la
+lib/evas/modules/engines/software_generic/${MODULE_ARCH}/module.la
 lib/libevas.la
 lib/pkgconfig/evas.pc
 @pkgdir lib/evas/modules/savers