Date: Thu, 31 Jan 2002 02:53:37 +0100 (CET) From: Cyrille Lefevre <cyrille.lefevre@laposte.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34472: Maintainer update: mail/elm+ME (2.4.96b) Message-ID: <200201310153.g0V1rbN30927@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 34472 >Category: ports >Synopsis: Maintainer update: mail/elm+ME (2.4.96b) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jan 30 18:00:14 PST 2002 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.4-STABLE i386 >Organization: ACME >Environment: System: FreeBSD gits 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #14: Fri Jan 11 00:18:07 CET 2002 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: Makefile PORTVERSION bumped PATCHLEVEL and PATCHFILES updated MAKE_ARGS changed to MAKE_ENV MAKEFILE added (needed hack!) DOC_SUBDIR changed from elm to elm+ME DOC_FILES (relpath) changed to match DOCSDIR (abspath) some variables added pre-install and post-install updated distinfo updated pkg-plist sorted +%%LIB_SUBDIR%%/elm.map.txt/* added %%LIB_SUBDIR%%/elm.mimecharsets heuristic added %%LIB_SUBDIR%%/elm.terminalinfo heuristic added @exec [ ! -f ... ] && cp ... changed to [ -f ... ] || cp ... *smpt* added files/patch-ac updated scripts/pre-configure updated smtp added to shared_list mydomain changed from tld.invalid to .invalid smtp heuristic added >How-To-Repeat: n/a >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/Makefile,v retrieving revision 1.73 diff -u -r1.73 Makefile --- Makefile 1 Nov 2001 23:07:13 -0000 1.73 +++ Makefile 31 Jan 2002 01:43:07 -0000 @@ -6,7 +6,7 @@ # PORTNAME= elm+ME -PORTVERSION= 2.4.95${PATCHLEVEL} +PORTVERSION= 2.4.96${PATCHLEVEL} CATEGORIES= mail DISTNAME= ${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E:S|${PATCHLEVEL}||} @@ -25,8 +25,9 @@ # ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \ # ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/ PATCH_SITES= ${MASTER_SITES} -PATCHFILES= ${DISTNAME:S/+/+PL/}a.patch.gz -PATCHLEVEL= a +PATCHFILES= ${DISTNAME:S/+/+PL/}a.patch.gz \ + ${DISTNAME:S/+/+PL/}b.patch.gz +PATCHLEVEL= b PATCH_DIST_STRIP= -p1 MAINTAINER= clefevre@citeweb.net @@ -51,9 +52,12 @@ LOCALBASE="${LOCALBASE}" MAN1PREFIX="${MAN1PREFIX}" CONFIGURE_ARGS= -S -P ${PREFIX} -MAKE_ARGS= MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1" +MAKE_ENV= MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1" ALL_TARGET= all documentation +# hack! don't know why but it's needed. +MAKEFILE= Makefile + INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/%%SHLIB_SUBDIR%% @@ -77,12 +81,19 @@ RCD_SUBDIR= etc/rc.d LIB_SUBDIR= lib/elm SHLIB_SUBDIR= libexec/elm -DOC_SUBDIR= share/doc/elm +DOC_SUBDIR= share/doc/elm+ME + +RCD_DIR= ${PREFIX}/${RCD_SUBDIR} +LIB_DIR= ${PREFIX}/${LIB_SUBDIR} RCD_FILE= 00elm.sh MIME_TYPES= elm.mimetypes +MIME_CSETS= elm.mimecharsets +TERM_INFO= elm.terminalinfo +ELM_RC= elm.rc DOC_FILES= README.ME+ \ shared_libs/iconv/README.ICONV \ + shared_libs/smtp/README.SMTP \ shared_libs/tls/README.TLS \ doc/Alias.fmtd doc/Config.fmtd doc/Cover.fmtd \ doc/Form.fmtd doc/Ref.fmtd doc/Users.fmtd @@ -107,34 +118,76 @@ patch-nls-files: @${PERL} -pi.fbsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS +# Pre-install +# + +pre-install: backup-mime-charsets backup-terminal-info + +backup-mime-charsets: +.if exists(${LIB_DIR}/${MIME_CSETS}) + @${MV} ${LIB_DIR}/${MIME_CSETS} ${LIB_DIR}/${MIME_CSETS}.orig +.endif + +backup-terminal-info: +.if exists(${LIB_DIR}/${TERM_INFO}) + @${MV} ${LIB_DIR}/${TERM_INFO} ${LIB_DIR}/${TERM_INFO}.orig +.endif + # Post-install # post-install: install-startup-files install-nls-files \ - install-doc-files install-mime-types install-global-rc-file \ + install-doc-files install-mime-types \ + install-mime-charsets restore-mime-charsets \ + install-terminal-info restore-terminal-info \ + install-global-rc-file \ remove-catman-files remove-catman-links install-startup-files: - @${INSTALL_SCRIPT} ${WRKSRC}/${RCD_FILE} ${PREFIX}/${RCD_SUBDIR} + @${INSTALL_SCRIPT} ${WRKSRC}/${RCD_FILE} ${RCD_DIR} install-nls-files: @cd ${WRKSRC}/nls; ${MAKE} install install-doc-files: .if !defined(NOPORTSDOC) - @${MKDIR} ${PREFIX}/${DOC_SUBDIR} + @${MKDIR} ${DOCSDIR} .for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR} - @${GZIP_CMD} ${PREFIX}/${DOC_SUBDIR}/${file:T} + @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + @${GZIP_CMD} ${DOCSDIR}/${file:T} .endfor .endif install-mime-types: - @${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} \ - ${PREFIX}/${LIB_SUBDIR}/${MIME_TYPES}-dist -.if !exists(${PREFIX}/${LIB_SUBDIR}/${MIME_TYPES}) - @${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} \ - ${PREFIX}/${LIB_SUBDIR} + @${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} ${LIB_DIR}/${MIME_TYPES}-dist +.if !exists(${LIB_DIR}/${MIME_TYPES}) + @${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} ${LIB_DIR} +.endif + +install-mime-charsets: + @${INSTALL_DATA} ${LIB_DIR}/${MIME_CSETS} ${LIB_DIR}/${MIME_CSETS}-dist +# was +# @${LIB_DIR}/elmcharset -G \ +# -I ${WRKSRC}/ConfTool/killsets \ +# -S ${WRKSRC}/charset/MAPPING/ISO8859 \ +# -w ${LIB_DIR}/${MIME_CSETS}-dist \ +# ${WRKSRC}/bin/${MIME_CSETS} + +restore-mime-charsets: +.if exists(${LIB_DIR}/${MIME_CSETS}.orig) + @${MV} ${LIB_DIR}/${MIME_CSETS}.orig ${LIB_DIR}/${MIME_CSETS} +.endif + +install-terminal-info: + @${INSTALL_DATA} ${LIB_DIR}/${TERM_INFO} ${LIB_DIR}/${TERM_INFO}-dist +# was +# @${LIB_DIR}/elmterminal -G \ +# -w ${LIB_DIR}/${TERM_INFO}-dist \ +# ${WRKSRC}/bin/${TERM_INFO} + +restore-terminal-info: +.if exists(${LIB_DIR}/${TERM_INFO}.orig) + @${MV} ${LIB_DIR}/${TERM_INFO}.orig ${LIB_DIR}/${TERM_INFO} .endif # at installation time, elm already has merged changes to the global @@ -142,14 +195,12 @@ # backup the original rc file, then to generate the -dist rc file # and to restore the backuped rc file. this allow us, at deinstallation # time, to not delete an existing customized rc file. +# same assertion about elm.mimecharsets and elm.terminalinfo. install-global-rc-file: - @${MV} ${PREFIX}/${LIB_SUBDIR}/elm.rc \ - ${PREFIX}/${LIB_SUBDIR}/elm.rc.orig - @${PREFIX}/${LIB_SUBDIR}/elmrc-write -G -I - @${MV} ${PREFIX}/${LIB_SUBDIR}/elm.rc \ - ${PREFIX}/${LIB_SUBDIR}/elm.rc-dist - @${MV} ${PREFIX}/${LIB_SUBDIR}/elm.rc.orig \ - ${PREFIX}/${LIB_SUBDIR}/elm.rc + @${MV} ${LIB_DIR}/${ELM_RC} ${LIB_DIR}/${ELM_RC}.orig + @${LIB_DIR}/elmrc-write -G -I + @${MV} ${LIB_DIR}/${ELM_RC} ${LIB_DIR}/${ELM_RC}-dist + @${MV} ${LIB_DIR}/${ELM_RC}.orig ${LIB_DIR}/${ELM_RC} remove-catman-files: .for sect in ${MSECS} @@ -175,12 +226,11 @@ # only enable the hack if FETCH_CMD is fetch .if !empty(FETCH_CMD_INTERIOR) -# lip6 dislike $USER@localhost... +# some ftp servers dislike $USER@localhost... FETCH_ENV= FTP_PASSWORD=${FTP_PASSWORD} IFCONFIG?= ifconfig -# well, this is a hack to make fetch happy on lip6, ugh! HOSTIPADDR= ${IFCONFIG} | ${AWK} '/inet /{print $$2; exit}' FTP_PASSWORD?= ${USER}@`${HOSTIPADDR}` .endif Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/distinfo,v retrieving revision 1.42 diff -u -r1.42 distinfo --- distinfo 1 Nov 2001 23:07:13 -0000 1.42 +++ distinfo 17 Jan 2002 23:03:12 -0000 @@ -1,2 +1,3 @@ -MD5 (elm-2.4ME+95.tar.gz) = ecb07943ff5e74a71ee39bb2ceb63187 -MD5 (elm-2.4ME+PL95a.patch.gz) = bd686b1cecc3412560d5080b68a9c306 +MD5 (elm-2.4ME+96.tar.gz) = 512c4ab96eb13b95065396c93e2c5bdb +MD5 (elm-2.4ME+PL96a.patch.gz) = ed18d1113734874faf160f72e05be0e0 +MD5 (elm-2.4ME+PL96b.patch.gz) = 1579052ae1e3adb3028b6876466587d5 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/pkg-plist,v retrieving revision 1.16 diff -u -r1.16 pkg-plist --- pkg-plist 1 Nov 2001 23:07:13 -0000 1.16 +++ pkg-plist 31 Jan 2002 01:32:14 -0000 @@ -21,10 +21,29 @@ %%LIB_SUBDIR%%/elm-help.2 %%LIB_SUBDIR%%/elm-help.3 %%LIB_SUBDIR%%/elm.map.bin/unidata.bin -%%LIB_SUBDIR%%/elm.mimecharsets +%%LIB_SUBDIR%%/elm.map.txt/8859-14.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-16.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-2.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-3.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-4.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-5.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-6.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-7.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-8.TXT +%%LIB_SUBDIR%%/elm.map.txt/8859-9.TXT +@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimecharsets %D/%%LIB_SUBDIR%%/elm.mimecharsets-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimecharsets; fi +%%LIB_SUBDIR%%/elm.mimecharsets-dist +@exec [ -f %B/elm.mimecharsets ] || cp %B/%f %B/elm.mimecharsets @unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimetypes %D/%%LIB_SUBDIR%%/elm.mimetypes-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimetypes; fi %%LIB_SUBDIR%%/elm.mimetypes-dist -@exec [ ! -f %B/elm.mimetypes ] && cp %B/%f %B/elm.mimetypes +@exec [ -f %B/elm.mimetypes ] || cp %B/%f %B/elm.mimetypes +@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.rc; fi +%%LIB_SUBDIR%%/elm.rc-dist +@exec if [ -f %B/elm.rc ]; then %D/%%LIB_SUBDIR%%/elmrc-write -G -I; fi +@exec [ -f %B/elm.rc ] || cp %B/%f %B/elm.rc +@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.terminalinfo %D/%%LIB_SUBDIR%%/elm.terminalinfo-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.terminalinfo; fi +%%LIB_SUBDIR%%/elm.terminalinfo-dist +@exec [ -f %B/elm.terminalinfo ] || cp %B/%f %B/elm.terminalinfo %%LIB_SUBDIR%%/elmcharset %%LIB_SUBDIR%%/elmrc-info %%LIB_SUBDIR%%/elmrc-write @@ -33,22 +52,21 @@ %%LIB_SUBDIR%%/prlong %%SHLIB_SUBDIR%%/libelmme-base.so%%SO_REV%% %%SHLIB_SUBDIR%%/libelmme-iconv.so%%SO_REV%% +%%SHLIB_SUBDIR%%/libelmme-smtp.so%%SO_REV%% %%SHLIB_SUBDIR%%/libelmme-tls.so%%SO_REV%% -%%PORTDOCS%%%%DOC_SUBDIR%%/README.ME+.gz -%%PORTDOCS%%%%DOC_SUBDIR%%/README.TLS.gz -%%PORTDOCS%%%%DOC_SUBDIR%%/README.ICONV.gz %%PORTDOCS%%%%DOC_SUBDIR%%/Alias.fmtd.gz %%PORTDOCS%%%%DOC_SUBDIR%%/Config.fmtd.gz %%PORTDOCS%%%%DOC_SUBDIR%%/Cover.fmtd.gz %%PORTDOCS%%%%DOC_SUBDIR%%/Form.fmtd.gz +%%PORTDOCS%%%%DOC_SUBDIR%%/README.ICONV.gz +%%PORTDOCS%%%%DOC_SUBDIR%%/README.ME+.gz +%%PORTDOCS%%%%DOC_SUBDIR%%/README.SMTP.gz +%%PORTDOCS%%%%DOC_SUBDIR%%/README.TLS.gz %%PORTDOCS%%%%DOC_SUBDIR%%/Ref.fmtd.gz %%PORTDOCS%%%%DOC_SUBDIR%%/Users.fmtd.gz share/nls/C/elm2.4me+.cat -@exec if [ -f %D/%%LIB_SUBDIR%%/elm.rc ]; then mv %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc.orig; fi -@exec %D/%%LIB_SUBDIR%%/elmrc-write -G -I; mv %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist -@exec if [ -f %D/%%LIB_SUBDIR%%/elm.rc.orig ]; then mv %D/%%LIB_SUBDIR%%/elm.rc.orig %D/%%LIB_SUBDIR%%/elm.rc; else cp -p %D/%%LIB_SUBDIR%%/elm.rc-dist %D/%%LIB_SUBDIR%%/elm.rc; fi -@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.rc; fi; rm -f %D/%%LIB_SUBDIR%%/elm.rc-dist +%%PORTDOCS%%@dirrm %%DOC_SUBDIR%% +@dirrm %%SHLIB_SUBDIR%% +@dirrm %%LIB_SUBDIR%%/elm.map.txt @dirrm %%LIB_SUBDIR%%/elm.map.bin @unexec rmdir %D/%%LIB_SUBDIR%% 2> /dev/null || : -@dirrm %%SHLIB_SUBDIR%% -%%PORTDOCS%%@dirrm %%DOC_SUBDIR%% Index: files/patch-ac =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/files/patch-ac,v retrieving revision 1.7 diff -u -r1.7 patch-ac --- files/patch-ac 27 May 2001 12:56:05 -0000 1.7 +++ files/patch-ac 19 Jan 2002 16:21:05 -0000 @@ -1,21 +1,37 @@ ---- Configure.orig Fri May 11 19:35:20 2001 -+++ Configure Sun May 13 01:26:06 2001 -@@ -16,10 +16,10 @@ - PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin" - export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$) +--- Configure.orig Sat Jan 19 01:18:12 2002 ++++ Configure Sat Jan 19 17:19:40 2002 +@@ -84,10 +84,10 @@ + yes) + ;; + *) +- if test ! -t 0; then +- echo "Say 'sh Configure', not 'sh <Configure'" +- exit 1 +- fi ++# if test ! -t 0; then ++# echo "Say 'sh Configure', not 'sh <Configure'" ++# exit 1 ++# fi + ;; + esac --if test ! -t 0; then -- echo "Say 'sh Configure', not 'sh <Configure'" -- exit 1 --fi -+# if test ! -t 0; then -+# echo "Say 'sh Configure', not 'sh <Configure'" -+# exit 1 -+# fi - - (alias) >/dev/null 2>&1 && \ - echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \ -@@ -1971,7 +1971,7 @@ +@@ -157,6 +157,7 @@ + nomap=y + fi + . ConfTool/GenCharmap ++ cp doc/terminal.info bin/elm.terminalinfo + exit 0 + ;; + map) +@@ -187,6 +188,7 @@ + nomap=y + fi + . ConfTool/GenCharmap ++ cp doc/terminal.info bin/elm.terminalinfo + exit 0 + ;; + esac +@@ -2050,7 +2052,7 @@ echo "Found shlib directory" fi @@ -24,7 +40,7 @@ LibLoc=`cd ..; pwd`/shlib -@@ -2263,7 +2263,10 @@ +@@ -2342,7 +2344,10 @@ : see if crypt exists echo " " @@ -36,7 +52,7 @@ echo 'crypt() found.' d_crypt="$define" cryptlib='' -@@ -2767,6 +2770,7 @@ +@@ -2846,6 +2851,7 @@ $echo $n "Testing if inet_aton can be used ... $c" $cat > try.c <<'EOF' Index: scripts/pre-configure =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/scripts/pre-configure,v retrieving revision 1.30 diff -u -r1.30 pre-configure --- scripts/pre-configure 1 Nov 2001 23:07:24 -0000 1.30 +++ scripts/pre-configure 21 Jan 2002 02:10:08 -0000 @@ -52,6 +52,7 @@ startsh='#!/bin/sh' define='define' loclist=' +basename cat chgrp chmod @@ -86,8 +87,8 @@ cp='/bin/cp' tail='' tr='/usr/bin/tr' -sort='' -uniq='' +sort='/usr/bin/sort' +uniq='/usr/bin/uniq' grep='/usr/bin/grep' fgrep='/usr/bin/fgrep' head='/usr/bin/head' @@ -96,6 +97,7 @@ compress cpp date +diff emacs execmail finger @@ -106,7 +108,6 @@ lp locale lpr -mailx metamail mips more @@ -130,7 +131,7 @@ uuname vi ' -test='/bin/test' +test='test' inews='' ispell='${LOCALBASE}/bin/ispell' egrep='/usr/bin/egrep' @@ -138,7 +139,7 @@ pg='pg' Mcc='Mcc' vi='/usr/bin/vi' -mailx='mailx' +mailx='' mail='' cpp='/usr/bin/cpp' perl='' @@ -166,6 +167,7 @@ lp='/usr/bin/lp' touch='/usr/bin/touch' make='/usr/bin/make' +make_sets_make='define' date='/bin/date' csh='' pmake='pmake' @@ -176,7 +178,7 @@ execmail='' libswanted='sun nls c_s' noaddlib='yes' -c_date='Sun May 13 02:00:14 CEST 2001' +c_date='Fri Jan 18 00:59:09 CET 2002' d_ascii='undef' d_broke_ctype='undef' d_calendar='define' @@ -255,12 +257,13 @@ d_shared='define' d_shared_rev='${d_shared_rev}' d_dlopen_libs='define' -shared_list='iconv tls' +shared_list='iconv smtp tls' d_dynamic_main='define' dynamic_opt='-rdynamic' dlopen_lib='' rpath_opt='-rpath ' soname_opt='-shared -soname ' +soname_include_path='define' tempnamo='' tempnamc='' d_termio='undef' @@ -272,9 +275,9 @@ defbatsub='no subject (file transmission)' defeditor='/usr/bin/vi' editoropts='' -hostname='' +hostname='localhost' phostname='hostname' -mydomain='tld.invalid' +mydomain='.invalid' autohostname='define' i_memory='define' i_time='define' @@ -328,6 +331,7 @@ d_xenix='undef' d_bsd='define' locale='locale' +have_codeset='undef' d_pgp='define' pgp='${LOCALBASE}/bin/pgp' pgp2_path='${LOCALBASE}/bin/pgp' @@ -349,6 +353,14 @@ iconv_include_dir='${LOCALBASE}/include' iconv_lib_dir='${LOCALBASE}/lib' iconv_link='giconv' +EOF + +mv ${WRKSRC}/shared_libs/smtp/README.ME+ \ + ${WRKSRC}/shared_libs/smtp/README.SMTP + +tee -a ${WRKSRC}/config.sh > ${WRKSRC}/shared_libs/smtp/config.res << EOF +# Support for SMTP +smtp_ok='define' EOF mv ${WRKSRC}/shared_libs/tls/README.ME+ \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201310153.g0V1rbN30927>