ports/107187: [FIX] japanese/emacs{, 20}-emcws unbuildable with gcc41
NAKAJI Hiroyuki
nakaji at jp.freebsd.org
Mon Dec 25 23:27:53 UTC 2006
Thank you for testing it, Martin.
I put a wrong CONFLICT in emacs-emcws/Makefile. How about this?
diff -urN -x CVS /usr/ports/japanese/emacs-emcws/Makefile emacs-emcws/Makefile
--- /usr/ports/japanese/emacs-emcws/Makefile Wed Nov 16 00:17:44 2005
+++ emacs-emcws/Makefile Tue Dec 26 07:57:08 2006
@@ -7,7 +7,7 @@
PORTNAME= emcws
PORTVERSION= ${EMACS_VER}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= japanese editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
@@ -20,7 +20,6 @@
.if defined(WITH_MENUBAR_FONTSET)
PATCH_SITES+= http://www.nijino.com/ari/emacs/
PATCHFILES+= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
-PATCH_DIST_STRIP= -p1
.endif
MAINTAINER= nakaji at jp.freebsd.org
@@ -29,6 +28,11 @@
BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs
RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs
+CONFLICTS= emacs-19.* emacs-20.* \
+ ja-emcws-20.* \
+ xemacs-[0-9]* xemacs-devel-[0-9]* \
+ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
+
WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}
USE_AUTOTOOLS= autoconf:213
@@ -152,7 +156,7 @@
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64"
-BROKEN= "Segfault during build on ia64"
+BROKEN= Segfault during build on ia64
CFLAGS:= ${CFLAGS:C/-O.?/-O0/g}
CONFIGURE_ENV= CFLAGS="${CFLAGS}"
.endif
diff -urN -x CVS /usr/ports/japanese/emacs-emcws/files/patch-src:wnnfns.c emacs-emcws/files/patch-src:wnnfns.c
--- /usr/ports/japanese/emacs-emcws/files/patch-src:wnnfns.c Thu Jan 1 09:00:00 1970
+++ emacs-emcws/files/patch-src:wnnfns.c Mon Dec 25 18:08:01 2006
@@ -0,0 +1,57 @@
+--- src/wnnfns.c.orig Mon Dec 25 18:05:08 2006
++++ src/wnnfns.c Mon Dec 25 18:07:15 2006
+@@ -341,6 +341,9 @@
+ static int wnnfns_norm;
+ static unsigned char lc_wnn_server_type[NSERVER] = {LCJP, LCCN, LCINV, LCKR};
+
++static int yes_or_no();
++static void puts2();
++
+ /* Lisp Variables and Constants Definition */
+ Lisp_Object Qjserver;
+ Lisp_Object Qcserver;
+@@ -452,8 +455,6 @@
+ int nargs;
+ register Lisp_Object *args;
+ {
+- static int yes_or_no();
+- static void puts2();
+ struct gcpro gcpro1;
+ int snum;
+ CHECK_STRING (args[0], 0);
+@@ -1293,8 +1294,6 @@
+ int nargs;
+ register Lisp_Object *args;
+ {
+- static int yes_or_no();
+- static void puts2();
+ struct gcpro gcpro1;
+ int snum;
+ CHECK_STRING (args[0], 0);
+@@ -1329,8 +1328,6 @@
+ int nargs;
+ register Lisp_Object *args;
+ {
+- static int yes_or_no();
+- static void puts2();
+ struct gcpro gcpro1;
+ int snum;
+ CHECK_STRING (args[0], 0);
+@@ -1365,8 +1362,6 @@
+ int nargs;
+ register Lisp_Object *args;
+ {
+- static int yes_or_no();
+- static void puts2();
+ struct gcpro gcpro1;
+ int snum;
+ int dic_no;
+@@ -1427,8 +1422,6 @@
+ int nargs;
+ register Lisp_Object *args;
+ {
+- static int yes_or_no();
+- static void puts2();
+ struct gcpro gcpro1;
+ int snum;
+ int dic_no;
--
NAKAJI Hiroyuki
More information about the freebsd-ports-bugs
mailing list