3 files changed, 40 insertions, 11 deletions

diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile
index ece5b697501c..23a6a4dad319 100644
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@@ -6,24 +6,42 @@
 #
 
 PORTNAME=	mp3plot
-DISTVERSION=	0.4.0a
-PORTREVISION=	1
+DISTVERSION=	0.5.1
 CATEGORIES=	audio
-MASTER_SITES=	http://p.outlyer.net/mp3plot/files/ CENKES
+MASTER_SITES=	http://p.outlyer.net/mp3plot/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mp3 bitrate plot tool
 
 LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost
 
+OPTIONS=	GD "Enable support for GD library" on \
+		IMAGEMAGICK "Enable support for Magick++" off
+
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME}
 
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_GD)
+CONFIGURE_ARGS+=	--disable-gd
+.else
+LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+.endif
+
+.if defined(WITH_IMAGEMAGICK)
+LIB_DEPENDS+=	Magick++.2:${PORTSDIR}/graphics/ImageMagick
+.else
+CONFIGURE_ARGS+=	--disable-magick
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e '/HAVE.*MAGICK=1/s|1|0|;/^#define HAVE.*MAGICK/s|1|0|;\
-		/test.*==/s|==|=|;s/-O2//' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/bldtype_/s|-O2||g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/mp3plot/distinfo b/audio/mp3plot/distinfo
index a746339dc233..5563150577d6 100644
--- a/audio/mp3plot/distinfo
+++ b/audio/mp3plot/distinfo
@@ -1,3 +1,3 @@
-MD5 (mp3plot-0.4.0a.tar.gz) = 5b1189a6e524fa9ffdf73c37505de4df
-SHA256 (mp3plot-0.4.0a.tar.gz) = 3c6e2fe90d399c300392ef81b714791591873f69508329cb957451d89c6eeddf
-SIZE (mp3plot-0.4.0a.tar.gz) = 137150
+MD5 (mp3plot-0.5.1.tar.gz) = 20d1e6b21926b9d42412eae37fe1cf91
+SHA256 (mp3plot-0.5.1.tar.gz) = d368bcdefb4e25abef93aa7c323f23311e553170392b2d88322f4812d42c7303
+SIZE (mp3plot-0.5.1.tar.gz) = 197379
diff --git a/audio/mp3plot/files/patch-src__macros.h b/audio/mp3plot/files/patch-src__macros.h
new file mode 100644
index 000000000000..1ff355a8acbf
--- /dev/null
+++ b/audio/mp3plot/files/patch-src__macros.h
@@ -0,0 +1,11 @@
+--- src/macros.h.orig	2009-04-14 11:21:18.000000000 +0900
++++ src/macros.h	2009-05-10 02:55:54.000000000 +0900
+@@ -34,7 +34,7 @@
+ // References of interest:
+ // <http://sourcefrog.net/weblog/software/languages/C/unused.html>
+ #ifndef UNUSED_
+-#   ifdef __GNUC__
++#   if (defined(__GNUC__) && __GNUC__ > 3)
+ #       define UNUSED_      __attribute__((unused))
+ #       define DEPRECATED_  __attribute__((deprecated))
+ #   // MSVC (_MSC_VER) doesn't seem to have an unused attribute (__declspec(...))