From owner-svn-ports-head@freebsd.org Wed Oct 5 19:11:02 2016 Return-Path: Delivered-To: svn-ports-head@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 2D24EAF6E84; Wed, 5 Oct 2016 19:11:02 +0000 (UTC) (envelope-from thierry@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 08227286; Wed, 5 Oct 2016 19:11:01 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u95JB1CC065940; Wed, 5 Oct 2016 19:11:01 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u95JB0QX065936; Wed, 5 Oct 2016 19:11:00 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201610051911.u95JB0QX065936@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Wed, 5 Oct 2016 19:11:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423374 - in head/multimedia/winff: . files X-SVN-Group: ports-head 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.23 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: Wed, 05 Oct 2016 19:11:02 -0000 Author: thierry Date: Wed Oct 5 19:11:00 2016 New Revision: 423374 URL: https://svnweb.freebsd.org/changeset/ports/423374 Log: Unbreak and upgrade to 1.5.5. Added: head/multimedia/winff/files/patch-winff_unit1.pas - copied, changed from r423373, head/multimedia/winff/files/patch-unit1.pas Deleted: head/multimedia/winff/files/patch-unit1.pas Modified: head/multimedia/winff/Makefile head/multimedia/winff/distinfo head/multimedia/winff/pkg-plist Modified: head/multimedia/winff/Makefile ============================================================================== --- head/multimedia/winff/Makefile Wed Oct 5 19:05:01 2016 (r423373) +++ head/multimedia/winff/Makefile Wed Oct 5 19:11:00 2016 (r423374) @@ -2,26 +2,23 @@ # $FreeBSD$ PORTNAME= WinFF -PORTVERSION= 1.5.2 -PORTREVISION= 7 +PORTVERSION= 1.5.5 CATEGORIES= multimedia -MASTER_SITES= GOOGLE_CODE -PROJECTHOST= ${_PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION}-source +MASTER_SITES= http://winff.org/docs/source/ +DISTNAME= ${_PORTNAME}-${PORTVERSION}-source MAINTAINER= thierry@FreeBSD.org COMMENT= Convert your videos quickly, easily, and all at once LICENSE= GPLv3 -BROKEN= Unfetchable (google code has gone away) - BUILD_DEPENDS= lazbuild:editors/lazarus LIB_DEPENDS= libavutil.so:multimedia/ffmpeg NO_WRKSUBDIR= yes -USE_FPC= cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg x11 -USE_GNOME= # +USE_XORG= x11 +USE_FPC= cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11 +USE_GNOME= cairo _PORTNAME= ${PORTNAME:tl} DATADIR= ${PREFIX}/share/${_PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${_PORTNAME} @@ -39,6 +36,8 @@ LAZARUS_VER= 1.6.0 LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} +BUILD_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${_PORTNAME} + OPTIONS_SINGLE= LCL OPTIONS_SINGLE_LCL= GTK2 QT4 @@ -63,23 +62,23 @@ BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_P .endif pre-configure: - ${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${WRKSRC}/unit1.pas -.for fp in unit1.pas unit4.pas - ${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${WRKSRC}/${fp} + ${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${BUILD_WRKSRC}/unit1.pas +.for fp in unit1.pas unit4.pas scripts/check_presets.sh + ${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${BUILD_WRKSRC}/${fp} .endfor do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} -B winff.lpr do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR}/languages - ${INSTALL_DATA} ${WRKSRC}/presets.xml ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/languages/* ${STAGEDIR}${DATADIR}/languages/ - ${INSTALL_MAN} ${WRKSRC}/${_PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/winff-icons/48x48/${_PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${BUILD_WRKSRC}/presets.xml ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/languages/* ${STAGEDIR}${DATADIR}/languages/ + ${INSTALL_MAN} ${BUILD_WRKSRC}/${_PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${BUILD_WRKSRC}/winff-icons/48x48/${_PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/ ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR} .include Modified: head/multimedia/winff/distinfo ============================================================================== --- head/multimedia/winff/distinfo Wed Oct 5 19:05:01 2016 (r423373) +++ head/multimedia/winff/distinfo Wed Oct 5 19:11:00 2016 (r423374) @@ -1,2 +1,3 @@ -SHA256 (WinFF-1.5.2-source.tar.gz) = 9ee1c68173263dad8d07df2bd62e830d73e6546a0fa86b35de9be8b4c363434c -SIZE (WinFF-1.5.2-source.tar.gz) = 2320565 +TIMESTAMP = 1475613452 +SHA256 (winff-1.5.5-source.tar.gz) = 3f67400ab8f7f43d2290dff3c5a0a8b8a966ba67cd971edb5d63e6a127d7a485 +SIZE (winff-1.5.5-source.tar.gz) = 2622722 Copied and modified: head/multimedia/winff/files/patch-winff_unit1.pas (from r423373, head/multimedia/winff/files/patch-unit1.pas) ============================================================================== --- head/multimedia/winff/files/patch-unit1.pas Wed Oct 5 19:05:01 2016 (r423373, copy source) +++ head/multimedia/winff/files/patch-winff_unit1.pas Wed Oct 5 19:11:00 2016 (r423374) @@ -1,5 +1,5 @@ ---- unit1.pas.orig 2013-08-16 03:55:46 UTC -+++ unit1.pas +--- winff/unit1.pas.orig 2013-08-16 03:55:46 UTC ++++ winff/unit1.pas @@ -1228,13 +1228,13 @@ end; // launch browser Modified: head/multimedia/winff/pkg-plist ============================================================================== --- head/multimedia/winff/pkg-plist Wed Oct 5 19:05:01 2016 (r423373) +++ head/multimedia/winff/pkg-plist Wed Oct 5 19:11:00 2016 (r423374) @@ -8,16 +8,17 @@ man/man1/winff.1.gz share/pixmaps/winff.png %%DATADIR%%/languages/winff.ab.po %%DATADIR%%/languages/winff.ar.po +%%DATADIR%%/languages/winff.ast.po %%DATADIR%%/languages/winff.bg.po %%DATADIR%%/languages/winff.ca.po %%DATADIR%%/languages/winff.cs.po -%%DATADIR%%/languages/winff.de.po %%DATADIR%%/languages/winff.de_DE.po +%%DATADIR%%/languages/winff.de.po %%DATADIR%%/languages/winff.el.po -%%DATADIR%%/languages/winff.en.po -%%DATADIR%%/languages/winff.es.po +%%DATADIR%%/languages/winff.en_GB.po %%DATADIR%%/languages/winff.es_AR.po %%DATADIR%%/languages/winff.es_UY.po +%%DATADIR%%/languages/winff.es.po %%DATADIR%%/languages/winff.eu.po %%DATADIR%%/languages/winff.fr.po %%DATADIR%%/languages/winff.gl.po @@ -37,14 +38,16 @@ share/pixmaps/winff.png %%DATADIR%%/languages/winff.pl.po %%DATADIR%%/languages/winff.po %%DATADIR%%/languages/winff.pot -%%DATADIR%%/languages/winff.pt.po %%DATADIR%%/languages/winff.pt_BR.po +%%DATADIR%%/languages/winff.pt.po %%DATADIR%%/languages/winff.ro.po %%DATADIR%%/languages/winff.ru.po %%DATADIR%%/languages/winff.se.po +%%DATADIR%%/languages/winff.si_LK.po %%DATADIR%%/languages/winff.sk.po %%DATADIR%%/languages/winff.sl.po %%DATADIR%%/languages/winff.sr.po +%%DATADIR%%/languages/winff.sr@latin.po %%DATADIR%%/languages/winff.sv.po %%DATADIR%%/languages/winff.te.po %%DATADIR%%/languages/winff.tr.po