cvs commit: ports/editors/emacs Makefile distinfo pkg-descr pkg-plist ports/editors/emacs/files patch-configure

[Ashish SHUKLA]

Hajimu UMEMOTO writes:
> Hi,

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

ashish> Modified files:
ashish> editors/emacs        Makefile distinfo pkg-descr pkg-plist 
ashish> Added files:
ashish> editors/emacs/files  patch-configure 
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 at gmail.com .
ashish> - Remove unneeded dependencies on gettext and dbus-glib.
ashish> - Remove ALSA checks.
ashish> - Clean up pkg-plist.
ashish> 
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=	${DATADIR}/${EMACS_VER} ${PREFIX}/libexec/${PORTNAME}
#v-

to:

#v+
EMACS_DIRS=	${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
-- 
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 !!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-ports/attachments/20101005/7f72425a/attachment.pgp