From owner-svn-ports-head@freebsd.org Mon Aug 24 00:11:23 2015 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 0CD3B9C1DE5; Mon, 24 Aug 2015 00:11:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 E9FA63EF; Mon, 24 Aug 2015 00:11:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7O0BMFM000750; Mon, 24 Aug 2015 00:11:22 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7O0BMYJ000600; Mon, 24 Aug 2015 00:11:22 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508240011.t7O0BMYJ000600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 24 Aug 2015 00:11:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395156 - head/x11/eaglemode 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.20 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: Mon, 24 Aug 2015 00:11:23 -0000 Author: amdmi3 Date: Mon Aug 24 00:11:22 2015 New Revision: 395156 URL: https://svnweb.freebsd.org/changeset/ports/395156 Log: - Switch to options helpers - Update to 0.89.1 Modified: head/x11/eaglemode/Makefile head/x11/eaglemode/distinfo Modified: head/x11/eaglemode/Makefile ============================================================================== --- head/x11/eaglemode/Makefile Mon Aug 24 00:08:41 2015 (r395155) +++ head/x11/eaglemode/Makefile Mon Aug 24 00:11:22 2015 (r395156) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= eaglemode -PORTVERSION= 0.89.0 -PORTREVISION= 1 +PORTVERSION= 0.89.1 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -35,9 +34,16 @@ PORTDATA= * OPTIONS_DEFINE= XINE RSVG PDF OPTIONS_DEFAULT=XINE RSVG PDF +OPTIONS_SUB= yes + RSVG_DESC= SVG support through librsvg PDF_DESC= PDF support through poppler-glib +XINE_LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine +RSVG_USE= GNOME=librsvg2 +PDF_LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib +PDF_USE= GNOME=gtk20 + .include .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 @@ -45,43 +51,24 @@ USE_GCC= yes .endif .if ${PORT_OPTIONS:MXINE} -LIB_DEPENDS+= libxine.so:${PORTSDIR}/multimedia/libxine BUILD_ARGS+= xine-inc-dir="${LOCALBASE}/include" \ xine-lib-dir="${LOCALBASE}/lib" -PLIST_SUB+= EMAV="" -.else -PLIST_SUB+= EMAV="@comment " -.endif - -.if ${PORT_OPTIONS:MRSVG} -USE_GNOME+= librsvg2 -PLIST_SUB+= EMSVG="" -.else -PLIST_SUB+= EMSVG="@comment " -.endif - -.if ${PORT_OPTIONS:MPDF} -LIB_DEPENDS+= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib -USE_GNOME+= gtk20 -PLIST_SUB+= EMPDF="" -.else -PLIST_SUB+= EMPDF="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|"-O2"|"${CFLAGS}"|' \ ${WRKSRC}/makers/unicc/plugins/unicc_gnu.pm -.if ! ${PORT_OPTIONS:MXINE} + @${FIND} ${WRKSRC} -name "*.pl" | ${XARGS} \ + ${REINPLACE_CMD} -e '1s|${perl_OLD_CMD}|${perl_CMD}|' + +post-patch-XINE-off: @${RM} -f ${WRKSRC}/makers/emAv.maker.pm -.endif -.if ! ${PORT_OPTIONS:MRSVG} + +post-patch-RSVG-off: @${RM} -f ${WRKSRC}/makers/emSvg.maker.pm -.endif -.if ! ${PORT_OPTIONS:MPDF} + +post-patch-PDF-off: @${RM} -f ${WRKSRC}/makers/emPdf.maker.pm -.endif - @${FIND} ${WRKSRC} -name "*.pl" | ${XARGS} \ - ${REINPLACE_CMD} -e '1s|${perl_OLD_CMD}|${perl_CMD}|' do-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ @@ -95,14 +82,14 @@ do-install: ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emClock/emTimeZonesProc \ ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emTmpConv/emTmpConvProc -.if ${PORT_OPTIONS:MXINE} + +do-install-XINE-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emAv/emAvServerProc_xine -.endif -.if ${PORT_OPTIONS:MRSVG} + +do-install-RSVG-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emSvg/emSvgServerProc -.endif -.if ${PORT_OPTIONS:MPDF} + +do-install-PDF-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emPdf/emPdfServerProc -.endif .include Modified: head/x11/eaglemode/distinfo ============================================================================== --- head/x11/eaglemode/distinfo Mon Aug 24 00:08:41 2015 (r395155) +++ head/x11/eaglemode/distinfo Mon Aug 24 00:11:22 2015 (r395156) @@ -1,2 +1,2 @@ -SHA256 (eaglemode-0.89.0.tar.bz2) = 916a198ffb7d4d77cdfb79c020df085603db9cad49eeb9b58a5fac0e12292ea2 -SIZE (eaglemode-0.89.0.tar.bz2) = 4931577 +SHA256 (eaglemode-0.89.1.tar.bz2) = 9a996b0309b7697d71b0350d1c74184bb979cdc079a2744870818abefb38fcd5 +SIZE (eaglemode-0.89.1.tar.bz2) = 5063741