From owner-svn-ports-head@FreeBSD.ORG Mon Oct 29 11:05:22 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3A2EE95A; Mon, 29 Oct 2012 11:05:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0706E8FC12; Mon, 29 Oct 2012 11:05:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9TB5LoX046567; Mon, 29 Oct 2012 11:05:21 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9TB5Lua046565; Mon, 29 Oct 2012 11:05:21 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201210291105.q9TB5Lua046565@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 29 Oct 2012 11:05:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306600 - in head/graphics/autotrace: . 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-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: Mon, 29 Oct 2012 11:05:22 -0000 Author: bapt Date: Mon Oct 29 11:05:21 2012 New Revision: 306600 URL: http://svn.freebsd.org/changeset/ports/306600 Log: - Optionify imagemagick dependency - Add LICENSE - Add MAKE_JOBS_SAFE PR: ports/172013 Submitted by: KATO Tsuguru Feature safe: yes Deleted: head/graphics/autotrace/files/patch-configure Modified: head/graphics/autotrace/Makefile Modified: head/graphics/autotrace/Makefile ============================================================================== --- head/graphics/autotrace/Makefile Mon Oct 29 10:27:24 2012 (r306599) +++ head/graphics/autotrace/Makefile Mon Oct 29 11:05:21 2012 (r306600) @@ -1,9 +1,5 @@ -# New ports collection makefile for: autotrace -# Date created: 12 April 2001 -# Whom: KANOU Hiroki -# +# Created by: KANOU Hiroki # $FreeBSD$ -# PORTNAME= autotrace PORTVERSION= 0.31.1 @@ -14,42 +10,48 @@ MASTER_SITES= SF/${PORTNAME}/AutoTrace/$ MAINTAINER= ports@FreeBSD.org COMMENT= Convert bitmap to vector graphics -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - MagickWand.5:${PORTSDIR}/graphics/ImageMagick +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png + +OPTIONS_DEFINE= IMAGEMAGICK MING PSTOEDIT +OPTIONS_DEFAULT= IMAGEMAGICK PSTOEDIT +MING_DESC= Enable swf interface +PSTOEDIT_DESC= Convert postscript to other formats + +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include/libpng15 +MAKE_JOBS_SAFE= yes +CPPFLAGS+= $$(libpng-config --I_opts) ${PTHREAD_CFLAGS} +LDFLAGS+= $$(libpng-config --L_opts) ${PTHREAD_LIBS} MAN1= autotrace.1 -OPTIONS_DEFINE= MING PSTOEDIT -OPTIONS_DEFAULT= PSTOEDIT -MING_DESC= Enable swf interface -PSTOEDIT_DESC= Convert postscript to other formats - .include +.if ${PORT_OPTIONS:MIMAGEMAGICK} +LIB_DEPENDS+= MagickWand:${PORTSDIR}/graphics/ImageMagick +.else +CONFIGURE_ARGS+= --without-magick +.endif + .if ${PORT_OPTIONS:MMING} -LIB_DEPENDS+= ming.5:${PORTSDIR}/graphics/ming +LIB_DEPENDS+= ming:${PORTSDIR}/graphics/ming CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ming .endif .if ${PORT_OPTIONS:MPSTOEDIT} -LIB_DEPENDS+= pstoedit.0:${PORTSDIR}/graphics/pstoedit +LIB_DEPENDS+= pstoedit:${PORTSDIR}/graphics/pstoedit .endif post-patch: @${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|' \ - ${WRKSRC}/Makefile.in - -.if ${PORT_OPTIONS:MPSTOEDIT} - @${REINPLACE_CMD} -e '/$$PSTOEDIT_CONFIG/ s|--version|--modversion| ; \ + 's|Magick-config|MagickWand-config|g ; \ + /$$PSTOEDIT_CONFIG/s|--version|--modversion| ; \ s|$$PSTOEDIT_CONFIG $$pstoedit_args|pkg-config pstoedit| ; \ - /^PSTOEDIT_CONFIG=/ s|=.*$$|=pkg-config| ' ${WRKSRC}/configure -.endif + /^PSTOEDIT_CONFIG=/s|=.*$$|=pkg-config|' ${WRKSRC}/configure .include