Conver to use the features framework and include do-build and do-install

targets so that we don't rely on BSD make for the build and install.

Bump the PKGREVISION to 2 as we no longer install the catman page.

4 files changed, 15 insertions, 36 deletions

diff --git a/shells/nologinmsg/Makefile b/shells/nologinmsg/Makefile
index f73b1739c04..5e8ca831c5a 100644
--- a/shells/nologinmsg/Makefile
+++ b/shells/nologinmsg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/09/06 21:51:54 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/08 21:57:13 jlam Exp $
 
 DISTNAME=	nologinmsg-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	shells sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -9,26 +9,22 @@ MAINTAINER=	cjep@NetBSD.org
 #HOMEPAGE=
 COMMENT=	More functional native binary replacement for /sbin/nologin
 
+USE_FEATURES=	getprogname
+
 SUBST_CLASSES+=		nlm
 SUBST_STAGE.nlm=	pre-configure
 SUBST_FILES.nlm=	nologinmsg.8 pathnames.h
 SUBST_SED.nlm=		-e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g'
 
-LIBS.Linux+=	-lnbcompat
-LIBS.IRIX+=	-lnbcompat
-MAKE_FLAGS+=	LDADD=${LIBS:M*:Q}
-MAKE_FLAGS+=	BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
-MAKE_FLAGS+=	MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8
-
-.include "../../mk/bsd.prefs.mk"
-# XXX: ${OPSYS} != "NetBSD" ?
-.if ${OPSYS} == "Linux" || ${OPSYS} == "IRIX" || ${OPSYS} == "Interix"
-MAKE_FLAGS+=	NOMAN=YES
-CFLAGS+=	-D__LIBNBCOMPAT
-.  include "../../pkgtools/libnbcompat/inplace.mk"
-.endif
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -I. ${LDFLAGS}	\
+		-o nologinmsg nologinmsg.c ${LIBS}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/nologinmsg ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/nologinmsg.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/nologinmsg/PLIST b/shells/nologinmsg/PLIST
index 3a387ca7dea..2fc51e86a17 100644
--- a/shells/nologinmsg/PLIST
+++ b/shells/nologinmsg/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/20 23:08:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/09/08 21:57:13 jlam Exp $
 bin/nologinmsg
-man/cat8/nologinmsg.0
 man/man8/nologinmsg.8
diff --git a/shells/nologinmsg/distinfo b/shells/nologinmsg/distinfo
index f0e5167e327..9ff406fc0b1 100644
--- a/shells/nologinmsg/distinfo
+++ b/shells/nologinmsg/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:14:41 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/09/08 21:57:13 jlam Exp $
 
 SHA1 (nologinmsg-1.0.tar.gz) = 2271adfc47985db5e9c3c17f885dd9f728596157
 RMD160 (nologinmsg-1.0.tar.gz) = 2c2e123dc497837169c0fcaee886dd2ab7ce530d
 Size (nologinmsg-1.0.tar.gz) = 2954 bytes
-SHA1 (patch-aa) = 926105531543916c9d183bcc964f15fdd136d6c6
diff --git a/shells/nologinmsg/patches/patch-aa b/shells/nologinmsg/patches/patch-aa
deleted file mode 100644
index 61ca7296828..00000000000
--- a/shells/nologinmsg/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/10 17:05:44 cjep Exp $
-
---- Makefile.orig	2002-09-29 02:42:07.000000000 +0100
-+++ Makefile
-@@ -2,8 +2,8 @@
- PROG=	nologinmsg
- SRCS=	nologinmsg.c
- BINDIR=	${PREFIX}/bin
--MANDIR=	${PREFIX}/man/man
--MAN8=	nologinmsg.8
-+MANDIR=	${PREFIX}/man
-+MAN=	nologinmsg.8
- 
- CFLAGS+=	-g
-