ports/88783: [PATCH] x11-fonts/libXft: Remove WITH_CJK knob for failed building

[chinsan]

>Number:         88783
>Category:       ports
>Synopsis:       [PATCH] x11-fonts/libXft: Remove WITH_CJK knob for failed building
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 10 09:50:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 6.0-STABLE FreeBSD 6.0-STABLE #3: Mon Nov 7 23:59:09 CST 2005 root at chinsan.twbbs.org:/usr/obj/usr/src/sys/TAKAKO i386

>Description:
 -  Remove WITH_CJK knob for faild building problem which occures on 5.4 -RELAESE and after... :(
    BTW, I will take time to take care of this issue and make new patch...

 -  add SHA256 keyprint

>How-To-Repeat:
# cd /usr/ports/x11-fonts/libXft/ 
# make -DWITH_CJK 
 cc -DHAVE_CONFIG_H -I. -I. -I. -I/usr/X11R6/include -I/usr/X11R6/include
-I/usr/local/include/freetype2 -I/usr/local/include -I/usr/X11R6/include
-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O -pipe -O2
-pipe -march=i686 -march=pentium3 -MT xftfreetype.lo -MD -MP -MF
.deps/xftfreetype.Tpo -c xftfreetype.c  -fPIC -DPIC -o .libs/xftfreetype.o
xftfreetype.c: In function FontInfoFill':
xftfreetype.c:526: error: C_EMBEDDED_BITMAP' undeclared (first use in this
function)
xftfreetype.c:526: error: (Each undeclared identifier is reported only once
xftfreetype.c:526: error: for each function it appears in.)
xftfreetype.c:565: error: C_USE_GAMMA' undeclared (first use in this
function)
gmake[1]: *** [xftfreetype.lo] Error 1
gmake[1]: Leaving directory /usr/ports/x11-fonts/libXft/work/libXft-2.1.7'
gmake: *** [all] Error 2
*** Error code 2

Stop in /usr/ports/x11-fonts/libXft.

>Fix:

--- libXft.diff begins here ---
diff -ruN libXft.orig/Makefile libXft/Makefile
--- libXft.orig/Makefile	Thu Nov 10 17:38:11 2005
+++ libXft/Makefile	Thu Nov 10 17:39:55 2005
@@ -26,12 +26,13 @@
 
 MAN3=		Xft.3
 
-.if defined(WITH_CJK)
-PATCH_SITES=	http://bsdchat.com/dist/firefly-cjk-patchset/ \
-		http://bbs.ilc.edu.tw/~chinsan/ \
-		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
-PATCHFILES+=	cjk-patch-libXft-20050716.diff.gz
-.endif
+# For some building on 5.4 -R (and later) may not work
+#.if defined(WITH_CJK)
+#PATCH_SITES=	http://bsdchat.com/dist/firefly-cjk-patchset/ \
+#		http://bbs.ilc.edu.tw/~chinsan/ \
+#		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
+#PATCHFILES+=	cjk-patch-libXft-20050716.diff.gz
+#.endif
 
 .include <bsd.port.pre.mk>
 
diff -ruN libXft.orig/distinfo libXft/distinfo
--- libXft.orig/distinfo	Thu Nov 10 17:38:11 2005
+++ libXft/distinfo	Thu Nov 10 17:42:39 2005
@@ -1,4 +1,3 @@
 MD5 (libXft-2.1.7.tar.bz2) = 3e311b4095283d59488b95c8bd772521
+SHA256 (libXft-2.1.7.tar.bz2) = 6c917395ecd3b39ea0e15a0ab1c89ec862a429d1e5f92de9651522bdae8abf56
 SIZE (libXft-2.1.7.tar.bz2) = 237056
-MD5 (cjk-patch-libXft-20050716.diff.gz) = 55d3b9b312643a3da07fd8ed8ecefd76
-SIZE (cjk-patch-libXft-20050716.diff.gz) = 3488
--- libXft.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: