diff options
Diffstat (limited to '')
26 files changed, 190 insertions, 17 deletions
diff --git a/editors/flim-emacs-current/Makefile b/editors/flim-emacs-current/Makefile index fd1f4ef4f507..86aa9d242739 100644 --- a/editors/flim-emacs-current/Makefile +++ b/editors/flim-emacs-current/Makefile @@ -103,6 +103,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: # install package-cookie @${MKDIR} -p ${PREFIX}/share/flim @@ -153,6 +158,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${FLIMDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/flim-emacs/Makefile b/editors/flim-emacs/Makefile index 3e06413e60b1..6ebf3d98b499 100644 --- a/editors/flim-emacs/Makefile +++ b/editors/flim-emacs/Makefile @@ -103,6 +103,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: # install package-cookie @${MKDIR} -p ${PREFIX}/share/flim @@ -153,6 +158,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${FLIMDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/flim-xemacs21-mule-current/Makefile b/editors/flim-xemacs21-mule-current/Makefile index 300b39d25690..4ee84486f168 100644 --- a/editors/flim-xemacs21-mule-current/Makefile +++ b/editors/flim-xemacs21-mule-current/Makefile @@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages +# packages-subdirectories which this port requires +EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo # how to make and install ALL_TARGET= package @@ -32,7 +34,7 @@ HAS_MULE= YES # whether building info files by emacs or makeinfo BUILD_INFO_BY_EMACS= YES # texinfo packages -BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile index 3b6652f5e277..c5753da7a318 100644 --- a/editors/flim-xemacs21-mule/Makefile +++ b/editors/flim-xemacs21-mule/Makefile @@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages +# packages-subdirectories which this port requires +EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo # how to make and install ALL_TARGET= package @@ -32,7 +34,7 @@ HAS_MULE= YES # whether building info files by emacs or makeinfo BUILD_INFO_BY_EMACS= YES # texinfo packages -BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/flim/Makefile b/editors/flim/Makefile index fd1f4ef4f507..86aa9d242739 100644 --- a/editors/flim/Makefile +++ b/editors/flim/Makefile @@ -103,6 +103,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: # install package-cookie @${MKDIR} -p ${PREFIX}/share/flim @@ -153,6 +158,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${FLIMDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile index fd1f4ef4f507..86aa9d242739 100644 --- a/editors/flim113-emacs/Makefile +++ b/editors/flim113-emacs/Makefile @@ -103,6 +103,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: # install package-cookie @${MKDIR} -p ${PREFIX}/share/flim @@ -153,6 +158,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${FLIMDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/flim113-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile index 300b39d25690..4ee84486f168 100644 --- a/editors/flim113-xemacs21-mule/Makefile +++ b/editors/flim113-xemacs21-mule/Makefile @@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages +# packages-subdirectories which this port requires +EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo # how to make and install ALL_TARGET= package @@ -32,7 +34,7 @@ HAS_MULE= YES # whether building info files by emacs or makeinfo BUILD_INFO_BY_EMACS= YES # texinfo packages -BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile index fd1f4ef4f507..86aa9d242739 100644 --- a/editors/flim113/Makefile +++ b/editors/flim113/Makefile @@ -103,6 +103,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: # install package-cookie @${MKDIR} -p ${PREFIX}/share/flim @@ -153,6 +158,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${FLIMDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/flim114-emacs20/Makefile b/editors/flim114-emacs20/Makefile index fd1f4ef4f507..86aa9d242739 100644 --- a/editors/flim114-emacs20/Makefile +++ b/editors/flim114-emacs20/Makefile @@ -103,6 +103,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: # install package-cookie @${MKDIR} -p ${PREFIX}/share/flim @@ -153,6 +158,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${FLIMDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile index 219e60b81a55..2e1d514c8d35 100644 --- a/editors/semi-emacs-current/Makefile +++ b/editors/semi-emacs-current/Makefile @@ -107,6 +107,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: @${MKDIR} -p ${PREFIX}/share/semi @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE} @@ -156,6 +161,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/semi-emacs/Makefile b/editors/semi-emacs/Makefile index c5af3f7c014b..2ed93b9c16a5 100644 --- a/editors/semi-emacs/Makefile +++ b/editors/semi-emacs/Makefile @@ -107,6 +107,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: @${MKDIR} -p ${PREFIX}/share/semi @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE} @@ -156,6 +161,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/semi-xemacs21-mule-current/Makefile b/editors/semi-xemacs21-mule-current/Makefile index 1769abbd9484..7a5e7b387219 100644 --- a/editors/semi-xemacs21-mule-current/Makefile +++ b/editors/semi-xemacs21-mule-current/Makefile @@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages +# packages-subdirectories which this port requires +EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo # how to make and install ALL_TARGET= package @@ -32,7 +34,7 @@ HAS_MULE= YES # whether building info files by emacs or makeinfo BUILD_INFO_BY_EMACS= YES # texinfo packages -BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/semi-xemacs21-mule-current/pkg-plist b/editors/semi-xemacs21-mule-current/pkg-plist index 498ee8f9b082..194507905254 100644 --- a/editors/semi-xemacs21-mule-current/pkg-plist +++ b/editors/semi-xemacs21-mule-current/pkg-plist @@ -12,13 +12,17 @@ %%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el @unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile index 879bb506d77e..49303a463132 100644 --- a/editors/semi-xemacs21-mule/Makefile +++ b/editors/semi-xemacs21-mule/Makefile @@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages +# packages-subdirectories which this port requires +EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo # how to make and install ALL_TARGET= package @@ -32,7 +34,7 @@ HAS_MULE= YES # whether building info files by emacs or makeinfo BUILD_INFO_BY_EMACS= YES # texinfo packages -BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/semi/Makefile b/editors/semi/Makefile index 219e60b81a55..2e1d514c8d35 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -107,6 +107,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: @${MKDIR} -p ${PREFIX}/share/semi @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE} @@ -156,6 +161,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile index 219e60b81a55..2e1d514c8d35 100644 --- a/editors/semi113-emacs/Makefile +++ b/editors/semi113-emacs/Makefile @@ -107,6 +107,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: @${MKDIR} -p ${PREFIX}/share/semi @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE} @@ -156,6 +161,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile index 1769abbd9484..7a5e7b387219 100644 --- a/editors/semi113-xemacs21-mule/Makefile +++ b/editors/semi113-xemacs21-mule/Makefile @@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages +# packages-subdirectories which this port requires +EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo # how to make and install ALL_TARGET= package @@ -32,7 +34,7 @@ HAS_MULE= YES # whether building info files by emacs or makeinfo BUILD_INFO_BY_EMACS= YES # texinfo packages -BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/semi113-xemacs21-mule/pkg-plist b/editors/semi113-xemacs21-mule/pkg-plist index 498ee8f9b082..194507905254 100644 --- a/editors/semi113-xemacs21-mule/pkg-plist +++ b/editors/semi113-xemacs21-mule/pkg-plist @@ -12,13 +12,17 @@ %%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el @unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile index 219e60b81a55..2e1d514c8d35 100644 --- a/editors/semi113/Makefile +++ b/editors/semi113/Makefile @@ -107,6 +107,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: @${MKDIR} -p ${PREFIX}/share/semi @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE} @@ -156,6 +161,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/semi113/pkg-plist.xemacs21-mule b/editors/semi113/pkg-plist.xemacs21-mule index 498ee8f9b082..194507905254 100644 --- a/editors/semi113/pkg-plist.xemacs21-mule +++ b/editors/semi113/pkg-plist.xemacs21-mule @@ -12,13 +12,17 @@ %%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el @unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile index 219e60b81a55..2e1d514c8d35 100644 --- a/editors/semi114-emacs20/Makefile +++ b/editors/semi114-emacs20/Makefile @@ -107,6 +107,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: @${MKDIR} -p ${PREFIX}/share/semi @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE} @@ -156,6 +161,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile index 4fbaf5bf5d89..588960cd1440 100644 --- a/editors/wemi-emacs-current/Makefile +++ b/editors/wemi-emacs-current/Makefile @@ -105,6 +105,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: @${MKDIR} -p ${PREFIX}/share/semi @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE} @@ -155,6 +160,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${WEMIDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile index 14c954bdb947..1d8ac6224b18 100644 --- a/editors/wemi-emacs/Makefile +++ b/editors/wemi-emacs/Makefile @@ -105,6 +105,11 @@ post-build: @${MAKE} info-build .endif +pre-install: +.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS) + @${MAKE} mkdir-site-packages +.endif + post-install: @${MKDIR} -p ${PREFIX}/share/semi @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE} @@ -155,6 +160,11 @@ info-build-by-emacs: done) .endif +mkdir-site-packages: + @(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \ + ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \ + done) + doc-install: @${MKDIR} ${PREFIX}/${WEMIDOCDIR} @(cd ${WRKSRC} ; \ diff --git a/editors/wemi-xemacs21-mule-current/Makefile b/editors/wemi-xemacs21-mule-current/Makefile index 0eedc20d8bf2..aeeb724a601a 100644 --- a/editors/wemi-xemacs21-mule-current/Makefile +++ b/editors/wemi-xemacs21-mule-current/Makefile @@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs-current EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages +# packages-subdirectories which this port requires +EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo # how to make and install ALL_TARGET= package @@ -32,7 +34,7 @@ HAS_MULE= YES # whether building info files by emacs or makeinfo BUILD_INFO_BY_EMACS= YES # texinfo packages -BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/wemi-xemacs21-mule-current/pkg-plist b/editors/wemi-xemacs21-mule-current/pkg-plist index 93af4aa0fd96..3a823d28e346 100644 --- a/editors/wemi-xemacs21-mule-current/pkg-plist +++ b/editors/wemi-xemacs21-mule-current/pkg-plist @@ -12,16 +12,21 @@ %%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el @unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.elc -%%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.el @unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.elc %%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.el diff --git a/editors/wemi-xemacs21-mule/Makefile b/editors/wemi-xemacs21-mule/Makefile index e9b458d95a10..b3efedd8c6cc 100644 --- a/editors/wemi-xemacs21-mule/Makefile +++ b/editors/wemi-xemacs21-mule/Makefile @@ -17,7 +17,9 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/site-packages +# packages-subdirectories which this port requires +EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo # how to make and install ALL_TARGET= package @@ -32,7 +34,7 @@ HAS_MULE= YES # whether building info files by emacs or makeinfo BUILD_INFO_BY_EMACS= YES # texinfo packages -BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg |