ports/172013: graphics/autotrace: Fix OPTIONS_DEFINE

[KATO Tsuguru]

>Number:         172013
>Category:       ports
>Synopsis:       graphics/autotrace: Fix OPTIONS_DEFINE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 18:10:27 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Fix OPTIONS_DEFINE
- Add LICENSE
- Add MAKE_JOBS_SAFE

Remove file:
files/patch-configure

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/autotrace/Makefile graphics/autotrace/Makefile
--- /usr/ports/graphics/autotrace/Makefile	2012-09-23 06:06:17.000000000 +0900
+++ graphics/autotrace/Makefile	2012-09-25 04:58:49.000000000 +0900
@@ -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: ports/graphics/autotrace/Makefile,v 1.59 2012/09/22 21:06:17 rm Exp $
-#
 
 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
@@ -14,42 +10,54 @@
 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
 
-MAN1=		autotrace.1
+CPPFLAGS+=	$$(libpng-config --I_opts) ${PTHREAD_CFLAGS}
+LDFLAGS+=	$$(libpng-config --L_opts) ${PTHREAD_LIBS}
 
-OPTIONS_DEFINE=	MING PSTOEDIT
-OPTIONS_DEFAULT=	PSTOEDIT
-MING_DESC=	Enable swf interface
-PSTOEDIT_DESC=	Convert postscript to other formats
+MAN1=		autotrace.1
 
 .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
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ming
+LIB_DEPENDS+=	ming:${PORTSDIR}/graphics/ming
+CPPFLAGS+=	$$(pkg-config --cflags-only-I libming)
+LDFLAGS+=	$$(pkg-config --libs-only-L libming)
+.else
+CONFIGURE_ENV+=	ac_cv_header_ming_h=no
 .endif
 
 .if ${PORT_OPTIONS:MPSTOEDIT}
-LIB_DEPENDS+=	pstoedit.0:${PORTSDIR}/graphics/pstoedit
+LIB_DEPENDS+=	pstoedit:${PORTSDIR}/graphics/pstoedit
+.else
+CONFIGURE_ARGS+=--without-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|$$PSTOEDIT_CONFIG $$pstoedit_args|pkg-config pstoedit| ; \
-		/^PSTOEDIT_CONFIG=/ s|=.*$$|=pkg-config| ' ${WRKSRC}/configure
-.endif
+		'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
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/autotrace/files/patch-configure graphics/autotrace/files/patch-configure
--- /usr/ports/graphics/autotrace/files/patch-configure	2008-09-26 22:59:08.000000000 +0900
+++ graphics/autotrace/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- configure.orig	2008-09-26 15:52:26.000000000 +0200
-+++ configure	2008-09-26 15:52:09.000000000 +0200
-@@ -7973,7 +7973,7 @@
- 		MAGICK_CFLAGS=${CPPFLAGS}
- 		CPPFLAGS=${CPPFLAGS_BACKUP}
- 		if test "x${magick_header_found}" = xyes ; then
--			MAGICK_LDFLAGS="`Magick-config --ldflags` `Magick-config --libs`"
-+			MAGICK_LDFLAGS="`Magick-config --ldflags` `Magick-config --libs` `MagickWand-config --ldflags` `MagickWand-config --libs`"
- 												echo "$as_me:$LINENO: checking ImageMagick - version >= 5.2.1" >&5
- echo $ECHO_N "checking ImageMagick - version >= 5.2.1... $ECHO_C" >&6
- 						MAGICK_VERSION=`Magick-config --version`
>Release-Note:
>Audit-Trail:
>Unformatted: