diff options
author | Mark Linimon <linimon@FreeBSD.org> | 2007-12-05 00:13:38 +0000 |
---|---|---|
committer | Mark Linimon <linimon@FreeBSD.org> | 2007-12-05 00:13:38 +0000 |
commit | 32287c109784671c0b626cc3f2ee67c51927bd99 (patch) | |
tree | ff92032febb21042ad9a2a84b180dac5cc9f7ad1 | |
parent | Attempt to fix build on 7.x with gcc4.2. (diff) |
Fix build on 7.x with gcc4.2.
PR: ports/118082
Submitted by: Sunry Chen <sunrychen at gmail dot com>
Approved by: portmgr (self)
Notes
Notes:
svn path=/head/; revision=202905
-rw-r--r-- | chinese/cce/Makefile | 16 | ||||
-rw-r--r-- | chinese/cce/distinfo | 3 | ||||
-rw-r--r-- | chinese/cce/files/patch-include::defs.h | 78 |
3 files changed, 11 insertions, 86 deletions
diff --git a/chinese/cce/Makefile b/chinese/cce/Makefile index c40346a419d8..78d70f5994b3 100644 --- a/chinese/cce/Makefile +++ b/chinese/cce/Makefile @@ -12,20 +12,20 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} 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} ONLY_FOR_ARCHS= i386 HAS_CONFIGURE= yes +CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= cce.1 cceconv.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/chinese/cce/distinfo b/chinese/cce/distinfo index 82f59f5a5a77..65a741f05bb2 100644 --- a/chinese/cce/distinfo +++ b/chinese/cce/distinfo @@ -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 --git a/chinese/cce/files/patch-include::defs.h b/chinese/cce/files/patch-include::defs.h deleted file mode 100644 index 064bc9275098..000000000000 --- a/chinese/cce/files/patch-include::defs.h +++ /dev/null @@ -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) |