From owner-freebsd-ports Sun Aug 19 1:10:21 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 382B037B409 for ; Sun, 19 Aug 2001 01:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f7J8A1Z36109; Sun, 19 Aug 2001 01:10:01 -0700 (PDT) (envelope-from gnats) Received: from smtp.noos.fr (racine.noos.net [212.198.2.71]) by hub.freebsd.org (Postfix) with ESMTP id 4A3B037B411 for ; Sun, 19 Aug 2001 01:04:33 -0700 (PDT) (envelope-from root@gits.dyndns.org) Received: (qmail 49979266 invoked by uid 0); 19 Aug 2001 08:04:29 -0000 Received: from unknown (HELO gits.dyndns.org) ([212.198.231.187]) (envelope-sender ) by 212.198.2.71 (qmail-ldap-1.03) with SMTP for ; 19 Aug 2001 08:04:29 -0000 Received: (from root@localhost) by gits.dyndns.org (8.11.4/8.11.4) id f7J84Sj74413; Sun, 19 Aug 2001 10:04:28 +0200 (CEST) (envelope-from root) Message-Id: <200108190804.f7J84Sj74413@gits.dyndns.org> Date: Sun, 19 Aug 2001 10:04:28 +0200 (CEST) From: Cyrille Lefevre Reply-To: clefevre@citeweb.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/29868: Updated port: mail/elm+ME - 2.4ME+94 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 29868 >Category: ports >Synopsis: Updated port: mail/elm+ME - 2.4ME+94 >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: Sun Aug 19 01:10:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.3-STABLE i386 >Organization: ACME >Environment: FreeBSD gits 4.3-STABLE FreeBSD 4.3-STABLE #28: Wed Jul 25 09:04:25 CEST 2001 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: new release of elm 2.4 ME+ pl 94. Makefile version bumped. MAINTAINER email address changed. PATCH_* and LIB_DEPENDS (iconv) added. INSTALLS_SHLIB and LDCONFIG_DIRS added. SCRIPTS_ENV and DOC_FILES updated. distinfo updated. pkg-plist shared libs and docs updated. files/elm.mimetypes updated. files/patch-ag (doc/Makefile.SH) deleted. files/patch-ah (doc/newalias.1) deleted. files/patch-newmbox.c updated. scripts/pre-configure -e added. PREFIX -> LOCALBASE for external programs. new iconv support added (untested). config.sh generation fixed. >How-To-Repeat: n/a >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/Makefile,v retrieving revision 1.69 diff -u -r1.69 Makefile --- Makefile 2001/06/09 12:59:31 1.69 +++ Makefile 2001/08/19 06:19:15 @@ -6,9 +6,10 @@ # PORTNAME= elm+ME -PORTVERSION= 2.4.92 +PORTVERSION= 2.4.94 CATEGORIES= mail DISTNAME= ${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E} +DIST_SUBDIR= ${PORTNAME} # here are the main repositories. MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \ @@ -27,15 +28,21 @@ ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \ ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/ -MAINTAINER= clefevre@redirect.to +PATCHFILES= ${DISTNAME:S/+/+PL/}a.patch.gz \ + ${DISTNAME:S/+/+PL/}b.patch.gz +PATCH_SITES= ${MASTER_SITES} +PATCH_DIST_STRIP= -p1 +MAINTAINER= clefevre@citeweb.net + +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv + # not needed since config.sh is generated by scripts/pre-configure. # BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell # BUILD_DEPENDS= metamail:${PORTSDIR}/mail/metamail # BUILD_DEPENDS= pgp:${PORTSDIR}/security/pgp # BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg -# # Global variables # @@ -44,13 +51,16 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure -SCRIPTS_ENV= CFLAGS="${CFLAGS}" ${PLIST_SUB} \ - PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" +SCRIPTS_ENV= CFLAGS="${CFLAGS}" ${PLIST_SUB} PREFIX="${PREFIX}" \ + LOCALBASE="${LOCALBASE}" MAN1PREFIX="${MAN1PREFIX}" CONFIGURE_ARGS= -S -P ${PREFIX} MAKE_ARGS= MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1" ALL_TARGET= all documentation +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= %%PREFIX%%/%%SHLIB_SUBDIR%% + PLIST_SUB= SO_REV="${SO_REV}" DOC_SUBDIR="${DOC_SUBDIR}" \ LIB_SUBDIR="${LIB_SUBDIR}" SHLIB_SUBDIR="${SHLIB_SUBDIR}" @@ -59,7 +69,6 @@ messages.1 newalias.1 newmail.1 printmail.1 readmsg.1 MLINKS= frm.1 nfrm.1 newmail.1 wnewmail.1 -# # Local variables # @@ -73,13 +82,12 @@ RCD_FILE= 00elm.sh MIME_TYPES= elm.mimetypes -DOC_FILES= README.ME+ shared_libs/tls/README.TLS \ +DOC_FILES= README.ME+ \ + shared_libs/iconv/README.ICONV \ + shared_libs/tls/README.TLS \ doc/Alias.fmtd doc/Config.fmtd doc/Cover.fmtd \ doc/Form.fmtd doc/Ref.fmtd doc/Users.fmtd -AWK?= awk - -# # Post-patch # @@ -100,7 +108,6 @@ patch-nls-files: @${PERL} -pi.fbsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS -# # Post-install # @@ -158,7 +165,6 @@ # lip6 dislike $USER@localhost... FETCH_ENV= FTP_PASSWORD=${FTP_PASSWORD} -AWK?= awk IFCONFIG?= ifconfig # well, this is a hack to make fetch happy on lip6, ugh! Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/distinfo,v retrieving revision 1.38 diff -u -r1.38 distinfo --- distinfo 2001/05/27 12:56:04 1.38 +++ distinfo 2001/08/19 02:52:56 @@ -1 +1,3 @@ -MD5 (elm-2.4ME+92.tar.gz) = fd3ebe8318a6f33cc3f42aeda39808d7 +MD5 (elm+ME/elm-2.4ME+94.tar.gz) = 51e17fea6a2bd8fa49633d07f4047b12 +MD5 (elm+ME/elm-2.4ME+PL94a.patch.gz) = 2f9dafa7e0bfaa8b56566bc876f556ec +MD5 (elm+ME/elm-2.4ME+PL94b.patch.gz) = 6db19ead83eafc7f6449fbbb9e20ee4c Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/pkg-plist,v retrieving revision 1.14 diff -u -r1.14 pkg-plist --- pkg-plist 2001/05/27 12:56:04 1.14 +++ pkg-plist 2001/08/19 05:03:22 @@ -31,9 +31,11 @@ %%LIB_SUBDIR%%/elmunidata %%LIB_SUBDIR%%/prlong %%SHLIB_SUBDIR%%/libelmme-base.so%%SO_REV%% +%%SHLIB_SUBDIR%%/libelmme-iconv.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 Index: files/elm.mimetypes =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/files/elm.mimetypes,v retrieving revision 1.4 diff -u -r1.4 elm.mimetypes --- files/elm.mimetypes 2001/05/27 12:56:05 1.4 +++ files/elm.mimetypes 2001/08/19 05:00:45 @@ -24,11 +24,11 @@ tgz application/octet-stream; type=tar; conversions=x-gzip tbz application/octet-stream; type=tar; conversions=x-bzip tbz2 application/octet-stream; type=tar; conversions=x-bzip2 -#tar application/octet-stream; type=tar +# application/octet-stream; type=tar #Z application/octet-stream #gz application/octet-stream #bz2 application/octet-stream -#zip application/octet-stream; type=zip +#zip application/octet-stream; type=zip [-> application/zip] # PGP users might want the following #pgp application/pgp @@ -963,9 +963,13 @@ mda application/vnd.ms-access mdb application/vnd.ms-access mde application/vnd.ms-access +pwz application/vnd.ms-powerpoint sc2 application/vnd.ms-schedule scd application/vnd.ms-schedule sch application/vnd.ms-schedule +wp5 application/wordperfect5.1 +wk application/x-123 +ckl application/x-fortezza-ckl mocha application/x-javascript jsc application/x-javascript-config pac application/x-ns-proxy-autoconfig @@ -976,6 +980,7 @@ # application/x-pkcs7-mime [-> application/pkcs7-mime] # application/x-pkcs7-signature [-> application/pkcs7-signature] # application/x-sdp [-> application/sdp] +wz application/x-wingz # application/x-zip-compressed [-> application/zip] # Image types @@ -1065,6 +1070,7 @@ # text/directory [-> text/x-directory] # text/htmlh [-> text/x-htmlh] # text/mathml [-> text/x-mathml] +# text/spreadsheet [-> text/x-spreadsheet] # text/x-abiword [-> application/x-abiword] # text/x-applix-word [-> application/x-applix-word] #?? text/x-authors @@ -1092,6 +1098,8 @@ # text/x-python [-> application/x-python] #?? text/x-readme # text/x-scheme [-> application/vnd.lotus-screencam] +slk text/x-spreadsheet +sylk text/x-spreadsheet stx text/x-setext # text/x-sh [-> application/x-sh] #?? text/x-speech @@ -1115,7 +1123,9 @@ # application/msexcel [-> application/vnd.ms-excel] # application/mspowerpoint [-> application/vnd.ms-powerpoint] pgp application/pgp -awb application/x-abiword +# application/qif [-> application/x-qif] +wks application/vnd.lotus-1-2-3 +abw application/x-abiword as application/x-applix-spreadsheet aw application/x-applix-word arj application/x-arj @@ -1128,7 +1138,8 @@ # application/x-bzip-compressed-tar [-> application/octet-stream] #?? application/x-cpio-compressed core application/x-core-file -deb application/x-deb +# application/x-deb [-> application/x-debian-package] +dia application/x-dia-diagram etheme application/x-e-theme #?? application/x-executable-file [-> application/octet-stream] afm application/x-font-afm @@ -1146,21 +1157,32 @@ pfa application/x-font-type1 pfb application/x-font-type1 #?? application/x-font-vfont +glade application/x-glade desktop application/x-gnome-app-info caves application/x-gnome-stones +gnucash application/x-gnucash +gnc application/x-gnucash +xac application/x-gnucash gnumeric application/x-gnumeric -#?? application/x-java-byte-code +# application/x-java-byte-code [-> application/x-java-vm] +jpr application/x-jbuilder-project +jpx application/x-jbuilder-project lha application/x-lha lzh application/x-lzh # application/x-kde-app-info [-> application/x-desktop] #?? application/x-ms-dos-executable o application/x-object-file # application/x-ogg [-> audio/x-ogg] +oleo application/x-oleo # application/x-palm-database [-> application/vnd.palm] #?? application/x-pef-executable # application/x-php [-> application/x-httpd-php4] -#?? application/x-profile +out application/x-profile +qif application/x-qif +# application/x-qw [-> application/x-qif] +sml application/x-smil rar application/x-rar +# application/x-rar-compressed [-> application/x-rar] rej application/x-reject rpm application/x-rpm so application/x-shared-library @@ -1173,6 +1195,7 @@ #?? application/x-troff-man-compressed a application/x-unix-archive # application/x-wordperfect [-> application/wordperfect5.1] +dbf application/x-xbase zoo application/x-zoo # Image types @@ -1193,17 +1216,21 @@ psd image/x-psd svg image/x-svg # image/x-tga [-> image/x-targa] +wmf image/x-wmf xcf image/x-xcf fig image/x-xfig # Audio types # ----------- +# audio/ac3 [-> audio/x-ac3] +ac3 audio/x-ac3 it audio/x-it # audio/x-mp3 [-> audio/mpeg] -#?? audio/x-mp3-playlist +# audio/x-mp3-playlist [-> audio/x-mpegurl] m3u audio/x-mpegurl ogg audio/x-ogg +# audio/x-real-audio [-> audio/vnd.rn-realaudio] #?? audio/x-riff # audio/x-s3m [-> audio/x-mod] # audio/x-stm [-> audio/x-mod] @@ -1218,9 +1245,13 @@ # video/isivideo [-> video/x-isivideo] # video/vivo [-> video/vnd.vivo] # video/wavelet [-> video/x-wavelet] +vob video/mpeg +dat video/mpeg anim video/x-anim # video/x-avi [-> video/x-msvideo] #?? video/x-isivideo +# video/x-ms-asf [-> video/vnd.ms-asf] +asx video/vnd.ms-asf #?? video/x-wavelet # video/x-real-video [-> video/vnd.rn-realvideo] @@ -1254,6 +1285,9 @@ # text/english [-> text/plain] #?? text/xmcd +H text/x-c++hdr +hpp text/x-c++hdr +hxx text/x-c++hdr hh text/x-c++hdr C text/x-c++src cc text/x-c++src @@ -1348,8 +1382,7 @@ # Image types # ----------- -# image/vnd.rn-realflash [-> application/x-shockwave-flash2-preview] -# image/vnd.rn-realflash [-> application/x-shockwave-flash] +rf image/vnd.rn-realflash rp image/vnd.rn-realpix # image/x-realaudio [-> audio/vnd.rn-realaudio] @@ -1379,7 +1412,7 @@ # ----------------- swf application/x-shockwave-flash -rf application/x-shockwave-flash2-preview +# application/x-shockwave-flash2-preview [-> image/vnd.rn-realflash] # ====================================================================== # Known unregistered MIME types from StarDivision @@ -1396,6 +1429,33 @@ sgl application/x-sgl smf application/x-smf sdw application/x-swriter + +# ====================================================================== +# Known unregistered MIME types from Links +# ====================================================================== + +# Application types +# ----------------- + +# application/x-debian-package [-> application/x-deb] +phtml application/x-httpd-php +pht application/x-httpd-php +# application/x-maker [-> application/vnd.framemaker] +# application/x-msdos-program [-> application/octet-stream] +# text/comma-separated-values [-> text/x-comma-separated-values] + +# Video types +# ----------- + +# video/dl [-> video/x-dl] +dl video/x-dl +# video/gl [-> video/x-gl] +gl video/x-gl + +# Model types +# ----------- + +vrm model/vrml # ====================================================================== # Known unregistered MIME types from Anywhere Index: files/patch-newmbox.c =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/files/patch-newmbox.c,v retrieving revision 1.1 diff -u -r1.1 patch-newmbox.c --- files/patch-newmbox.c 2001/05/27 12:56:05 1.1 +++ files/patch-newmbox.c 2001/08/19 05:47:47 @@ -1,11 +1,10 @@ ---- src/newmbox.c.orig Tue Feb 6 19:48:32 2001 -+++ src/newmbox.c Sat May 12 21:28:05 2001 -@@ -568,6 +568,33 @@ - } +--- src/newmbox.c.orig Sun Aug 19 07:24:27 2001 ++++ src/newmbox.c Sun Aug 19 07:25:50 2001 +@@ -585,6 +585,36 @@ } -+ else if (NULL != (tmphdr = locate_header_by_name(parsed_headers, -+ "Newsgroups"))) { + if (NULL != (tmphdr = locate_header_by_name(parsed_headers, ++ "Newsgroups"))) { + struct addr_item * addrs = + break_down_address(tmphdr->body, + !(current_header -> status & @@ -17,20 +16,24 @@ + if (current_header->to) + free_addr_items(current_header->to); + current_header->to = addrs; -+ if (debug > 15 && debugfile) { ++ ++#if DEBUG ++ if (Debug.active > 10) { + struct addr_item * p; + for (p = current_header->to; p->addr; p++) { -+ elm_fprintf(debugfile, -+ FRM("-- to[%d] addr='%s' comment='%S' fullname='%S'\n"), -+ p - current_header->to, -+ p->addr, -+ p->comment, -+ p->fullname); ++ DPRINT(Debug,15,(&Debug, ++ "-- newsgroup[%d] addr='%s' comment='%S' fullname='%S'\n", ++ p - current_header->to, ++ p->addr, ++ p->comment, ++ p->fullname)); + } + } ++#endif + } + } + - if (NULL != (tmphdr = locate_header_by_name(parsed_headers, ++ if (NULL != (tmphdr = locate_header_by_name(parsed_headers, "Cc"))) { struct addr_item * addrs = + break_down_address(tmphdr->body, Index: scripts/pre-configure =================================================================== RCS file: /home/ncvs/ports/mail/elm+ME/scripts/pre-configure,v retrieving revision 1.28 diff -u -r1.28 pre-configure --- scripts/pre-configure 2001/05/27 12:56:05 1.28 +++ scripts/pre-configure 2001/08/19 07:56:24 @@ -1,4 +1,4 @@ -#!/bin/sh - +#!/bin/sh -e # # pre-configure script for Elm port to FreeBSD # @@ -121,7 +121,7 @@ ' test='/bin/test' inews='' -ispell='${PREFIX}/bin/ispell' +ispell='${LOCALBASE}/bin/ispell' egrep='/usr/bin/egrep' more='/usr/bin/more' pg='pg' @@ -131,7 +131,7 @@ mail='' cpp='/usr/bin/cpp' perl='' -emacs='${PREFIX}/bin/emacs' +emacs='${LOCALBASE}/bin/emacs' ls='/bin/ls' rmail='/bin/rmail' sendmail='/usr/sbin/sendmail' @@ -195,7 +195,7 @@ d_index='undef' d_internet='' d_ispell='define' -ispell_path='${PREFIX}/bin/ispell' +ispell_path='${LOCALBASE}/bin/ispell' ispell_options='-x' d_locale='define' d_nl_types='define' @@ -203,7 +203,7 @@ d_usenls='' d_mallocvoid='define' d_mboxedit='define' -metamail_path='${PREFIX}/bin/metamail' +metamail_path='${LOCALBASE}/bin/metamail' d_8bitmime='define' d_binarymime='undef' d_dsn='define' @@ -244,7 +244,7 @@ d_shared='define' d_shared_rev='${SO_REV}' d_dlopen_libs='define' -shared_list='tls' +shared_list='iconv tls' d_dynamic_main='define' dynamic_opt='-rdynamic' dlopen_lib='' @@ -292,7 +292,7 @@ suffix='' packer='' optimize='${CFLAGS}' -ccflags='' +ccflags='-D_LIBICONV_VERSION=200' cppflags='' ldflags='-s' cc='cc' @@ -318,20 +318,32 @@ d_bsd='define' locale='locale' d_pgp='define' -pgp='${PREFIX}/bin/pgp' -pgp2_path='${PREFIX}/bin/pgp' -pgp5_dir='${PREFIX}/bin' -gpg_path='${PREFIX}/bin/gpg' +pgp='${LOCALBASE}/bin/pgp' +pgp2_path='${LOCALBASE}/bin/pgp' +pgp5_dir='${LOCALBASE}/bin' +gpg_path='${LOCALBASE}/bin/gpg' special_path='/usr/bin' special_path2='${PREFIX}/bin' locale_dir='/usr/share/locale' CONFIG=true -tls_ok='define' EOF -mv ${WRKSRC}/shared_libs/tls/README.ME+ ${WRKSRC}/shared_libs/tls/README.TLS +mv ${WRKSRC}/shared_libs/iconv/README.ME+ \ + ${WRKSRC}/shared_libs/iconv/README.ICONV -cat > ${WRKSRC}/shared_libs/tls/config.res << EOF +tee -a ${WRKSRC}/config.sh > ${WRKSRC}/shared_libs/iconv/config.res << EOF +# Support for ICONV +iconv_ok='define' +iconv_dir='${LOCALBASE}' +iconv_include_dir='${LOCALBASE}/include' +iconv_lib_dir='${LOCALBASE}/lib' +iconv_link='iconv' +EOF + +mv ${WRKSRC}/shared_libs/tls/README.ME+ \ + ${WRKSRC}/shared_libs/tls/README.TLS + +tee -a ${WRKSRC}/config.sh > ${WRKSRC}/shared_libs/tls/config.res << EOF # Support for TLS tls_ok='define' tls_dir='system' >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message