From c0359992391de9b98ac70e23b74f74800f22e5e9 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Thu, 25 Feb 2016 15:31:00 +0000
Subject: Use OPSYSVARS.

---
 meta-pkgs/kde3/kde3.mk          | 15 +++++----------
 meta-pkgs/xfce4/Makefile.common |  8 ++------
 2 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'meta-pkgs')

diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk
index 7eb7ca53e75..9bc05bd491e 100644
--- a/meta-pkgs/kde3/kde3.mk
+++ b/meta-pkgs/kde3/kde3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.17 2009/07/22 09:01:35 wiz Exp $
+# $NetBSD: kde3.mk,v 1.18 2016/02/25 15:31:00 jperkin Exp $
 #
 # This Makefile fragment is included by packages that use the KDE3
 # configure-and-build process.
@@ -41,18 +41,13 @@ USE_PKGLOCALEDIR=	YES
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${OPSYS} == "Linux"
 # work-around bug noted in PR #25402
-BUILDLINK_TRANSFORM+=	rm:-Wl,--no-undefined
-.endif
+BUILDLINK_TRANSFORM.Linux+=	rm:-Wl,--no-undefined
 
-.if ${OPSYS} == "SunOS"
-GCC_REQD+=		3.3
-.endif
+OPSYSVARS+=		GCC_REQD
+GCC_REQD.SunOS+=	3.3
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--disable-pie
-.endif
+CONFIGURE_ARGS.NetBSD+=	--disable-pie
 
 KDEDIR?=		${PREFIX}
 QTDIR?=			${PREFIX}/qt3
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index 3dc79deca24..744803e40cf 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2015/07/31 09:03:36 youri Exp $
+# $NetBSD: Makefile.common,v 1.58 2016/02/25 15:31:00 jperkin Exp $
 #
 # used by archivers/xfce4-thunar-archive/Makefile
 # used by audio/xfce4-mixer/Makefile
@@ -79,10 +79,6 @@ USE_TOOLS+=		gmake pkg-config msgfmt perl intltool
 
 XFCE4_EGBASE=		${PREFIX}/share/examples/xfce4
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-visibility
-.endif
+CONFIGURE_ARGS.Darwin+=	--disable-visibility
 
 .include "../../x11/gtk2/buildlink3.mk"
-- 
cgit v1.2.3