diff options
author | jlam <jlam> | 2002-10-23 00:07:07 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-10-23 00:07:07 +0000 |
commit | 76783b1177727b497335889bb93b29459e7de821 (patch) | |
tree | f376cd0b6c188f624033f19e4dc58bacfe8c3c71 /mail | |
parent | c2ec225646232bc82400d8acb2cecc6bc3b0aeeb (diff) | |
download | pkgsrc-76783b1177727b497335889bb93b29459e7de821.tar.gz |
buildlink1 -> buildlink2 and use bsd.pkg.install.mk to properly handle
elm.mimetypes-dist. Also add a few files to PLIST that were installed but
not listed.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/elm-me/Makefile | 21 | ||||
-rw-r--r-- | mail/elm-me/PLIST | 12 |
2 files changed, 18 insertions, 15 deletions
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile index bd7e60270ae..91c55f0f0eb 100644 --- a/mail/elm-me/Makefile +++ b/mail/elm-me/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/08/13 22:10:21 kim Exp $ +# $NetBSD: Makefile,v 1.6 2002/10/23 00:07:07 jlam Exp $ # FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp # @@ -15,13 +15,17 @@ COMMENT= ELM Mail User Agent with ME extensions CONFLICTS= elm-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES HAS_CONFIGURE= YES CONFIGURE_SCRIPT= ksh ./Configure CONFIGURE_ENV= PREFIX="${PREFIX}" RUN_AS_BATCH=yes CONFIGURE_ARGS= -S WRKSRC= ${WRKDIR}/elm2.4.ME+.93 +INSTALL_DIRS= ${WRKSRC} ${WRKSRC}/nls + +SUPPORT_FILES= ${PREFIX}/lib/elm.mimetypes-dist \ + ${PREFIX}/lib/elm.mimetypes pre-configure: ${CP} ${FILESDIR}/config.sh ${WRKSRC}/ @@ -29,18 +33,13 @@ pre-configure: ${SED} -e 's:__PREFIX:'${PREFIX}':g'< ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS post-install: - cd ${WRKSRC}/nls; ${MAKE} install - if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \ - ${INSTALL_DATA} \ - ${FILESDIR}/elm.mimetypes ${PREFIX}/lib/elm.mimetypes-dist; \ - else \ - ${INSTALL_DATA} \ - ${FILESDIR}/elm.mimetypes ${PREFIX}/lib; \ - fi + ${INSTALL_DATA} ${FILESDIR}/elm.mimetypes \ + ${PREFIX}/lib/elm.mimetypes-dist post-configure: ${TOUCH} ${WRKSRC}/config.sh ${TOUCH} ${WRKSRC}/config.h -.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/elm-me/PLIST b/mail/elm-me/PLIST index 3cf157dbf75..b1f846ce819 100644 --- a/mail/elm-me/PLIST +++ b/mail/elm-me/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:52 zuntum Exp $ -bin/elm +@comment $NetBSD: PLIST,v 1.2 2002/10/23 00:07:07 jlam Exp $ bin/answer bin/checkalias +bin/elm bin/elmalias bin/fastmail bin/frm @@ -13,14 +13,17 @@ bin/nfrm bin/printmail bin/readmsg bin/wnewmail -lib/elmcharset +lib/elm.map.bin/unidata.bin lib/elm-help.0 lib/elm-help.1 lib/elm-help.2 lib/elm-help.3 lib/elm.mimecharsets -lib/elm.mimetypes +lib/elm.mimetypes-dist +lib/elmcharset lib/elmrc-info +lib/elmterminal +lib/elmunidata lib/prlong man/cat1/answer.0 man/cat1/checkalias.0 @@ -51,3 +54,4 @@ man/man1/printmail.1 man/man1/readmsg.1 man/man1/wnewmail.1 share/nls/C/elm2.4me+.cat +@dirrm lib/elm.map.bin |