From owner-cvs-all@FreeBSD.ORG Wed Oct 6 03:20:46 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from chateau.d.if (localhost [IPv6:::1]) by hub.freebsd.org (Postfix) with ESMTP id C2E47106564A; Wed, 6 Oct 2010 03:20:45 +0000 (UTC) (envelope-from ashish@freebsd.org) Received: from chateau.d.if (chateau.d.if [IPv6:::1]) by chateau.d.if (Postfix) with ESMTP id EE8E14AC7A; Wed, 6 Oct 2010 08:50:43 +0530 (IST) From: ashish@FreeBSD.org (Ashish SHUKLA) To: Hajimu UMEMOTO Organization: The FreeBSD Project References: <201009270114.o8R1Eqwh022991@repoman.freebsd.org> <86r5g4tvl3.fsf@chateau.d.if> X-Face: )vGQ9yK7Y$Flebu1C>(B\gYBm)[$zfKM+p&TT[[JWl6:]S>cc$%-z7-`46Zf0B*syL.C]oCq[upTG~zuS0.$"_%)|Q@$hA=9{3l{%u^h3jJ^Zl; t7 X-Uptime: 8:47AM up 1:59, 5 users, load averages: 0.03, 0.06, 0.08 X-URL: http://762e5e74.wordpress.com/ X-Operating-System: FreeBSD/FreeBSD 8.1-RELEASE/amd64 X-OpenPGP-ID: E74FA4B0 X-OpenPGP-Fingerprint: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 X-Mailer: Gnus v5.13 X-Mail-Morse: .-- .- .... .--- .- ...- .- .--.-. --. -- .- .. .-.. .-.-.- -.-. --- -- X-Attribution: =?utf-8?B?4KSG4KS24KWA4KS3?= Organisation: The FreeBSD Project Date: Wed, 06 Oct 2010 08:50:43 +0530 In-Reply-To: <86r5g4tvl3.fsf@chateau.d.if> (Ashish SHUKLA's message of "Tue, 05 Oct 2010 22:39:44 +0530") Message-ID: <86lj6cypkk.fsf@chateau.d.if> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (amd64-portbld-freebsd8.1) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJ1BMVEWpqal/f39tbW1jY2Md HR2goKCenp6UlJROTk7////9/f35+fnT09ORJdieAAACVklEQVQ4jXXUP2vbQBQA8AvUTkgz5OzY Z0iGWhpS6BSrkECn0mvx0MEJ6AjtYrfoBCVDlD8naJYmNlRfwZq8+mkKlIZaGpJSYmP7Q/XkJDrJ Td8i/H68u3vHPaPufwLdf32AMA4A6GcAgvAamY1pOJiDIFqicTwLswDhfr3uxfFtkAY/GFHPMwzD 8zpnACmIOnE6js7rQb+v4NJrG9od0C+QgpHMy5jBewV+UDSMWiw1Y4fWfyV7+NGFzDsYa3pth9LJ Q4XvXxFHcJRvHOmygn5NAEabnDcQQguarnfoiwSCJ99jmKKcphsZONmWsDK9Ro7cvZOCtQdg8nje egLhc2LNlkLmsezzTFUUy5w18ocox/f0LaLgJy0zO75zk+9pp85GAj36xjqhdI0y3tq2m4dqqcWX zQWBTz8L1irvolXV4J+3q7eCDgVnttjNq6X8H+9KOZsuNk1uCzx8pSp+E9HImfJOTLdcGqo+YKnG EIovizkEn48V7BO+ch2DXcD4ENSpWiU+q8hjjbgTBZCXnZtyj0Ws4Q1Q0B2WXFtYZo65Bbyeeldw RS6qFueM80LlLA29YlVwGRYvFD+kwI/0O+A2PlpOP9GwslUVciHuYGechuBTp922YiDZCrghTknm XSyOM+D3aoRZlo0Jb42zY7DN4p2x4AeZ+QAYutx1sHwTHzMT5cMNduQ9yW3GczN4KZ86kb0c9O8T yXDeFqpl2fryPEAYGXIlezAPXYh2NgVr/gvdoHIuDwuPwOhcWE8f8mmICq41eATkn8x0kuRTIKcB wE9+/QUtiiAnYcaN7wAAAABJRU5ErkJggg== MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Cc: cvs-ports@FreeBSD.org, Ashish SHUKLA , 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Oct 2010 03:20:47 -0000 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Attached are the diffs for my previously mentioned solution to fix the issue in editors/emacs, as well as editors/emacs-devel. In additon to the diffs also proposing to add a message to UPDATING, inform= ing users of this fiasco and advising them to backup ${DATADIR}/${EMACS_VER}/site-lisp directory prior to deinstalling/upgrading the port. 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: text/plain Content-Disposition: inline; filename=emacs-devel.diff Content-Transfer-Encoding: quoted-printable Content-Description: editors/emacs-devel diff diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 609141f..182e253 100644 =2D-- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -7,6 +7,7 @@ =20 PORTNAME=3D emacs PORTVERSION=3D ${EMACS_VER}.${EMACS_REV} +PORTREVISION=3D 1 PORTEPOCH=3D 1 CATEGORIES=3D editors ipv6 MASTER_SITES=3D http://wahjava.users.sourceforge.net/%SUBDIR%/ \ @@ -44,7 +45,9 @@ MAN1=3D b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 et= ags.1 \ MANCOMPRESSED=3D yes PLIST_SUB=3D EMACS_VER=3D${EMACS_VER} =20 =2DEMACS_DIRS=3D ${DATADIR}/${EMACS_VER} ${PREFIX}/libexec/${PORTNAME} +EMACS_DIRS=3D ${DATADIR}/${EMACS_VER}/etc ${DATADIR}/${EMACS_VER}/leim \ + ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \ + ${PREFIX}/libexec/${PORTNAME} =20 MAKE_ENV=3D LC_ALL=3DC =20 @@ -243,10 +246,14 @@ add-plist-data: .endfor =20 .if defined(WITH_SOURCES) +PLIST_SUB+=3D SOURCES=3D"" + post-install: @${MKDIR} ${DATADIR}/${EMACS_VER}/src @${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${DATADIR}/${EMACS_VER}/src @${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/s= ite-start.el +.else +PLIST_SUB+=3D SOURCES=3D"@comment " .endif =20 .if !defined(WITHOUT_X11) diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index 09d2267..ad916a9 100644 =2D-- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -8,6 +8,8 @@ bin/etags bin/grep-changelog bin/rcs-checkin share/applications/emacs.desktop +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el +%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el %%DATADIR%%/site-lisp/subdirs.el share/icons/hicolor/128x128/apps/emacs.png share/icons/hicolor/16x16/apps/emacs.png @@ -20,6 +22,9 @@ share/icons/hicolor/48x48/apps/emacs.png share/icons/hicolor/48x48/apps/emacs22.png share/icons/hicolor/scalable/apps/emacs.svg share/icons/hicolor/scalable/mimetypes/emacs-document.svg +@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp +@dirrmtry %%DATADIR%%/%%EMACS_VER%% +@dirrmtry %%DATADIR%% @dirrmtry share/icons/hicolor/scalable/mimetypes @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable --=-=-= Content-Type: text/plain Content-Disposition: inline; filename=emacs.diff Content-Transfer-Encoding: quoted-printable Content-Description: editors/emacs diff diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 74b46ca..2f2ed8b 100644 =2D-- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -7,7 +7,7 @@ =20 PORTNAME=3D emacs PORTVERSION=3D ${EMACS_VER} =2DPORTREVISION=3D 4 +PORTREVISION=3D 5 PORTEPOCH=3D 2 CATEGORIES=3D editors ipv6 MASTER_SITES=3D ${MASTER_SITE_GNU} @@ -39,7 +39,9 @@ MAN1=3D b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 et= ags.1 \ grep-changelog.1 rcs-checkin.1 PLIST_SUB=3D EMACS_VER=3D${EMACS_VER} =20 =2DEMACS_DIRS=3D ${DATADIR}/${EMACS_VER} ${PREFIX}/libexec/${PORTNAME} +EMACS_DIRS=3D ${DATADIR}/${EMACS_VER}/etc ${DATADIR}/${EMACS_VER}/leim \ + ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \ + ${PREFIX}/libexec/${PORTNAME} =20 MAKE_ENV=3D LC_ALL=3DC =20 @@ -238,10 +240,14 @@ add-plist-data: .endfor =20 .if defined(WITH_SOURCES) +PLIST_SUB+=3D SOURCES=3D"" + post-install: @${MKDIR} ${DATADIR}/${EMACS_VER}/src @${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${DATADIR}/${EMACS_VER}/src @${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/s= ite-start.el +.else +PLIST_SUB+=3D SOURCES=3D"@comment " .endif =20 pre-everything:: diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist index 09d2267..ad916a9 100644 =2D-- a/editors/emacs/pkg-plist +++ b/editors/emacs/pkg-plist @@ -8,6 +8,8 @@ bin/etags bin/grep-changelog bin/rcs-checkin share/applications/emacs.desktop +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el +%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el %%DATADIR%%/site-lisp/subdirs.el share/icons/hicolor/128x128/apps/emacs.png share/icons/hicolor/16x16/apps/emacs.png @@ -20,6 +22,9 @@ share/icons/hicolor/48x48/apps/emacs.png share/icons/hicolor/48x48/apps/emacs22.png share/icons/hicolor/scalable/apps/emacs.svg share/icons/hicolor/scalable/mimetypes/emacs-document.svg +@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp +@dirrmtry %%DATADIR%%/%%EMACS_VER%% +@dirrmtry %%DATADIR%% @dirrmtry share/icons/hicolor/scalable/mimetypes @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iQIcBAEBCgAGBQJMq+sLAAoJEMdGz6nnT6SwUi0QAKjTVM0avVOEUvTNN4CHQdsH fBUBSKiphDysvfQy2vG9TJyDz8kslqlaCp9jE64BZSy28SI3Ld62SaRN4NzKZsN/ CLot/YWF/Rqs73aZj/f0smHtp/Bhz+ujRH5R5vI333iOGCtF+aqEXKDizih6WR9Z p1PAbnmVWRMCE4Ei96anHkTo/VGNzDDPyRq0nE39waFOXhdlgK+CLZE7RXmhOGGh mOyULlwH63c7KuwuYPtVk5hTnve5GGIFbYuH9EQXj3FLC0A20hUlsK04b6EK5JED n/0w7JPgzalpYXDSmYB9tnmhWqS69+5htwjkomPyifJB38ehQRvKgGNJmBxhZsC4 7fOvj48pLv1igVtkzmH/uEUK94/g+KhVuXcuhH5HCNuxu0tqwETHaQ8DVw9cVUlX ODMWKEHdICw2s6MrWeut0fyOE/MN3H1vL43U4RI1bDtxpfBI+dwBE6L25wJjt7gm ZiqhF17zkkiHmWUUZ47yoScYyFzPuslpGUUCWaWVq3wqgqZT4dxrhm+WXmpeuK5r LgCixbT8bi4FTrIolx1sWglvBg090SMVogwROuExUxzKwunvZEmBFDTuQnQknJuE pIr5FtE6Lv3I1MAE7/zjc+r4IaRLvD8SgVJZg2Wt7oW0YLLnSWlan0b2U617HTFQ W7II4qPndzL87liHTB3R =xS1V -----END PGP SIGNATURE----- --==-=-=--