diff options
30 files changed, 319 insertions, 159 deletions
diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile index 3395e9a..fb9724c 100644 --- a/editors/semi-emacs-current/Makefile +++ b/editors/semi-emacs-current/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for emacs -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -8,19 +8,24 @@ DISTNAME= semi-${SEMI_VER} CATEGORIES= editors elisp -MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/ +MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.12/ MAINTAINER?= shige@FreeBSD.org PORTCLASS?= master # distfile version -FLIM_VER= 1.12.5 -SEMI_VER= 1.13.3 +FLIM_VER= 1.13.2 +SEMI_VER= 1.13.6 # setupel filename SEMI_SETUPEL= semi-setupel.el # document install directory by install-doc target SEMIDOCDIR?= share/doc/semi +FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages +SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages .if (${PORTCLASS} == "master") # emacs port setup @@ -29,7 +34,7 @@ EMACS_PORT= emacs EMACS_VER= 19.34 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} -# emacs requires *-setupel.el +# whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES .endif @@ -39,9 +44,9 @@ ALL_TARGET?= elc .if defined(EMACS_PORT) PKGNAME= semi-${EMACS_PORT}-${SEMI_VER} EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} -BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES") -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common +BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} +.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES") +RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common .else RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} .endif @@ -52,8 +57,9 @@ SCRIPTS_ENV+= 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} \ - SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} -MAKE_FLAGS+= EMACS=${EMACS_CMD} + SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \ + FLIM_COOKIE=${FLIM_COOKIE} +MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${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} @@ -64,13 +70,13 @@ RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR} 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 +# 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 # depends on flim -BUILD_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current -RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current .else .BEGIN: @${ECHO} "Error: Bad port." @@ -78,8 +84,10 @@ RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/fl @${FALSE} .endif +.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO") # info files JIS to EUC BUILD_DEPENDS+= nkf:${PORTSDIR}/japanese/nkf +.endif pre-configure: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -93,8 +101,11 @@ MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer post-build: +.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES") + @${MAKE} info-build-by-emacs +.else @${MAKE} info-build - +.endif post-install: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -111,23 +122,37 @@ post-install: .endif - -# functions +############################################################################### +# +# miscellaneous local functions +# info-build: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-en.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ ${MAKEINFO} $${i} || ${TRUE} ; \ done) - -info-build-by-emacs: +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-ja.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ + ${MAKEINFO} $${i} || ${TRUE} ; \ + done) +.endif + +info-build-by-emacs: + @(cd ${WRKSRC} ; \ + for i in mime-ui-en.texi; do \ ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.texi; do \ + ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ + done) +.endif doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @@ -138,14 +163,21 @@ doc-install: setupel-install: @${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp info-install: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.info mime-ui-ja.info; do \ + for i in mime-ui-en.info; do \ + ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ + install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ + done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ done) +.endif info-package-install: @(cd ${WRKSRC} ; \ diff --git a/editors/semi-emacs-current/distinfo b/editors/semi-emacs-current/distinfo index 97b011d..7340e6c 100644 --- a/editors/semi-emacs-current/distinfo +++ b/editors/semi-emacs-current/distinfo @@ -1 +1 @@ -MD5 (semi-1.13.3.tar.gz) = 6015cca40c844a9c93083c3e73463d5d +MD5 (semi-1.13.6.tar.gz) = 1c46a8d8ae4b0fa91b73ffd992aae0af diff --git a/editors/semi-emacs-current/pkg-plist b/editors/semi-emacs-current/pkg-plist index 9378598..723126a 100644 --- a/editors/semi-emacs-current/pkg-plist +++ b/editors/semi-emacs-current/pkg-plist @@ -29,8 +29,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi-emacs20-current/Makefile b/editors/semi-emacs20-current/Makefile index 2c7514f..4e1520f 100644 --- a/editors/semi-emacs20-current/Makefile +++ b/editors/semi-emacs20-current/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for emacs20 -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 23 September 1998 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -20,6 +20,9 @@ EMACS_VER= 20.4 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} +# whether emacs has mule feature +HAS_MULE= YES + # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/semi-mule-current/Makefile b/editors/semi-mule-current/Makefile index da20b63..2e9981e 100644 --- a/editors/semi-mule-current/Makefile +++ b/editors/semi-mule-current/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for mule -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -20,8 +20,12 @@ EMACS_VER= 19.34 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} -HAVE_COMMON_PORT= YES +# whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES +# whether emacs has a *-common port +HAS_COMMON_PORT= YES +# whether emacs has mule feature +HAS_MULE= YES # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/semi-xemacs-current/Makefile b/editors/semi-xemacs-current/Makefile index 8cfee51..baec4f4 100644 --- a/editors/semi-xemacs-current/Makefile +++ b/editors/semi-xemacs-current/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for xemacs -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 25 July 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # diff --git a/editors/semi-xemacs-current/pkg-plist b/editors/semi-xemacs-current/pkg-plist index 04fb2c6..1fcd35a 100644 --- a/editors/semi-xemacs-current/pkg-plist +++ b/editors/semi-xemacs-current/pkg-plist @@ -32,8 +32,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi-xemacs20-current/Makefile b/editors/semi-xemacs20-current/Makefile index 1aaaa04..cfc8e31 100644 --- a/editors/semi-xemacs20-current/Makefile +++ b/editors/semi-xemacs20-current/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for xemacs20 -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 25 July 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # diff --git a/editors/semi-xemacs20-current/pkg-plist b/editors/semi-xemacs20-current/pkg-plist index 247fab1..e8706ea 100644 --- a/editors/semi-xemacs20-current/pkg-plist +++ b/editors/semi-xemacs20-current/pkg-plist @@ -33,8 +33,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi-xemacs21-mule-current/Makefile b/editors/semi-xemacs21-mule-current/Makefile index de86b81..c37ca88 100644 --- a/editors/semi-xemacs21-mule-current/Makefile +++ b/editors/semi-xemacs21-mule-current/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for xemacs-mule -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 25 July 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -24,7 +24,15 @@ ALL_TARGET= package INSTALL_TARGET= install-package # RUN_DEPENDS port name's suffix is '-common'. -HAVE_COMMON_PORT= YES +HAS_COMMON_PORT= YES + +# whether emacs has mule feature +HAS_MULE= YES + +# whether building info files by emacs or makeinfo +BUILD_INFO_BY_EMACS= YES +# texinfo packages +BUILD_DEPENDS+= ${EMACS_PACKAGESDIR}/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 3395e9a..fb9724c 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for emacs -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -8,19 +8,24 @@ DISTNAME= semi-${SEMI_VER} CATEGORIES= editors elisp -MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/ +MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.12/ MAINTAINER?= shige@FreeBSD.org PORTCLASS?= master # distfile version -FLIM_VER= 1.12.5 -SEMI_VER= 1.13.3 +FLIM_VER= 1.13.2 +SEMI_VER= 1.13.6 # setupel filename SEMI_SETUPEL= semi-setupel.el # document install directory by install-doc target SEMIDOCDIR?= share/doc/semi +FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages +SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages .if (${PORTCLASS} == "master") # emacs port setup @@ -29,7 +34,7 @@ EMACS_PORT= emacs EMACS_VER= 19.34 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} -# emacs requires *-setupel.el +# whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES .endif @@ -39,9 +44,9 @@ ALL_TARGET?= elc .if defined(EMACS_PORT) PKGNAME= semi-${EMACS_PORT}-${SEMI_VER} EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} -BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES") -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common +BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} +.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES") +RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common .else RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} .endif @@ -52,8 +57,9 @@ SCRIPTS_ENV+= 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} \ - SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} -MAKE_FLAGS+= EMACS=${EMACS_CMD} + SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \ + FLIM_COOKIE=${FLIM_COOKIE} +MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${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} @@ -64,13 +70,13 @@ RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR} 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 +# 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 # depends on flim -BUILD_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current -RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current .else .BEGIN: @${ECHO} "Error: Bad port." @@ -78,8 +84,10 @@ RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/fl @${FALSE} .endif +.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO") # info files JIS to EUC BUILD_DEPENDS+= nkf:${PORTSDIR}/japanese/nkf +.endif pre-configure: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -93,8 +101,11 @@ MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer post-build: +.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES") + @${MAKE} info-build-by-emacs +.else @${MAKE} info-build - +.endif post-install: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -111,23 +122,37 @@ post-install: .endif - -# functions +############################################################################### +# +# miscellaneous local functions +# info-build: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-en.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ ${MAKEINFO} $${i} || ${TRUE} ; \ done) - -info-build-by-emacs: +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-ja.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ + ${MAKEINFO} $${i} || ${TRUE} ; \ + done) +.endif + +info-build-by-emacs: + @(cd ${WRKSRC} ; \ + for i in mime-ui-en.texi; do \ ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.texi; do \ + ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ + done) +.endif doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @@ -138,14 +163,21 @@ doc-install: setupel-install: @${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp info-install: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.info mime-ui-ja.info; do \ + for i in mime-ui-en.info; do \ + ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ + install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ + done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ done) +.endif info-package-install: @(cd ${WRKSRC} ; \ diff --git a/editors/semi/distinfo b/editors/semi/distinfo index 97b011d..7340e6c 100644 --- a/editors/semi/distinfo +++ b/editors/semi/distinfo @@ -1 +1 @@ -MD5 (semi-1.13.3.tar.gz) = 6015cca40c844a9c93083c3e73463d5d +MD5 (semi-1.13.6.tar.gz) = 1c46a8d8ae4b0fa91b73ffd992aae0af diff --git a/editors/semi/pkg-plist.emacs20 b/editors/semi/pkg-plist.emacs20 index 9378598..723126a 100644 --- a/editors/semi/pkg-plist.emacs20 +++ b/editors/semi/pkg-plist.emacs20 @@ -29,8 +29,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi/pkg-plist.emacs21 b/editors/semi/pkg-plist.emacs21 index 9378598..723126a 100644 --- a/editors/semi/pkg-plist.emacs21 +++ b/editors/semi/pkg-plist.emacs21 @@ -29,8 +29,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile index 3395e9a..fb9724c 100644 --- a/editors/semi113-emacs/Makefile +++ b/editors/semi113-emacs/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for emacs -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -8,19 +8,24 @@ DISTNAME= semi-${SEMI_VER} CATEGORIES= editors elisp -MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/ +MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.12/ MAINTAINER?= shige@FreeBSD.org PORTCLASS?= master # distfile version -FLIM_VER= 1.12.5 -SEMI_VER= 1.13.3 +FLIM_VER= 1.13.2 +SEMI_VER= 1.13.6 # setupel filename SEMI_SETUPEL= semi-setupel.el # document install directory by install-doc target SEMIDOCDIR?= share/doc/semi +FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages +SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages .if (${PORTCLASS} == "master") # emacs port setup @@ -29,7 +34,7 @@ EMACS_PORT= emacs EMACS_VER= 19.34 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} -# emacs requires *-setupel.el +# whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES .endif @@ -39,9 +44,9 @@ ALL_TARGET?= elc .if defined(EMACS_PORT) PKGNAME= semi-${EMACS_PORT}-${SEMI_VER} EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} -BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES") -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common +BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} +.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES") +RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common .else RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} .endif @@ -52,8 +57,9 @@ SCRIPTS_ENV+= 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} \ - SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} -MAKE_FLAGS+= EMACS=${EMACS_CMD} + SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \ + FLIM_COOKIE=${FLIM_COOKIE} +MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${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} @@ -64,13 +70,13 @@ RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR} 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 +# 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 # depends on flim -BUILD_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current -RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current .else .BEGIN: @${ECHO} "Error: Bad port." @@ -78,8 +84,10 @@ RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/fl @${FALSE} .endif +.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO") # info files JIS to EUC BUILD_DEPENDS+= nkf:${PORTSDIR}/japanese/nkf +.endif pre-configure: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -93,8 +101,11 @@ MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer post-build: +.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES") + @${MAKE} info-build-by-emacs +.else @${MAKE} info-build - +.endif post-install: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -111,23 +122,37 @@ post-install: .endif - -# functions +############################################################################### +# +# miscellaneous local functions +# info-build: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-en.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ ${MAKEINFO} $${i} || ${TRUE} ; \ done) - -info-build-by-emacs: +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-ja.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ + ${MAKEINFO} $${i} || ${TRUE} ; \ + done) +.endif + +info-build-by-emacs: + @(cd ${WRKSRC} ; \ + for i in mime-ui-en.texi; do \ ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.texi; do \ + ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ + done) +.endif doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @@ -138,14 +163,21 @@ doc-install: setupel-install: @${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp info-install: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.info mime-ui-ja.info; do \ + for i in mime-ui-en.info; do \ + ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ + install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ + done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ done) +.endif info-package-install: @(cd ${WRKSRC} ; \ diff --git a/editors/semi113-emacs/distinfo b/editors/semi113-emacs/distinfo index 97b011d..7340e6c 100644 --- a/editors/semi113-emacs/distinfo +++ b/editors/semi113-emacs/distinfo @@ -1 +1 @@ -MD5 (semi-1.13.3.tar.gz) = 6015cca40c844a9c93083c3e73463d5d +MD5 (semi-1.13.6.tar.gz) = 1c46a8d8ae4b0fa91b73ffd992aae0af diff --git a/editors/semi113-emacs/pkg-plist b/editors/semi113-emacs/pkg-plist index 9378598..723126a 100644 --- a/editors/semi113-emacs/pkg-plist +++ b/editors/semi113-emacs/pkg-plist @@ -29,8 +29,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile index 2c7514f..4e1520f 100644 --- a/editors/semi113-emacs20/Makefile +++ b/editors/semi113-emacs20/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for emacs20 -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 23 September 1998 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -20,6 +20,9 @@ EMACS_VER= 20.4 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} +# whether emacs has mule feature +HAS_MULE= YES + # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile index da20b63..2e9981e 100644 --- a/editors/semi113-mule/Makefile +++ b/editors/semi113-mule/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for mule -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -20,8 +20,12 @@ EMACS_VER= 19.34 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} -HAVE_COMMON_PORT= YES +# whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES +# whether emacs has a *-common port +HAS_COMMON_PORT= YES +# whether emacs has mule feature +HAS_MULE= YES # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/semi113-xemacs/Makefile b/editors/semi113-xemacs/Makefile index 8cfee51..baec4f4 100644 --- a/editors/semi113-xemacs/Makefile +++ b/editors/semi113-xemacs/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for xemacs -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 25 July 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # diff --git a/editors/semi113-xemacs/pkg-plist b/editors/semi113-xemacs/pkg-plist index 04fb2c6..1fcd35a 100644 --- a/editors/semi113-xemacs/pkg-plist +++ b/editors/semi113-xemacs/pkg-plist @@ -32,8 +32,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi113-xemacs20/Makefile b/editors/semi113-xemacs20/Makefile index 1aaaa04..cfc8e31 100644 --- a/editors/semi113-xemacs20/Makefile +++ b/editors/semi113-xemacs20/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for xemacs20 -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 25 July 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # diff --git a/editors/semi113-xemacs20/pkg-plist b/editors/semi113-xemacs20/pkg-plist index 247fab1..e8706ea 100644 --- a/editors/semi113-xemacs20/pkg-plist +++ b/editors/semi113-xemacs20/pkg-plist @@ -33,8 +33,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile index de86b81..c37ca88 100644 --- a/editors/semi113-xemacs21-mule/Makefile +++ b/editors/semi113-xemacs21-mule/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for xemacs-mule -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 25 July 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -24,7 +24,15 @@ ALL_TARGET= package INSTALL_TARGET= install-package # RUN_DEPENDS port name's suffix is '-common'. -HAVE_COMMON_PORT= YES +HAS_COMMON_PORT= YES + +# whether emacs has mule feature +HAS_MULE= YES + +# whether building info files by emacs or makeinfo +BUILD_INFO_BY_EMACS= YES +# texinfo packages +BUILD_DEPENDS+= ${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile index 3395e9a..fb9724c 100644 --- a/editors/semi113/Makefile +++ b/editors/semi113/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for emacs -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -8,19 +8,24 @@ DISTNAME= semi-${SEMI_VER} CATEGORIES= editors elisp -MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/ +MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.12/ MAINTAINER?= shige@FreeBSD.org PORTCLASS?= master # distfile version -FLIM_VER= 1.12.5 -SEMI_VER= 1.13.3 +FLIM_VER= 1.13.2 +SEMI_VER= 1.13.6 # setupel filename SEMI_SETUPEL= semi-setupel.el # document install directory by install-doc target SEMIDOCDIR?= share/doc/semi +FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages +SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages .if (${PORTCLASS} == "master") # emacs port setup @@ -29,7 +34,7 @@ EMACS_PORT= emacs EMACS_VER= 19.34 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} -# emacs requires *-setupel.el +# whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES .endif @@ -39,9 +44,9 @@ ALL_TARGET?= elc .if defined(EMACS_PORT) PKGNAME= semi-${EMACS_PORT}-${SEMI_VER} EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} -BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES") -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common +BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} +.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES") +RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common .else RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} .endif @@ -52,8 +57,9 @@ SCRIPTS_ENV+= 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} \ - SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} -MAKE_FLAGS+= EMACS=${EMACS_CMD} + SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \ + FLIM_COOKIE=${FLIM_COOKIE} +MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${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} @@ -64,13 +70,13 @@ RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR} 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 +# 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 # depends on flim -BUILD_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current -RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current .else .BEGIN: @${ECHO} "Error: Bad port." @@ -78,8 +84,10 @@ RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/fl @${FALSE} .endif +.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO") # info files JIS to EUC BUILD_DEPENDS+= nkf:${PORTSDIR}/japanese/nkf +.endif pre-configure: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -93,8 +101,11 @@ MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer post-build: +.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES") + @${MAKE} info-build-by-emacs +.else @${MAKE} info-build - +.endif post-install: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -111,23 +122,37 @@ post-install: .endif - -# functions +############################################################################### +# +# miscellaneous local functions +# info-build: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-en.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ ${MAKEINFO} $${i} || ${TRUE} ; \ done) - -info-build-by-emacs: +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-ja.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ + ${MAKEINFO} $${i} || ${TRUE} ; \ + done) +.endif + +info-build-by-emacs: + @(cd ${WRKSRC} ; \ + for i in mime-ui-en.texi; do \ ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.texi; do \ + ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ + done) +.endif doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @@ -138,14 +163,21 @@ doc-install: setupel-install: @${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp info-install: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.info mime-ui-ja.info; do \ + for i in mime-ui-en.info; do \ + ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ + install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ + done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ done) +.endif info-package-install: @(cd ${WRKSRC} ; \ diff --git a/editors/semi113/distinfo b/editors/semi113/distinfo index 97b011d..7340e6c 100644 --- a/editors/semi113/distinfo +++ b/editors/semi113/distinfo @@ -1 +1 @@ -MD5 (semi-1.13.3.tar.gz) = 6015cca40c844a9c93083c3e73463d5d +MD5 (semi-1.13.6.tar.gz) = 1c46a8d8ae4b0fa91b73ffd992aae0af diff --git a/editors/semi113/pkg-plist.emacs19 b/editors/semi113/pkg-plist.emacs19 index 9378598..723126a 100644 --- a/editors/semi113/pkg-plist.emacs19 +++ b/editors/semi113/pkg-plist.emacs19 @@ -29,8 +29,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile index 3395e9a..fb9724c 100644 --- a/editors/semi114-emacs20/Makefile +++ b/editors/semi114-emacs20/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: semi-current for emacs -# Version required: 1.13.3 +# Version required: 1.13.6 # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org> # @@ -8,19 +8,24 @@ DISTNAME= semi-${SEMI_VER} CATEGORIES= editors elisp -MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/ +MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.12/ \ + ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.12/ MAINTAINER?= shige@FreeBSD.org PORTCLASS?= master # distfile version -FLIM_VER= 1.12.5 -SEMI_VER= 1.13.3 +FLIM_VER= 1.13.2 +SEMI_VER= 1.13.6 # setupel filename SEMI_SETUPEL= semi-setupel.el # document install directory by install-doc target SEMIDOCDIR?= share/doc/semi +FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages +SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages .if (${PORTCLASS} == "master") # emacs port setup @@ -29,7 +34,7 @@ EMACS_PORT= emacs EMACS_VER= 19.34 EMACS_LIBDIR= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} -# emacs requires *-setupel.el +# whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES .endif @@ -39,9 +44,9 @@ ALL_TARGET?= elc .if defined(EMACS_PORT) PKGNAME= semi-${EMACS_PORT}-${SEMI_VER} EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} -BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES") -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common +BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} +.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES") +RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common .else RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} .endif @@ -52,8 +57,9 @@ SCRIPTS_ENV+= 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} \ - SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} -MAKE_FLAGS+= EMACS=${EMACS_CMD} + SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \ + FLIM_COOKIE=${FLIM_COOKIE} +MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${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} @@ -64,13 +70,13 @@ RUN_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR} 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 +# 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 # depends on flim -BUILD_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current -RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current +RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current .else .BEGIN: @${ECHO} "Error: Bad port." @@ -78,8 +84,10 @@ RUN_DEPENDS+= ${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/fl @${FALSE} .endif +.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO") # info files JIS to EUC BUILD_DEPENDS+= nkf:${PORTSDIR}/japanese/nkf +.endif pre-configure: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -93,8 +101,11 @@ MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer post-build: +.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES") + @${MAKE} info-build-by-emacs +.else @${MAKE} info-build - +.endif post-install: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -111,23 +122,37 @@ post-install: .endif - -# functions +############################################################################### +# +# miscellaneous local functions +# info-build: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-en.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ ${MAKEINFO} $${i} || ${TRUE} ; \ done) - -info-build-by-emacs: +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") @(cd ${WRKSRC} ; \ - for i in mime-ui-en.texi mime-ui-ja.texi; do \ + for i in mime-ui-ja.texi; do \ ${MV} $${i} $${i}.jis ; \ ${CAT} $${i}.jis | nkf -e > $${i} ; \ + ${MAKEINFO} $${i} || ${TRUE} ; \ + done) +.endif + +info-build-by-emacs: + @(cd ${WRKSRC} ; \ + for i in mime-ui-en.texi; do \ ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.texi; do \ + ${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \ + done) +.endif doc-install: @${MKDIR} ${PREFIX}/${SEMIDOCDIR} @@ -138,14 +163,21 @@ doc-install: setupel-install: @${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp info-install: @(cd ${WRKSRC} ; \ - for i in mime-ui-en.info mime-ui-ja.info; do \ + for i in mime-ui-en.info; do \ + ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ + install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ + done) +.if defined(HAS_MULE) && (${HAS_MULE} == "YES") + @(cd ${WRKSRC} ; \ + for i in mime-ui-ja.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \ install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \ done) +.endif info-package-install: @(cd ${WRKSRC} ; \ diff --git a/editors/semi114-emacs20/distinfo b/editors/semi114-emacs20/distinfo index 97b011d..7340e6c 100644 --- a/editors/semi114-emacs20/distinfo +++ b/editors/semi114-emacs20/distinfo @@ -1 +1 @@ -MD5 (semi-1.13.3.tar.gz) = 6015cca40c844a9c93083c3e73463d5d +MD5 (semi-1.13.6.tar.gz) = 1c46a8d8ae4b0fa91b73ffd992aae0af diff --git a/editors/semi114-emacs20/pkg-plist b/editors/semi114-emacs20/pkg-plist index 9378598..723126a 100644 --- a/editors/semi114-emacs20/pkg-plist +++ b/editors/semi114-emacs20/pkg-plist @@ -29,8 +29,5 @@ %%SEMIDOCDIR%%/VERSION @dirrm %%SEMIDOCDIR%% @unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir info/mime-ui-en.info -info/mime-ui-ja.info @exec install-info %D/info/mime-ui-en.info %D/info/dir -@exec install-info %D/info/mime-ui-ja.info %D/info/dir |
