From owner-freebsd-multimedia@FreeBSD.ORG Sat Aug 14 08:43:24 2010 Return-Path: Delivered-To: freebsd-multimedia@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 264A9106566C for ; Sat, 14 Aug 2010 08:43:24 +0000 (UTC) (envelope-from nox@jelal.kn-bremen.de) Received: from smtp.kn-bremen.de (gelbbaer.kn-bremen.de [78.46.108.116]) by mx1.freebsd.org (Postfix) with ESMTP id 679298FC20 for ; Sat, 14 Aug 2010 08:43:22 +0000 (UTC) Received: by smtp.kn-bremen.de (Postfix, from userid 10) id 3AC171E00173; Sat, 14 Aug 2010 10:43:22 +0200 (CEST) Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1]) by triton8.kn-bremen.de (8.14.4/8.14.3) with ESMTP id o7E8frHY009522; Sat, 14 Aug 2010 10:41:53 +0200 (CEST) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.4/8.14.3/Submit) id o7E8fr8A009521; Sat, 14 Aug 2010 10:41:53 +0200 (CEST) (envelope-from nox) From: Juergen Lock Date: Sat, 14 Aug 2010 10:41:53 +0200 To: freebsd-multimedia@FreeBSD.org Message-ID: <20100814084153.GA9139@triton8.kn-bremen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Cc: alepulver@FreeBSD.org, freebsd-ports@FreeBSD.org Subject: updating dvdstyler, and wxsvg from wx 2.6 to 2.8 X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2010 08:43:24 -0000 Hi! I noticed our version of dvdstyler in ports is pretty old and took a stab at updating it, which means I also needed a version of wxsvg for wx 2.8 (that dvdstyler now uses). It appears dvdstyler is also the only port in the tree that uses wxsvg, so would it be okay to just update the wxsvg port in place and have no wx 2.6 version of it from then on? (instead of having no wx 2.8 version as up to now?) Or should we keep the old version and repocopy it to graphics/wxsvg28 or something like that and then update that port? My opinion would be the former i.e. just update it in place (in the interest of keeping unnecessary bloat out of the tree) - what do others think? (I Cc'd alepulver because you created bsd.wx.mk, hope thats okay.) Thanx, Juergen Index: Mk/bsd.wx.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.wx.mk,v retrieving revision 1.14 diff -u -p -r1.14 bsd.wx.mk --- /usr/ports/Mk/bsd.wx.mk 13 Jun 2009 16:35:47 -0000 1.14 +++ /usr/ports/Mk/bsd.wx.mk 14 Aug 2010 08:09:29 -0000 @@ -164,8 +164,8 @@ _WX_LIB_contrib_2.6= wx_gtk2${_WX_UC}_an _WX_PORT_python_2.6= x11-toolkits/py-wxPython26${_WX_UCL} _WX_FILE_python_2.6= ${PYTHON_SITELIBDIR}/wx-2.6-gtk2${_WX_PYSUFX}/wx/__init__.py -_WX_PORT_svg_2.6= graphics/wxsvg -_WX_LIB_svg_2.6= wxsvg +#_WX_PORT_svg_2.6= graphics/wxsvg +#_WX_LIB_svg_2.6= wxsvg # wxgtk 2.8 _WX_PORT_wx_2.8= x11-toolkits/wxgtk28${_WX_UCL} @@ -177,6 +177,9 @@ _WX_LIB_contrib_2.8= wx_gtk2${_WX_UC}_fl _WX_PORT_python_2.8= x11-toolkits/py-wxPython28${_WX_UCL} _WX_FILE_python_2.8= ${PYTHON_SITELIBDIR}/wx-2.8-gtk2${_WX_PYSUFX}/wx/__init__.py +_WX_PORT_svg_2.8= graphics/wxsvg +_WX_LIB_svg_2.8= wxsvg + # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately. # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib". Index: graphics/wxsvg/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/wxsvg/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- graphics/wxsvg/Makefile 26 Jul 2010 00:03:10 -0000 1.20 +++ graphics/wxsvg/Makefile 11 Aug 2010 20:52:13 -0000 @@ -6,20 +6,22 @@ # $MCom: ports/graphics/wxsvg/Makefile,v 1.1 2006/09/22 01:48:33 ahze Exp $ PORTNAME= wxsvg -DISTVERSION= 1.0b7_2 -PORTREVISION= 5 +DISTVERSION= 1.0.5 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/OldFiles +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= C++ library to create, manipulate, and render SVG files -AUTOMAKE_ARGS= --add-missing +USE_BZIP2= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:22 automake:15 autoconf:262 +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-wx-config=${LOCALBASE}/bin/wxgtk2-2.8-config +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" USE_GNOME= libartlgpl2 USE_GMAKE= yes -USE_WX= 2.6 +USE_WX= 2.8 post-patch: @cd ${WRKSRC} && \ @@ -27,8 +29,4 @@ post-patch: @${REINPLACE_CMD} -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=${WX_CONFIG}|' \ ${WRKSRC}/*.m4 -pre-configure: - @cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I .; \ - ${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake - .include Index: graphics/wxsvg/distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/wxsvg/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- graphics/wxsvg/distinfo 4 Sep 2007 01:13:11 -0000 1.5 +++ graphics/wxsvg/distinfo 11 Aug 2010 20:33:38 -0000 @@ -1,3 +1,3 @@ -MD5 (wxsvg-1.0b7_2.tar.gz) = 5700d30555a6459377c87b817b3276d7 -SHA256 (wxsvg-1.0b7_2.tar.gz) = 463ae9b3bbc4a67bc206885c7522c072ab38c0293553cbf0f9b981e94d9b1360 -SIZE (wxsvg-1.0b7_2.tar.gz) = 592442 +MD5 (wxsvg-1.0.5.tar.bz2) = 27ead41fa22fc70fc490983c6bd217cf +SHA256 (wxsvg-1.0.5.tar.bz2) = 816ee1922b11edab450903c99ba46cd49fdc4991c2f493e3d4470b14df11871b +SIZE (wxsvg-1.0.5.tar.bz2) = 639450 Index: graphics/wxsvg/pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/wxsvg/pkg-plist,v retrieving revision 1.3 diff -u -p -r1.3 pkg-plist --- graphics/wxsvg/pkg-plist 23 Feb 2006 10:37:24 -0000 1.3 +++ graphics/wxsvg/pkg-plist 11 Aug 2010 20:52:13 -0000 @@ -11,6 +11,7 @@ include/wxSVG/ElementTimeControl.h include/wxSVG/EventTarget.h include/wxSVG/GetSVGDocument.h include/wxSVG/NodeList.h +include/wxSVG/NodeListCls.h include/wxSVG/RGBColor.h include/wxSVG/SVGAElement.h include/wxSVG/SVGAltGlyphDefElement.h @@ -176,15 +177,16 @@ include/wxSVG/SVGViewElement.h include/wxSVG/SVGViewSpec.h include/wxSVG/SVGZoomAndPan.h include/wxSVG/SVGZoomEvent.h -include/wxSVG/String.h +include/wxSVG/String_wxsvg.h include/wxSVG/ViewCSS.h +include/wxSVG/mediadec_ffmpeg.h include/wxSVG/svg.h include/wxSVG/svgctrl.h -include/wxXML/xml.h -include/wxXML/xmlhelpr.h +include/wxSVGXML/svgxml.h +include/wxSVGXML/svgxmlhelpr.h lib/libwxsvg.a lib/libwxsvg.la lib/libwxsvg.so lib/libwxsvg.so.0 -@dirrm include/wxXML +@dirrm include/wxSVGXML @dirrm include/wxSVG Index: graphics/wxsvg/files/patch-configure.in =================================================================== RCS file: /home/pcvs/ports/graphics/wxsvg/files/patch-configure.in,v retrieving revision 1.1 diff -u -p -r1.1 patch-configure.in --- graphics/wxsvg/files/patch-configure.in 22 Feb 2007 23:51:13 -0000 1.1 +++ graphics/wxsvg/files/patch-configure.in 14 Aug 2010 07:59:25 -0000 @@ -1,11 +0,0 @@ ---- configure.in.orig Thu Feb 22 18:29:47 2007 -+++ configure.in Thu Feb 22 18:30:09 2007 -@@ -3,7 +3,7 @@ - dnl initialization - AC_PREREQ(2.57) - AC_INIT([wxsvgtest], [1.0], [wx-svg-users@lists.sourceforge.net]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE(wxsvg, 1.0b7) - AM_MAINTAINER_MODE - - dnl options Index: multimedia/dvdstyler/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/dvdstyler/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- multimedia/dvdstyler/Makefile 31 May 2010 02:00:08 -0000 1.35 +++ multimedia/dvdstyler/Makefile 11 Aug 2010 21:42:38 -0000 @@ -6,11 +6,10 @@ # PORTNAME= dvdstyler -DISTVERSION= 1.5.1_2 -PORTREVISION= 6 +DISTVERSION= 1.8.1 PORTEPOCH= 2 CATEGORIES= multimedia -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.5.1 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} DISTNAME= DVDStyler-${DISTVERSION} MAINTAINER= multimedia@FreeBSD.org @@ -18,17 +17,19 @@ COMMENT= WXGTK2 front end to dvd recodin BUILD_DEPENDS= dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ mplex:${PORTSDIR}/multimedia/mjpegtools \ - jpegtopnm:${PORTSDIR}/graphics/netpbm \ - mpgtx:${PORTSDIR}/multimedia/mpgtx \ - growisofs:${PORTSDIR}/sysutils/dvd+rw-tools + growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ + xmlto:${PORTSDIR}/textproc/xmlto RUN_DEPENDS= dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ mplex:${PORTSDIR}/multimedia/mjpegtools \ - jpegtopnm:${PORTSDIR}/graphics/netpbm \ - mpgtx:${PORTSDIR}/multimedia/mpgtx \ - growisofs:${PORTSDIR}/sysutils/dvd+rw-tools + growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ + xmlto:${PORTSDIR}/textproc/xmlto +LIB_DEPENDS+= avformat.1:${PORTSDIR}/multimedia/ffmpeg \ + exif:${PORTSDIR}/graphics/libexif -USE_WX= 2.6 +USE_BZIP2= yes +USE_WX= 2.8 WX_COMPS= wx svg +#WX_COMPS= wx WX_CONF_ARGS= absolute USE_GMAKE= yes USE_GNOME= gnometarget desktopfileutils @@ -38,6 +39,7 @@ USE_CDRTOOLS= yes # dvdstyler needs mkis GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +MAN1= dvdstyler.1 .include Index: multimedia/dvdstyler/distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/dvdstyler/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- multimedia/dvdstyler/distinfo 4 Sep 2007 01:32:51 -0000 1.11 +++ multimedia/dvdstyler/distinfo 11 Aug 2010 20:15:37 -0000 @@ -1,3 +1,3 @@ -MD5 (DVDStyler-1.5.1_2.tar.gz) = 6cbb02a5b1853aaf0623205a3724cc83 -SHA256 (DVDStyler-1.5.1_2.tar.gz) = e3d2c60834b611d26fd8ae9d8bd20785a65878014a42e10669668a844403f740 -SIZE (DVDStyler-1.5.1_2.tar.gz) = 834479 +MD5 (DVDStyler-1.8.1.tar.bz2) = 076bd95e15912c1c0f7f9165d0ea5632 +SHA256 (DVDStyler-1.8.1.tar.bz2) = 5dcc38cd1560bf2ccfed66b93de620f63cb4aab7e46bd45fa1b32e22424e8c1c +SIZE (DVDStyler-1.8.1.tar.bz2) = 1845503 Index: multimedia/dvdstyler/pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/dvdstyler/pkg-plist,v retrieving revision 1.13 diff -u -p -r1.13 pkg-plist --- multimedia/dvdstyler/pkg-plist 4 Sep 2007 01:32:51 -0000 1.13 +++ multimedia/dvdstyler/pkg-plist 11 Aug 2010 21:04:50 -0000 @@ -5,10 +5,10 @@ share/applications/dvdstyler.desktop %%DOCSDIR%%/ChangeLog %%DOCSDIR%%/INSTALL %%DOCSDIR%%/README -%%DATADIR%%/backgrounds/01_autobahn.jpg %%DATADIR%%/backgrounds/02_bi_domrep.jpg %%DATADIR%%/backgrounds/03_creta.jpg %%DATADIR%%/backgrounds/04_kiel_kanal.jpg +%%DATADIR%%/backgrounds/05_easyblue.jpg %%DATADIR%%/backgrounds/10_turbulence_blue.jpg %%DATADIR%%/backgrounds/11_turbulence_green.jpg %%DATADIR%%/backgrounds/15_bordes_blue.jpg @@ -19,72 +19,107 @@ share/applications/dvdstyler.desktop %%DATADIR%%/backgrounds/23_lava.jpg %%DATADIR%%/backgrounds/30_brushed_aluminiun.jpg %%DATADIR%%/backgrounds/31_texture_border.jpg -%%DATADIR%%/buttons/arrow-down.xml -%%DATADIR%%/buttons/arrow-left.xml -%%DATADIR%%/buttons/arrow-next.xml -%%DATADIR%%/buttons/arrow-right.xml -%%DATADIR%%/buttons/arrow-up.xml +%%DATADIR%%/backgrounds/32_blue_fractal.jpg +%%DATADIR%%/backgrounds/40_swans.jpg +%%DATADIR%%/backgrounds/45_nevado.jpg +%%DATADIR%%/backgrounds/46_paisaje.jpg +%%DATADIR%%/buttons/arrow-star.xml %%DATADIR%%/buttons/arrow.xml -%%DATADIR%%/buttons/arrow2-down.xml -%%DATADIR%%/buttons/arrow2-left.xml -%%DATADIR%%/buttons/arrow2-right.xml -%%DATADIR%%/buttons/arrow2-up.xml +%%DATADIR%%/buttons/arrow2.xml +%%DATADIR%%/buttons/arrow3.xml %%DATADIR%%/buttons/buttons.lst %%DATADIR%%/buttons/cancel.xml +%%DATADIR%%/buttons/deprecated/arrow-down.xml +%%DATADIR%%/buttons/deprecated/arrow-left.xml +%%DATADIR%%/buttons/deprecated/arrow-next.xml +%%DATADIR%%/buttons/deprecated/arrow-right.xml +%%DATADIR%%/buttons/deprecated/arrow-up.xml +%%DATADIR%%/buttons/deprecated/arrow2-down.xml +%%DATADIR%%/buttons/deprecated/arrow2-left.xml +%%DATADIR%%/buttons/deprecated/arrow2-right.xml +%%DATADIR%%/buttons/deprecated/arrow2-up.xml +%%DATADIR%%/buttons/deprecated/text-shadow.xml +%%DATADIR%%/buttons/deprecated/text-underlined.xml +%%DATADIR%%/buttons/deprecated/text.xml %%DATADIR%%/buttons/ellipse.xml %%DATADIR%%/buttons/frame.xml %%DATADIR%%/buttons/ok.xml %%DATADIR%%/buttons/pill.xml +%%DATADIR%%/buttons/text-circle.xml %%DATADIR%%/buttons/text-shadow.xml -%%DATADIR%%/buttons/text.xml +%%DATADIR%%/buttons/text-square.xml +%%DATADIR%%/buttons/text-underlined-v2.xml +%%DATADIR%%/buttons/text-v2.xml %%DATADIR%%/data/empty_ntsc_ac3.mpg %%DATADIR%%/data/empty_ntsc_mp2.mpg %%DATADIR%%/data/empty_pal_ac3.mpg %%DATADIR%%/data/empty_pal_mp2.mpg -%%DATADIR%%/data/silence.ac3 -%%DATADIR%%/data/silence.mp2 +%%DATADIR%%/data/subtitles.rgb +%%DATADIR%%/docs/help_de.zip +%%DATADIR%%/docs/help_en.zip +%%DATADIR%%/docs/help_ja.zip +%%DATADIR%%/docs/help_nb.zip +%%DATADIR%%/docs/help_ru.zip %%DATADIR%%/objects/ellipse.xml %%DATADIR%%/objects/frame.xml %%DATADIR%%/objects/image.xml %%DATADIR%%/objects/rectangle.xml %%DATADIR%%/objects/text-shadow.xml %%DATADIR%%/objects/text.xml +%%DATADIR%%/rc/add.png %%DATADIR%%/rc/dvdstyler.png %%DATADIR%%/rc/files.png -%%DATADIR%%/rc/folder1.png -%%DATADIR%%/rc/folder2.png %%DATADIR%%/rc/logo.png +%%DATADIR%%/rc/logoSmall.png %%DATADIR%%/rc/minus.png %%DATADIR%%/rc/move.cur %%DATADIR%%/rc/nesw.cur %%DATADIR%%/rc/new.png +%%DATADIR%%/rc/noaudio.png %%DATADIR%%/rc/nwse.cur %%DATADIR%%/rc/open.png %%DATADIR%%/rc/plus.png +%%DATADIR%%/rc/preferences.png +%%DATADIR%%/rc/remove.png %%DATADIR%%/rc/run.png %%DATADIR%%/rc/save.png -share/locale/ca/LC_MESSAGES/dvdstyler.mo +%%DATADIR%%/templates/blue.dvdt +%%DATADIR%%/templates/blue.png +%%DATADIR%%/templates/travel.dvdt +%%DATADIR%%/templates/travel.png +%%DATADIR%%/templates/turbulence.dvdt +%%DATADIR%%/templates/turbulence.png share/locale/cs/LC_MESSAGES/dvdstyler.mo share/locale/da/LC_MESSAGES/dvdstyler.mo share/locale/de/LC_MESSAGES/dvdstyler.mo +share/locale/el/LC_MESSAGES/dvdstyler.mo share/locale/es/LC_MESSAGES/dvdstyler.mo share/locale/eu/LC_MESSAGES/dvdstyler.mo share/locale/fr/LC_MESSAGES/dvdstyler.mo share/locale/hu/LC_MESSAGES/dvdstyler.mo +share/locale/hy/LC_MESSAGES/dvdstyler.mo share/locale/it/LC_MESSAGES/dvdstyler.mo share/locale/ja/LC_MESSAGES/dvdstyler.mo +share/locale/ko/LC_MESSAGES/dvdstyler.mo +share/locale/mk/LC_MESSAGES/dvdstyler.mo +share/locale/nb/LC_MESSAGES/dvdstyler.mo share/locale/nl/LC_MESSAGES/dvdstyler.mo share/locale/pl/LC_MESSAGES/dvdstyler.mo share/locale/pt/LC_MESSAGES/dvdstyler.mo share/locale/pt_BR/LC_MESSAGES/dvdstyler.mo share/locale/ru/LC_MESSAGES/dvdstyler.mo share/locale/sk/LC_MESSAGES/dvdstyler.mo +share/locale/sl/LC_MESSAGES/dvdstyler.mo share/locale/sr/LC_MESSAGES/dvdstyler.mo share/locale/sv/LC_MESSAGES/dvdstyler.mo +share/locale/vi/LC_MESSAGES/dvdstyler.mo share/pixmaps/dvdstyler.png +@dirrm %%DATADIR%%/templates @dirrm %%DATADIR%%/rc @dirrm %%DATADIR%%/objects +@dirrm %%DATADIR%%/docs @dirrm %%DATADIR%%/data +@dirrm %%DATADIR%%/buttons/deprecated @dirrm %%DATADIR%%/buttons @dirrm %%DATADIR%%/backgrounds @dirrm %%DATADIR%%