Index: head/mail/elm+ME/Makefile =================================================================== --- head/mail/elm+ME/Makefile (revision 117596) +++ head/mail/elm+ME/Makefile (revision 117597) @@ -1,331 +1,337 @@ # New ports collection makefile for: elm ME+ (unofficial Elm) # Date created: 26 June 1995 # Whom: ache # # $FreeBSD$ # PORTNAME= elm+ME PORTVERSION= ${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL:S/_//} CATEGORIES= mail DISTNAME= elm-${ELM_VERSION}ME+${ELM_REVISION} # here are the main repositories. MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \ http://www.ozone.fmi.fi/KEH/ # the following repositories conform to the main repository. MASTER_SITES+= ftp://ftp.lip6.fr/pub/unix/mail/elm-me/ \ ftp://ftp.tu-darmstadt.de/pub/networking/mail/elm+ME/ \ ftp://ftp.cs.tu-berlin.de/pub/net/mail/elm-me-plus/ \ ftp://ftp.ntua.gr/pub/net/mail/elm-me/ \ ftp://ftp.eos.hokudai.ac.jp/pub/network/mail/elm-2.4ME+/ \ ftp://ftp.win.ne.jp/pub/network/mail/elm-2.4ME+/ + # the following repositories maybe conform to the main repository. # MASTER_SITES+= ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \ # 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= # see below. PATCH_DIST_STRIP= -p1 MAINTAINER= cyrille.lefevre@laposte.net COMMENT= A once-popular mail user agent, unofficial clone # 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 # WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./} HAS_CONFIGURE= yes USE_RC_SUBR= yes USE_REINPLACE= yes +USE_OPENSSL= yes CONFIGURE_SCRIPT= Configure SCRIPTS_ENV= CONFIG_PATH="${CONFIG_PATH}" CFLAGS="${CFLAGS}" \ PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \ MAN1PREFIX="${MAN1PREFIX}" CONF_DIR="${CONF_DIR}" \ LIB_DIR="${LIB_DIR}" SHLIB_DIR="${SHLIB_DIR}" \ - STAGE_DIR="${STAGE_DIR}" ELM_SHLIBS="${ELM_SHLIBS}" + STAGE_DIR="${STAGE_DIR}" ELM_SHLIBS="${ELM_SHLIBS}" \ + OPENSSLLIB="${OPENSSLLIB}" OPENSSLINC="${OPENSSLINC}" \ + OPENSSLBASE="${OPENSSLBASE}" CONFIGURE_ARGS= -b -S -P ${PREFIX} -c ../${CONFIG_PATH:T} MAKE_ENV= MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1" ALL_TARGET= all documentation INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/%%SHLIB_DIR%% PLIST_SUB= SO_REV="${SO_REV}" \ RC_DIR="${RC_DIR:S,^${PREFIX}/,,}" \ MAIL_DIR="${MAIL_DIR:S,^${PREFIX}/,,}" \ CONF_DIR="${CONF_DIR:S,^${PREFIX}/,,}" \ LIB_DIR="${LIB_DIR:S,^${PREFIX}/,,}" \ SHLIB_DIR="${SHLIB_DIR:S,^${PREFIX}/,,}" \ ELM_SHLIBS="${ELM_SHLIBS}" \ ${ELM_SHLIBS:U:S/^/ELM_/:S/$/=""/} \ ${ELM_UNSHLIBS:U:S/^/ELM_/:S/$/="@comment "/} RCSCRIPTS_SUB= SHLIB_DIR="${SHLIB_DIR}" RC_SUBR=${RC_SUBR} MAN1= answer.1 checkalias.1 elm.1 elmalias.1 elmbindata.1 \ elmcharset.1 elmlibregister.1 elmrc-write.1 elmregister.1 \ elmstringconvert.1 elmterminal.1 elmunidata.1 elmuninstall.1 \ fastmail.1 frm.1 listalias.1 messages.1 newalias.1 newmail.1 \ printmail.1 readmsg.1 MLINKS= frm.1 nfrm.1 newmail.1 wnewmail.1 .if !defined(ELM_USER_SHLIBS) OPTIONS= ELM_ICONV "libiconv support" on \ ELM_SMTP "SMTP submission protocol (RFC2746) support" on \ - ELM_TLS "POP STLS and IMAP STARTTLS support" on + ELM_TLS "POP STLS and IMAP STARTTLS support" on \ + OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \ + OPENSSL_PORT "use OpenSSL from ports (requires by TLS)" off .endif .include # Local variables # ELM_VERSION= 2.4 -ELM_REVISION= 116 +ELM_REVISION= 119 ELM_PATCHLEVEL= _ # a...z = patch-level, _ means no patch-level. ELM_PATCHDONE= false .for level in _ a b c d e f g h i j k l m n o p q r s t u v w x y z _level=${level} . if ${_level} != _ && ${ELM_PATCHDONE} == false PATCHFILES+= ${DISTNAME:S/+/+PL/}${level}.patch.gz . endif . if ${ELM_PATCHLEVEL} == ${_level} ELM_PATCHDONE= true . endif .endfor ELM_SYSTEM_SHLIBS= iconv smtp tls .if !defined(ELM_USER_SHLIBS) . for shlib in ${ELM_SYSTEM_SHLIBS} . if !defined(${shlib:U:S/^/WITHOUT_ELM_/}) ELM_USER_SHLIBS+=${shlib} . endif . endfor .endif ELM_USER_SHLIBS?= ${ELM_SYSTEM_SHLIBS} # or none ELM_SHLIBS= .if ${ELM_USER_SHLIBS} == none ELM_UNSHLIBS= ${ELM_SYSTEM_SHLIBS} .else ELM_UNSHLIBS= . for shlib1 in ${ELM_SYSTEM_SHLIBS} _shlib1=${shlib1} _define= false . for shlib2 in ${ELM_USER_SHLIBS} _shlib2=${shlib2} . if ${_shlib1} == ${_shlib2} _define= true . endif . endfor . if ${_define} == true ELM_SHLIBS+= ${shlib1} . else ELM_UNSHLIBS+= ${shlib1} . endif . endfor .endif .if ${ELM_SHLIBS:Miconv} == iconv USE_ICONV= yes .endif # evaluation should be protected 'til extraction to avoid noisy messages. SO_REV= $$([ -f ${WRKSRC}/hdrs/patchlevel.h ] && \ ${AWK} '/SHAREDTAG:/{print $$2}' ${WRKSRC}/hdrs/patchlevel.h) MSECS= 1 STAGE_DIR= ${WRKDIR}/stage RC_DIR= ${PREFIX}/etc/rc.d MAIL_DIR= ${PREFIX}/etc/mail CONF_DIR= ${MAIL_DIR}/elm LIB_DIR= ${PREFIX}/lib/elm SHLIB_DIR= ${PREFIX}/libexec/elm CONFIG_PATH= ${WRKDIR}/config.sh _RC_FILE= 00elm.sh RC_FILE= 000.elm.sh MIME_TYPES= elm.mimetypes MIME_CSETS= elm.mimecharsets TERM_INFO= elm.terminalinfo ELM_RC= elm.rc CONF_FILES= ${MIME_TYPES} ${MIME_CSETS} ${TERM_INFO} ${ELM_RC} DOC_FILES= MIME.txt README.ME+ \ doc/Alias.fmtd doc/Config.fmtd doc/Cover.fmtd \ doc/Form.fmtd doc/Ref.fmtd doc/Users.fmtd .for shlib in ${ELM_SHLIBS} DOC_FILES+= shared_libs/${shlib:L}/README.${shlib:U} .endfor # Post-patch # post-patch: fix-permissions patch-startup-scripts patch-setgid patch-nls-files fix-permissions: @${CHMOD} -R u+w ${WRKSRC} patch-startup-scripts: @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/${_RC_FILE} > ${WRKDIR}/${RC_FILE} # from : # Although we have saved user/group IDs, we do not use them in setuid # as described in POSIX 1003.1, because the feature does not work for # root. We use the saved IDs in seteuid/setegid, which are not currently # part of the POSIX 1003.1 specification. XXX revisit for 1003.1-2001 # as this is now mandatory. patch-setgid: @if [ "$$(sysctl -n kern.saved_ids)" -eq 0 ]; then \ ${REINPLACE_CMD} -e 's|setgid|setegid|' \ ${WRKSRC}/lib/localmbx.c \ ${WRKSRC}/src/init.c ${WRKSRC}/src/lock.c; \ ${REINPLACE_CMD} -e 's|have_saved_ids = 0|have_saved_ids = 1|' \ ${WRKSRC}/lib/read_rc.c; \ fi patch-nls-files: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/nls/LANGS # Pre-configure # pre-configure: configure-shlibs TEE?= tee configure-shlibs: @${CP} /dev/null ${CONFIG_PATH} .for shlib in ${ELM_SYSTEM_SHLIBS} @${ECHO_CMD} "\# Support for ${shlib:U}" \ > ${WRKSRC}/shared_libs/${shlib:L}/config.res .endfor .for shlib in ${ELM_SHLIBS} @${ECHO_CMD} "${shlib:L}_ok='define'" \ | ${TEE} -a ${CONFIG_PATH} \ >> ${WRKSRC}/shared_libs/${shlib:L}/config.res .endfor .for shlib in ${ELM_UNSHLIBS} @${ECHO_CMD} "${shlib:L}_ok='undef'" \ | ${TEE} -a ${CONFIG_PATH} \ >> ${WRKSRC}/shared_libs/${shlib:L}/config.res .endfor # Post-configure # post-configure: rename-readmes rename-readmes: .for shlib in ${ELM_SHLIBS} @if [ -f ${WRKSRC}/shared_libs/${shlib:L}/README.ME+ ]; then \ ${MV} ${WRKSRC}/shared_libs/${shlib:L}/README.ME+ \ ${WRKSRC}/shared_libs/${shlib:L}/README.${shlib:U}; \ fi .endfor # Pre-install # pre-install: create-install-dirs backup-conf-files create-install-dirs: @${MKDIR} ${CONF_DIR} ${LIB_DIR} ${SHLIB_DIR} backup-conf-files: .for file in ${CONF_FILES} @if [ -f ${LIB_DIR}/${file} ]; then \ ${MV} ${LIB_DIR}/${file} ${CONF_DIR}/${file}.orig; \ elif [ -f ${CONF_DIR}/${file} ]; then \ ${MV} ${CONF_DIR}/${file} ${CONF_DIR}/${file}.orig; \ fi .endfor # Post-install # post-install: install-startup-files install-nls-files \ install-doc-files install-mime-types \ install-conf-files restore-conf-files \ merge-global-rc-file \ remove-catman-files remove-catman-links install-startup-files: @${INSTALL_SCRIPT} ${WRKDIR}/${RC_FILE} ${RC_DIR} install-nls-files: @cd ${WRKSRC}/nls; ${MAKE} install install-doc-files: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} . for file in ${DOC_FILES} @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} @${GZIP_CMD} ${DOCSDIR}/${file:T} . endfor .endif install-mime-types: @${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} ${CONF_DIR}/${MIME_TYPES} install-conf-files: .for file in ${CONF_FILES} @${INSTALL_DATA} ${CONF_DIR}/${file} ${CONF_DIR}/${file}-dist .endfor # for instance, don't restore obsolete files :( except elm.rc :) restore-conf-files: .for file in ${ELM_RC} # ${CONF_FILES} @if [ -f ${CONF_DIR}/${file}.orig ]; then \ ${MV} ${CONF_DIR}/${file}.orig ${CONF_DIR}/${file}; \ fi .endfor merge-global-rc-file: @${LIB_DIR}/elmrc-write -G -I @${LIB_DIR}/elmlibregister -G -I ${ELM_SHLIBS} remove-catman-files: .for sect in ${MSECS} . for page in ${MAN${sect}} @${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page} . endfor .endfor remove-catman-links: .for sect in ${MSECS} . for page in ${MLINKS} . if ${MAN${sect}:M${page}} == "" @${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page} . endif . endfor .endfor # some sketchy hackery FETCH_CMD_INTERIOR= ${FETCH_CMD:M*fetch*} # only enable the hack if FETCH_CMD is fetch .if !empty(FETCH_CMD_INTERIOR) # some ftp servers dislike $USER@localhost... FETCH_ENV= FTP_PASSWORD=${FTP_PASSWORD} IFCONFIG?= ifconfig HOSTIPADDR= ${IFCONFIG} | ${AWK} '/inet /{print $$2; exit}' FTP_PASSWORD?= ${USER}@`${HOSTIPADDR}` .endif .include Property changes on: head/mail/elm+ME/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.85 \ No newline at end of property +1.86 \ No newline at end of property Index: head/mail/elm+ME/distinfo =================================================================== --- head/mail/elm+ME/distinfo (revision 117596) +++ head/mail/elm+ME/distinfo (revision 117597) @@ -1,2 +1,2 @@ -MD5 (elm-2.4ME+116.tar.gz) = cb2ef246253a679268102e3e0d0b1954 -SIZE (elm-2.4ME+116.tar.gz) = 1458277 +MD5 (elm-2.4ME+119.tar.gz) = b9491fcc6533a42d1e835c5cc0049a45 +SIZE (elm-2.4ME+119.tar.gz) = 1491512 Property changes on: head/mail/elm+ME/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.49 \ No newline at end of property +1.50 \ No newline at end of property Index: head/mail/elm+ME/files/patch-aa =================================================================== --- head/mail/elm+ME/files/patch-aa (revision 117596) +++ head/mail/elm+ME/files/patch-aa (nonexistent) @@ -1,20 +0,0 @@ ---- nls/Makefile.orig Wed Mar 20 08:04:46 2002 -+++ nls/Makefile Tue Apr 16 04:58:53 2002 -@@ -3,7 +3,7 @@ - # - LANGFILE=LANGS - CATNAME=elm2.4me+.cat --GENCAT= nls/gencat -+GENCAT= gencat - - HDIR= ../hdrs - SDIR= C/C/C -@@ -44,7 +44,7 @@ - ./Install $(LANGFILE) $(GENCAT) $(CATNAME) - - $(HFILES): $(MFILES) gencat/gencat -- gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@ -+ $(GENCAT) $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@ - - clean: FRC - /bin/rm -f $(MSGCAT) Property changes on: head/mail/elm+ME/files/patch-aa ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/elm+ME/files/00elm.sh =================================================================== --- head/mail/elm+ME/files/00elm.sh (revision 117596) +++ head/mail/elm+ME/files/00elm.sh (revision 117597) @@ -1,37 +1,39 @@ #!/bin/sh # # $FreeBSD$ # # Configure the shared library cache # # PROVIDE: elm # REQUIRE: ldconfig # KEYWORD: FreeBSD -elm_enable="YES" -elm_shlib_dir="%%SHLIB_DIR%%" +elm_enable=${elm_enable:-"YES"} +elm_shlib_dir=${elm_shlib_dir:-"%%SHLIB_DIR%%"} . %%RC_SUBR%% name=ldconfig rcvar=$(set_rcvar) ldconfig_command="/sbin/ldconfig" load_rc_config ${name} name="elm" rcvar=$(set_rcvar) start_cmd="elm_start" stop_cmd=":" elm_start () { + local _ins + _ins= ldconfig=${ldconfig_command} checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then ${ldconfig} -m ${_ins} ${elm_shlib_dir} fi } load_rc_config ${name} run_rc_command "$1" Property changes on: head/mail/elm+ME/files/00elm.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/mail/elm+ME/files/patch-ac =================================================================== --- head/mail/elm+ME/files/patch-ac (revision 117596) +++ head/mail/elm+ME/files/patch-ac (revision 117597) @@ -1,67 +1,49 @@ --- Configure.orig Sat Nov 15 17:19:06 2003 +++ Configure Tue Dec 23 03:24:03 2003 @@ -64,7 +64,7 @@ shift ;; -P*) - prefix="`expr \"$1\" : '-P\(.*\)'`" + prefix="`expr \"X$1\" : 'X-P\(.*\)'`" shift case "$prefix" in "") @@ -75,7 +75,7 @@ echo "Prefix: $prefix" ;; -s*) - libsuffix="`expr \"$1\" : '-s\(.*\)'`" + libsuffix="`expr \"X$1\" : 'X-s\(.*\)'`" shift case "$libsuffix" in "") @@ -86,7 +86,7 @@ echo "Extra library suffix: $libsuffix" ;; -c*) - config="`expr \"$1\" : '-c\(.*\)'`" + config="`expr \"X$1\" : 'X-c\(.*\)'`" shift case "$config" in "") -@@ -122,7 +122,7 @@ - case "$error" in - true) - cat >&2 << EOM --Usage: Configure [-dS] -+Usage: Configure [-dbhSMN] [-P'prefix'] [-s'suffix'] [-c'config'] [-DDEBUG] - -d : use defaults for all answers. - -b : batchmode -- do not prompt user (implies -d) - -h : print this help message and exit (with an error status). -@@ -2296,7 +2296,7 @@ - echo "Found shlib directory" - fi - -- $echo "Trying create chared library" -+ $echo "Trying create shared library" - - LibLoc=`cd ..; pwd`/shlib - @@ -2589,7 +2589,10 @@ : see if crypt exists echo " " -if $contains '^crypt$' libc.list >/dev/null 2>&1; then +if $test "$cryptlib" = -lcrypt; then + echo 'crypt() found.' + d_crypt="$define" +elif $contains '^crypt$' libc.list >/dev/null 2>&1; then echo 'crypt() found.' d_crypt="$define" cryptlib='' @@ -3093,6 +3096,7 @@ $echo $n "Testing if inet_aton can be used ... $c" $cat > try.c <<'EOF' +#include #include #include #include Property changes on: head/mail/elm+ME/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/mail/elm+ME/files/patch-mailmsg2.c =================================================================== --- head/mail/elm+ME/files/patch-mailmsg2.c (revision 117596) +++ head/mail/elm+ME/files/patch-mailmsg2.c (revision 117597) @@ -1,61 +1,61 @@ ---- src/mailmsg2.c.orig Wed Mar 20 08:04:47 2002 -+++ src/mailmsg2.c Fri May 10 10:21:54 2002 -@@ -259,6 +259,7 @@ - - } else if (copy_msg && ! retransmit) { /* if retransmit we have it! */ - struct string * From_buffer = NULL; -+ struct string * Date_buffer = NULL; - struct addr_item *p; +--- src/mailmsg2.c.orig Wed Aug 4 19:07:35 2004 ++++ src/mailmsg2.c Wed Aug 25 01:44:23 2004 +@@ -486,6 +486,7 @@ + } else if ( + (forwarding || mime_attach || copy_msg)) { + struct string * From_buffer = NULL; ++ struct string * Date_buffer = NULL; + struct addr_item *p; - if (current_header->from) { -@@ -277,7 +278,23 @@ + if (hdr->from) { +@@ -504,7 +505,22 @@ + } } } - } - + -+ if (current_header->time_sent) { -+ char date_buf[SLEN]; ++ if (hdr->time_sent) { ++ char date_buf[SLEN]; + -+ Date_buffer = new_string(display_charset); -+ add_ascii_to_string(Date_buffer, -+ s2us(elm_date_str(date_buf, -+ current_header->time_sent + -+ current_header->tz_offset, -+ sizeof date_buf))); -+ if (current_header->time_zone[0]) { -+ add_ascii_to_string(Date_buffer, s2us(" ")); ++ Date_buffer = new_string(display_charset); + add_ascii_to_string(Date_buffer, -+ s2us(current_header->time_zone)); ++ s2us(elm_date_str(date_buf, ++ hdr->time_sent + ++ hdr->tz_offset, ++ sizeof date_buf))); ++ if (hdr->time_zone[0]) { ++ add_ascii_to_string(Date_buffer, s2us(" ")); ++ add_ascii_to_string(Date_buffer, s2us(hdr->time_zone)); ++ } + } -+ } + - if (!cur_editcharset) - cur_editcharset = display_charset; + if (!cur_editcharset) + cur_editcharset = display_charset; -@@ -296,12 +313,14 @@ - current_header->env_from); - - } else if (attribution[0] && current_header) { -+ char * date = us2s(stream_from_string(Date_buffer,1,NULL)); - if (From_buffer) { - char * str = us2s(stream_from_string(From_buffer,1,NULL)); -- fprintf(reply, attribution, str); -+ fprintf(reply, attribution, str, date); - free(str); - } else -- fprintf(reply, attribution, current_header->env_from); -+ fprintf(reply, attribution, current_header->env_from, date); -+ free(date); - fputc('\n', reply); - } - if (edit_message && current_folder) { -@@ -389,6 +408,8 @@ - } - if (From_buffer) - free_string(&From_buffer); -+ if (Date_buffer) -+ free_string(&Date_buffer); - } - - if (!cur_editcharset) +@@ -523,12 +539,15 @@ + hdr->env_from); + + } else if (attribution[0] && hdr) { ++ char * date = us2s(stream_from_string(Date_buffer,1,NULL)); ++ + if (From_buffer) { + char * str = us2s(stream_from_string(From_buffer,1,NULL)); +- fprintf(reply, attribution, str); ++ fprintf(reply, attribution, str, date); + free(str); + } else +- fprintf(reply, attribution, hdr->env_from); ++ fprintf(reply, attribution, hdr->env_from, date); ++ free(date); + fputc('\n', reply); + } + if (edit_message && mailbox_file) { +@@ -621,6 +640,8 @@ + + if (From_buffer) + free_string(&From_buffer); ++ if (Date_buffer) ++ free_string(&Date_buffer); + + } else { + /* make referenced message as edited message */ Property changes on: head/mail/elm+ME/files/patch-mailmsg2.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/elm+ME/scripts/pre-configure =================================================================== --- head/mail/elm+ME/scripts/pre-configure (revision 117596) +++ head/mail/elm+ME/scripts/pre-configure (revision 117597) @@ -1,367 +1,368 @@ #!/bin/sh -e # # pre-configure script for Elm port to FreeBSD # # $FreeBSD$ [ -r /usr/include/inttypes.h ] && has_inttypes=define || has_inttypes=undef d_shared_rev=${SO_REV:-$(awk '/SHAREDTAG:/{print $2}' ${WRKSRC}/hdrs/patchlevel.h)} [ -d ${WRKSRC}/shlib ] || mkdir ${WRKSRC}/shlib case ${CFLAGS} in *-g*) DEBUG="-DDEBUG" ;; *) DEBUG= ;; esac cat >> ${CONFIG_PATH} << EOF #!/bin/sh # config.sh # This file was produced by running the $0 script. Log='\$Log' Header='\$Header' install_prefix='${PREFIX}' bin='${PREFIX}/bin' contains='grep' cppstdin='/usr/bin/cpp' cppminus='' diff='/usr/bin/diff' d_getopt='define' d_memcpy='define' d_symlink='define' d_whoami='undef' d_poll='define' d_select='define' i_sys_select='define' d_mmap='define' d_socket='define' d_connect_reopen='undef' d_netdb='define' d_netinet_in='define' d_use_aton='define' d_inttypes='${has_inttypes}' d_nointtypes='undef' n='-n' c='' orderlib='false' ranlib=':' package='elm2.4me+' pager='builtin++' use_builtin_pager='define' startsh='#!/bin/sh' define='define' loclist=' basename cat chgrp chmod cp dirname echo expr egrep grep fgrep head ln ls make mv rm sed sleep sort diff touch tr uniq cut ' expr='/bin/expr' sed='/usr/bin/sed' echo='/bin/echo' cat='/bin/cat' rm='/bin/rm' mv='/bin/mv' cp='/bin/cp' tail='' tr='/usr/bin/tr' sort='/usr/bin/sort' uniq='/usr/bin/uniq' grep='/usr/bin/grep' fgrep='/usr/bin/fgrep' head='/usr/bin/head' trylist=' Mcc compress cpp date diff emacs execmail -finger +gencat gpg ispell line lint lp locale lpr metamail mips more nroff pack pg pgp pmake pr rmail sendmail shar smail submit tar tbl test troff gtroff uname uuname vi ' test='test' inews='' ispell='${LOCALBASE}/bin/ispell' egrep='/usr/bin/egrep' more='/usr/bin/more' pg='pg' Mcc='Mcc' vi='/usr/bin/vi' mailx='' mail='' cpp='/usr/bin/cpp' perl='' emacs='${LOCALBASE}/bin/emacs' ls='/bin/ls' rmail='/bin/rmail' sendmail='/usr/sbin/sendmail' shar='/usr/bin/shar' smail='smail' submit='' tbl='/usr/bin/tbl' troff='/usr/bin/troff' nroff='/usr/bin/nroff' uname='/usr/bin/uname' uuname='/usr/bin/uuname' line='line' chgrp='/usr/bin/chgrp' chmod='/bin/chmod' lint='/usr/bin/lint' sleep='/bin/sleep' pr='/usr/bin/pr' tar='/usr/bin/tar' ln='/bin/ln' lpr='/usr/bin/lpr' lp='/usr/bin/lp' touch='/usr/bin/touch' make='/usr/bin/make' make_sets_make='define' date='/bin/date' csh='' pmake='pmake' mips='false' col='' pack='pack' compress='/usr/bin/compress' execmail='' +gencat='/usr/bin/gencat' libswanted='sun nls c_s' noaddlib='yes' -c_date='Wed Dec 24 03:02:21 CET 2003' +c_date='Tue Aug 24 15:05:52 CEST 2004' d_ascii='undef' d_broke_ctype='undef' d_calendar='define' calendar='calendar' d_chown_neg1='define' d_content='undef' d_crypt='define' cryptlib='-lcrypt' d_cuserid='undef' d_disphost='define' d_domname='define' d_usegetdom='undef' d_errlst='define' d_flock='define' d_dotlock='define' d_fcntlock='undef' has_flock='define' has_fcntl='define' d_ftruncate='define' d_gethname='define' d_douname='undef' ign_hname='' d_havetlib='define' termlib='-ltermlib' i_curses='undef' i_term='define' d_index='undef' d_internet='' d_ispell='define' ispell_path='${LOCALBASE}/bin/ispell' ispell_options='-x' d_locale='define' d_nl_types='define' d_msgcat='define' d_usenls='' d_mallocvoid='define' d_mboxedit='define' metamail_path='${LOCALBASE}/bin/metamail' d_8bitmime='define' d_binarymime='undef' d_dsn='define' defsystemcharset='US-ASCII' d_mmdf='undef' d_newauto='define' d_noaddfrom='define' d_usedomain='undef' d_noxheader='undef' d_pidcheck='define' d_ptem='undef' d_putenv='define' maxattempts='6' d_setgid='define' mailermode='2755' d_sigvec='undef' d_sigvectr='undef' d_sigset='undef' d_sighold='undef' d_sigprocmask='define' d_sigblock='undef' d_waitpid='define' d_sigaction='define' d_strcspn='define' d_strspn='define' d_strpbrk='define' d_strerror='define' d_strftime='define' d_strings='undef' d_pwdinsys='undef' strings='/usr/include/string.h' includepath='' d_strstr='define' d_strtok='define' d_subshell='define' d_tempnam='define' d_setlinebuf='define' d_shared='define' d_shared_rev='${d_shared_rev}' d_dlopen_libs='define' shared_list='${ELM_SHLIBS}' shared_register='${ELM_SHLIBS}' 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' d_termios='define' d_utimbuf='define' d_vfork='define' d_directory='define' d_directyry_type='USE_DIRENT' defbatsub='no subject (file transmission)' defeditor='/usr/bin/vi' editoropts='' hostname='localhost' phostname='hostname' mydomain='.invalid' autohostname='define' i_memory='define' i_time='define' i_systime='define' d_systimekernel='undef' i_unistd='define' i_utime='define' i_sysutime='undef' lib='${LIB_DIR}' shlib='${SHLIB_DIR}' etc='${CONF_DIR}' stage_dir='${STAGE_DIR}' build_package='undef' libdirname='lib' libc='/usr/lib/libc.so' linepr='/usr/bin/lp' maildir='/var/mail' mailer='/usr/sbin/sendmail' mailgrp='mail' mansrc='${MAN1PREFIX}/man/man1' catmansrc='${MAN1PREFIX}/man/cat1' manext='.1' manext_choice='.1' catmanext='.1' catmanext_choice='.1' packed='n' manroff='/usr/bin/nroff' manroffopts='' suffix='' packer='' optimize='${CFLAGS}' ccflags='${DEBUG}' picflag='-fPIC' nopic='' shared_extra='' cppflags='' ldflags='-s' cc='cc' libs='' nametype='bsd' d_passnames='define' d_berknames='define' d_usgnames='undef' # passcat='' rmttape='unknown-remote-tape-unit' roff='/usr/bin/troff' roffopts='' sigtype='void' spitshell='cat' shsharp='true' sharpbang='#!' tmpdir='/tmp' tzname_handling='TM_ZONE' use_pmake='n' xencf='' xenlf='' d_xenix='undef' d_bsd='define' locale='locale' have_codeset='undef' d_pgp='define' 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 EOF tee -a ${CONFIG_PATH} >> ${WRKSRC}/shared_libs/iconv/config.res << EOF iconv_dir='${LOCALBASE}' iconv_include_dir='${LOCALBASE}/include' iconv_lib_dir='${LOCALBASE}/lib' iconv_link='iconv' EOF tee -a ${CONFIG_PATH} >> ${WRKSRC}/shared_libs/tls/config.res << EOF -tls_dir='system' -tls_include_dir='' -tls_lib_dir='' +tls_dir='${OPENSSLBASE}' +tls_include_dir='${OPENSSLINC}' +tls_lib_dir='${OPENSSLLIB}' EOF exit 0 Property changes on: head/mail/elm+ME/scripts/pre-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.34 \ No newline at end of property +1.35 \ No newline at end of property