From owner-svn-ports-all@freebsd.org Thu Oct 13 09:03:46 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECB61C109A2; Thu, 13 Oct 2016 09:03:46 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id A1F7095C; Thu, 13 Oct 2016 09:03:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9D93j98054074; Thu, 13 Oct 2016 09:03:45 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9D93jgl054073; Thu, 13 Oct 2016 09:03:45 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201610130903.u9D93jgl054073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 13 Oct 2016 09:03:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423904 - head/multimedia/dvdauthor X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2016 09:03:47 -0000 Author: amdmi3 Date: Thu Oct 13 09:03:45 2016 New Revision: 423904 URL: https://svnweb.freebsd.org/changeset/ports/423904 Log: - Fix LICENSE - Switch to USES=localbase - Cosmetic fixes - Switch to options helpers - Fix options - Simplify docs installation Modified: head/multimedia/dvdauthor/Makefile Modified: head/multimedia/dvdauthor/Makefile ============================================================================== --- head/multimedia/dvdauthor/Makefile Thu Oct 13 08:15:35 2016 (r423903) +++ head/multimedia/dvdauthor/Makefile Thu Oct 13 09:03:45 2016 (r423904) @@ -10,7 +10,8 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Makes a DVD file structure from one or more MPEG2 streams -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdvdread.so:multimedia/libdvdread \ libfribidi.so:converters/fribidi \ @@ -21,55 +22,35 @@ LIB_DEPENDS= libdvdread.so:multimedia/li WRKSRC= ${WRKDIR}/${PORTNAME} -USES= gmake iconv pkgconfig +USES= gmake iconv localbase pkgconfig USE_GNOME= libxml2 GNU_CONFIGURE= yes -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -PORTDOCS= * - -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= AUTHORS ChangeLog README - -DOCSRCDIR2= ${WRKDIR} -DOC_FILES2= README.FreeBSD +SUB_FILES= README.FreeBSD -OPTIONS_DEFINE= DOCS IMAGEMAGICK VIDEO-FORMAT +PORTDOCS= * -OPTIONS_SINGLE= VIDEO-FORMAT -OPTIONS_SINGLE_VIDEO-FORMAT= NTSC PAL +OPTIONS_DEFINE= DOCS IMAGEMAGICK +OPTIONS_RADIO= VIDEO-FORMAT +OPTIONS_RADIO_VIDEO-FORMAT= NTSC PAL VIDEO-FORMAT_DESC= Use default video format NTSC_DESC= Default video format NTSC PAL_DESC= Default video format PAL -SUB_FILES= README.FreeBSD - IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick -.include - -.if ${PORT_OPTIONS:MNTSC} -.if ${PORT_OPTIONS:MVIDEO-FORMAT} -CONFIGURE_ENV+= --enable-default-video-format=NTSC -.endif -.endif - -.if ${PORT_OPTIONS:MPAL} -.if ${PORT_OPTIONS:MVIDEO-FORMAT} -CONFIGURE_ENV+= --enable-default-video-format=PAL -.endif -.endif +NTSC_CONFIGURE_ON= --enable-default-video-format=NTSC +PAL_CONFIGURE_ON= --enable-default-video-format=PAL -pre-configure: -.if ! ${PORT_OPTIONS:MIMAGEMAGICK} +pre-configure-IMAGEMAGICK-off: @${REINPLACE_CMD} 's|usemagick=1|usemagick=0|g' \ ${WRKSRC}/configure -.endif -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} \ + ${WRKSRC}/AUTHORS ${WRKSRC}/ChangeLog ${WRKSRC}/README \ + ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR} .include