From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 13:45:50 2014 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 ESMTPS id 781BBBA9; Tue, 28 Jan 2014 13:45:50 +0000 (UTC) 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 525A91EFC; Tue, 28 Jan 2014 13:45:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SDjoCL094543; Tue, 28 Jan 2014 13:45:50 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SDjnug094541; Tue, 28 Jan 2014 13:45:49 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401281345.s0SDjnug094541@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 28 Jan 2014 13:45:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341563 - head/graphics/ocre 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.17 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: Tue, 28 Jan 2014 13:45:50 -0000 Author: bapt Date: Tue Jan 28 13:45:49 2014 New Revision: 341563 URL: http://svnweb.freebsd.org/changeset/ports/341563 QAT: https://qat.redports.org/buildarchive/r341563/ Log: Support stage Use MAKE_ARGS when possible instead of patching Switch ispell to aspell-ispell Modified: head/graphics/ocre/Makefile head/graphics/ocre/pkg-plist Modified: head/graphics/ocre/Makefile ============================================================================== --- head/graphics/ocre/Makefile Tue Jan 28 13:45:46 2014 (r341562) +++ head/graphics/ocre/Makefile Tue Jan 28 13:45:49 2014 (r341563) @@ -3,6 +3,7 @@ PORTNAME= ocre PORTVERSION= 0.042 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://lem.eui.upm.es/pub/ocre/ DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/} @@ -13,28 +14,21 @@ COMMENT= Simple optical character recogn LICENSE= GPLv2 -LIB_DEPENDS= aspell:${PORTSDIR}/textproc/aspell +LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell RUN_DEPENDS= display:${PORTSDIR}/graphics/ImageMagick \ gnuplot:${PORTSDIR}/math/gnuplot \ - ispell:${PORTSDIR}/textproc/ispell + ispell:${PORTSDIR}/textproc/aspell-ispell WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME} USE_GNOME= gtk20 USES= gettext gmake pkgconfig -MAKE_ENV= CFLAGS1="${CFLAGS}" +MAKE_ARGS= CC="${CC}" CFLAGS1="${CFLAGS}" -MANLANG= "" es -MAN1= ${PORTNAME}.1 - -NO_STAGE= yes post-extract: @cd ${WRKSRC} && ${TAR} --exclude "*.orig" -xof ocre-decsWood-${PORTVERSION}.tgz post-patch: - @${REINPLACE_CMD} -e 's|^CC =|CC ?=|g ; \ - s|^CFLAGS1=|CFLAGS1 ?=| ; \ - s|-O2||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|, sys_nerr||' ${WRKSRC}/src/errors.c @${FIND} ${WRKSRC} -name "*.[1ch]" -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e \ @@ -46,14 +40,14 @@ do-configure: @${ECHO_CMD} -n > ${WRKSRC}/ddepend do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 - @${MKDIR} ${MAN1PREFIX}/man/es/man1 - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}-es.1 ${MAN1PREFIX}/man/es/man1/${PORTNAME}.1 - ${INSTALL_DATA} ${WRKSRC}/po/es.mo ${PREFIX}/share/locale/es/LC_MESSAGES/${PORTNAME}.mo - @${MKDIR} ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/es/man1 + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}-es.1 ${STAGEDIR}${MAN1PREFIX}/man/es/man1/${PORTNAME}.1 + ${INSTALL_DATA} ${WRKSRC}/po/es.mo ${STAGEDIR}${PREFIX}/share/locale/es/LC_MESSAGES/${PORTNAME}.mo + @${MKDIR} ${STAGEDIR}${DATADIR} .for dir in conv decsWood decsWoodCur decsWoodCyrillic decsWoodLatin decsWoodLatinW - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}) .endfor .include Modified: head/graphics/ocre/pkg-plist ============================================================================== --- head/graphics/ocre/pkg-plist Tue Jan 28 13:45:46 2014 (r341562) +++ head/graphics/ocre/pkg-plist Tue Jan 28 13:45:49 2014 (r341563) @@ -1,4 +1,6 @@ bin/ocre +man/es/man1/ocre.1.gz +man/man1/ocre.1.gz share/locale/es/LC_MESSAGES/ocre.mo %%DATADIR%%/conv/cod39a2c %%DATADIR%%/conv/maymin