[pkgsrc/trunk]: pkgsrc/net/icsi-finger Fix Solaris detection; should fix Sola...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3faaa7f7fbbe
branches:  trunk
changeset: 639369:3faaa7f7fbbe
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Thu Sep 11 21:27:09 2014 +0000

description:
Fix Solaris detection; should fix Solaris build.

diffstat:

 net/icsi-finger/Makefile         |   7 ++++++-
 net/icsi-finger/distinfo         |   4 ++--
 net/icsi-finger/patches/patch-ac |  12 +++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diffs (70 lines):

diff -r cd7735fc9aaa -r 3faaa7f7fbbe net/icsi-finger/Makefile
--- a/net/icsi-finger/Makefile  Thu Sep 11 17:08:00 2014 +0000
+++ b/net/icsi-finger/Makefile  Thu Sep 11 21:27:09 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/10/10 00:08:40 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2014/09/11 21:27:09 dholland Exp $
 #
 
 DISTNAME=      icsi-finger-1.0.29
@@ -23,11 +23,16 @@
 TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
 
 .include "../../mk/compiler.mk"
+.include "../../mk/bsd.prefs.mk"
 
 .if !empty(PKGSRC_COMPILER:Mclang)
 CPPFLAGS+=     -Wno-error=return-type
 .endif
 
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=     CPP_ARGS=-DSVR4
+.endif
+
 pre-configure:
                chmod +w ${WRKSRC}/config.h
                ${ECHO} \#define ManDir ${PREFIX}/${PKGMANDIR} >> \
diff -r cd7735fc9aaa -r 3faaa7f7fbbe net/icsi-finger/distinfo
--- a/net/icsi-finger/distinfo  Thu Sep 11 17:08:00 2014 +0000
+++ b/net/icsi-finger/distinfo  Thu Sep 11 21:27:09 2014 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.17 2013/07/01 10:43:50 joerg Exp $
+$NetBSD: distinfo,v 1.18 2014/09/11 21:27:09 dholland Exp $
 
 SHA1 (icsi-finger-1.0.29.tar.Z) = 7c61ce8c847ff6e40ecc3de909c3db1a4b996d04
 RMD160 (icsi-finger-1.0.29.tar.Z) = 5047e636538ae66cf0ba3e170dc3a3edb31f317a
 Size (icsi-finger-1.0.29.tar.Z) = 302729 bytes
 SHA1 (patch-aa) = d68de6daa5a9ebaeb57cd5afd723f502a72d7dc5
 SHA1 (patch-ab) = d8a719d78288aad8ab3a7159f332afdd59231ebb
-SHA1 (patch-ac) = 6348df24858979b42b99ad7f34b2f388c602d3bd
+SHA1 (patch-ac) = ad13f2c4bb781fbeab4399cc0812f43f6052a74f
 SHA1 (patch-ad) = de1489cf9860bd412a43a875a43eae69dd559606
 SHA1 (patch-ae) = 7613ee307bb047d5e5c794b829dcd1cb1c8edb81
 SHA1 (patch-ah) = 9e3b5dc141395d36140f4b1166bad7429f3a0977
diff -r cd7735fc9aaa -r 3faaa7f7fbbe net/icsi-finger/patches/patch-ac
--- a/net/icsi-finger/patches/patch-ac  Thu Sep 11 17:08:00 2014 +0000
+++ b/net/icsi-finger/patches/patch-ac  Thu Sep 11 21:27:09 2014 +0000
@@ -1,6 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2013/07/01 10:43:50 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2014/09/11 21:27:09 dholland Exp $
 
---- Makefile.orig      1998-04-04 19:27:42.000000000 +0000
+- configure for pkgsrc
+- always use tradcpp
+- quote $(CC) bmake-style when passing to cpp
+- allow putting stuff in CPP_ARGS from the pkgsrc makefile
+- improve post-cpp seddery (?)
+
+--- Makefile.orig      1999-03-29 06:09:39.000000000 +0000
 +++ Makefile
 @@ -44,22 +44,8 @@ DEFINES = -DSVR4
  DEFINES = 
@@ -31,7 +37,7 @@
  
  CPPFLAGS = $(SYSTEM) $(CPP_DEFINES)
 -CPP_ARGS = -DCPP_CC="$(CC)" -DIncludes=$(INCLUDES)
-+CPP_ARGS = -DCPP_CC=${CC:Q} -DIncludes=$(INCLUDES)
++CPP_ARGS += -DCPP_CC=${CC:Q} -DIncludes=$(INCLUDES)
  
  all:  $(SRC)$(MKFILE)
  #     (cd $(SRC); $(MAKE) -f $(MKFILE) depend)