From owner-svn-ports-head@freebsd.org Sat Jan 9 10:49:28 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 95A1A4D0B1C; Sat, 9 Jan 2021 10:49:28 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DCcD83qdcz4pCB; Sat, 9 Jan 2021 10:49:28 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6BB64148A0; Sat, 9 Jan 2021 10:49:28 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 109AnSID015707; Sat, 9 Jan 2021 10:49:28 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 109AnRlE015702; Sat, 9 Jan 2021 10:49:27 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202101091049.109AnRlE015702@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 9 Jan 2021 10:49:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560847 - head/multimedia/dvdauthor X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/multimedia/dvdauthor X-SVN-Commit-Revision: 560847 X-SVN-Commit-Repository: ports 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.34 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: Sat, 09 Jan 2021 10:49:28 -0000 Author: tcberner Date: Sat Jan 9 10:49:27 2021 New Revision: 560847 URL: https://svnweb.freebsd.org/changeset/ports/560847 Log: multimedia/dvdauthor: Fails to build if GraphicsMagick is installed Switch to using latest commit from github. The handling of the image magic dependency has been improved in [1] in 2017, but the software has not seen a release since. [1] https://github.com/ldo/dvdauthor/commit/a0d57bebb3a5d7259a0508a07a898cfe044155a1 PR: 240270 Submitted by: VVD Reported by: Ting-Wei Lan Modified: head/multimedia/dvdauthor/Makefile head/multimedia/dvdauthor/distinfo head/multimedia/dvdauthor/pkg-descr head/multimedia/dvdauthor/pkg-plist Modified: head/multimedia/dvdauthor/Makefile ============================================================================== --- head/multimedia/dvdauthor/Makefile Sat Jan 9 10:36:03 2021 (r560846) +++ head/multimedia/dvdauthor/Makefile Sat Jan 9 10:49:27 2021 (r560847) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= dvdauthor -PORTVERSION= 0.7.2 -PORTREVISION= 2 +PORTVERSION= 0.7.2.20190419 CATEGORIES= multimedia -MASTER_SITES= SF/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Makes a DVD file structure from one or more MPEG2 streams @@ -20,9 +18,13 @@ LIB_DEPENDS= libdvdread.so:multimedia/libdvdread \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig -WRKSRC= ${WRKDIR}/${PORTNAME} +USE_GITHUB= yes +GH_ACCOUNT= ldo +GH_TAGNAME= d5bb0b +WRKSRC= ${WRKDIR}/${PORTNAME}-${GH_TAGNAME} -USES= gmake gnome iconv localbase pkgconfig +USES= autoreconf:build bison:alias gettext-tools \ + gmake gnome iconv localbase pkgconfig USE_GNOME= libxml2 GNU_CONFIGURE= yes @@ -30,27 +32,40 @@ SUB_FILES= README.FreeBSD PORTDOCS= * -OPTIONS_DEFINE= DOCS IMAGEMAGICK -OPTIONS_RADIO= VIDEO-FORMAT +OPTIONS_DEFINE= DOCS MANPAGES +OPTIONS_RADIO= IMAGEMAGICK VIDEO-FORMAT +OPTIONS_RADIO_IMAGEMAGICK= GRAPHICSMAGICK IMAGEMAGICK6 OPTIONS_RADIO_VIDEO-FORMAT= NTSC PAL +OPTIONS_SUB= yes -VIDEO-FORMAT_DESC= Use default video format -NTSC_DESC= Default video format NTSC -PAL_DESC= Default video format PAL +GRAPHICSMAGICK_DESC= GraphicsMagick image processing support +IMAGEMAGICK6_DESC= ImageMagick 6.x image processing support +NTSC_DESC= Default video format NTSC +PAL_DESC= Default video format PAL +VIDEO-FORMAT_DESC= Use default video format -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 +GRAPHICSMAGICK_CONFIGURE_WITH= graphicsmagick +GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick +IMAGEMAGICK6_CONFIGURE_WITH= imagemagick +IMAGEMAGICK6_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 +MANPAGES_BUILD_DEPENDS= docbook2man:textproc/docbook-utils +NTSC_CONFIGURE_ON= --enable-default-video-format=NTSC +PAL_CONFIGURE_ON= --enable-default-video-format=PAL -NTSC_CONFIGURE_ON= --enable-default-video-format=NTSC -PAL_CONFIGURE_ON= --enable-default-video-format=PAL +pre-configure-MANPAGES-off: + @(${MV} ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.am.bak && \ + ${GREP} '^dist_pkgdata_DATA' \ + ${WRKSRC}/doc/Makefile.am.bak > ${WRKSRC}/doc/Makefile.am) -pre-configure-IMAGEMAGICK-off: - @${REINPLACE_CMD} 's|usemagick=1|usemagick=0|g' \ - ${WRKSRC}/configure +pre-configure: + @(cd ${WRKSRC} && ${MKDIR} autotools/ && \ + ${CP} ${LOCALBASE}/share/gettext/config.rpath autotools/ && \ + ${LOCALBASE}/bin/autoreconf -i) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} \ ${WRKSRC}/AUTHORS ${WRKSRC}/ChangeLog ${WRKSRC}/README \ - ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR} + ${WRKSRC}/TODO ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR} .include Modified: head/multimedia/dvdauthor/distinfo ============================================================================== --- head/multimedia/dvdauthor/distinfo Sat Jan 9 10:36:03 2021 (r560846) +++ head/multimedia/dvdauthor/distinfo Sat Jan 9 10:49:27 2021 (r560847) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494876457 -SHA256 (dvdauthor-0.7.2.tar.gz) = 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7 -SIZE (dvdauthor-0.7.2.tar.gz) = 648305 +TIMESTAMP = 1609892901 +SHA256 (ldo-dvdauthor-0.7.2.20190419-d5bb0b_GH0.tar.gz) = 50e8d117669dbc1b4d0cae4930ebae18973bd1ea9a5c6502487f38d80ef6bbab +SIZE (ldo-dvdauthor-0.7.2.20190419-d5bb0b_GH0.tar.gz) = 252411 Modified: head/multimedia/dvdauthor/pkg-descr ============================================================================== --- head/multimedia/dvdauthor/pkg-descr Sat Jan 9 10:36:03 2021 (r560846) +++ head/multimedia/dvdauthor/pkg-descr Sat Jan 9 10:49:27 2021 (r560847) @@ -1,4 +1,4 @@ dvdauthor is a program that will generate a DVD movie from a valid mpeg2 stream that should play when you put it in a DVD player. -WWW: http://dvdauthor.sourceforge.net/ +WWW: https://dvdauthor.sourceforge.net/ https://github.com/ldo/dvdauthor Modified: head/multimedia/dvdauthor/pkg-plist ============================================================================== --- head/multimedia/dvdauthor/pkg-plist Sat Jan 9 10:36:03 2021 (r560846) +++ head/multimedia/dvdauthor/pkg-plist Sat Jan 9 10:49:27 2021 (r560847) @@ -4,13 +4,13 @@ bin/dvdunauthor bin/mpeg2desc bin/spumux bin/spuunmux -man/man1/dvdauthor.1.gz -man/man1/dvddirdel.1.gz -man/man1/dvdunauthor.1.gz -man/man1/mpeg2desc.1.gz -man/man1/spumux.1.gz -man/man1/spuunmux.1.gz -man/man7/video_format.7.gz +%%MANPAGES%%man/man1/dvdauthor.1.gz +%%MANPAGES%%man/man1/dvddirdel.1.gz +%%MANPAGES%%man/man1/dvdunauthor.1.gz +%%MANPAGES%%man/man1/mpeg2desc.1.gz +%%MANPAGES%%man/man1/spumux.1.gz +%%MANPAGES%%man/man1/spuunmux.1.gz +%%MANPAGES%%man/man7/video_format.7.gz %%DATADIR%%/common.xsd %%DATADIR%%/dvdauthor.xsd %%DATADIR%%/spumux.xsd