summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-07-01 10:43:50 +0000
committerjoerg <joerg@pkgsrc.org>2013-07-01 10:43:50 +0000
commit3d0c15a8e8ee44c1e8472fbd42fb7a1426f3554b (patch)
treeb33682d5ae894796be8cbcd4cae9ee552788ed07
parenta414abf5451d6f27586944354b7adcaaa654befc (diff)
downloadpkgsrc-3d0c15a8e8ee44c1e8472fbd42fb7a1426f3554b.tar.gz
Use tradcpp as preprocessor instead of second-guessing that cpp
-traditional will work.
-rw-r--r--net/icsi-finger/Makefile10
-rw-r--r--net/icsi-finger/distinfo4
-rw-r--r--net/icsi-finger/patches/patch-ac4
3 files changed, 13 insertions, 5 deletions
diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile
index aafc279fb41..4ac989c2e74 100644
--- a/net/icsi-finger/Makefile
+++ b/net/icsi-finger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/04/06 14:58:20 rodent Exp $
+# $NetBSD: Makefile,v 1.25 2013/07/01 10:43:50 joerg Exp $
#
DISTNAME= icsi-finger-1.0.29
@@ -20,6 +20,14 @@ INSTALLATION_DIRS= bin libexec sbin
INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
INSTALLATION_DIRS+= share/examples/icsi-finger/targets
+TOOLS_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+CPPFLAGS+= -Wno-error=return-type
+.endif
+
pre-configure:
chmod +w ${WRKSRC}/config.h
${ECHO} \#define ManDir ${PREFIX}/${PKGMANDIR} >> \
diff --git a/net/icsi-finger/distinfo b/net/icsi-finger/distinfo
index df43c06c6c3..f78afd4469e 100644
--- a/net/icsi-finger/distinfo
+++ b/net/icsi-finger/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.16 2011/11/23 16:25:07 is Exp $
+$NetBSD: distinfo,v 1.17 2013/07/01 10:43:50 joerg 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) = e3759d714eafae1cc6a8e974d8a79f065f7efe24
+SHA1 (patch-ac) = 6348df24858979b42b99ad7f34b2f388c602d3bd
SHA1 (patch-ad) = de1489cf9860bd412a43a875a43eae69dd559606
SHA1 (patch-ae) = 7613ee307bb047d5e5c794b829dcd1cb1c8edb81
SHA1 (patch-ah) = 9e3b5dc141395d36140f4b1166bad7429f3a0977
diff --git a/net/icsi-finger/patches/patch-ac b/net/icsi-finger/patches/patch-ac
index baedae67579..2ce5edb1efb 100644
--- a/net/icsi-finger/patches/patch-ac
+++ b/net/icsi-finger/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2006/06/08 14:29:26 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2013/07/01 10:43:50 joerg Exp $
--- Makefile.orig 1998-04-04 19:27:42.000000000 +0000
+++ Makefile
@@ -22,7 +22,7 @@ $NetBSD: patch-ac,v 1.2 2006/06/08 14:29:26 joerg Exp $
-CC = cc $(DEFINES)
-CPP = $(CC) -E
-#endif
-+CPP = cpp -traditional
++CPP = tradcpp
DIRNAME = /tmp/dirname
EXCLUDE = /tmp/exclude