From owner-svn-ports-head@freebsd.org Mon Jun 12 22:25:27 2017 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 12CF9C7988D; Mon, 12 Jun 2017 22:25:27 +0000 (UTC) (envelope-from sunpoet@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 D4B56822E9; Mon, 12 Jun 2017 22:25:26 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5CMPPXq025898; Mon, 12 Jun 2017 22:25:25 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5CMPPtG025897; Mon, 12 Jun 2017 22:25:25 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201706122225.v5CMPPtG025897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 12 Jun 2017 22:25:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443477 - head/lang/ohugs 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.23 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, 12 Jun 2017 22:25:27 -0000 Author: sunpoet Date: Mon Jun 12 22:25:25 2017 New Revision: 443477 URL: https://svnweb.freebsd.org/changeset/ports/443477 Log: Convert to options helper - Use USES=readline:port Approved by: portmgr (blanket) Modified: head/lang/ohugs/Makefile Modified: head/lang/ohugs/Makefile ============================================================================== --- head/lang/ohugs/Makefile Mon Jun 12 22:25:20 2017 (r443476) +++ head/lang/ohugs/Makefile Mon Jun 12 22:25:25 2017 (r443477) @@ -13,27 +13,18 @@ COMMENT= Interpreter for Haskell with object-oriented OPTIONS_DEFINE= X11 -.include - -LIB_DEPENDS= libreadline.so.6:devel/readline -.if empty(PORT_OPTIONS:MX11) -LIB_DEPENDS= libTix8.4.3.so:x11-toolkits/tix -.endif - WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//} BUILD_WRKSRC= ${WRKSRC}/src -USES= bison ncurses readline +USES= bison ncurses readline:port LDFLAGS+= -lm -lreadline -lncurses -.if ${PORT_OPTIONS:MX11} -USES+= tk -CFLAGS+= -I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER} -ltcl${TCL_SHLIB_VER} -lTix8.4.3 -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_prelude.h -.endif - MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ INSTBIN=${PREFIX}/bin INSTLIB=${PREFIX}/lib/ohugs + +X11_CFLAGS= -I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} -I${LOCALBASE}/include +X11_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-src_prelude.h +X11_LDFLAGS= -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER} -ltcl${TCL_SHLIB_VER} -lTix8.4.3 +X11_LIB_DEPENDS_OFF= libTix8.4.3.so:x11-toolkits/tix +X11_USES= tk .include