The emacs port does no add -nox11 suffix when WITHOUT_X11 is defined. And, no matter how you install a -nox11 emacs, the .desktop entity does not work. Fix: 1. Add the suffix support; 2. Rearrange the CONFLICTS; 3. Use Terminal=true when WITHOUT_X11 is defined.
Responsible Changed From-To: freebsd-ports-bugs->ashish Fix synopsis and assign.
I tried the new version. I think my patch on post-patch: +.if defined(WITHOUT_X11) + ${REINPLACE_CMD} -e 's/Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop +.endif is still useful. I'm not sure whether we need that for nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop , since I have no experience on GNUstep. -- Zhihao Yuan, nickname lichray The best way to predict the future is to invent it. -------------------------------------------------- 4BSD - http://lichray.tumblr.com/
=2D----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi, My apologies for the delay in replying. I don't think we need to add "-nox11" suffix when WITHOUT_X11 is defined, as =2D -nox11 suffix is already added by editors/emacs-nox11 slave port. Regarding fixing .desktop file, I totally agree with you. I'll test the .desktop file, and then will commit changes, hopefully this weekend. 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 !! =2D----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iQIcBAEBCgAGBQJNzDbkAAoJEMdGz6nnT6SwnNUQAJNvf8k7ZDP44sNCdt1s4JXw 85g1bFK+13SIH3GVxDfSwmgEL96UbrUPKEC/nYV1evKPwZLKB7/p9mhmgP2/JiAp aNaWFEmW3szFgF1Ws2a/TLmvRI524r6qEOq5nxwiTVLLcMFuGKhSLaLOXg4/zvJ4 vRViVXzBo7fr9v9J4ZskjVjYR34lMUdPW492wR2rqcVzHN2M6dwdvIUVezegDBD2 zfpfEvv1cBizy6pd3s2BXU4TYVwg5nfzKnhnzPJ0l6VchUetUSts9Ot3jzTpsqDV EuvLreLdr/kMeRzU2/VR51CSOKGUqbp9ZHr5hfuFNE6ZSHtloKncTFPQ1skG/qw+ C4/DF0X0yUL+mVmIMwL8nuXD8nsitBIuefxa2rqPqvUbm00dHyoIYKKQGOvNb+8X cHwlsY3GlhqXrMYvmhnbeuD9vJjrMjY67bdrZUwtkkk7sBvQwC4+VcPlxGJwyd+Y ADBa9YFiTHdJ7p6fzBmLPCCXqKGpmojopwkXrTXgxjzO+VEw/j6FPN6lt+vhcgiI Vrp+nqxqSvw7xCvkOzCzpOWcL2klANWWFCDriFc7m1Vfp39OxUBNFUF8Ki5DBHsA W7F4b3aT9gN5nukNxz6m9wSlpIVkofe7c8hsaAZUkY+R2y4HDt9PTdw1bMeh3h+6 q5vuGzKsiHj1OHxgQ96m =3Dvrgv =2D----END PGP SIGNATURE-----
ashish 2011-05-16 12:14:17 UTC FreeBSD ports repository Modified files: editors/emacs-devel Makefile distinfo editors/emacs-devel/files patch-Makefile.in Log: - Update to bzr revision 104238. - Update emacs.desktop to launch Emacs in Terminal when WITHOUT_X11 is defined.[1] - Emacs picks up giflib if available instead of libungif. Account for this.[2] PR: ports/156167[1] Submitted by: Zhihao Yuan <lichray@gmail.com>[1] Herbert J. Skuhra <h.skuhra@gmail.com>[2] (via private email) Revision Changes Path 1.48 +9 -2 ports/editors/emacs-devel/Makefile 1.25 +2 -2 ports/editors/emacs-devel/distinfo 1.12 +6 -6 ports/editors/emacs-devel/files/patch-Makefile.in _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
ashish 2011-05-16 12:27:12 UTC FreeBSD ports repository Modified files: editors/emacs Makefile Added files: editors/emacs/files patch-src_config.in Log: - Update emacs.desktop to launch Emacs in Terminal when WITHOUT_X11 is defined.[1] - Emacs picks up giflib if available instead of libungif. Account for this.[2] - Include 'alloca' fix.[2] PR: ports/156167[1] Submitted by: Zhihao Yuan <lichray@gmail.com>[1] Herbert J. Skuhra <h.skuhra@gmail.com>[2] (via private email) Revision Changes Path 1.102 +8 -0 ports/editors/emacs/Makefile 1.1 +14 -0 ports/editors/emacs/files/patch-src_config.in (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!