From owner-svn-ports-all@FreeBSD.ORG Mon Jul 8 11:29:54 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 065ABFF6; Mon, 8 Jul 2013 11:29:54 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 99CFC178E; Mon, 8 Jul 2013 11:20:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68BKRs8043400; Mon, 8 Jul 2013 11:20:27 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68BKRLE043399; Mon, 8 Jul 2013 11:20:27 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201307081120.r68BKRLE043399@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 8 Jul 2013 11:20:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322487 - head/converters/bsdconv/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jul 2013 11:29:54 -0000 Author: danfe Date: Mon Jul 8 11:20:27 2013 New Revision: 322487 URL: http://svnweb.freebsd.org/changeset/ports/322487 Log: Attempt to fix parallel builds. Modified: head/converters/bsdconv/files/patch-Makefile Modified: head/converters/bsdconv/files/patch-Makefile ============================================================================== --- head/converters/bsdconv/files/patch-Makefile Mon Jul 8 06:17:25 2013 (r322486) +++ head/converters/bsdconv/files/patch-Makefile Mon Jul 8 11:20:27 2013 (r322487) @@ -2,7 +2,7 @@ +++ Makefile 2012-08-16 22:36:47.000000000 +0800 @@ -3,17 +3,9 @@ CFLAGS+=-Wall -DPREFIX='"${PREFIX}"' -DBSDCONV_PATH='"${BSDCONV_PATH}"' - SHLIBVER=7 + SHLIBVER=10 -UNAME_S=$(shell uname -s) -ifeq (${UNAME_S}, Darwin) @@ -16,5 +16,37 @@ -LIBS+=-ldl -endif - TODO_CODECS_BASIC_TABLE= - TODO_CODECS_BASIC_TABLE+=from/3F + TODO_CODECS_BASIC= + TODO_CODECS_BASIC+=from/00 +@@ -184,27 +176,27 @@ + bsdconv-man: builddir libbsdconv meta src/bsdconv.h src/bsdconv.c + $(CC) ${CFLAGS} src/bsdconv-man.c -L./build/lib/ -o build/bin/bsdconv-man -lbsdconv ${LIBS} + +-bsdconv-completion: builddir libbsdconv src/bsdconv.h src/bsdconv-completion.c ++bsdconv-completion: builddir libbsdconv meta src/bsdconv.h src/bsdconv-completion.c + $(CC) ${CFLAGS} src/bsdconv-completion.c -L./build/lib -o build/bin/bsdconv-completion -lbsdconv ${LIBS} + + bsdconv_dbg: builddir libbsdconv src/libbsdconv.c src/bsdconv.h src/bsdconv_dbg.c + $(CC) ${CFLAGS} src/libbsdconv.c src/bsdconv_dbg.c -o build/bin/bsdconv_dbg ${LIBS} + +-codecs_basic: builddir bsdconv-mktable ++codecs_basic: builddir bsdconv-mktable libbsdconv meta + for item in ${TODO_CODECS_BASIC} ; do \ + ./build/bin/bsdconv-mktable codecs/$${item}.txt ./build/share/bsdconv/$${item} ; \ + if [ -e codecs/$${item}.man ]; then cp codecs/$${item}.man ./build/share/bsdconv/$${item}.man ; fi ; \ + if [ -e codecs/$${item}.c ]; then $(CC) ${CFLAGS} codecs/$${item}.c -L./build/lib/ -fPIC -shared -o ./build/share/bsdconv/$${item}.so -lbsdconv ${LIBS} ; fi ; \ + done + +-codecs_chinese: builddir bsdconv-mktable ++codecs_chinese: builddir bsdconv-mktable libbsdconv meta + for item in ${TODO_CODECS_CHINESE} ; do \ + ./build/bin/bsdconv-mktable codecs/$${item}.txt ./build/share/bsdconv/$${item} ; \ + if [ -e codecs/$${item}.man ]; then cp codecs/$${item}.man ./build/share/bsdconv/$${item}.man ; fi ; \ + if [ -e codecs/$${item}.c ]; then $(CC) ${CFLAGS} codecs/$${item}.c -L./build/lib/ -fPIC -shared -o ./build/share/bsdconv/$${item}.so -lbsdconv ${LIBS} ; fi ; \ + done + +-codecs_ebcdic: builddir bsdconv-mktable ++codecs_ebcdic: builddir bsdconv-mktable libbsdconv meta + for item in ${TODO_CODECS_EBCDIC} ; do \ + ./build/bin/bsdconv-mktable codecs/$${item}.txt ./build/share/bsdconv/$${item} ; \ + if [ -e codecs/$${item}.man ]; then cp codecs/$${item}.man ./build/share/bsdconv/$${item}.man ; fi ; \