svn commit: r306600 - in head/graphics/autotrace: . files

[Baptiste Daroussin]

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 <tkato432 at yahoo.com>
  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 <kanou at mil.allnet.ne.jp>
-#
+# Created by: KANOU Hiroki <kanou at mil.allnet.ne.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
@@ -14,42 +10,48 @@ MASTER_SITES=	SF/${PORTNAME}/AutoTrace/$
 MAINTAINER=	ports at 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 <bsd.port.options.mk>
 
+.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 <bsd.port.mk>