diff options
| -rw-r--r-- | editors/flim-emacs/Makefile | 105 | ||||
| -rw-r--r-- | editors/flim-xemacs21-mule/Makefile | 13 | ||||
| -rw-r--r-- | editors/flim-xemacs21-mule/pkg-descr | 2 | ||||
| -rw-r--r-- | editors/flim-xemacs21-mule/pkg-plist | 78 |
4 files changed, 129 insertions, 69 deletions
diff --git a/editors/flim-emacs/Makefile b/editors/flim-emacs/Makefile index a980275..5f463c7 100644 --- a/editors/flim-emacs/Makefile +++ b/editors/flim-emacs/Makefile @@ -16,8 +16,10 @@ PORTCLASS?= master # distfile version FLIM_VER= 1.9.2 -FLIMDOCDIR= share/doc/flim +# setupel filename FLIM_SETUPEL= flim-setupel.el +# document install directory by install-doc target +FLIMDOCDIR?= share/doc/flim .if (${PORTCLASS} == "master") # for emacs @@ -33,15 +35,6 @@ REQUIRE_SETUPEL= YES # target name for make build ALL_TARGET?= elc -# if RUN_DEPENDS-emacs port name has the suffix '-common'. -.if !defined(HAVE_COMMON_PORT) -HAVE_COMMON_PORT= NO -.endif -# if RUN_DEPENDS-emacs needs setup elisp -.if !defined(REQUIRE_SETUPEL) -REQUIRE_SETUPEL= NO -.endif - .if defined(EMACS_PORT) PKGNAME= flim-${EMACS_PORT}-${FLIM_VER} EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} @@ -51,21 +44,29 @@ RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common .else RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} .endif -SCRIPTS_ENV= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ +SCRIPTS_ENV+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ + EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \ TARGETS="${FLIM_SETUPEL}" -PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ +PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ + EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \ FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} -MAKE_FLAGS= EMACS=${EMACS_CMD} +MAKE_FLAGS+= EMACS=${EMACS_CMD} .if (${EMACS_VER} == "19.34") # depends on custom: emacs-19.34 or mule-19.34 BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT} RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT} .endif -# depends on apel +# depends on apel (case of xemacs-21.x or later) +.if defined(EMACS_PACKAGESDIR) +BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT} +RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT} +.else +# depends on apel (case of other emacsen etc...) BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT} RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT} +.endif .else .BEGIN: @${ECHO} "Error: Bad port." @@ -76,40 +77,90 @@ RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR # info files JIS to EUC BUILD_DEPENDS+= nkf:${PORTSDIR}/japanese/nkf -.if (${REQUIRE_SETUPEL} == "YES") pre-configure: +.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR} .endif .include <bsd.port.pre.mk> -MAKEINFO= makeinfo --no-split --no-validate +# makeinfo stuff +MAKEINFO= makeinfo --no-split --no-validate +MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch +MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer + post-build: + @${MAKE} info-build + +post-install: +.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") + @${MAKE} setupel-install +.endif +.if defined(EMACS_PACKAGESDIR) && defined(MANIFEST) + @${MAKE} info-package-install + @${MAKE} manifest-install +.else + @${MAKE} info-install +.endif +.if !defined(NOPORTDOCS) + @${MAKE} doc-install +.endif + + +# install functions +info-build: @(cd ${WRKSRC} ; \ for i in mime-en.texi mime-ja.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ - ${ECHO_MSG} "===> Please ignore the following errors." ; \ ${MAKEINFO} $${i} || ${TRUE} ; \ done) -post-install: +info-build-by-emacs: @(cd ${WRKSRC} ; \ - for i in mime-en.info mime-ja.info; do \ - ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ - install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ + for i in mime-en.texi mime-ja.texi; do \ + ${MV} $${i} $${i}.jis ; \ + ${CAT} $${i}.jis | nkf -e > $${i} ; \ + ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ done) -.if (${REQUIRE_SETUPEL} == "YES") - @${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp -.endif -.if !defined(NOPORTDOCS) + +doc-install: @${MKDIR} ${PREFIX}/${FLIMDOCDIR} @(cd ${WRKSRC} ; \ for i in ChangeLog README.* ; do \ ${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \ done) -.endif + +setupel-install: + @${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \ + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp + + +info-install: + @(cd ${WRKSRC} ; \ + for i in mime-en.info mime-ja.info; do \ + ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ + install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ + done) + +info-package-install: + @(cd ${WRKSRC} ; \ + for i in mime-en.info mime-ja.info; do \ + ${INSTALL_DATA} ${WRKSRC}/$${i} \ + ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \ + done ; \ + ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \ + for i in mime-en.texi mime-ja.texi; do \ + ${INSTALL_DATA} ${WRKSRC}/$${i} \ + ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \ + done) + +manifest-install: + @${RM} -f ${WRKDIR}/${MANIFEST} + @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} + @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ + ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/ .include <bsd.port.post.mk> diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile index deac4fc..f60cce9 100644 --- a/editors/flim-xemacs21-mule/Makefile +++ b/editors/flim-xemacs21-mule/Makefile @@ -17,9 +17,11 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs EMACS_NAME= xemacs EMACS_PORT= xemacs-mule EMACS_VER= 21.1.6 -EMACS_LIBDIR= lib/${EMACS_NAME}-${EMACS_VER} -# xemacs-mule-21.1.6 has no version specific site-lisp directories. -EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR} +EMACS_PACKAGESDIR= lib/${EMACS_NAME}/${EMACS_NAME}-packages + +# how to make and install +ALL_TARGET= package +INSTALL_TARGET= install-package # RUN_DEPENDS port name's suffix is '-common'. HAVE_COMMON_PORT= YES @@ -27,4 +29,9 @@ HAVE_COMMON_PORT= YES # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg +# package info manifest +MANIFEST= MANIFEST.flim +# package documents +FLIMDOCDIR= ${EMACS_PACKAGESDIR}/lisp/flim + .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-xemacs21-mule/pkg-descr b/editors/flim-xemacs21-mule/pkg-descr index 4de45aa..a406f8b 100644 --- a/editors/flim-xemacs21-mule/pkg-descr +++ b/editors/flim-xemacs21-mule/pkg-descr @@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs-mule. - mailcap parser and utility FLIM is installed the following directory tree: - ${PREFIX}/lib/xemacs-20.4/site-lisp/flim/ --- FLIM + ${PREFIX}/lib/xemacs/xemacs-packages/lisp/flim/ --- FLIM --- Porting by shige <shige@FreeBSD.ORG> diff --git a/editors/flim-xemacs21-mule/pkg-plist b/editors/flim-xemacs21-mule/pkg-plist index d527673..6fefa51 100644 --- a/editors/flim-xemacs21-mule/pkg-plist +++ b/editors/flim-xemacs21-mule/pkg-plist @@ -1,38 +1,40 @@ -%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.el -%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc -%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el -%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el -%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mel-b.el -%%EMACS_LIBDIR%%/site-lisp/flim/mel-b.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el -%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el -%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el -%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mel.el -%%EMACS_LIBDIR%%/site-lisp/flim/mel.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el -%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el -%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mime.el -%%EMACS_LIBDIR%%/site-lisp/flim/mime.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.el -%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc -%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el -%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc -%%EMACS_LIBDIR%%/site-lisp/flim/std11.el -%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc -@dirrm %%EMACS_LIBDIR%%/site-lisp/flim -%%FLIMDOCDIR%%/ChangeLog -%%FLIMDOCDIR%%/README.en -@dirrm %%FLIMDOCDIR%% -@unexec install-info --delete %D/info/mime-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ja.info %D/info/dir -info/mime-en.info -info/mime-ja.info -@exec install-info %D/info/mime-en.info %D/info/dir -@exec install-info %D/info/mime-ja.info %D/info/dir +%%EMACS_PACKAGESDIR%%/lisp/flim/ChangeLog +%%EMACS_PACKAGESDIR%%/lisp/flim/README.en +%%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.el +%%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.el +%%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/eword-decode.el +%%EMACS_PACKAGESDIR%%/lisp/flim/eword-decode.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/eword-encode.el +%%EMACS_PACKAGESDIR%%/lisp/flim/eword-encode.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mel-g.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mel-g.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mel-u.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mel-u.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mel.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mel.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mime-def.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mime-def.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mime-parse.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mime-parse.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mime.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mime.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mmbuffer.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mmbuffer.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/mmcooked.el +%%EMACS_PACKAGESDIR%%/lisp/flim/mmcooked.elc +%%EMACS_PACKAGESDIR%%/lisp/flim/std11.el +%%EMACS_PACKAGESDIR%%/lisp/flim/std11.elc +@dirrm %%EMACS_PACKAGESDIR%%/lisp/flim +%%EMACS_PACKAGESDIR%%/info/mime-en.info +%%EMACS_PACKAGESDIR%%/info/mime-ja.info +%%EMACS_PACKAGESDIR%%/man/flim/mime-en.texi +%%EMACS_PACKAGESDIR%%/man/flim/mime-ja.texi +@dirrm %%EMACS_PACKAGESDIR%%/man/flim |
