From 59ec2e1b4808ae52e2a7f76d3828ed722a26a7c5 Mon Sep 17 00:00:00 2001 From: agc Date: Mon, 27 Sep 1999 13:28:56 +0000 Subject: Make this program compile on Solaris. --- sysutils/skill/Makefile | 16 ++++++++++++---- sysutils/skill/patches/patch-aa | 11 ++++++----- 2 files changed, 18 insertions(+), 9 deletions(-) (limited to 'sysutils/skill') diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile index eae201aa7da..84fd6ade7a8 100644 --- a/sysutils/skill/Makefile +++ b/sysutils/skill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/01/05 19:12:00 kim Exp $ +# $NetBSD: Makefile,v 1.4 1999/09/27 13:28:56 agc Exp $ # # The version number for skill does not match the @P number. # This is normal. @@ -13,14 +13,22 @@ EXTRACT_SUFX= _tar.Z MAINTAINER= kim@tac.nyc.ny.us BINMODE= 02555 -BINGRP= kmem + +.include "../../mk/bsd.prefs.mk" MAKE_ENV+= UVM=${UVM} +.if ${OPSYS} == "NetBSD" +MAKE_ENV+= OSTYPE=bsd-4.4 BINGRP=kmem +.elif ${OPSYS} == "SunOS" +MAKE_ENV+= OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS= +.endif + pre-install: ${INSTALL_PROGRAM} ${WRKSRC}/skill ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/skill.1 ${PREFIX}/man/man1 - ln -s skill ${PREFIX}/bin/snice - ln -s skill.1 ${PREFIX}/man/man1/snice.1 + ${RM} -f ${PREFIX}/bin/snice ${PREFIX}/man/man1/snice.1 + ${LN} -s skill ${PREFIX}/bin/snice + ${LN} -s skill.1 ${PREFIX}/man/man1/snice.1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/skill/patches/patch-aa b/sysutils/skill/patches/patch-aa index 90fe4d2bbb6..cd05de9914a 100644 --- a/sysutils/skill/patches/patch-aa +++ b/sysutils/skill/patches/patch-aa @@ -1,14 +1,15 @@ -$NetBSD: patch-aa,v 1.3 1999/01/05 19:12:00 kim Exp $ +$NetBSD: patch-aa,v 1.4 1999/09/27 13:28:57 agc Exp $ ---- Makefile.orig Wed Oct 28 11:20:26 1998 -+++ Makefile Tue Jan 5 14:02:28 1999 +--- Makefile.orig Wed Oct 28 16:20:26 1998 ++++ Makefile Mon Sep 27 14:18:52 1999 @@ -51,22 +51,29 @@ SHELL= /bin/sh # CONFIGURE: Set location of executable, it's group and mode. -BINDIR= /usr/local/bin +-BINGRP= kmem +BINDIR= ${PREFIX}/bin - BINGRP= kmem ++#BINGRP= kmem BINMOD= 2755 # CONFIGURE: Set location of man directory and man page suffix. @@ -19,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 1999/01/05 19:12:00 kim Exp $ # CONFIGURE(Config): Select an OSTYPE for your machine from the list above. -OSTYPE= sys-5r4 -+OSTYPE= bsd-44 ++#OSTYPE= bsd-44 # CONFIGURE(Config): Add any OS-specific options here. COPTS= -- cgit v1.2.3