diff options
author | jmmv <jmmv@pkgsrc.org> | 2002-11-27 19:05:39 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2002-11-27 19:05:39 +0000 |
commit | 424ee9a24186248c9666a3f9726cce6c3fbaa183 (patch) | |
tree | f9105825e2306af4694a2ddfc486f6cc375366a2 /mail | |
parent | 6a78c3e4bb762ad344785f20c53c1256972fde08 (diff) | |
download | pkgsrc-424ee9a24186248c9666a3f9726cce6c3fbaa183.tar.gz |
Change location of mutt examples, so they are installed under the
standard directory share/examples/mutt instead of beeing in
share/doc/mutt/samples. Provide a compatibility symlink.
Also avoid direct installation of files under PKG_SYSCONFDIR. Instead
force mutt to install them inside the examples directory and let
bsd.pkg.install.mk copy them to the right place.
Bump PKGREVISION to 2.
Approved by tron (the maintainer) and wiz.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/mutt/Makefile | 9 | ||||
-rw-r--r-- | mail/mutt/PLIST | 67 | ||||
-rw-r--r-- | mail/mutt/distinfo | 4 | ||||
-rw-r--r-- | mail/mutt/patches/patch-ab | 23 | ||||
-rw-r--r-- | mail/mutt/patches/patch-ad | 28 |
5 files changed, 92 insertions, 39 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 3b0b42b3a24..3d14971a7d2 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.86 2002/10/28 21:09:18 elric Exp $ +# $NetBSD: Makefile,v 1.87 2002/11/27 19:05:39 jmmv Exp $ DISTNAME= mutt-1.4i PKGNAME= ${DISTNAME:C/i$//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \ @@ -60,13 +60,12 @@ CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} BUILD_DEFS+= MUTT_USE_NCURSES MUTT_USE_SLANG MUTT_USE_SSL USE_SASL MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -EGDIR= ${PREFIX}/share/doc/mutt/samples +EGDIR= ${PREFIX}/share/examples/mutt CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc SUPPORT_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types post-install: - ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/share/doc/mutt/samples - ${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/share/doc/mutt/samples + ${LN} -s ${EGDIR} ${PREFIX}/share/doc/mutt/samples .include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST index ea90d56ad57..c28d28ea3d0 100644 --- a/mail/mutt/PLIST +++ b/mail/mutt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/05/29 12:13:52 tron Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/11/27 19:05:40 jmmv Exp $ bin/flea bin/mutt bin/muttbug @@ -32,36 +32,37 @@ share/doc/mutt/html/manual-7.html share/doc/mutt/html/manual.html share/doc/mutt/manual.txt share/doc/mutt/patch-notes.txt -share/doc/mutt/samples/Mush.rc -share/doc/mutt/samples/Muttrc -share/doc/mutt/samples/Pine.rc -share/doc/mutt/samples/Tin.rc -share/doc/mutt/samples/gpg.rc -share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc -share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc -share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc -share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc -share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc -share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc -share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc -share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc -share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc -share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc -share/doc/mutt/samples/iconv/iconv.irix-6.5.rc -share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc -share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc -share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc -share/doc/mutt/samples/mime.types -share/doc/mutt/samples/pgp2.rc -share/doc/mutt/samples/pgp5.rc -share/doc/mutt/samples/pgp6.rc -share/doc/mutt/samples/sample.mailcap -share/doc/mutt/samples/sample.muttrc -share/doc/mutt/samples/sample.muttrc-tlr +share/doc/mutt/samples +share/examples/mutt/Mush.rc +share/examples/mutt/Muttrc +share/examples/mutt/Pine.rc +share/examples/mutt/Tin.rc +share/examples/mutt/gpg.rc +share/examples/mutt/iconv/iconv.aix-3.2.5.rc +share/examples/mutt/iconv/iconv.aix-4.1.5.rc +share/examples/mutt/iconv/iconv.aix-4.2.0.rc +share/examples/mutt/iconv/iconv.aix-4.3.2.rc +share/examples/mutt/iconv/iconv.freebsd-3.3.rc +share/examples/mutt/iconv/iconv.glibc-2.1.3.rc +share/examples/mutt/iconv/iconv.glibc-2.1.90.rc +share/examples/mutt/iconv/iconv.hpux-10.01.rc +share/examples/mutt/iconv/iconv.hpux-10.20.rc +share/examples/mutt/iconv/iconv.hpux-11.00.rc +share/examples/mutt/iconv/iconv.irix-6.5.rc +share/examples/mutt/iconv/iconv.osf1-4.0a.rc +share/examples/mutt/iconv/iconv.osf1-4.0d.rc +share/examples/mutt/iconv/iconv.solaris-2.4.rc +share/examples/mutt/iconv/iconv.solaris-2.5.1.rc +share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc +share/examples/mutt/iconv/iconv.solaris-2.6.rc +share/examples/mutt/iconv/iconv.solaris-2.7.rc +share/examples/mutt/mime.types +share/examples/mutt/pgp2.rc +share/examples/mutt/pgp5.rc +share/examples/mutt/pgp6.rc +share/examples/mutt/sample.mailcap +share/examples/mutt/sample.muttrc +share/examples/mutt/sample.muttrc-tlr ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mutt.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo @@ -88,7 +89,7 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mutt.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mutt.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mutt.mo -@dirrm share/doc/mutt/samples/iconv -@dirrm share/doc/mutt/samples +@dirrm share/examples/mutt/iconv +@dirrm share/examples/mutt @dirrm share/doc/mutt/html @dirrm share/doc/mutt diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 2d5d5ce258c..d1f6037fa34 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.8 2002/08/25 23:06:16 jlam Exp $ +$NetBSD: distinfo,v 1.9 2002/11/27 19:05:40 jmmv Exp $ SHA1 (mutt-1.4i.tar.gz) = 6b7fb8440de18f12ceb24a486a1bbe77fce93955 Size (mutt-1.4i.tar.gz) = 2554158 bytes SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c +SHA1 (patch-ab) = ceb983dd36cd5d8960c41b8f232cc5210b99f50b SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2 +SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab new file mode 100644 index 00000000000..eea715e7aa8 --- /dev/null +++ b/mail/mutt/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.9 2002/11/27 19:05:40 jmmv Exp $ + +--- Makefile.in.orig Wed May 29 11:31:04 2002 ++++ Makefile.in +@@ -23,7 +23,8 @@ bindir = @bindir@ + sbindir = @sbindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ +-sysconfdir = @sysconfdir@ ++sysconfdir = @datadir@/examples/@PACKAGE@ ++realsysconfdir = @sysconfdir@ + sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ +@@ -139,7 +140,7 @@ makedoc_DEPENDENCIES = + + CPP = @CPP@ + +-DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H=1 ++DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(realsysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H=1 + + + INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad new file mode 100644 index 00000000000..a3ebde7181a --- /dev/null +++ b/mail/mutt/patches/patch-ad @@ -0,0 +1,28 @@ +$NetBSD: patch-ad,v 1.4 2002/11/27 19:05:40 jmmv Exp $ + +--- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001 ++++ contrib/Makefile.in +@@ -12,6 +12,7 @@ libdir = @libdir@ + mandir = @mandir@ + srcdir = @srcdir@ + docdir = @docdir@ ++egdir = @datadir@/examples/@PACKAGE@ + top_srcdir = @top_srcdir@ + top_builddir = .. + INSTALL = @INSTALL@ +@@ -37,12 +38,12 @@ distclean: + check: + + install: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(egdir) $(DESTDIR)$(egdir)/iconv + for f in $(SAMPLES) ; do \ +- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ ++ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(egdir) ; \ + done + for f in $(srcdir)/iconv/*.rc ; do \ +- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ ++ $(INSTALL) -m 644 $$f $(DESTDIR)$(egdir)/iconv ; \ + done + + # Nothing needs to be done - uninstall in doc removes samples as well. |