5 files changed, 45 insertions, 11 deletions

diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index fba2a206c59d..f475bc80e926 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -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=${PREFIX}
 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 @@ post-install:
 	@${ECHO_MSG} "====>"
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/emacs-emcws/files/patch-lib-src:movemail.c b/japanese/emacs-emcws/files/patch-lib-src:movemail.c
new file mode 100644
index 000000000000..c47286937302
--- /dev/null
+++ b/japanese/emacs-emcws/files/patch-lib-src:movemail.c
@@ -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 --git a/japanese/emacs-emcws/files/patch-src:Makefile.in b/japanese/emacs-emcws/files/patch-src:Makefile.in
new file mode 100644
index 000000000000..d0e31255cc3b
--- /dev/null
+++ b/japanese/emacs-emcws/files/patch-src:Makefile.in
@@ -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 --git a/japanese/emacs-emcws/files/patch-src:s:freebsd.h b/japanese/emacs-emcws/files/patch-src:s:freebsd.h
index effb78a6a62b..2eb9ea8823ee 100644
--- a/japanese/emacs-emcws/files/patch-src:s:freebsd.h
+++ b/japanese/emacs-emcws/files/patch-src:s:freebsd.h
@@ -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 --git a/japanese/emacs-emcws/files/patch-src:xterm.h b/japanese/emacs-emcws/files/patch-src:xterm.h
new file mode 100644
index 000000000000..a0faee236ed5
--- /dev/null
+++ b/japanese/emacs-emcws/files/patch-src:xterm.h
@@ -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>