diff options
author | hubertf <hubertf> | 1999-10-25 14:38:39 +0000 |
---|---|---|
committer | hubertf <hubertf> | 1999-10-25 14:38:39 +0000 |
commit | 3a1456c147835c724f01bdd4e352c827bb73bba1 (patch) | |
tree | e33f95603d25b9ebf778af73352872c46e7abb83 /mail/elm | |
parent | 28cf2b3a0b541ea961bc81bbfa7359d1a4a73ed6 (diff) | |
download | pkgsrc-3a1456c147835c724f01bdd4e352c827bb73bba1.tar.gz |
Remove conflicts
Diffstat (limited to 'mail/elm')
-rw-r--r-- | mail/elm/Makefile | 12 | ||||
-rw-r--r-- | mail/elm/files/md5 | 4 | ||||
-rw-r--r-- | mail/elm/files/patch-sum | 4 | ||||
-rw-r--r-- | mail/elm/patches/patch-ad | 8 | ||||
-rw-r--r-- | mail/elm/pkg/PLIST | 11 |
5 files changed, 21 insertions, 18 deletions
diff --git a/mail/elm/Makefile b/mail/elm/Makefile index 4c078c6ec4a..73c5af3af04 100644 --- a/mail/elm/Makefile +++ b/mail/elm/Makefile @@ -1,24 +1,26 @@ -# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:09 tsarna Exp $ +# $NetBSD: Makefile,v 1.9 1999/10/25 14:38:39 hubertf Exp $ # FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp # -DISTNAME= elm-2.4ME+32 +DISTNAME= elm-2.4ME+54 CATEGORIES= mail MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \ ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \ ftp://ftp.ibp.fr/pub/unix/mail/elm-me/ MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.myxa.com/elm/ - -WRKSRC= ${WRKDIR}/elm2.4.ME+.32 +HOMEPAGE= http://www.myxa.com/old/elm/ HAS_CONFIGURE= Yes CONFIGURE_SCRIPT= Configure CONFIGURE_ENV= PREFIX="${PREFIX}" CONFIGURE_ARGS= -S +WRKSRC= ${WRKDIR}/elm2.4.ME+.54 + pre-configure: + ${CP} ${FILESDIR}/config.sh ${WRKSRC}/ + ${CP} ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin/ ${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl ${SED} -e 's:__PREFIX:'${PREFIX}':g'< ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS diff --git a/mail/elm/files/md5 b/mail/elm/files/md5 index 2455fa9058a..e507f87624f 100644 --- a/mail/elm/files/md5 +++ b/mail/elm/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:24:59 agc Exp $ +$NetBSD: md5,v 1.3 1999/10/25 14:38:39 hubertf Exp $ -MD5 (elm-2.4ME+32.tar.gz) = 7db4b64a0db169dee2b96a3a031aef88 +MD5 (elm-2.4ME+54.tar.gz) = 189b1bd3ed6f1c8c0e8a116a201ab49e diff --git a/mail/elm/files/patch-sum b/mail/elm/files/patch-sum index ca1e675904e..caf6e4367cd 100644 --- a/mail/elm/files/patch-sum +++ b/mail/elm/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:03 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/25 14:38:39 hubertf Exp $ MD5 (patch-ab) = e273d71fe1bb6842840f342999574f41 MD5 (patch-ac) = 50b949b887c14702ea9c82358008920d -MD5 (patch-ad) = bc902ef8ec4e679b22fe8f5de871611b +MD5 (patch-ad) = 3d90d8158227eeca1c55d918cb2d72d1 diff --git a/mail/elm/patches/patch-ad b/mail/elm/patches/patch-ad index 4a3a753cb8c..e56ddf7e30d 100644 --- a/mail/elm/patches/patch-ad +++ b/mail/elm/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.3 1998/08/07 11:09:33 agc Exp $ +$NetBSD: patch-ad,v 1.4 1999/10/25 14:38:39 hubertf Exp $ --- src/pgp.c.orig Sat May 17 20:30:00 1997 +++ src/pgp.c Thu Apr 16 23:13:29 1998 @@ -6,8 +6,8 @@ $NetBSD: patch-ad,v 1.3 1998/08/07 11:09:33 agc Exp $ dup (fd[1]); close (fd[1]); -- execl(PGP_PATH, -+ execlp(PGP_PATH, - PGP_PATH,"+verbose=0", "+language=en", "-kv", c, (char *)0); +- execl(pgp_path, ++ execlp(pgp_path, + pgp_path,"+verbose=0", "+language=en", "-kv", c, (char *)0); tmp = errno; diff --git a/mail/elm/pkg/PLIST b/mail/elm/pkg/PLIST index 5c812a2ffe7..82c3eab8ccf 100644 --- a/mail/elm/pkg/PLIST +++ b/mail/elm/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/02/25 22:10:05 tron Exp $ +@comment $NetBSD: PLIST,v 1.5 1999/10/25 14:38:39 hubertf Exp $ bin/elm bin/answer bin/checkalias @@ -13,13 +13,14 @@ bin/nfrm bin/printmail bin/readmsg bin/wnewmail -lib/prlong -lib/elm.mimetypes -lib/elmrc-info lib/elm-help.0 lib/elm-help.1 lib/elm-help.2 lib/elm-help.3 +lib/elm.mimecharsets +lib/elm.mimetypes +lib/elmrc-info +lib/prlong man/cat1/answer.0 man/cat1/checkalias.0 man/cat1/elm.0 @@ -46,4 +47,4 @@ man/man1/newmail.1 man/man1/printmail.1 man/man1/readmsg.1 man/man1/wnewmail.1 -share/nls/C/elm2.4.cat +share/nls/C/elm2.4me+.cat |