diff options
| -rw-r--r-- | mail/mailcrypt/Makefile | 7 | ||||
| -rw-r--r-- | mail/mailcrypt/PLIST | 3 | ||||
| -rw-r--r-- | mail/mailcrypt/patches/patch-aa | 21 | ||||
| -rw-r--r-- | mail/mairix/Makefile | 15 | ||||
| -rw-r--r-- | mail/mairix/PLIST | 3 | ||||
| -rw-r--r-- | mail/mpop/Makefile | 5 | ||||
| -rw-r--r-- | mail/mpop/PLIST | 3 | ||||
| -rw-r--r-- | mail/msmtp/Makefile | 4 | ||||
| -rw-r--r-- | mail/msmtp/PLIST | 3 |
9 files changed, 23 insertions, 41 deletions
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile index 97bceac885f..4637a8f91df 100644 --- a/mail/mailcrypt/Makefile +++ b/mail/mailcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:55 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/04/05 16:41:34 jlam Exp $ DISTNAME= mailcrypt-3.5.8 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -14,9 +14,8 @@ COMMENT= Emacs frontend for PGP and GPG EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 GNU_CONFIGURE= yes -MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q} - -INFO_FILES= mailcrypt.info +MAKE_FLAGS+= lispdir=${EMACS_LISPPREFIX:Q} +INFO_FILES= # PLIST .include "../../mk/emacs.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailcrypt/PLIST b/mail/mailcrypt/PLIST index a41d2df0986..29524e34af9 100644 --- a/mail/mailcrypt/PLIST +++ b/mail/mailcrypt/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.5 2004/03/07 20:51:55 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/04/05 16:41:34 jlam Exp $ +${EMACS_INFOPREFIX}/mailcrypt.info ${EMACS_LISPPREFIX}/expect.el ${EMACS_LISPPREFIX}/expect.elc ${EMACS_LISPPREFIX}/mailcrypt.el diff --git a/mail/mailcrypt/patches/patch-aa b/mail/mailcrypt/patches/patch-aa deleted file mode 100644 index cb944afd4ba..00000000000 --- a/mail/mailcrypt/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2003/08/11 15:57:43 seb Exp $ - ---- Makefile.in.orig 2002-09-25 04:57:03.000000000 +0000 -+++ Makefile.in -@@ -12,7 +12,7 @@ exec_prefix = @exec_prefix@ - datadir = $(prefix)/share - - # Where to put the .el and .elc files --lispdir = $(datadir)/emacs/site-lisp -+lispdir = $(EMACS_LISPPREFIX) - - # Where to put the Info files - infodir = @infodir@ -@@ -27,7 +27,6 @@ INSTALL_DATA = @INSTALL_DATA@ - INSTALL_INFO = @INSTALL_INFO@ - - # Various auxiliary programs --MAKEINFO=makeinfo - DVIPS=dvips - TEXI2DVI=texi2dvi - TEXI2HTML=texi2html diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile index 4c77bd514d9..5e214b1f6e0 100644 --- a/mail/mairix/Makefile +++ b/mail/mairix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/05 07:06:13 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/04/05 16:41:34 jlam Exp $ # DISTNAME= mairix-0.16.1 @@ -13,23 +13,24 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX:Q} USE_TOOLS+= bison makeinfo -INFO_FILES= mairix.info +INFO_FILES= # PLIST BINDIR= ${PREFIX}/bin -INFODIR= ${PREFIX}/info +INFODIR= ${PREFIX}/${PKGINFODIR} HTMLDIR= ${PREFIX}/share/doc/html/mairix -INSTALLATION_DIRS= bin info +INSTALLATION_DIRS= ${BINDIR} ${INFODIR} ${HTMLDIR} pre-build: cd ${WRKSRC} && makeinfo mairix.texi - cd ${WRKSRC} && makeinfo --no-split --number-sections --html \ + cd ${WRKSRC} && makeinfo --no-split --number-sections --html \ mairix.texi > mairix.html do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mairix ${BINDIR} - ${INSTALL_DATA_DIR} ${HTMLDIR} ${INSTALL_DATA} ${WRKSRC}/mairix.html ${HTMLDIR} - ${INSTALL_DATA} ${WRKSRC}/mairix.info ${INFODIR} + cd ${WRKSRC}; for f in mairix.info mairix.info-[0-9]; do \ + ${TEST} ! -f "$$f" || ${INSTALL_DATA} "$$f" ${INFODIR}; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/mail/mairix/PLIST b/mail/mairix/PLIST index e1fecec3ba5..cc6a4b3bfa5 100644 --- a/mail/mairix/PLIST +++ b/mail/mairix/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/25 00:19:40 simonb Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/04/05 16:41:34 jlam Exp $ bin/mairix +info/mairix.info share/doc/html/mairix/mairix.html @dirrm share/doc/html/mairix diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile index 4ca3dda8002..023b8783fb1 100644 --- a/mail/mpop/Makefile +++ b/mail/mpop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/29 21:58:39 reed Exp $ +# $NetBSD: Makefile,v 1.7 2006/04/05 16:41:34 jlam Exp $ # DISTNAME= mpop-0.8.2 @@ -14,13 +14,12 @@ COMMENT= Small, fast and portable POP3 client GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= pkg-config +INFO_FILES= # PLIST CONFIGURE_ARGS+= --enable-nls EGDIR= ${PREFIX}/share/examples/mpop -INFO_FILES= mpop.info - .include "options.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" diff --git a/mail/mpop/PLIST b/mail/mpop/PLIST index cdc8b6792e2..0316adb9e2d 100644 --- a/mail/mpop/PLIST +++ b/mail/mpop/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/13 03:09:20 minskim Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/04/05 16:41:34 jlam Exp $ bin/mpop +info/mpop.info man/man1/mpop.1 share/examples/mpop/mpoprc.example ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mpop.mo diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 2f9025ed537..77082936890 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/14 20:43:23 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/04/05 16:41:34 jlam Exp $ DISTNAME= msmtp-1.4.5 CATEGORIES= mail @@ -18,7 +18,7 @@ EGDIR= ${PREFIX}/share/examples/msmtp CONF_FILES= ${EGDIR}/msmtprc-user.example \ ${PKG_SYSCONFDIR}/msmtprc -INFO_FILES= msmtp.info +INFO_FILES= # PLIST .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Interix" diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST index ccff680a27d..a04ea5202b9 100644 --- a/mail/msmtp/PLIST +++ b/mail/msmtp/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.4 2006/01/14 20:08:20 ben Exp $ +@comment $NetBSD: PLIST,v 1.5 2006/04/05 16:41:34 jlam Exp $ bin/msmtp +info/msmtp.info man/man1/msmtp.1 share/examples/msmtp/msmtprc-user.example @dirrm share/examples/msmtp |