Thu Aug 23 18:04:12 2012 UTC ()
mail/fdm: Fix non-privileged build and MAXNAMLEN

- The patch was added to define the non-posix MAXNAMLEN macro if it was
  not already defined.
- The Makefile had to patched and then inline-replaced to fix the
  invocation of the install program.  Without this, non-root builds fail.


(marino)
diff -r1.1.1.1 -r1.2 pkgsrc/mail/fdm/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/mail/fdm/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/mail/fdm/patches/patch-aa
diff -r0 -r1.1 pkgsrc/mail/fdm/patches/patch-fdm.h
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/fdm/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/fdm/Makefile 2012/08/17 17:45:40 1.1.1.1
+++ pkgsrc/mail/fdm/Makefile 2012/08/23 18:04:12 1.2
@@ -1,29 +1,38 @@ @@ -1,29 +1,38 @@
1# $NetBSD: Makefile,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $ 1# $NetBSD: Makefile,v 1.2 2012/08/23 18:04:12 marino Exp $
2 2
3DISTNAME= fdm-1.6 3DISTNAME= fdm-1.6
4CATEGORIES= mail 4CATEGORIES= mail
 5PKG_REVISION= 1
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://fdm.sourceforge.net/ 9HOMEPAGE= http://fdm.sourceforge.net/
9COMMENT= Fetch or receive mail and deliver it in various ways 10COMMENT= Fetch or receive mail and deliver it in various ways
10LICENSE= modified-bsd 11LICENSE= modified-bsd
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR} 15INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR}
15EGDIR= ${PREFIX}/share/examples/fdm 16EGDIR= ${PREFIX}/share/examples/fdm
16DOCDIR= ${PREFIX}/share/doc/fdm 17DOCDIR= ${PREFIX}/share/doc/fdm
17 18
18USE_TOOLS+= pax 19USE_TOOLS+= pax
19MAKE_ENV+= PCRE=1 20MAKE_ENV+= PCRE=1
20 21
 22SUBST_CLASSES+= files
 23SUBST_STAGE.files= post-patch
 24SUBST_FILES.files= Makefile
 25SUBST_SED.files= -e "s|@INSTALL_PROGRAM_DIR@|${INSTALL_PROGRAM_DIR}|"
 26SUBST_SED.files+= -e "s|@INSTALL_PROGRAM@|${INSTALL_PROGRAM}|"
 27SUBST_SED.files+= -e "s|@INSTALL_MAN@|${INSTALL_MAN}|"
 28SUBST_MESSAGE.files= Fixing install invocation in Makefile
 29
21post-install: 30post-install:
22 cd ${WRKSRC}/examples && pax -rwpam . ${DESTDIR}${EGDIR} 31 cd ${WRKSRC}/examples && pax -rwpam . ${DESTDIR}${EGDIR}
23 ${INSTALL_DATA} ${WRKSRC}/MANUAL ${DESTDIR}${DOCDIR} 32 ${INSTALL_DATA} ${WRKSRC}/MANUAL ${DESTDIR}${DOCDIR}
24 33
25.include "../../security/openssl/buildlink3.mk" 34.include "../../security/openssl/buildlink3.mk"
26.include "../../devel/zlib/buildlink3.mk" 35.include "../../devel/zlib/buildlink3.mk"
27.include "../../devel/pcre/buildlink3.mk" 36.include "../../devel/pcre/buildlink3.mk"
28.include "../../databases/tdb/buildlink3.mk" 37.include "../../databases/tdb/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/fdm/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/fdm/distinfo 2012/08/17 17:45:40 1.1.1.1
+++ pkgsrc/mail/fdm/distinfo 2012/08/23 18:04:12 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $ 1$NetBSD: distinfo,v 1.2 2012/08/23 18:04:12 marino Exp $
2 2
3SHA1 (fdm-1.6.tar.gz) = fb8042f2355062848ff142c9604069b6657e6a82 3SHA1 (fdm-1.6.tar.gz) = fb8042f2355062848ff142c9604069b6657e6a82
4RMD160 (fdm-1.6.tar.gz) = 7e2c846b97dce20e123b8453732e107f88e0de8f 4RMD160 (fdm-1.6.tar.gz) = 7e2c846b97dce20e123b8453732e107f88e0de8f
5Size (fdm-1.6.tar.gz) = 192159 bytes 5Size (fdm-1.6.tar.gz) = 192159 bytes
6SHA1 (patch-aa) = 48df1eff56801692dc27a1e8670f155afd392f67 6SHA1 (patch-aa) = 4284d7fc2e88fc9d42fc861e19a890dd526354d6
 7SHA1 (patch-fdm.h) = 03ad0167120e06e76f4f1ef086c918c6a0cccf55
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/fdm/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/fdm/patches/Attic/patch-aa 2012/08/17 17:45:40 1.1.1.1
+++ pkgsrc/mail/fdm/patches/Attic/patch-aa 2012/08/23 18:04:12 1.2
@@ -1,25 +1,38 @@ @@ -1,25 +1,38 @@
1$NetBSD: patch-aa,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $ 1$NetBSD: patch-aa,v 1.2 2012/08/23 18:04:12 marino Exp $
2 2
3cleanup cpp args dans adjust/fix Darwin build 3cleanup cpp args dans adjust/fix Darwin build
4 4
5--- Makefile.orig 2008-12-22 16:20:05.000000000 +0000 5--- Makefile.orig 2008-12-22 16:20:05.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -37,7 +37,7 @@ HDRS= fdm.h array.h fetch.h match.h deli 7@@ -37,7 +37,7 @@ HDRS= fdm.h array.h fetch.h match.h deli
8 YACC= yacc -d 8 YACC= yacc -d
9  9
10 CC?= cc 10 CC?= cc
11-INCDIRS+= -I. -I- -I/usr/local/include 11-INCDIRS+= -I. -I- -I/usr/local/include
12+INCDIRS+= -I.  12+INCDIRS+= -I.
13 .ifdef PROFILE 13 .ifdef PROFILE
14 # Don't use ccache 14 # Don't use ccache
15 CC= /usr/bin/gcc 15 CC= /usr/bin/gcc
16@@ -70,7 +70,8 @@ LIBS+= -lpcre 16@@ -70,7 +70,8 @@ LIBS+= -lpcre
17 .if ${OS} == "Darwin" 17 .if ${OS} == "Darwin"
18 SRCS+= compat/strtonum.c 18 SRCS+= compat/strtonum.c
19 INCDIRS+= -Icompat -I/usr/local/include/openssl 19 INCDIRS+= -Icompat -I/usr/local/include/openssl
20-CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE 20-CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE
21+CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE -DNO_QUEUE_H -DNO_TREE_H 21+CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE -DNO_QUEUE_H -DNO_TREE_H
22+LIBS+= -lresolv 22+LIBS+= -lresolv
23 .endif 23 .endif
24  24
25 # NetBSD 25 # NetBSD
 26@@ -93,9 +94,9 @@ CFLAGS+= -DNO_STRTONUM
 27 .endif
 28
 29 PREFIX?= /usr/local
 30-INSTALLDIR= install -d
 31-INSTALLBIN= install -g bin -o root -m 555
 32-INSTALLMAN= install -g bin -o root -m 444
 33+INSTALLDIR= @INSTALL_PROGRAM_DIR@
 34+INSTALLBIN= @INSTALL_PROGRAM@
 35+INSTALLMAN= @INSTALL_MAN@
 36
 37 LDFLAGS+= -L/usr/local/lib
 38 .ifdef PROFILE
File Added: pkgsrc/mail/fdm/patches/Attic/patch-fdm.h
$NetBSD: patch-fdm.h,v 1.1 2012/08/23 18:04:12 marino Exp $

--- fdm.h.orig	2012-08-23 17:13:57.000000000 +0000
+++ fdm.h
@@ -71,6 +71,10 @@
 
 extern char	*__progname;
 
+#ifndef MAXNAMLEN
+#define MAXNAMLEN NAME_MAX
+#endif
+
 /* Linux compatibility bullshit. */
 #ifndef UID_MAX
 #define UID_MAX UINT_MAX