From 0d6e6a9fe79318b2308dc135183d398e752ea942 Mon Sep 17 00:00:00 2001
From: cheusov <cheusov@pkgsrc.org>
Date: Mon, 9 May 2011 13:06:29 +0000
Subject: Closes PR pkg/41217. Fix PLIST issue on Linux and other OSes, tested
 on NetBSD-5.1 and Linux. Oked by wiz@

---
 graphics/evas/Makefile        | 9 ++++++++-
 graphics/evas/Makefile.common | 6 ++++--
 graphics/evas/PLIST.cserve    | 3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 graphics/evas/PLIST.cserve

(limited to 'graphics')

diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 722329cdead..6ff941f23db 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2011/05/09 13:06:29 cheusov Exp $
 #
 
 COMMENT=	Enlightened Canvas Library
@@ -13,6 +13,13 @@ PKGCONFIG_OVERRIDE=	evas.pc.in
 
 INSTALLATION_DIRS=	lib/evas/modules/loaders lib/evas/modules/savers
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_SRC+=	PLIST
+.if ${OPSYS} != "NetBSD" && ${OPSYS} != "OpenBSD" && ${OPSYS} != "MirBSD"
+PLIST_SRC+=	PLIST.cserve
+.endif
+
 .include "../../devel/eet/buildlink3.mk"
 .include "../../devel/eina/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/graphics/evas/Makefile.common b/graphics/evas/Makefile.common
index cb0eeea55ba..20f5f3b2180 100644
--- a/graphics/evas/Makefile.common
+++ b/graphics/evas/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2011/01/31 10:17:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.10 2011/05/09 13:06:29 cheusov Exp $
 # used by graphics/evas-png/Makefile
 
 DISTNAME=	evas-0.9.9.063
@@ -42,6 +42,8 @@ CONFIGURE_ARGS+=	--disable-image-loader-${mod}
 CONFIGURE_ARGS+=	--enable-cpu-altivec
 .endif
 
-MODULE_ARCH=	${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}-${LOWER_ARCH}-ver-svn-05
+MODULE_ARCH=	${LOWER_OPSYS}-${LOWER_ARCH}
 PLIST_SUBST=	MODULE_ARCH=${MODULE_ARCH}
 PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+
+MAKE_FLAGS+=	MODULE_ARCH=${MODULE_ARCH}
diff --git a/graphics/evas/PLIST.cserve b/graphics/evas/PLIST.cserve
new file mode 100644
index 00000000000..557e7e60a2b
--- /dev/null
+++ b/graphics/evas/PLIST.cserve
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.cserve,v 1.1 2011/05/09 13:06:29 cheusov Exp $
+bin/evas_cserve
+bin/evas_cserve_tool
-- 
cgit v1.2.3