to Matt Ruzicka, sorry for this late upgrade, but for a long time, I thought elm's make install was broken, while in fact, it was the ports's Makefile %-/ everything should be alright now, good luck. Makefile conditionnaly add USE_ICONV USE_RC_SUBR added ELM_SHLIBS added to SCRIPTS_ENV and to PLIST_SUB DOC_SUBDIR deleted from PLIST_SUB -b and -c freebsd.sh added to CONFIGURE_ARGS elmbindata, elmlibregister and elmregister added to MAN1 RCSCRIPTS_SUB added elmregister called at post-install time OPTIONS (make config) added if ELM_USER_SHLIBS is undefined bsd.port.pre.mk moved ELM_REVISION bumped to 116 and ELM_PATCHLEVEL reseted ELM_SYSTEM_SHLIBS added and defaulted to iconv, smtp and tls. ELM_USER_SHLIBS tunable added and defaulted to ELM_SYSTEM_SHLIBS *_SUBDIR changed to *_DIR, RCD_* renamed to RC_* MIME.txt added to DOC_FILES shared_libs/*/README.* conditionnaly added to DOC_FILES patch-install-script renamed patch-startup-scripts patch-setgid reworked pre-configure and post-configure added configuration files moved from LIB_DIR to CONF_DIR pre-install and post-install targets reworked distinfo updated pkg-plist *_SUBDIR changed to *_DIR DOC_SUBDIR changed to DOCSDIR many files added some actions reworked files/00elm.sh converted to rc.subr files/patch-ac (Configure) updated test ! -t 0 left as is expr complains about illegal options usage string not complete files/patch-newmbox.c deleted files/patch-header_alloc.c new file handle Newsgroup header scripts/pre-configure shared_list defaulted to ELM_SHLIBS ${PREFIX}/${*_SUBDIR} changed to ${*_DIR} Fix: take care, this patch set is in two parts, the first one is a diff against /dev/null and the second one a cvs diff. How-To-Repeat: n/a
Hi, Your patch fails to apply cleanly. > -# $FreeBSD$ > +# $FreeBSD: ports/mail/elm+ME/files/00elm.sh,v 1.2 2002/07/28 20:26:39 naddy Exp $ Futhermore, please run portlint -A before submitting. clem
"Clement Laforet" <clement@FreeBSD.org> wrote: > > Your patch fails to apply cleanly. > > > -# $FreeBSD$ > > +# $FreeBSD: ports/mail/elm+ME/files/00elm.sh,v 1.2 2002/07/28 20:26:39 naddy Exp $ > > Futhermore, please run portlint -A before submitting. well, except the above line which was generated by "cvs diff", I don't see anything which prevent the commit of this patch. Cyrille Lefevre. -- home: mailto:cyrille.lefevre@laposte.net
Responsible Changed From-To: freebsd-ports-bugs->sem I take it.
State Changed From-To: open->feedback Patching file files/00elm.sh using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed--saving rejects to files/00elm.sh.rej
Send just files/00elm.sh. -- Sem.
On Jul 10, 2004 03:03:53 pm +0400, Sergey Matveychuk wrote: > Send just files/00elm.sh. === cut here === #!/bin/sh # # $FreeBSD$ # # Configure the shared library cache # # PROVIDE: elm # REQUIRE: ldconfig # KEYWORD: FreeBSD elm_enable="YES" 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 () { _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" === cut here === Cyrille Lefevre -- mailto:cyrille.lefevre@laposte.net
===> Extracting for elm+ME-2.4.116 >> Checksum OK for elm-2.4ME+116.tar.gz. ===> Patching for elm+ME-2.4.116 ===> Applying distribution patches for elm+ME-2.4.116 ===> Applying FreeBSD patches for elm+ME-2.4.116 1 out of 1 hunks failed--saving rejects to src/newmbox.c.rej >> Patch patch-newmbox.c failed to apply cleanly. >> Patch(es) patch-aa patch-ab patch-ac patch-header_alloc.c patch-mailmsg2.c applied cleanly. *** Error code 1 Stop in /usr/ports/mail/elm+ME. *** Error code 1 Stop in /usr/ports/mail/elm+ME. -- Sem.
"Sergey Matveychuk" <sem@FreeBSD.org> wrote: > ===> Extracting for elm+ME-2.4.116 > >> Checksum OK for elm-2.4ME+116.tar.gz. > ===> Patching for elm+ME-2.4.116 > ===> Applying distribution patches for elm+ME-2.4.116 > ===> Applying FreeBSD patches for elm+ME-2.4.116 > 1 out of 1 hunks failed--saving rejects to src/newmbox.c.rej > >> Patch patch-newmbox.c failed to apply cleanly. > >> Patch(es) patch-aa patch-ab patch-ac patch-header_alloc.c > patch-mailmsg2.c applied cleanly. > *** Error code 1 from the PR... files/patch-newmbox.c deleted anything else :) Cyrille Lefevre. -- home: mailto:cyrille.lefevre@laposte.net
Cyrille Lefevre wrote: > from the PR... > > files/patch-newmbox.c > deleted OK. It was missed from noisy comments. -- Sem.
State Changed From-To: feedback->closed Committed. Thanks!