From owner-svn-ports-head@FreeBSD.ORG Wed Oct 30 14:58:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8E087DFA; Wed, 30 Oct 2013 14:58:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7C01A284F; Wed, 30 Oct 2013 14:58:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UEwxXP018562; Wed, 30 Oct 2013 14:58:59 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UEwx74018560; Wed, 30 Oct 2013 14:58:59 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201310301458.r9UEwx74018560@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 30 Oct 2013 14:58:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332123 - head/textproc/catdoc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 14:58:59 -0000 Author: amdmi3 Date: Wed Oct 30 14:58:58 2013 New Revision: 332123 URL: http://svnweb.freebsd.org/changeset/ports/332123 Log: - Support staging Modified: head/textproc/catdoc/Makefile head/textproc/catdoc/pkg-plist Modified: head/textproc/catdoc/Makefile ============================================================================== --- head/textproc/catdoc/Makefile Wed Oct 30 14:57:19 2013 (r332122) +++ head/textproc/catdoc/Makefile Wed Oct 30 14:58:58 2013 (r332123) @@ -6,7 +6,7 @@ PORTVERSION= 0.94.2 PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ - ${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|} \ + LOCAL/amdmi3 \ ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \ ftp://ftp.demos.ru/pub/sunfreeware/SOURCES/ @@ -14,34 +14,33 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= MS Word/Excel converter to plain ASCII or TeX. TK viewer included GNU_CONFIGURE= yes -USE_GMAKE= yes -MAN1= catdoc.1 xls2csv.1 catppt.1 +CONFIGURE_ARGS= --with-install-root="${STAGEDIR}" +USES= gmake + +PORTDATA= * OPTIONS_DEFINE= WORDVIEW +OPTIONS_DEFAULT=WORDVIEW +OPTIONS_SUB= yes + WORDVIEW_DESC= Build Tcl/Tk document viewer -OPTIONS_DEFAULT= WORDVIEW .if !defined(LANG) || ${LANG} != ru_RU.KOI8-R # Remove the below line to get Cyrillic code page support instead CFLAGS+= -DLATIN1=1 .endif -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/doc/catdoc.1.in - -.include .include .if ${PORT_OPTIONS:MWORDVIEW} USE_TK= 84+ .include "${PORTSDIR}/Mk/bsd.tcl.mk" CONFIGURE_ARGS+= --with-wish=${WISH} -PLIST_SUB+= WORDVIEW="" -MAN1+= wordview.1 .else CONFIGURE_ARGS+= --disable-wordview -PLIST_SUB+= WORDVIEW="@comment " .endif -.include +post-patch: + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/doc/catdoc.1.in + +.include Modified: head/textproc/catdoc/pkg-plist ============================================================================== --- head/textproc/catdoc/pkg-plist Wed Oct 30 14:57:19 2013 (r332122) +++ head/textproc/catdoc/pkg-plist Wed Oct 30 14:58:58 2013 (r332123) @@ -2,54 +2,7 @@ bin/catdoc bin/catppt %%WORDVIEW%%bin/wordview bin/xls2csv -%%DATADIR%%/8859-1.txt -%%DATADIR%%/8859-10.txt -%%DATADIR%%/8859-11.txt -%%DATADIR%%/8859-13.txt -%%DATADIR%%/8859-14.txt -%%DATADIR%%/8859-15.txt -%%DATADIR%%/8859-2.txt -%%DATADIR%%/8859-3.txt -%%DATADIR%%/8859-4.txt -%%DATADIR%%/8859-5.txt -%%DATADIR%%/8859-6.txt -%%DATADIR%%/8859-7.txt -%%DATADIR%%/8859-8.txt -%%DATADIR%%/8859-9.txt -%%DATADIR%%/ascii.replchars -%%DATADIR%%/ascii.specchars -%%DATADIR%%/cp1250.txt -%%DATADIR%%/cp1251.txt -%%DATADIR%%/cp1252.txt -%%DATADIR%%/cp1253.txt -%%DATADIR%%/cp1254.txt -%%DATADIR%%/cp1255.txt -%%DATADIR%%/cp1256.txt -%%DATADIR%%/cp1257.txt -%%DATADIR%%/cp1258.txt -%%DATADIR%%/cp437.txt -%%DATADIR%%/cp850.txt -%%DATADIR%%/cp852.txt -%%DATADIR%%/cp855.txt -%%DATADIR%%/cp857.txt -%%DATADIR%%/cp860.txt -%%DATADIR%%/cp861.txt -%%DATADIR%%/cp862.txt -%%DATADIR%%/cp863.txt -%%DATADIR%%/cp864.txt -%%DATADIR%%/cp865.txt -%%DATADIR%%/cp866.txt -%%DATADIR%%/cp869.txt -%%DATADIR%%/cp874.txt -%%DATADIR%%/koi8-r.txt -%%DATADIR%%/koi8-u.txt -%%DATADIR%%/mac-arabic.txt -%%DATADIR%%/mac-centeuro.txt -%%DATADIR%%/mac-cyrillic.txt -%%DATADIR%%/mac-greek.txt -%%DATADIR%%/mac-hebrew.txt -%%DATADIR%%/mac-roman.txt -%%DATADIR%%/tex.replchars -%%DATADIR%%/tex.specchars -%%DATADIR%%/us-ascii.txt -@dirrm %%DATADIR%% +man/man1/catdoc.1.gz +man/man1/catppt.1.gz +%%WORDVIEW%%man/man1/wordview.1.gz +man/man1/xls2csv.1.gz