summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2013-08-30 22:36:51 +0000
committerjoerg <joerg>2013-08-30 22:36:51 +0000
commitea2d4b9abceca97b2ed7b90d399ee9d8cea5e533 (patch)
tree491b8f2e4eae44609f4658be038e221f196a500b
parentb645b7e179cd031e4c25305b530b3c911a99fa4c (diff)
downloadpkgsrc-ea2d4b9abceca97b2ed7b90d399ee9d8cea5e533.tar.gz
Don't hard-code /usr/bin/cpp, use tradcpp.
Make return type errors non-fatal for clang.
-rw-r--r--lang/sather/Makefile9
-rw-r--r--lang/sather/distinfo4
-rw-r--r--lang/sather/patches/patch-ae4
3 files changed, 12 insertions, 5 deletions
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 443ef58de48..8e96282c5cb 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2013/06/06 12:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2013/08/30 22:36:51 joerg Exp $
DISTNAME= sather-1.2.3
PKGREVISION= 6
@@ -14,6 +14,8 @@ MAKE_JOBS_SAFE= no
USE_TOOLS+= gmake makeinfo pax perl:run
+BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
+
BUILD_TARGET= full optional
INFO_FILES= yes
@@ -96,6 +98,11 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/Emacs/*.el \
${DESTDIR}${PREFIX}/share/emacs/site-lisp
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+_WRAP_EXTRA_ARGS.CC+= -Wno-error=return-type -Wno-comment -Wno-parentheses-equality
+.endif
+
.include "../../devel/boehm-gc/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
diff --git a/lang/sather/distinfo b/lang/sather/distinfo
index b22103dd307..4e718d62724 100644
--- a/lang/sather/distinfo
+++ b/lang/sather/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/08/27 00:36:25 dholland Exp $
+$NetBSD: distinfo,v 1.12 2013/08/30 22:36:51 joerg Exp $
SHA1 (sather-1.2.3.tar.gz) = 85678468dc99ee1880a38d994d4231e799fcaae6
RMD160 (sather-1.2.3.tar.gz) = 219594b2621df4f4bb75bd41c67b1a26ecb04042
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = d326038193ce2fb459ed19f9ab2ae2b6dce1ace3
SHA1 (patch-ab) = e45f8a8230d1fbe3fc72babbecfa8148699f7906
SHA1 (patch-ac) = 586cdebde7a2c1b49f9b75a33d26980a2c0397f3
SHA1 (patch-ad) = 47218ca16bb8aec4d43f96f0d72b879b24c95f26
-SHA1 (patch-ae) = ba1b6c0d47313793cfab8823cee76952090e53c9
+SHA1 (patch-ae) = 23441ee35fca897c3cd2d3920d87a4d2f78ac691
SHA1 (patch-af) = 1ab2a67446f48c088ec77550d199a9779c50ffb8
SHA1 (patch-ag) = 5cd0a0ab1c1fbf80c6ba424fa1926957ede35715
SHA1 (patch-ah) = 9dad48a3bc7e6af65eb51ae6070b8e67cab9ca2b
diff --git a/lang/sather/patches/patch-ae b/lang/sather/patches/patch-ae
index 051263b8d0c..3fee9cdb885 100644
--- a/lang/sather/patches/patch-ae
+++ b/lang/sather/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2008/07/14 01:23:52 dholland Exp $
+$NetBSD: patch-ae,v 1.4 2013/08/30 22:36:51 joerg Exp $
--- Makefile.orig Thu Nov 4 08:04:28 1999
+++ Makefile Thu May 2 17:09:46 2002
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.3 2008/07/14 01:23:52 dholland Exp $
-CPP=/lib/cpp -C -P
-CC=gcc
-+CPP=/usr/bin/cpp -C -P
++CPP=tradcpp -C -P
+CC?=gcc
EXEC_SUFFIX=
# CC is only used for bootstrapping, check System/Common/CONFIG.proto if