diff options
| author | marino <marino@pkgsrc.org> | 2012-08-23 18:04:12 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-23 18:04:12 +0000 |
| commit | 74381dcf06ddb237dd601aa8c0302d9626962e8b (patch) | |
| tree | 809f5e63d2e306dd48f32d7f0a34dda25291b7cd /mail | |
| parent | 0fda1671d331badee61a13eb535aa00bbb747e7e (diff) | |
| download | pkgsrc-74381dcf06ddb237dd601aa8c0302d9626962e8b.tar.gz | |
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.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/fdm/Makefile | 11 | ||||
| -rw-r--r-- | mail/fdm/distinfo | 5 | ||||
| -rw-r--r-- | mail/fdm/patches/patch-aa | 15 | ||||
| -rw-r--r-- | mail/fdm/patches/patch-fdm.h | 15 |
4 files changed, 42 insertions, 4 deletions
diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile index e3e371ba6d9..296096ce68b 100644 --- a/mail/fdm/Makefile +++ b/mail/fdm/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $ +# $NetBSD: Makefile,v 1.2 2012/08/23 18:04:12 marino Exp $ DISTNAME= fdm-1.6 CATEGORIES= mail +PKG_REVISION= 1 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/} MAINTAINER= pkgsrc-users@NetBSD.org @@ -18,6 +19,14 @@ DOCDIR= ${PREFIX}/share/doc/fdm USE_TOOLS+= pax MAKE_ENV+= PCRE=1 +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 + 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 2e6fcdcb022..b1f8910b289 100644 --- a/mail/fdm/distinfo +++ b/mail/fdm/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $ +$NetBSD: distinfo,v 1.2 2012/08/23 18:04:12 marino 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) = 48df1eff56801692dc27a1e8670f155afd392f67 +SHA1 (patch-aa) = 4284d7fc2e88fc9d42fc861e19a890dd526354d6 +SHA1 (patch-fdm.h) = 03ad0167120e06e76f4f1ef086c918c6a0cccf55 diff --git a/mail/fdm/patches/patch-aa b/mail/fdm/patches/patch-aa index 7eb89218712..03fd2b530f0 100644 --- a/mail/fdm/patches/patch-aa +++ b/mail/fdm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $ +$NetBSD: patch-aa,v 1.2 2012/08/23 18:04:12 marino Exp $ cleanup cpp args dans adjust/fix Darwin build @@ -23,3 +23,16 @@ cleanup cpp args dans adjust/fix Darwin build .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@ + + LDFLAGS+= -L/usr/local/lib + .ifdef PROFILE diff --git a/mail/fdm/patches/patch-fdm.h b/mail/fdm/patches/patch-fdm.h new file mode 100644 index 00000000000..efa2a10edf0 --- /dev/null +++ b/mail/fdm/patches/patch-fdm.h @@ -0,0 +1,15 @@ +$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 |