Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2013/02/06 23:22:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/12 23:18:07 tron Exp $

-DISTNAME=		fdm-1.6
+DISTNAME=		fdm-1.7
 PKGREVISION=		1
 CATEGORIES=		mail
-PKG_REVISION=		1
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fdm/}

 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -11,20 +10,19 @@ HOMEPAGE=		http://fdm.sourceforge.net/
 COMMENT=		Fetch or receive mail and deliver it in various ways
 LICENSE=		modified-bsd

+HAS_CONFIGURE=		yes
+
 INSTALLATION_DIRS+=	${EGDIR} ${DOCDIR}
 EGDIR=			${PREFIX}/share/examples/fdm
 DOCDIR=			${PREFIX}/share/doc/fdm

-USE_TOOLS+=		pax
-MAKE_ENV+=		PCRE=1
+USE_TOOLS+=		yacc pax

-SUBST_CLASSES+=		files
-SUBST_STAGE.files=	post-patch
-SUBST_FILES.files=	Makefile
-SUBST_SED.files=	-e "s|@INSTALL_PROGRAM_DIR@|${INSTALL_PROGRAM_DIR}|"
-SUBST_SED.files+=	-e "s|@INSTALL_PROGRAM@|${INSTALL_PROGRAM}|"
-SUBST_SED.files+=	-e "s|@INSTALL_MAN@|${INSTALL_MAN}|"
-SUBST_MESSAGE.files=	Fixing install invocation in Makefile
+.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}
@@ -32,6 +30,5 @@ post-install:

 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
 .include "../../databases/tdb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/mail/fdm/PLIST
+++ b/mail/fdm/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/10/03 11:12:43 obache Exp $
 bin/fdm
 man/man1/fdm.1
 man/man5/fdm.conf.5
 share/doc/fdm/MANUAL
 share/examples/fdm/f-terbeck.conf
 share/examples/fdm/g-lando.conf
-share/examples/fdm/n-marriott-old.conf
 share/examples/fdm/n-marriott.conf
 share/examples/fdm/t-ulmer.conf
 share/examples/fdm/w-maier.conf
--- a/mail/fdm/distinfo
+++ b/mail/fdm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/08/23 18:04:12 marino Exp $
+$NetBSD: distinfo,v 1.4 2013/10/15 14:44:18 joerg Exp $

-SHA1 (fdm-1.6.tar.gz) = fb8042f2355062848ff142c9604069b6657e6a82
-RMD160 (fdm-1.6.tar.gz) = 7e2c846b97dce20e123b8453732e107f88e0de8f
-Size (fdm-1.6.tar.gz) = 192159 bytes
-SHA1 (patch-aa) = 4284d7fc2e88fc9d42fc861e19a890dd526354d6
-SHA1 (patch-fdm.h) = 03ad0167120e06e76f4f1ef086c918c6a0cccf55
+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 (patch-fdm.h) = aa13bc8507c9918fb56ff65e64a83b3b5d29ce14
--- a/mail/fdm/options.mk
+++ b/mail/fdm/options.mk
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2013/10/03 11:12:43 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.fdm
+PKG_SUPPORTED_OPTIONS=	debug pcre
+PKG_SUGGESTED_OPTIONS=	pcre
+
+.include "../../mk/bsd.options.mk"
+
+#
+# Debug
+#
+.if !empty(PKG_OPTIONS:Mdebug)
+   MAKE_ENV+=	FDEBUG=1
+.endif
+
+#
+# PCRE support
+#
+.if !empty(PKG_OPTIONS:Mpcre)
+   MAKE_ENV+=	PCRE=1
+.  include "../../devel/pcre/buildlink3.mk"
+.endif
--- a/mail/fdm/patches/patch-aa
+++ b/mail/fdm/patches/patch-aa
@@ -1,38 +1,49 @@
-$NetBSD: patch-aa,v 1.2 2012/08/23 18:04:12 marino Exp $
+$NetBSD: patch-aa,v 1.4 2013/10/15 14:44:18 joerg Exp $

-cleanup cpp args dans adjust/fix Darwin build
-
--- Makefile.orig	2008-12-22 16:20:05.000000000 +0000
+--- Makefile.orig	2009-06-26 15:58:00.000000000 +0000
 +++ Makefile
-@@ -37,7 +37,7 @@ HDRS= fdm.h array.h fetch.h match.h deli
- YACC= yacc -d
+@@ -5,7 +5,7 @@
+ 
+ VERSION= 1.7
+ 
+-FDEBUG= 1
+#FDEBUG= 1
 
 CC?= cc
-INCDIRS+= -I. -I- -I/usr/local/include
-+INCDIRS+= -I. 
- .ifdef PROFILE
- # Don't use ccache
- CC= /usr/bin/gcc
-@@ -70,7 +70,8 @@ LIBS+= -lpcre
- .if ${OS} == "Darwin"
- SRCS+= compat/strtonum.c
- INCDIRS+= -Icompat -I/usr/local/include/openssl
-CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE
-+CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE -DNO_QUEUE_H -DNO_TREE_H
-+LIBS+=	-lresolv
- .endif
- 
- # NetBSD
-@@ -93,9 +94,9 @@ CFLAGS+= -DNO_STRTONUM
- .endif
- 
- PREFIX?= /usr/local
-INSTALLDIR= install -d
-INSTALLBIN= install -g bin -o root -m 555
-INSTALLMAN= install -g bin -o root -m 444
-+INSTALLDIR= @INSTALL_PROGRAM_DIR@
-+INSTALLBIN= @INSTALL_PROGRAM@
-+INSTALLMAN= @INSTALL_MAN@
- 
+ YACC= yacc -d
+@@ -13,15 +13,7 @@ CFLAGS+= -DBUILD="\"$(VERSION)\""
 LDFLAGS+= -L/usr/local/lib
- .ifdef PROFILE
+ 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
+-		${INSTALLDIR} ${DESTDIR}${PREFIX}/bin
+-		${INSTALLBIN} fdm ${DESTDIR}${PREFIX}/bin/
+-		${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1
+-		${INSTALLMAN} fdm.1 ${DESTDIR}${PREFIX}/man/man1/
+-		${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man5
+-		${INSTALLMAN} fdm.conf.5 ${DESTDIR}${PREFIX}/man/man5/
+		${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+		${BSD_INSTALL_PROGRAM} fdm ${DESTDIR}${PREFIX}/bin/
+		${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+		${BSD_INSTALL_MAN} fdm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+		${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+		${BSD_INSTALL_MAN} fdm.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/
+ 
+ uninstall:
+ 		rm -f ${DESTDIR}${PREFIX}/bin/fdm
--- a/mail/fdm/patches/patch-fdm.h
+++ b/mail/fdm/patches/patch-fdm.h
@@ -1,8 +1,11 @@
-$NetBSD: patch-fdm.h,v 1.1 2012/08/23 18:04:12 marino Exp $
+$NetBSD: patch-fdm.h,v 1.2 2013/10/03 11:12:43 obache Exp $

--- fdm.h.orig	2012-08-23 17:13:57.000000000 +0000
+MAXNAMLEN is not POSIX. For systems that does not define it use NAME_MAX
+macro instead.
+
+--- fdm.h.orig	2011-10-10 13:36:29.000000000 +0000
 +++ fdm.h
-@@ -71,6 +71,10 @@
+@@ -76,6 +76,10 @@
 
 extern char	*__progname;