From f826af41cb86a118ad17dac29f0574cce5ec66ba Mon Sep 17 00:00:00 2001
From: mef <mef@pkgsrc.org>
Date: Mon, 5 Jan 2015 13:56:46 +0000
Subject: Based on PR pkg/49537 by Leonardo Taccari, Update 1.7 to 1.8 (pkgsrc)
   - Remove post-build: target in Makefile     (not necessary now) (upstream) 
  - No immediate ChangeLog, Release note found other than     1.8 is released
 on 2014-12-03

---
 mail/fdm/Makefile         |  9 ++-------
 mail/fdm/distinfo         | 10 +++++-----
 mail/fdm/patches/patch-aa | 32 +++-----------------------------
 3 files changed, 10 insertions(+), 41 deletions(-)

(limited to 'mail')

diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index 7ed2439f8be..f0c35612062 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2014/02/12 23:18:07 tron Exp $
+# $NetBSD: Makefile,v 1.7 2015/01/05 13:56:46 mef Exp $
 
-DISTNAME=		fdm-1.7
-PKGREVISION=		1
+DISTNAME=		fdm-1.8
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fdm/}
 
@@ -20,10 +19,6 @@ USE_TOOLS+=		yacc pax
 
 .include "options.mk"
 
-post-build:
-	${RUN}cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-		-f tools/dist.mk manual
-
 post-install:
 	cd ${WRKSRC}/examples && pax -rwpam . ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/MANUAL ${DESTDIR}${DOCDIR}
diff --git a/mail/fdm/distinfo b/mail/fdm/distinfo
index 9a58891d9c6..eb1de92ede1 100644
--- a/mail/fdm/distinfo
+++ b/mail/fdm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2013/10/15 14:44:18 joerg Exp $
+$NetBSD: distinfo,v 1.5 2015/01/05 13:56:46 mef 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) = 8d3b3c6b7f42f8a88420a17c34a545a23fa2e9a4
+SHA1 (fdm-1.8.tar.gz) = 25c0ebc0c2b43984d04c82d0ba3909acf7403df7
+RMD160 (fdm-1.8.tar.gz) = 460bd3ced27caf248878d803c0efefd090b8e0b1
+Size (fdm-1.8.tar.gz) = 193220 bytes
+SHA1 (patch-aa) = 1464ecfca828c93b90a2700a2329273992cd1959
 SHA1 (patch-fdm.h) = aa13bc8507c9918fb56ff65e64a83b3b5d29ce14
diff --git a/mail/fdm/patches/patch-aa b/mail/fdm/patches/patch-aa
index c14faa51b30..131b14097c7 100644
--- a/mail/fdm/patches/patch-aa
+++ b/mail/fdm/patches/patch-aa
@@ -1,34 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2013/10/15 14:44:18 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2015/01/05 13:56:46 mef Exp $
 
---- Makefile.orig	2009-06-26 15:58:00.000000000 +0000
+--- Makefile.orig	2014-12-02 14:17:21.000000000 +0000
 +++ Makefile
-@@ -5,7 +5,7 @@
- 
- VERSION= 1.7
- 
--FDEBUG= 1
-+#FDEBUG= 1
- 
- CC?= cc
- YACC= yacc -d
-@@ -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
+@@ -68,12 +68,12 @@ regress:	fdm
  		cd regress && ${MAKE}
  
  install:	all
-- 
cgit v1.2.3