Date: Mon, 03 Aug 2026 06:35:25 +0000 From: Kousuke Kannagi <mce@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3a020e893938 - main - editors/tamago: Do not build *.elc files Message-ID: <6a7036ad.22cb0.b1d1328@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mce: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a020e8939381a9d6e69d1707b3841506b54e91c commit 3a020e8939381a9d6e69d1707b3841506b54e91c Author: Kousuke Kannagi <mce@FreeBSD.org> AuthorDate: 2026-07-18 19:22:54 +0000 Commit: Kousuke Kannagi <mce@FreeBSD.org> CommitDate: 2026-08-03 06:33:52 +0000 editors/tamago: Do not build *.elc files Add LICENSE_FILE. PR: 296888 Approved by: hrs (maintainer timeout 2 weeks) Approved by: fluffy (mentor) --- editors/tamago/Makefile | 11 +---- editors/tamago/files/patch-Makefile.in | 77 +++++++++++++++++++++++++----- editors/tamago/files/patch-egg-Makefile.in | 15 ------ editors/tamago/files/patch-egg_Makefile.in | 66 +++++++++++++++++++++++++ editors/tamago/files/patch-its-Makefile.in | 15 ------ editors/tamago/files/patch-its_Makefile.in | 67 ++++++++++++++++++++++++++ 6 files changed, 200 insertions(+), 51 deletions(-) diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 6215205abaad..4b20e5654ee9 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -9,6 +9,7 @@ COMMENT= Egg V4, Multilingual Input Method for Emacsen WWW= https://github.com/hrs-allbsd/tamago LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USES= emacs:build USE_GITHUB= yes @@ -18,12 +19,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-lispdir="${LOCALBASE}/${EMACS_SITE_LISPDIR}" CONFIGURE_ENV= EMACS="${EMACS_CMD}" -# Sometimes parallel build fails with such error as following: -# egg-com.el:35:11: Error: Loading file /wrkdirs/usr/ports/editors/tamago/work-devel_nox/tamago-4.0.6.0.20041122.19.15/egg-edep.elc failed to provide feature `egg-edep' -MAKE_JOBS_UNSAFE= yes - -CONFLICTS_INSTALL= tamago-emacs_* - NO_ARCH= yes PLIST_SUB= ELISPDIR="${EMACS_SITE_LISPDIR}" @@ -33,8 +28,4 @@ PORTDOCS= AUTHORS ChangeLog ChangeLog.1997-1998 \ OPTIONS_DEFINE= DOCS DOCS_CONFIGURE_ENABLE= doc -post-install: - ${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/egg \ - -name "*.elc" -delete - .include <bsd.port.mk> diff --git a/editors/tamago/files/patch-Makefile.in b/editors/tamago/files/patch-Makefile.in index 666ae26c41a5..4943fdfc3ef0 100644 --- a/editors/tamago/files/patch-Makefile.in +++ b/editors/tamago/files/patch-Makefile.in @@ -1,15 +1,70 @@ ---- Makefile.in.orig 2016-05-15 21:22:18 UTC +--- Makefile.in.orig 2022-05-05 12:01:44 UTC +++ Makefile.in -@@ -423,8 +423,11 @@ distclean-hdr: - $(EMACS) --batch \ - $(AM_ELCFLAGS) $(ELCFLAGS) \ - $$am__subdir_includes -L $(builddir) -L $(srcdir) \ +@@ -347,10 +347,10 @@ noinst_LISP = \ + its.el \ + its-keydef.el + +-dist_lisp_LISP = ${noinst_LISP:.el=.el.gz} ${noinst_LISP:.el=.elc} \ ++dist_lisp_LISP = ${noinst_LISP:.el=.el.gz} \ + leim-list.el eggrc + +-ELCFILES = ${noinst_LISP:.el=.el.gz} ${noinst_LISP:.el=.elc} ++ELCFILES = ${noinst_LISP:.el=.el.gz} + EXTRA_LISP = docomp.el leim-list.el + DOCS = AUTHORS ChangeLog README TODO PROBLEMS \ + ChangeLog.1997-1998 ChangeLog.2000-2001 ChangeLog.2002-2004 \ +@@ -361,32 +361,6 @@ all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +-.SUFFIXES: .el .elc +-am--refresh: Makefile +- @: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/elisp.mk $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ +- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- echo ' $(SHELL) ./config.status'; \ +- $(SHELL) ./config.status;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ +- esac; +-$(top_srcdir)/elisp.mk $(am__empty): + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +@@ -411,21 +385,6 @@ distclean-hdr: + + distclean-hdr: + -rm -f config.h stamp-h1 +- +-.el.elc: +- if test "$(EMACS)" != "no"; then \ +- am__dir=. am__subdir_includes=''; \ +- case $@ in */*) \ +- am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \ +- am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \ +- esac; \ +- test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \ +- $(EMACS) --batch \ +- $(AM_ELCFLAGS) $(ELCFLAGS) \ +- $$am__subdir_includes -L $(builddir) -L $(srcdir) \ - --eval "(defun byte-compile-dest-file (f) \"$@\")" \ -+ --eval "(defun byte-compile-dest-file (f) \"/tmp/$@\")" \ - --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \ -+ if [ -f "/tmp/$@" ]; then \ -+ cp /tmp/$@ $@ && rm -f /tmp/$@; \ -+ fi; \ - else :; fi +- --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \ +- else :; fi install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) + @$(NORMAL_INSTALL) diff --git a/editors/tamago/files/patch-egg-Makefile.in b/editors/tamago/files/patch-egg-Makefile.in deleted file mode 100644 index 5f24565559c4..000000000000 --- a/editors/tamago/files/patch-egg-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- egg/Makefile.in.orig 2016-05-15 21:22:18 UTC -+++ egg/Makefile.in -@@ -322,8 +322,11 @@ $(am__aclocal_m4_deps): - $(EMACS) --batch \ - $(AM_ELCFLAGS) $(ELCFLAGS) \ - $$am__subdir_includes -L $(builddir) -L $(srcdir) \ -- --eval "(defun byte-compile-dest-file (f) \"$@\")" \ -+ --eval "(defun byte-compile-dest-file (f) \"/tmp/$@\")" \ - --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \ -+ if [ -f "/tmp/$@" ]; then \ -+ cp /tmp/$@ $@ && rm -f /tmp/$@; \ -+ fi; \ - else :; fi - - install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) diff --git a/editors/tamago/files/patch-egg_Makefile.in b/editors/tamago/files/patch-egg_Makefile.in new file mode 100644 index 000000000000..d2f063b9de46 --- /dev/null +++ b/editors/tamago/files/patch-egg_Makefile.in @@ -0,0 +1,66 @@ +--- egg/Makefile.in.orig 2022-05-05 12:01:44 UTC ++++ egg/Makefile.in +@@ -153,7 +153,7 @@ am__ELCFILES = $(am__ELFILES:.el=.elc) + sj3.elc sj3rpc.el sj3rpc.el.gz sj3rpc.elc wnn.el wnn.el.gz \ + wnn.elc wnnrpc.el wnnrpc.el.gz wnnrpc.elc + am__ELCFILES = $(am__ELFILES:.el=.elc) +-ELCFILES = $(LISP:.el=.elc) ++ELCFILES = + DATA = $(doc_DATA) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, +@@ -276,31 +276,10 @@ noinst_LISP = \ + anthyipc.el \ + anthy.el + +-dist_lisp_LISP = ${noinst_LISP:.el=.el.gz} ${noinst_LISP:.el=.elc} .nosearch ++dist_lisp_LISP = ${noinst_LISP:.el=.el.gz} .nosearch + all: all-am + + .SUFFIXES: +-.SUFFIXES: .el .elc +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu egg/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu egg/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +@@ -310,21 +289,6 @@ $(am__aclocal_m4_deps): + $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(am__aclocal_m4_deps): +- +-.el.elc: +- if test "$(EMACS)" != "no"; then \ +- am__dir=. am__subdir_includes=''; \ +- case $@ in */*) \ +- am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \ +- am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \ +- esac; \ +- test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \ +- $(EMACS) --batch \ +- $(AM_ELCFLAGS) $(ELCFLAGS) \ +- $$am__subdir_includes -L $(builddir) -L $(srcdir) \ +- --eval "(defun byte-compile-dest-file (f) \"$@\")" \ +- --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \ +- else :; fi + + install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) + @$(NORMAL_INSTALL) diff --git a/editors/tamago/files/patch-its-Makefile.in b/editors/tamago/files/patch-its-Makefile.in deleted file mode 100644 index d92978653283..000000000000 --- a/editors/tamago/files/patch-its-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- its/Makefile.in.orig 2016-05-15 21:22:18 UTC -+++ its/Makefile.in -@@ -336,8 +336,11 @@ $(am__aclocal_m4_deps): - $(EMACS) --batch \ - $(AM_ELCFLAGS) $(ELCFLAGS) \ - $$am__subdir_includes -L $(builddir) -L $(srcdir) \ -- --eval "(defun byte-compile-dest-file (f) \"$@\")" \ -+ --eval "(defun byte-compile-dest-file (f) \"/tmp/$@\")" \ - --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \ -+ if [ -f "/tmp/$@" ]; then \ -+ cp /tmp/$@ $@ && rm -f /tmp/$@; \ -+ fi; \ - else :; fi - - install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) diff --git a/editors/tamago/files/patch-its_Makefile.in b/editors/tamago/files/patch-its_Makefile.in new file mode 100644 index 000000000000..e94810d3a99d --- /dev/null +++ b/editors/tamago/files/patch-its_Makefile.in @@ -0,0 +1,67 @@ +--- its/Makefile.in.orig 2022-05-05 12:01:44 UTC ++++ its/Makefile.in +@@ -158,7 +158,7 @@ am__ELCFILES = $(am__ELFILES:.el=.elc) + thai.elc zenkaku.el zenkaku.el.gz zenkaku.elc zhuyin.el \ + zhuyin.el.gz zhuyin.elc + am__ELCFILES = $(am__ELFILES:.el=.elc) +-ELCFILES = $(LISP:.el=.elc) ++ELCFILES = + DATA = $(doc_DATA) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, +@@ -289,32 +289,11 @@ noinst_LISP = \ + jiskana.el \ + @HAVE_JISX0213@ + +-dist_lisp_LISP = ${noinst_LISP:.el=.el.gz} ${noinst_LISP:.el=.elc} .nosearch ++dist_lisp_LISP = ${noinst_LISP:.el=.el.gz} .nosearch + EXTRA_LISP = aynu.el + all: all-am + + .SUFFIXES: +-.SUFFIXES: .el .elc +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu its/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu its/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +@@ -324,21 +303,6 @@ $(am__aclocal_m4_deps): + $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(am__aclocal_m4_deps): +- +-.el.elc: +- if test "$(EMACS)" != "no"; then \ +- am__dir=. am__subdir_includes=''; \ +- case $@ in */*) \ +- am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \ +- am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \ +- esac; \ +- test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \ +- $(EMACS) --batch \ +- $(AM_ELCFLAGS) $(ELCFLAGS) \ +- $$am__subdir_includes -L $(builddir) -L $(srcdir) \ +- --eval "(defun byte-compile-dest-file (f) \"$@\")" \ +- --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \ +- else :; fi + + install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) + @$(NORMAL_INSTALL)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a7036ad.22cb0.b1d1328>