From owner-svn-ports-all@freebsd.org Wed Mar 30 00:56:09 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 00661AE2A2C; Wed, 30 Mar 2016 00:56:09 +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 A82C51C95; Wed, 30 Mar 2016 00:56:08 +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 u2U0u7qv029592; Wed, 30 Mar 2016 00:56:07 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2U0u77C029591; Wed, 30 Mar 2016 00:56:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201603300056.u2U0u77C029591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 30 Mar 2016 00:56:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412152 - head/editors/ted 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.21 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: Wed, 30 Mar 2016 00:56:09 -0000 Author: amdmi3 Date: Wed Mar 30 00:56:07 2016 New Revision: 412152 URL: https://svnweb.freebsd.org/changeset/ports/412152 Log: - Add LICENSE_FILE - Switch to options helpers - Fix build with GTK2 Modified: head/editors/ted/Makefile Modified: head/editors/ted/Makefile ============================================================================== --- head/editors/ted/Makefile Wed Mar 30 00:54:20 2016 (r412151) +++ head/editors/ted/Makefile Wed Mar 30 00:56:07 2016 (r412152) @@ -13,6 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= X11 based RTF editor LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/gpl.txt LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libpng.so:${PORTSDIR}/graphics/png \ @@ -20,13 +21,10 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve libpaper.so:${PORTSDIR}/print/libpaper RUN_DEPENDS= gsfonts>0:${PORTSDIR}/print/gsfonts -OPTIONS_DEFINE= GTK2 DOCS -GTK2_DESC= Use GTK2 instead of MOTIF - WRKSRC= ${WRKDIR}/Ted-${PORTVERSION} USE_XORG= xext xft -USES= ghostscript:x11,run iconv +USES= ghostscript:x11,run iconv pkgconfig GNU_CONFIGURE= yes MAKE_ENV= DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}/\\\"\"" \ DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}/\\\"\"" \ @@ -42,15 +40,13 @@ DOCSDIR= ${PREFIX}/share/doc/Ted AFMDIR= ${DATADIR}/afm INDDIR= ${DATADIR}/dfa -.include - -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME= gtk20 -CONFIGURE_ARGS+=--with-GTK -.else -USES+= motif -CONFIGURE_ARGS+=--with-MOTIF -.endif +OPTIONS_DEFINE= GTK2 DOCS +GTK2_DESC= Use GTK2 instead of MOTIF +GTK2_USE= GNOME=gtk20 +GTK2_CONFIGURE_ON= --with-GTK +GTK2_CPPFLAGS= `pkg-config --cflags gtk+-2.0 | ${SED} -e 's|-I|-isystem |g'` +GTK2_USES_OFF= motif +GTK2_CONFIGURE_OFF= --with-MOTIF .include @@ -81,9 +77,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/tedPackage/afm/*.afm ${STAGEDIR}${AFMDIR} @${MKDIR} ${STAGEDIR}${INDDIR} ${INSTALL_DATA} ${WRKSRC}/tedPackage/dfa/*.dfa ${STAGEDIR}${INDDIR} -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf ${STAGEDIR}${DOCSDIR} -.endif .include