From owner-svn-ports-all@freebsd.org Fri Sep 25 11:50:25 2015 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 C8043A08BAD; Fri, 25 Sep 2015 11:50:25 +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 B826B1EAD; Fri, 25 Sep 2015 11:50:25 +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 t8PBoP2H007290; Fri, 25 Sep 2015 11:50:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8PBoPLa007289; Fri, 25 Sep 2015 11:50:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509251150.t8PBoPLa007289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 25 Sep 2015 11:50:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397813 - head/x11/mlterm 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.20 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: Fri, 25 Sep 2015 11:50:26 -0000 Author: amdmi3 Date: Fri Sep 25 11:50:24 2015 New Revision: 397813 URL: https://svnweb.freebsd.org/changeset/ports/397813 Log: - Drop 8.x support - Switch to options helpers Approved by: portmgr blanket Modified: head/x11/mlterm/Makefile Modified: head/x11/mlterm/Makefile ============================================================================== --- head/x11/mlterm/Makefile Fri Sep 25 11:50:16 2015 (r397812) +++ head/x11/mlterm/Makefile Fri Sep 25 11:50:24 2015 (r397813) @@ -24,6 +24,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -lintl MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= CAIRO DOCS FRIBIDI IBUS M17NLIB REGIS SCIM SIXEL UIM +OPTIONS_SUB= yes CAIRO_DESC= Use Cairo for type engine (experimental) FRIBIDI_DESC= Use Fribidi for BiDi rendering IBUS_DESC= IBUS support (experimental) @@ -33,93 +34,44 @@ SCIM_DESC= SCIM support (experimental) SIXEL_DESC= Sixel graphics support UIM_DESC= uim support (experimental) -.include +FRIBIDI_CONFIGURE_ENABLE= fribidi +FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi -.if ${PORT_OPTIONS:MFRIBIDI} -CONFIGURE_ARGS+= --enable-fribidi -LIB_DEPENDS+= libfribidi.so:${PORTSDIR}/converters/fribidi -PLIST_SUB+= FRIBIDI="" -.else -CONFIGURE_ARGS+= --disable-fribidi -PLIST_SUB+= FRIBIDI="@comment " -.endif +UIM_CONFIGURE_ENABLE= uim +UIM_LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim -.if ${PORT_OPTIONS:MUIM} -CONFIGURE_ARGS+= --enable-uim -LIB_DEPENDS+= libuim.so:${PORTSDIR}/textproc/uim -PLIST_SUB+= UIM="" -.else -CONFIGURE_ARGS+= --disable-uim -PLIST_SUB+= UIM="@comment " -.endif +M17NLIB_CONFIGURE_ENABLE= m17nlib +M17NLIB_LIB_DEPENDS= libm17n.so:${PORTSDIR}/devel/m17n-lib -.if ${PORT_OPTIONS:MM17NLIB} -CONFIGURE_ARGS+= --enable-m17nlib -LIB_DEPENDS+= libm17n.so:${PORTSDIR}/devel/m17n-lib -PLIST_SUB+= M17NLIB="" -.else -CONFIGURE_ARGS+= --disable-m17nlib -PLIST_SUB+= M17NLIB="@comment " -.endif +SCIM_CONFIGURE_ENABLE= scim +SCIM_LIB_DEPENDS= libscim-1.0.so:${PORTSDIR}/textproc/scim -.if ${PORT_OPTIONS:MSCIM} -CONFIGURE_ARGS+= --enable-scim -LIB_DEPENDS+= libscim-1.0.so:${PORTSDIR}/textproc/scim -PLIST_SUB+= SCIM="" -.else -CONFIGURE_ARGS+= --disable-scim -PLIST_SUB+= SCIM="@comment " -.endif +IBUS_CONFIGURE_ENABLE= ibus +IBUS_LIB_DEPENDS= libibus-1.0.so:${PORTSDIR}/textproc/ibus -.if ${PORT_OPTIONS:MIBUS} -CONFIGURE_ARGS+= --enable-ibus -LIB_DEPENDS+= libibus-1.0.so:${PORTSDIR}/textproc/ibus -PLIST_SUB+= IBUS="" -.else -CONFIGURE_ARGS+= --disable-ibus -PLIST_SUB+= IBUS="@comment " -.endif +CAIRO_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo +CAIRO_CONFIGURE_ON= --with-type-engines="xcore,xft,cairo" +CAIRO_CONFIGURE_OFF= --with-type-engines="xcore,xft" -.if ${PORT_OPTIONS:MCAIRO} -CONFIGURE_ARGS+= --with-type-engines="xcore,xft,cairo" -LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo -PLIST_SUB+= CAIRO="" -.else -CONFIGURE_ARGS+= --with-type-engines="xcore,xft" -PLIST_SUB+= CAIRO="@comment " -.endif +SIXEL_CONFIGURE_ENABLE= sixel -.if ${PORT_OPTIONS:MSIXEL} -CONFIGURE_ARGS+= --enable-sixel -PLIST_SUB+= SIXEL="" -.else -CONFIGURE_ARGS+= --disable-sixel -PLIST_SUB+= SIXEL="@comment " -.endif +REGIS_LIB_DEPENDS= libSDL.so:${PORTSDIR}/devel/sdl12 \ + libSDL_ttf.so:${PORTSDIR}/graphics/sdl_ttf \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig + +.include .if ${PORT_OPTIONS:MREGIS} -LIB_DEPENDS+= libSDL.so:${PORTSDIR}/devel/sdl12 \ - libSDL_ttf.so:${PORTSDIR}/graphics/sdl_ttf \ - libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig EXTERNAL_TOOLS+=,registobmp -PLIST_SUB+= REGIS="" -.else -PLIST_SUB+= REGIS="@comment " .endif CONFIGURE_ARGS+=--with-tools="${EXTERNAL_TOOLS}" -.if ${OSVERSION} < 900004 -LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter -.endif - post-configure: @${REINPLACE_CMD} -e "s,@CGI_BIN@,${PREFIX}/libexec/w3mmlconfig," \ ${WRKSRC}/tool/w3mmlconfig/mlconfig.cgi -.if ${OSVERSION} >= 900004 @${REINPLACE_CMD} -e 's|kik_utmp_bsd|kik_utmp_utmper|' \ ${WRKSRC}/kiklib/src/Makefile -.endif post-install: (cd ${WRKSRC}/tool/w3mmlconfig && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \