Date: Fri, 16 Nov 2007 03:29:31 GMT From: Sunry Chen <sunrychen@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/118082: [PATCH]chinese/port broken in 7.x Message-ID: <200711160329.lAG3TViO082564@www.freebsd.org> Resent-Message-ID: <200711160340.lAG3e170074815@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118082 >Category: ports >Synopsis: [PATCH]chinese/port broken in 7.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 16 03:40:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Sunry Chen >Release: FreeBSD 7.0-BETA2 i386 >Organization: Shenzhen Institute of Technology >Environment: FreeBSD freebsd7.0 7.0-BETA2 FreeBSD 7.0-BETA2 #0: Fri Nov 2 16:47:33 UTC 2007 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 freebsd7# >Description: Port chinses/cce compile error in 7.x: http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.7.2007111200/zh-cce-0.51.log And marked as broken in Makefile: .if ${OSVERSION} >= 700042 BROKEN= Does not compile with GCC 4.2 .endif >How-To-Repeat: Compile it in 7.x >Fix: Patch attached with submission follows: diff -ruN cce.orig/Makefile cce/Makefile --- cce.orig/Makefile 2007-07-02 19:01:00.000000000 +0000 +++ cce/Makefile 2007-11-15 18:27:51.000000000 +0000 @@ -12,8 +12,13 @@ MASTER_SITE_SUBDIR= cce2k DISTNAME= ${PORTNAME}-${PORTVERSION}-02132004-dist EXTRACT_SUFX= .tgz +PATCH_SITES= http://www.chinatinco.com/freebsd/cce/ \ + http://www.525183.com/freebsd/cce/ \ + http://525183.serverbox.org/freebsd/cce/ +PATCHFILES= cce_0.51-1.diff.gz +PATCH_DIST_STRIP=-p1 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunrychen@gmail.com COMMENT= Console CJK Environment WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -24,8 +29,4 @@ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif - .include <bsd.port.post.mk> diff -ruN cce.orig/distinfo cce/distinfo --- cce.orig/distinfo 2005-11-24 23:01:40.000000000 +0000 +++ cce/distinfo 2007-11-15 17:59:36.000000000 +0000 @@ -1,3 +1,6 @@ MD5 (cce-0.51-02132004-dist.tgz) = 3f3cadb0daed1f67771982459c42cfea SHA256 (cce-0.51-02132004-dist.tgz) = 3d5498f7940191b2a99b284e4e3c37b8b4552bd4a9a8ac8f2692ee138d53f078 SIZE (cce-0.51-02132004-dist.tgz) = 7130658 +MD5 (cce_0.51-1.diff.gz) = 2fc71dbcc6d0ef7f21f3dfef1bf9537a +SHA256 (cce_0.51-1.diff.gz) = 8e0cdabacadea3c469cac1ae735c68a8fcea373ab1d59ef3f5de94315a301b72 +SIZE (cce_0.51-1.diff.gz) = 8911 diff -ruN cce.orig/files/patch-include::defs.h cce/files/patch-include::defs.h --- cce.orig/files/patch-include::defs.h 2005-05-01 03:03:15.000000000 +0000 +++ cce/files/patch-include::defs.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -diff -urN ./include/defs.h.orig ./include/defs.h ---- ./include/defs.h.orig Sun Jan 11 12:41:21 2004 -+++ ./include/defs.h Tue Dec 14 08:53:19 2004 -@@ -57,49 +57,67 @@ - - static inline void bzero2(void *head, int n) - { -+ unsigned char *p = (unsigned char *) head; -+ - while (n-- > 0) -- *((unsigned char *)head)++ = (unsigned char)0x0; -+ *p++ = (unsigned char)0x0; - } - - static inline void wzero(void *head, int n) - { -+ unsigned short *p = (unsigned short *) head; -+ - n >>= 1; - while (n-- > 0) -- *((unsigned short *)head)++ = (unsigned short)0x0; -+ *p++ = (unsigned short)0x0; - - } - - static inline void lzero(void *head, int n) - { -+ unsigned int *p = (unsigned int *) head; -+ - n >>= 2; - while (n-- > 0) -- *((unsigned int *)head)++ = (unsigned int)0x0; -+ *p++ = (unsigned int)0x0; - } - - static inline void bmove(void *dst, void *src, int n) - { -+ unsigned char *d = (unsigned char *) dst; -+ unsigned char *s = (unsigned char *) src; -+ - while(n-- > 0) -- *((unsigned char *)dst)++ = *((unsigned char *)src)++; -+ *d++ = *s++; - } - - static inline void brmove(void *dst, void *src, int n) - { -+ unsigned char *d = (unsigned char *) dst; -+ unsigned char *s = (unsigned char *) src; -+ - while(n-- > 0) -- *--((unsigned char *)dst) = *--((unsigned char *)src); -+ *--d = *--s; - } - - static inline void wmove(void *dst, void *src, int n) - { -+ unsigned short *d = (unsigned short *) dst; -+ unsigned short *s = (unsigned short *) src; -+ - n >>= 1; - while(n-- > 0) -- *((unsigned short *)dst)++ = *((unsigned short *)src)++; -+ *d++ = *s++; - } - - static inline void lmove(void *dst, void *src, int n) - { -+ unsigned int *d = (unsigned int *) dst; -+ unsigned int *s = (unsigned int *) src; -+ - n >>= 2; - while(n-- > 0) -- *((unsigned int *)dst)++ = *((unsigned int *)src)++; -+ *d++ = *s++; - } - - static inline void SafeFree(void **p) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711160329.lAG3TViO082564>