Date: Tue, 28 Jan 2014 13:45:49 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341563 - head/graphics/ocre Message-ID: <201401281345.s0SDjnug094541@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401281345.s0SDjnug094541>