Date: Sun, 3 Jul 2005 16:22:24 +0900 (JST) From: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/82916: japanese/emacs-emcws: same update as editors/emacs Message-ID: <200507030722.j637MO2G080401@ra333.heimat.gr.jp> Resent-Message-ID: <200507030730.j637UFPB094109@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82916 >Category: ports >Synopsis: japanese/emacs-emcws: same update as editors/emacs >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jul 03 07:30:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: NAKAJI Hiroyuki >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD ra333.heimat.gr.jp 5.4-STABLE FreeBSD 5.4-STABLE #16: Wed May 18 14:45:15 JST 2005 root@ra333.heimat.gr.jp:/usr/obj/usr/src/sys/RA333 i386 >Description: Editors/emacs was updated months ago, but japanese/emacs-emcws not. Sorry for late. >How-To-Repeat: >Fix: I hope this will also fix the ia64 build failure reported in http://people.freebsd.org/~fenner/errorlogs/nakaji@jp.freebsd.org.html diff -urN -x CVS -x work -x .#* /usr/ports/japanese/emacs-emcws/Makefile ./Makefile --- /usr/ports/japanese/emacs-emcws/Makefile Tue Apr 12 22:08:04 2005 +++ ./Makefile Sat May 28 09:46:41 2005 @@ -7,7 +7,7 @@ PORTNAME= emcws PORTVERSION= ${EMACS_VER} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -149,6 +149,13 @@ EMACS_BASE=${LOCALBASE} .endif +.include <bsd.port.pre.mk> + +.if ${ARCH} == "ia64" +CFLAGS:= ${CFLAGS:C/-O.?/-O0/g} +CONFIGURE_ENV= CFLAGS="${CFLAGS}" +.endif + pre-everything:: @${CAT} ${FILESDIR}/emcws-message .if !defined(WITH_MENUBAR_FONTSET) @@ -215,4 +222,4 @@ @${ECHO_MSG} "====>" .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -urN -x CVS -x work -x .#* /usr/ports/japanese/emacs-emcws/files/patch-lib-src:movemail.c ./files/patch-lib-src:movemail.c --- /usr/ports/japanese/emacs-emcws/files/patch-lib-src:movemail.c Thu Jan 1 09:00:00 1970 +++ ./files/patch-lib-src:movemail.c Sat May 28 09:19:55 2005 @@ -0,0 +1,11 @@ +--- lib-src/movemail.c.orig Mon Feb 14 11:29:49 2005 ++++ lib-src/movemail.c Mon Feb 14 11:33:06 2005 +@@ -787,7 +787,7 @@ + mbx_delimit_begin (mbf); + if (pop_retr (server, i, mbf) != OK) + { +- error (Errmsg, 0, 0); ++ error ("%s", Errmsg, 0); + close (mbfi); + return (1); + } diff -urN -x CVS -x work -x .#* /usr/ports/japanese/emacs-emcws/files/patch-src:Makefile.in ./files/patch-src:Makefile.in --- /usr/ports/japanese/emacs-emcws/files/patch-src:Makefile.in Thu Jan 1 09:00:00 1970 +++ ./files/patch-src:Makefile.in Sat May 28 09:20:56 2005 @@ -0,0 +1,13 @@ +--- src/Makefile.in.orig Mon Dec 17 23:09:32 2001 ++++ src/Makefile.in Mon Oct 21 13:37:26 2002 +@@ -155,6 +155,10 @@ + /* This holds special options for linking temacs + that should be used for linking anything else. */ + #ifndef LD_SWITCH_SYSTEM_TEMACS ++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042) ++#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc ++#else + #define LD_SWITCH_SYSTEM_TEMACS ++#endif + #endif + diff -urN -x CVS -x work -x .#* /usr/ports/japanese/emacs-emcws/files/patch-src:s:freebsd.h ./files/patch-src:s:freebsd.h --- /usr/ports/japanese/emacs-emcws/files/patch-src:s:freebsd.h Wed Nov 20 20:03:38 2002 +++ ./files/patch-src:s:freebsd.h Sat May 28 09:48:04 2005 @@ -1,5 +1,5 @@ --- src/s/freebsd.h.orig Tue Feb 20 19:52:17 2001 -+++ src/s/freebsd.h Sat Nov 16 21:46:03 2002 ++++ src/s/freebsd.h Mon Feb 18 11:51:50 2002 @@ -68,6 +68,11 @@ #define LIBS_SYSTEM -lutil #if __FreeBSD_version < 400000 @@ -12,11 +12,3 @@ #endif #define SYSV_SYSTEM_DIR -@@ -220,3 +225,7 @@ - of sigblock says it is obsolete. */ - - #define POSIX_SIGNALS 1 -+ -+#if __FreeBSD_version >= 500000 -+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc -+#endif diff -urN -x CVS -x work -x .#* /usr/ports/japanese/emacs-emcws/files/patch-src:xterm.h ./files/patch-src:xterm.h --- /usr/ports/japanese/emacs-emcws/files/patch-src:xterm.h Thu Jan 1 09:00:00 1970 +++ ./files/patch-src:xterm.h Sat May 28 09:22:11 2005 @@ -0,0 +1,11 @@ +--- src/xterm.h.orig Mon Feb 28 13:53:40 2005 ++++ src/xterm.h Mon Feb 28 13:53:57 2005 +@@ -21,8 +21,8 @@ + + #include <X11/Xlib.h> + #include <X11/cursorfont.h> +-#include <X11/Xutil.h> + #include <X11/keysym.h> ++#include <X11/Xutil.h> + #include <X11/Xatom.h> + #include <X11/Xresource.h> >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507030722.j637MO2G080401>