ports/60345: fix port: chinese/vflib

Yen-Ming Lee leeym at utopia.leeym.com
Wed Dec 17 20:20:29 UTC 2003


>Number:         60345
>Category:       ports
>Synopsis:       fix port: chinese/vflib
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 17 12:20:22 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.2-RC i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.2-RC FreeBSD 5.2-RC #4: Tue Dec 16 05:13:28 CST 2003 root at utopia.leeym.com:/mnt3/obj/usr/src/sys/UTOPIA i386


	
>Description:

enslave and unbreak chinese/vflib

>How-To-Repeat:

http://bento.freebsd.org/errorlogs/i386-5-latest/zh-vflib-2.25.1.log

>Fix:

	

--- vflib.diff begins here ---
diff -ruN --exclude CVS /usr/ports/japanese/vflib/Makefile vflib/Makefile
--- /usr/ports/japanese/vflib/Makefile	Wed Aug 27 05:51:35 2003
+++ vflib/Makefile	Thu Dec 18 03:03:20 2003
@@ -8,13 +8,13 @@
 PORTNAME=	vflib
 PORTVERSION=	${VFLIB_VERSION}
 PORTREVISION=	4
-CATEGORIES=	japanese print
+CATEGORIES?=	japanese print
 MASTER_SITES=	ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
 DISTNAME=	VFlib2-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	mita at FreeBSD.org
-COMMENT=	Japanese Vector font library
+MAINTAINER?=	mita at FreeBSD.org
+COMMENT?=	Japanese Vector font library
 
 BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
diff -ruN --exclude CVS /usr/ports/chinese/vflib/Makefile vflib/Makefile
--- /usr/ports/chinese/vflib/Makefile	Sun Dec  7 07:18:17 2003
+++ vflib/Makefile	Thu Dec 18 03:34:56 2003
@@ -5,54 +5,16 @@
 # $FreeBSD: ports/chinese/vflib/Makefile,v 1.6 2003/12/06 22:01:30 linimon Exp $
 #
 
-PORTNAME=	vflib
-PORTVERSION=	${VFLIB_VERSION}
 CATEGORIES=	chinese print
-MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/VFlib2/ \
-		ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
-DISTNAME=	VFlib2-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} zh-vfontcap.in
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/VFlib2/
 PATCHFILES=	VFlib2-2.25.1-Chinese.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Vector font library with free vector font, BIG5 and GB supported
+COMMENT=	Japanese Vector font library, BIG5 and GB supported
 
-BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
+MD5_FILE=	${.CURDIR}/distinfo
+MASTERDIR=	${.CURDIR}/../../japanese/vflib
 
-VFLIB_VERSION=	2.25.1
-PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
-
-GNU_CONFIGURE=	yes
-USE_FREETYPE=	yes
-USE_XLIB=	yes
-USE_AUTOCONF=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--with-freetype \
-		--with-freetype-includedir=${PREFIX}/include/freetype1/freetype \
-		--with-freetype-libdir=${PREFIX}/lib
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (need to replace varargs.h with stdarg.h)"
-.endif
-
-pre-patch:
-	@${SED} -e "s;%%LOCALBASE%%;${LOCALBASE};g" -e "s;%%X11BASE%%;${X11BASE};g" ${DISTDIR}/zh-vfontcap.in > ${WRKSRC}/vfontcap
-
-pre-install:
-	@(cd ${WRKSRC}/tools; \
-	    ${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${PREFIX}/bin)
-	@(cd ${WRKSRC}; \
-	  ${MKDIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION} ;\
-	  ${CP} COPYING COPYING.LIB README.txt.JP_EUC \
-		${PREFIX}/share/VFlib/${VFLIB_VERSION})
-
-post-install:
-	${MV} ${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${PREFIX}/include
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff -ruN --exclude CVS /usr/ports/chinese/vflib/distinfo vflib/distinfo
--- /usr/ports/chinese/vflib/distinfo	Mon Dec 11 17:47:22 2000
+++ vflib/distinfo	Thu Dec 18 02:18:04 2003
@@ -1,3 +1,2 @@
-MD5 (VFlib2-2.25.1.tar.gz) = 533bd3b39e1e2b883b5a6b5c14443c93
-MD5 (zh-vfontcap.in) = 4738e8c2cb06f46f9c0d03b8babcc77d
+MD5 (VFlib2-2.25.6.tar.gz) = 64899702c94ce059069a5532098d5937
 MD5 (VFlib2-2.25.1-Chinese.patch.gz) = 879611ba64426835b6f2026adf263235
diff -ruN --exclude CVS /usr/ports/chinese/vflib/files/patch-vfontcap vflib/files/patch-vfontcap
--- /usr/ports/chinese/vflib/files/patch-vfontcap	Thu Jan  1 08:00:00 1970
+++ vflib/files/patch-vfontcap	Thu Dec 18 02:21:49 2003
@@ -0,0 +1,80 @@
+--- vfontcap.orig	Thu Dec 18 02:19:10 2003
++++ vfontcap	Thu Dec 18 02:21:14 2003
+@@ -800,5 +800,77 @@
+ 	:fc=r-ricoh-ttw-hg-mincho-l-pro:
+ ricoh-ttw-hg-gothic-b-pro:\
+ 	:fc=r-ricoh-ttw-hg-gothic-b-pro:
++
++# Chinese
++#b5song|b5song5|b5song6|b5song7|b5song8|b5song9|b5song10|b5song12|b5song17:\
++#        :ox#0:oy#-5:\
++#        :fc=b5-song:
++# by Chih-Wei Huang <cwhuang at linux.org.tw>
++b5song:\
++	:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/bsmi00lp.ttf:
++b5songs:\
++	:sl#15:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/bsmi00lp.ttf:
++b5songb:\
++	:fx#105:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/bsmi00lp.ttf:
++gbsong:\
++	:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/gbsn00lp.ttf:
++gbsongs:\
++	:sl#15:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/gbsn00lp.ttf:
++gbsongb:\
++	:fx#105:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/gbsn00lp.ttf:
++b5kai:\
++	:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/bkai00mp.ttf:
++b5kais:\
++	:sl#15:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/bkai00mp.ttf:
++b5kaib:\
++	:fx#105:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/bkai00mp.ttf:
++gbkai:\
++	:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/gkai00mp.ttf:
++gbkais:\
++	:sl#15:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/gkai00mp.ttf:
++gbkais:\
++	:fx#105:ox#0:oy#-8:\
++	:ft=freetype-gbk:\
++	:ff=/usr/local/share/fonts/TrueType/gkai00mp.ttf:
++hei|hei5|hei6|hei7|hei8|hei9|hei10|hei12|hei17:\
++	:ox#0:oy#-10:\
++	:fc=ht-hei:
++ht-hei:\
++	:ft=freetype-gbk:\
++	:ff=/usr/X11R6/lib/X11/fonts/tt/tlc_hei.ttf:
++fs|fs5|fs6|fs7|fs8|fs9|fs10|fs12|fs17:\
++	:ox#0:oy#-10:\
++	:fc=ht-fs:
++ht-fs:\
++	:ft=freetype-gbk:\
++	:ff=/usr/X11R6/lib/X11/fonts/tt/tlc_fs.ttf:
++kai|kai5|kai6|kai7|kai8|kai9|kai10|kai12|kai17:\
++	:ox#0:oy#-10:\
++	:fc=ht-kai:
++ht-kai:\
++	:ft=freetype-gbk:\
++	:ff=/usr/X11R6/lib/X11/fonts/tt/tlc_kai.ttf:
+ # EOF
+ 
--- vflib.diff ends here ---


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



More information about the freebsd-ports-bugs mailing list