5 files changed, 17 insertions, 39 deletions
diff --git a/time/plan/Makefile b/time/plan/Makefile
index 88394619571..9fb31f5010e 100644
--- a/time/plan/Makefile
+++ b/time/plan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/07/04 16:18:40 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2016/02/26 10:37:09 jperkin Exp $
 
 DISTNAME=	plan-1.9
 PKGREVISION=	1
@@ -11,20 +11,13 @@ COMMENT=	Schedule planner based on X/Motif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_TOOLS+=	yacc lex
-BUILD_TARGET=	${LOWER_OPSYS}
 
 INSTALLATION_DIRS=	libexec/plan ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 \
 			share/plan/holiday
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "IRIX"
-BUILD_TARGET=	${LOWER_VENDOR}${OS_VERSION:C/.[0-9]//}
-.endif
-
-.if ${OPSYS} == "SunOS"
-BUILD_TARGET=	"solg"
-.endif
+BUILD_TARGET.IRIX=	${LOWER_VENDOR}${OS_VERSION:C/.[0-9]//}
+BUILD_TARGET.SunOS=	solg
+BUILD_TARGET.*=		${LOWER_OPSYS}
 
 .include "../../mk/compiler.mk"
 
diff --git a/time/wmCalClock/Makefile b/time/wmCalClock/Makefile
index 787fa0b119e..ae41616cdc2 100644
--- a/time/wmCalClock/Makefile
+++ b/time/wmCalClock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/02/26 10:37:09 jperkin Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
@@ -17,11 +17,7 @@ USE_TOOLS+=	gmake
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	EXTRALIBS="-lsocket -lnsl"
-.endif
+MAKE_ENV.SunOS+=	EXTRALIBS="-lsocket -lnsl"
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 \
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 5ace2c452f8..a233e695ecd 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/08/06 22:38:28 khorben Exp $
+# $NetBSD: Makefile,v 1.24 2016/02/26 10:37:09 jperkin Exp $
 
 DISTNAME=	wmMoonClock-1.27
 PKGREVISION=	1
@@ -12,14 +12,9 @@ COMMENT=	Shows lunar ephemeris to fairly high accuracy
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 USE_TOOLS+=	gmake
 
-MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+=	EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-EXTRA_LOCAL_LIBS=	-lsocket
-.endif
+OPSYSVARS+=		MAKE_FLAGS
+MAKE_FLAGS+=		CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS.SunOS+=	EXTRA_LOCAL_LIBS=-lsocket
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index f16a5fbea98..86cafa9552e 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2015/04/25 14:24:59 tnn Exp $
+# $NetBSD: Makefile,v 1.115 2016/02/26 10:38:36 jperkin Exp $
 
 DISTNAME=	metacity-2.34.13
 PKGREVISION=	1
@@ -30,10 +30,8 @@ CONFIGURE_ARGS+=	--disable-xinerama
 CONFIGURE_ARGS+=	--disable-compositor
 .endif
 
-CFLAGS.SunOS+=		-std=c99 -D__EXTENSIONS__
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-ansi
-.endif
+CFLAGS.SunOS+=			-std=c99 -D__EXTENSIONS__
+BUILDLINK_TRANSFORM.SunOS+=	rm:-ansi
 
 BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
 
diff --git a/wm/notion/Makefile b/wm/notion/Makefile
index c9bb55f8a97..76c3c0940b1 100644
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/06/14 21:02:46 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/02/26 10:38:36 jperkin Exp $
 
 DISTNAME=	notion-3-2015061300
 PKGNAME=	${DISTNAME:S/3-/3./}
@@ -63,14 +63,10 @@ INSTALLATION_DIRS=	${EGDIR}
 CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
 # Abuse buildlink to add required libraries.
-BUILDLINK_TRANSFORM+=	opt:-Wl,--as-needed:-lsocket
-BUILDLINK_TRANSFORM+=	rm:-Wl,-whole-archive
-BUILDLINK_TRANSFORM+=	rm:-Wl,-no-whole-archive
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,--as-needed:-lsocket
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-whole-archive
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-no-whole-archive
 
 post-install:
 	cd ${WRKSRC} && pax -rw contrib ${DESTDIR}${EGDIR}