Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 05 Oct 2010 22:39:44 +0530
From:      ashish@FreeBSD.org (Ashish SHUKLA)
To:        Hajimu UMEMOTO <ume@FreeBSD.org>
Cc:        cvs-ports@FreeBSD.org, Ashish SHUKLA <ashish@FreeBSD.org>, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject:   Re: cvs commit: ports/editors/emacs Makefile distinfo pkg-descr pkg-plist ports/editors/emacs/files patch-configure
Message-ID:  <86r5g4tvl3.fsf@chateau.d.if>
In-Reply-To: <yge39skwpea.wl%ume@mahoroba.org> (Hajimu UMEMOTO's message of "Wed, 06 Oct 2010 01:55:09 %2B0900")
References:  <201009270114.o8R1Eqwh022991@repoman.freebsd.org> <yge39skwpea.wl%ume@mahoroba.org>

next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hajimu UMEMOTO writes:
> Hi,

>>>>>> On Mon, 27 Sep 2010 01:14:52 +0000 (UTC)
>>>>>> Ashish SHUKLA <ashish@FreeBSD.org> said:

ashish> Modified files:
ashish> editors/emacs        Makefile distinfo pkg-descr pkg-plist=20
ashish> Added files:
ashish> editors/emacs/files  patch-configure=20
ashish> Log:
ashish> - Add CANNA support to the port, provided by Yuji TAKANO.
ashish> - Update CONFLICTS to conflict with 24.x.
ashish> - Include the license file to the port.
ashish> - Update descriptions of the OPTIONS.
ashish> - Fix building of port on 6.x/9.x with DBUS option enabled, provided
ashish> by swell.k@gmail.com .
ashish> - Remove unneeded dependencies on gettext and dbus-glib.
ashish> - Remove ALSA checks.
ashish> - Clean up pkg-plist.
ashish>=20
ashish> PR:             ports/146979
ashish> Approved by:    tabthorpe (mentor)

> Now, pkg-plist is almost generated automatically.  However, it lists
> ${EMACS_DIRS} blindly, and the generated pkg-list contains site-lisp
> packages installed not by emacs itself.  After installing this
> version, deinstalling emacs blows site-lisp packages away.

My apologies, I didn't realize that. I'll commit the fix in a day or
two. Could you please confirm if following change are fine:

change:

#v+
EMACS_DIRS=3D	${DATADIR}/${EMACS_VER} ${PREFIX}/libexec/${PORTNAME}
#v-

to:

#v+
EMACS_DIRS=3D	${DATADIR}/${EMACS_VER}/etc ${DATADIR}/${EMACS_VER}/leim \
		${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
		${PREFIX}/libexec/${PORTNAME}
#v-

and adding following to the pkg-plist:

#v+
%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
#v-

Sorry, about providing changes like this, as I'm not on my FreeBSD box.

Thanks
=2D-=20
Ashish SHUKLA      | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
freebsd.org!ashish | http://people.freebsd.org/~ashish/

Avoid Success At All Costs !!

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)

iQIcBAEBCgAGBQJMq1vcAAoJEMdGz6nnT6SwA3IP/1HsJhcRtW2lkMSC8aplCwZ+
M0NsN/K/9FLS1ryKMDm0eRKHmSs3Ns6zK76+nn0fvjHPTQsDTUqnSvPhPk3HPJ8W
jJ9M8Ldfu5VOF89wdJWnNp3gIbnyXltFR04QGkdYyrMQwMtcEJIo0kjFxR3EqZ+m
Fvk41q+S1O7H1y4ln33T00r9OXQQn7b/8baqTKV0fi7RvBgwztW6VMxTEwksOldX
9Uv9S7jW4RLz+COs47SbIXa4MMgkpes9pb6qWGzIJf3KiOG8cNImrV5QLqyJD/iF
MtcePwYLddLmMgx5fceb2VpXx2+lg/8uUCNEIWhnTb5Dh3RdmCK1HSndAWRQAEYs
a0Naj0Hm6A/0c/VbOqTeX3rw4kciytsowkhDPlQl+VGYKkZumEFuVwaqQohkg1pI
5gDAo401HDH7B0ZYpG7O52HiVh/Nq+5y/h/WXkwUOYh0yjpSFXGMkvzqbeIPTNsT
p0cA/rYl6UhFGwWQCv1oQnsf/L5uscEF926tVaoJUaZ6oPJGLO7buJM9OntVuMzj
IR/T+ziNR8BJRfmh75Bb/8NEhHk19IS9IQgiUEEq6cQYlia3gqyr0MZ4I6Qpozbi
ApZDn9EFqgsZQ+7JZRyKpVst/AZ+jnk3ZYcSosGLjaooKNd3f2ft5b7eYdrk+PY0
B1Pr1gLS4zeJ4w9Ukgj9
=PIsr
-----END PGP SIGNATURE-----
--=-=-=--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86r5g4tvl3.fsf>