Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Mar 2016 00:56:07 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412152 - head/editors/ted
Message-ID:  <201603300056.u2U0u77C029591@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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 <bsd.port.pre.mk>
 
@@ -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 <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603300056.u2U0u77C029591>