Date: Mon, 19 Jan 2004 17:40:27 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: obrien@FreeBSD.org Cc: perl@FreeBSD.org Subject: Re: cvs commit: ports/mail/p5-Mail-SpamAssassin Makefile Message-ID: <359313585.1074534027@andromede.reaumur.absolight.net> In-Reply-To: <20040119163126.GA4722@dragon.nuxi.com> References: <200401191015.i0JAF9iR071128@repoman.freebsd.org> <20040119163126.GA4722@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--==========FAE0816E00A3CB9BC565==========
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
+-le 19/01/2004 08:31 -0800, David O'Brien =E9crivait :
| On Mon, Jan 19, 2004 at 02:15:09AM -0800, Mathieu Arnold wrote:
|> mat 2004/01/19 02:15:09 PST
|>=20
|> FreeBSD ports repository
|>=20
|> Modified files:
|> mail/p5-Mail-SpamAssassin Makefile=20
|> Log:
|> - change spaces to tab to make portlint a little happier
|> - allow users override RC_DIR and RC_SUFX
|> - fix install spamd.sh in RC_DIR, not PREFIX/etc/rc.d
|=20
| WHY?? rc scripts live in <PREFIX>/etc/rc.d peroid.
| Please make this port always ahear to our standards. There is no need to
| make ever little thing overrideable as that will only encourage people to
| try to do weird things we don't support.
Hum, as RC_DIR is defined as PREFIX/etc/rc.d, and that it's only used in
this port, I don't see the point.
| Also it is well known that one can turn off a packages's rc script by
| renaming the rc script such that it doesn't have a ".sh" extention. It
| is our defacto standard that packages rc scripts have ".sh" as their
| extention, again please don't encourage a wide sweaping change.
Well, this was already discussed, and we ended up leaving it this way.
| Note that pkg-plist and spamd.sh were broken WRT RC_DIR -- neither did
| anything with it. I'd like to commit this patch to make this port to
| follow the FreeBSD Ports estabished ways:
Well, do as you with, but it's not this commit that added all thoses
things, they've been there for a week.
| Index: Makefile
| =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
| RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
| retrieving revision 1.53
| diff -u -r1.53 Makefile
| --- Makefile 19 Jan 2004 15:44:37 -0000 1.53
| +++ Makefile 19 Jan 2004 16:30:22 -0000
| @@ -42,14 +42,8 @@
| SED_SCRIPT=3D -e 's|%%PREFIX%%|${PREFIX}|g'
| =20
| USE_RC_SUBR=3D yes
| -RC_DIR?=3D ${PREFIX}/etc/rc.d
| -RC_SUFX?=3D .sh
| -SED_SCRIPT+=3D -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
| - -e 's|%%RC_DIR%%|${RC_DIR}|g' \
| - -e 's|%%RC_SUFX%%|${RC_SUFX}|g'
| -PLIST_SUB+=3D RC_DIR=3D${RC_DIR} \
| - RC_SUFX=3D${RC_SUFX}
| -
| +SED_SCRIPT+=3D -e 's|%%PREFIX%%|${PREFIX}|g' \
| + -e 's|%%RC_SUBR%%|${RC_SUBR}|g'
| post-patch:
| @${FIND} ${WRKSRC} -name \*.orig -delete
| =20
| @@ -63,7 +57,7 @@
| =20
| post-install:
| @${STRIP_CMD} ${PREFIX}/bin/spamc
| - ${INSTALL_SCRIPT} ${WRKDIR}/spamd.sh ${RC_DIR}/spamd${RC_SUFX}
| + ${INSTALL_SCRIPT} ${WRKDIR}/spamd.sh ${PREFIX}/etc/rc.d/spamd.sh
| =20
| .if !defined(NOPORTDOCS)
| ${MKDIR} ${DOCSDIR}
| Index: pkg-plist
| =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
| RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/pkg-plist,v
| retrieving revision 1.20
| diff -u -r1.20 pkg-plist
| --- pkg-plist 13 Jan 2004 08:29:28 -0000 1.20
| +++ pkg-plist 19 Jan 2004 16:30:22 -0000
| @@ -3,7 +3,7 @@
| bin/spamc
| bin/spamd
| etc/mail/spamassassin/local.cf.sample
| -etc/rc.d/spamd%%RC_SUFX%%
| +etc/rc.d/spamd.sh
| %%SITE_PERL%%/Mail/SpamAssassin.pm
| %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
| %%SITE_PERL%%/Mail/SpamAssassin/AuditMessage.pm
--=20
Mathieu Arnold
--==========FAE0816E00A3CB9BC565==========
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (MingW32)
iD8DBQFADAh9qYYpzGz/vmcRAgEsAKClQRE5ndcwThy/WXFFLgiYSs/IYgCeK0ea
RyqldLWEy/WDDJBs4G5jdAY=
=zHxW
-----END PGP SIGNATURE-----
--==========FAE0816E00A3CB9BC565==========--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?359313585.1074534027>