summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjoerg <joerg>2013-10-15 14:44:18 +0000
committerjoerg <joerg>2013-10-15 14:44:18 +0000
commitd15c8e2042fa6e5e1d939096386007636ef4f137 (patch)
treee7c1a96bdd6cc3d576c171abe089aff676149c63 /mail
parentb7b8bd8d7d86f86d0db88796bf8a7d3f42544ffc (diff)
downloadpkgsrc-d15c8e2042fa6e5e1d939096386007636ef4f137.tar.gz
Don't use -I-.
Diffstat (limited to 'mail')
-rw-r--r--mail/fdm/distinfo4
-rw-r--r--mail/fdm/patches/patch-aa24
2 files changed, 21 insertions, 7 deletions
diff --git a/mail/fdm/distinfo b/mail/fdm/distinfo
index 85553fe2a04..9a58891d9c6 100644
--- a/mail/fdm/distinfo
+++ b/mail/fdm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2013/10/03 11:12:43 obache Exp $
+$NetBSD: distinfo,v 1.4 2013/10/15 14:44:18 joerg Exp $
SHA1 (fdm-1.7.tar.gz) = 5534d1ec1831794e092e0821db70f36b7e1ee961
RMD160 (fdm-1.7.tar.gz) = 942f0989501645aa7e04bd428510daa309e8fca6
Size (fdm-1.7.tar.gz) = 199808 bytes
-SHA1 (patch-aa) = 1bd7ccac945d0cb2cd23f992a58c740b9372455f
+SHA1 (patch-aa) = 8d3b3c6b7f42f8a88420a17c34a545a23fa2e9a4
SHA1 (patch-fdm.h) = aa13bc8507c9918fb56ff65e64a83b3b5d29ce14
diff --git a/mail/fdm/patches/patch-aa b/mail/fdm/patches/patch-aa
index 57961f3b940..c14faa51b30 100644
--- a/mail/fdm/patches/patch-aa
+++ b/mail/fdm/patches/patch-aa
@@ -1,7 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2013/10/03 11:12:43 obache Exp $
-
-* disable DEBUG knob, it will be controlled with option.
-* fixes manpath and installation command for unprivileged build.
+$NetBSD: patch-aa,v 1.4 2013/10/15 14:44:18 joerg Exp $
--- Makefile.orig 2009-06-26 15:58:00.000000000 +0000
+++ Makefile
@@ -14,7 +11,24 @@ $NetBSD: patch-aa,v 1.3 2013/10/03 11:12:43 obache Exp $
CC?= cc
YACC= yacc -d
-@@ -76,12 +76,12 @@ regress: fdm
+@@ -13,15 +13,7 @@ CFLAGS+= -DBUILD="\"$(VERSION)\""
+ LDFLAGS+= -L/usr/local/lib
+ LIBS+= -lssl -lcrypto -ltdb -lz
+
++CPPFLAGS+=-I.
+-# This sort of sucks but gets rid of the stupid warning and should work on
+-# most platforms...
+-CCV!= (LC_ALL=C ${CC} -v 2>&1|awk '/gcc version 4/') || true
+-.if empty(CCV)
+-CPPFLAGS:= -I. -I- -I/usr/local/include ${CPPFLAGS}
+-.else
+-CPPFLAGS:= -iquote. -I/usr/local/include ${CPPFLAGS}
+-.endif
+-
+ .ifdef FDEBUG
+ LDFLAGS+= -Wl,-E
+ CFLAGS+= -g -ggdb -DDEBUG
+@@ -76,12 +67,12 @@ regress: fdm
cd regress && ${MAKE}
install: all