From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 24 10:48:27 2006 Return-Path: X-Original-To: freebsd-ports-bugs@freebsd.org Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E92A116A41F for ; Tue, 24 Jan 2006 10:48:26 +0000 (GMT) (envelope-from kanou@khdd.net) Received: from khdd.net (kappa.allnet.ne.jp [61.211.150.156]) by mx1.FreeBSD.org (Postfix) with SMTP id 5C3CE43D4C for ; Tue, 24 Jan 2006 10:48:25 +0000 (GMT) (envelope-from kanou@khdd.net) Received: (qmail 88078 invoked from network); 24 Jan 2006 10:49:16 -0000 Received: from localhost.khdd.net (HELO localhost) (127.0.0.1) by localhost.khdd.net with SMTP; 24 Jan 2006 10:49:16 -0000 To: Pav Lucistnik , freebsd-ports-bugs@freebsd.org In-reply-to: Your message of "Tue, 24 Jan 2006 09:07:51 GMT." <200601240907.k0O97p9q020633@freefall.freebsd.org> Date: Tue, 24 Jan 2006 19:49:16 +0900 From: KANOU Hiroki Message-Id: <20060124104825.5C3CE43D4C@mx1.FreeBSD.org> Cc: kanou@khdd.net Subject: Re: ports/92240: maintainer-update: print/fontforge to 20060117 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 10:48:27 -0000 > You can't use tar -z flag to extract .bz2 file as you used it for DOCFILEs here --- fontforge.orig/Makefile Tue Nov 15 22:00:44 2005 +++ fontforge/Makefile Tue Jan 24 19:40:37 2006 @@ -6,13 +6,16 @@ # PORTNAME= fontforge -PORTVERSION= 20051028 -PORTREVISION= 1 +PORTVERSION= 20060117 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= fontforge DISTFILES= ${EXTRACT_ONLY} ${DOCFILE} EXTRACT_ONLY= ${PORTNAME}_full-${PORTVERSION}.tar.bz2 +.if defined(FONTFORGE_WITH_TTF_DEBUGGER) +FREETYPE_VERSION= 2.1.10 +EXTRACT_ONLY+= freetype-${FREETYPE_VERSION}.tar.bz2 +.endif MAINTAINER= kanou@khdd.net COMMENT= Type 1/TrueType/OpenType/bitmap font editor @@ -25,33 +28,69 @@ freetype.9:${PORTSDIR}/print/freetype2 \ xml2.5:${PORTSDIR}/textproc/libxml2 -DOC_VERSION= ${PORTVERSION} -DOCFILE= ${PORTNAME}_htdocs-${DOC_VERSION}.tgz +DOC_VERSION= 20060114 +DOCFILES= ${DOCFILE_IN_TAR_GZ} ${DOCFILE_IN_TAR_BZ2} +DOCFILE_IN_TAR_GZ= ${PORTNAME}_htdocs-${DOC_VERSION}.tgz +DOCFILE_IN_TAR_BZ2= ${PORTNAME}_ja_htdocs-${DOC_VERSION}.tar.bz2 USE_GMAKE= yes USE_XLIB= yes USE_ICONV= yes USE_BZIP2= yes PATCH_STRIP= -l + CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .if !defined(FONTFORGE_NO_MULTILAYER) -CONFIGURE_ARGS= --with-multilayer --with-devicetables --without-freetype-src +WITH_MULTILAYER= --with-multilayer +.endif +.if !defined(WITHOUT_TTF_BYTECODE_ENABLED) && defined(FONTFORGE_WITH_TTF_DEBUGGER) +WITH_FREETYPE_SRC= --with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION} .else -CONFIGURE_ARGS= --with-devicetables --without-freetype-src +WITH_FREETYPE_SRC= --without-freetype-src .endif +CONFIGURE_ARGS= ${WITH_MULTILAYER} --with-devicetables ${WITH_FREETYPE_SRC} CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \ -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/freetype2" + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} INSTALLS_SHLIB= yes USE_AUTOTOOLS= libtool:13 MAN1= fontforge.1 sfddiff.1 +pre-everything:: +.if defined(WITHOUT_EXTRA_ENCODINGS) + @${ECHO_MSG} "WARNING: You should not compile libiconv with WITHOUT_EXTRA_ENCODINGS" + @${ECHO_MSG} "defined, because libiconv must be configured with --enable-extra-encoding" + @${ECHO_MSG} "as FontForge requires Shift-JIS." + @${ECHO_MSG} "" +.endif +.if !defined(WITHOUT_TTF_BYTECODE_ENABLED) && !defined(FONTFORGE_WITH_TTF_DEBUGGER) + @${ECHO_MSG} "If you have built freetype2 port with bytecode interpreter enabled," + @${ECHO_MSG} "You can use TTF instruction debugger by compiling fontforge port" + @${ECHO_MSG} "with FONTFORGE_WITH_TTF_DEBUGGER defined." + @${ECHO_MSG} "Note that you must put the source archive of FreeType in ${DISTDIR}." + @${ECHO_MSG} "If you have installed freetype2 from a package, chdir to ${PORTSDIR}/print/" + @${ECHO_MSG} "and execute 'make fetch' before building this port". + @${ECHO_MSG} "" +.endif +.if !defined(FONTFORGE_NO_MULTILAYER) + @${ECHO_MSG} "If your machine has small memory and you have to edit fonts with a lot" + @${ECHO_MSG} "of glyphs, you can save memory by defining FONTFORGE_NO_MULTILAYER." + @${ECHO_MSG} "Enablling multilayer editing increases memory consumption per glyph." + @${ECHO_MSG} "" +.endif + post-extract: ${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap - ${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE} + for doc in ${DOCFILE_IN_TAR_GZ} ; \ + do ${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/$${doc} ; \ + done + for doc in ${DOCFILE_IN_TAR_BZ2} ; \ + do ${TAR} -xyC ${WRKDIR}/html -f ${DISTDIR}/$${doc} ; \ + done ${TAR} -xzC ${WRKSRC}/cidmap -f ${WRKDIR}/html/cidmaps.tgz ${RM} ${WRKDIR}/html/cidmaps.tgz @@ -59,7 +98,10 @@ ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} .if !defined(NOPORTDOCS) - ${INSTALL_DATA} ${WRKDIR}/html/* ${DOCSDIR} + ${MKDIR} ${DOCSDIR}/flags ${DOCSDIR}/ja + ${INSTALL_DATA} ${WRKDIR}/html/*.* ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/html/flags/* ${DOCSDIR}/flags + ${INSTALL_DATA} ${WRKDIR}/html/ja/* ${DOCSDIR}/ja .endif .include