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, informing
users of this fiasco and advising them to backup
${DATADIR}/${EMACS_VER}/site-lisp directory prior to deinstalling/upgrading
the port.
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 !!
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 609141f..182e253 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}.${EMACS_REV}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors ipv6
MASTER_SITES= http://wahjava.users.sourceforge.net/%SUBDIR%/ \
@@ -44,7 +45,9 @@ MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1
etags.1 \
MANCOMPRESSED= yes
PLIST_SUB= EMACS_VER=${EMACS_VER}
-EMACS_DIRS= ${DATADIR}/${EMACS_VER} ${PREFIX}/libexec/${PORTNAME}
+EMACS_DIRS= ${DATADIR}/${EMACS_VER}/etc ${DATADIR}/${EMACS_VER}/leim \
+ ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
+ ${PREFIX}/libexec/${PORTNAME}
MAKE_ENV= LC_ALL=C
@@ -243,10 +246,14 @@ add-plist-data:
.endfor
.if defined(WITH_SOURCES)
+PLIST_SUB+= SOURCES=""
+
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/site-start.el
+.else
+PLIST_SUB+= SOURCES="@comment "
.endif
.if !defined(WITHOUT_X11)
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 09d2267..ad916a9 100644
--- 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
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 74b46ca..2f2ed8b 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 2
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -39,7 +39,9 @@ MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1
etags.1 \
grep-changelog.1 rcs-checkin.1
PLIST_SUB= EMACS_VER=${EMACS_VER}
-EMACS_DIRS= ${DATADIR}/${EMACS_VER} ${PREFIX}/libexec/${PORTNAME}
+EMACS_DIRS= ${DATADIR}/${EMACS_VER}/etc ${DATADIR}/${EMACS_VER}/leim \
+ ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
+ ${PREFIX}/libexec/${PORTNAME}
MAKE_ENV= LC_ALL=C
@@ -238,10 +240,14 @@ add-plist-data:
.endfor
.if defined(WITH_SOURCES)
+PLIST_SUB+= SOURCES=""
+
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/site-start.el
+.else
+PLIST_SUB+= SOURCES="@comment "
.endif
pre-everything::
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 09d2267..ad916a9 100644
--- 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
pgpYicNGvKSkS.pgp
Description: PGP signature
