From c38a63e5d4278b3cbf0ab593b165910762a1d371 Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 25 Feb 2016 16:20:49 +0000 Subject: Use OPSYSVARS. --- news/newsfetch/Makefile | 8 ++------ news/nn/Makefile | 22 ++++++++-------------- 2 files changed, 10 insertions(+), 20 deletions(-) (limited to 'news') diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile index 65375702a2c..680c4670a93 100644 --- a/news/newsfetch/Makefile +++ b/news/newsfetch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/08 12:27:41 asau Exp $ +# $NetBSD: Makefile,v 1.12 2016/02/25 16:30:31 jperkin Exp $ # DISTNAME= newsfetch-1.3 @@ -12,11 +12,7 @@ COMMENT= Downloads newsgroup messages in mail file format WRKSRC= ${WRKDIR}/newsfetch -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -LDFLAGS+= -lsocket -lnsl -lresolv -.endif +LDFLAGS.SunOS+= -lsocket -lnsl -lresolv INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 diff --git a/news/nn/Makefile b/news/nn/Makefile index e13c60f433b..f7e0c9238b8 100644 --- a/news/nn/Makefile +++ b/news/nn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2016/01/24 16:14:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.48 2016/02/25 16:30:31 jperkin Exp $ DISTNAME= nn-6.7.3 PKGREVISION= 4 @@ -14,16 +14,14 @@ PKG_SYSCONFSUBDIR= nntp TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp -.include "../../mk/bsd.prefs.mk" -.include "../../mk/compiler.mk" +CPPFLAGS.IRIX+= -DHAVE_TERMIO_H -.if ${OPSYS} == "SunOS" -SFILE= s-sunos5.h -.elif ${OPSYS} == "Linux" -SFILE= s-linux.h -.else -SFILE= s-netbsd.h -.endif +OPSYSVARS+= SFILE +SFILE.SunOS= s-sunos5.h +SFILE.Linux= s-linux.h +SFILE.*= s-netbsd.h + +.include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "i386" MFILE= m-i80386.h @@ -33,10 +31,6 @@ MFILE= m-mipsel.h MFILE= m-${MACHINE_ARCH}.h .endif -.if ${OPSYS} == "IRIX" -CPPFLAGS+= -DHAVE_TERMIO_H -.endif - INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 post-patch: -- cgit v1.2.3