diff -ur multimedia/dvdauthor.orig/Makefile multimedia/dvdauthor/Makefile --- multimedia/dvdauthor.orig/Makefile +++ multimedia/dvdauthor/Makefile @@ -2,8 +2,8 @@ # $FreeBSD: head/multimedia/dvdauthor/Makefile 529240 2020-03-27 11:23:42Z martymac $ PORTNAME= dvdauthor -PORTVERSION= 0.7.2 -PORTREVISION= 2 +DISTVERSION= 0.7.2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME} @@ -30,21 +30,36 @@ PORTDOCS= * -OPTIONS_DEFINE= DOCS IMAGEMAGICK -OPTIONS_RADIO= VIDEO-FORMAT +OPTIONS_DEFINE= DOCS +OPTIONS_RADIO= IMAGEMAGICK VIDEO-FORMAT +OPTIONS_RADIO_IMAGEMAGICK= GRAPHICSMAGICK IMAGEMAGICK6 OPTIONS_RADIO_VIDEO-FORMAT= NTSC PAL +GRAPHICSMAGICK_DESC= GraphicsMagick image processing support +IMAGEMAGICK6_DESC= ImageMagick 6.x image processing support VIDEO-FORMAT_DESC= Use default video format -NTSC_DESC= Default video format NTSC -PAL_DESC= Default video format PAL +NTSC_DESC= Default video format NTSC +PAL_DESC= Default video format PAL -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 +GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick +GRAPHICSMAGICK_CONFIGURE_ENV= ac_cv_prog_MAGICKCONFIG=${LOCALBASE}/bin/GraphicsMagick-config +IMAGEMAGICK6_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 NTSC_CONFIGURE_ON= --enable-default-video-format=NTSC PAL_CONFIGURE_ON= --enable-default-video-format=PAL -pre-configure-IMAGEMAGICK-off: - @${REINPLACE_CMD} 's|usemagick=1|usemagick=0|g' \ +.include + +.if !${PORT_OPTIONS:MGRAPHICSMAGICK} && !${PORT_OPTIONS:MIMAGEMAGICK6} +USEMAGICK_OFF= -e 's|usemagick=1|usemagick=0|g' +.endif + +pre-configure-GRAPHICSMAGICK-off: + @${REINPLACE_CMD} -e 's|HAVE_GMAGICK|_HAVE_GMAGICK|g' \ + ${WRKSRC}/configure + +pre-configure-IMAGEMAGICK6-off: + @${REINPLACE_CMD} -e 's|HAVE_MAGICK|_HAVE_MAGICK|g' ${USEMAGICK_OFF} \ ${WRKSRC}/configure post-install-DOCS-on: