From 00016275bee904e5f375e3ab3ddd9f3cea95b0a9 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Mon, 10 Aug 2015 07:31:31 +0000
Subject: Build and install fuser on Linux. PR 25673 (not actually tested on
 Linux; but package is Linux native so I'm expecting it to work)

---
 sysutils/psmisc/Makefile         | 22 ++++++++++++++++++++--
 sysutils/psmisc/PLIST            |  4 +++-
 sysutils/psmisc/distinfo         |  5 ++---
 sysutils/psmisc/patches/patch-aa | 13 -------------
 sysutils/psmisc/patches/patch-ab | 15 +++++++--------
 5 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 sysutils/psmisc/patches/patch-aa

(limited to 'sysutils')

diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 6dc9d9e125f..2f335a6245e 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/10/09 14:06:59 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/08/10 07:31:31 dholland Exp $
 
 DISTNAME=		psmisc-20.1
 CATEGORIES=		sysutils
-PKGREVISION=		2
+PKGREVISION=		3
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=psmisc/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -13,9 +13,27 @@ LICENSE=		gnu-gpl-v2
 CONFLICTS+=		pstree<=2.16
 
 GNU_CONFIGURE=		yes
+PLIST_VARS+=		fuser
 LIBS+=			${BUILDLINK_LDADD.getopt}
 
+#
+# fuser works only on Linux.
+#
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+PLIST.fuser=		yes
+
+.else
+SUBST_CLASSES+=		fuser
+SUBST_STAGE.fuser=	pre-configure
+SUBST_FILES.fuser=	src/Makefile.in doc/Makefile.in
+SUBST_SED.fuser=	-e '/^man_MANS =/s/fuser.1//' \
+			-e '/^bin_PROGRAMS =/s/fuser//'
+.endif
+
+#
 # "make install" doesn't install the link from killall -> pidof.
+#
 post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/bin/pidof
 	${LN} -f ${DESTDIR}${PREFIX}/bin/killall ${DESTDIR}${PREFIX}/bin/pidof
diff --git a/sysutils/psmisc/PLIST b/sysutils/psmisc/PLIST
index d6172642b69..5506ae42b3a 100644
--- a/sysutils/psmisc/PLIST
+++ b/sysutils/psmisc/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:38 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/08/10 07:31:31 dholland Exp $
+${PLIST.fuser}bin/fuser
 bin/killall
 bin/pidof
 bin/pstree
+${PLIST.fuser}man/man1/fuser.1
 man/man1/killall.1
 man/man1/pidof.1
 man/man1/pstree.1
diff --git a/sysutils/psmisc/distinfo b/sysutils/psmisc/distinfo
index 4dce5e248ea..9834fefda17 100644
--- a/sysutils/psmisc/distinfo
+++ b/sysutils/psmisc/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.6 2014/09/23 22:18:21 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2015/08/10 07:31:31 dholland Exp $
 
 SHA1 (psmisc-20.1.tar.gz) = e969a2f539b181c372b0f82bbbd430c4d57d5d6b
 RMD160 (psmisc-20.1.tar.gz) = 48698ad9f431c881bcb42394f5c912ef91b84d2b
 Size (psmisc-20.1.tar.gz) = 57767 bytes
-SHA1 (patch-aa) = 97b586e06444b9aa2a6ba95c10eaabc93f89c833
-SHA1 (patch-ab) = 4aadacec85e2234c010aad2db5fa9fe469562f4f
+SHA1 (patch-ab) = 74134f6cd2ea0270fdbaff8c0acb9e40767cc5cb
 SHA1 (patch-ac) = 9f9a7c7c5155345a1045aee70a2dd65a25ec7219
 SHA1 (patch-ad) = 6e2886ca59160d161d334e276675f187f138db7c
 SHA1 (patch-ae) = 484305118582c575f8c4827783aa3d5f57b25b5d
diff --git a/sysutils/psmisc/patches/patch-aa b/sysutils/psmisc/patches/patch-aa
deleted file mode 100644
index 5f92deabcf1..00000000000
--- a/sysutils/psmisc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/04/24 16:59:35 jlam Exp $
-
---- doc/Makefile.in.orig	Sat Mar 31 05:40:07 2001
-+++ doc/Makefile.in
-@@ -64,7 +64,7 @@
- TERMCAP_LIB = @TERMCAP_LIB@
- VERSION = @VERSION@
- 
--man_MANS = fuser.1 killall.1 pidof.1 pstree.1
-+man_MANS = killall.1 pidof.1 pstree.1
- 
- EXTRA_DIST = $(man_MANS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/sysutils/psmisc/patches/patch-ab b/sysutils/psmisc/patches/patch-ab
index beee06dddd3..57a76b287b0 100644
--- a/sysutils/psmisc/patches/patch-ab
+++ b/sysutils/psmisc/patches/patch-ab
@@ -1,16 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2001/04/24 16:59:35 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2015/08/10 07:31:31 dholland Exp $
 
---- src/Makefile.in.orig	Sat Mar 31 05:40:12 2001
+Honor pkgsrc CFLAGS.
+
+--- src/Makefile.in.orig	2001-03-31 10:40:12.000000000 +0000
 +++ src/Makefile.in
-@@ -64,9 +64,9 @@
+@@ -64,7 +64,7 @@ PACKAGE = @PACKAGE@
  TERMCAP_LIB = @TERMCAP_LIB@
  VERSION = @VERSION@
  
 -CFLAGS = -Wall
-+#CFLAGS = -Wall
- 
--bin_PROGRAMS = fuser killall pstree
-+bin_PROGRAMS = killall pstree
++CFLAGS += -Wall
  
- fuser_SOURCES = fuser.c comm.h signals.c signals.h signames.h loop.h
+ bin_PROGRAMS = fuser killall pstree
  
-- 
cgit v1.2.3