From owner-svn-ports-head@freebsd.org Tue Aug 25 14:58:24 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 DFF619C2301; Tue, 25 Aug 2015 14:58: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 C57742AA; Tue, 25 Aug 2015 14:58:23 +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 t7PEwNLk083856; Tue, 25 Aug 2015 14:58:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7PEwN3V083854; Tue, 25 Aug 2015 14:58:23 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508251458.t7PEwN3V083854@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 25 Aug 2015 14:58:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395295 - head/net-mgmt/spectools 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: Tue, 25 Aug 2015 14:58:24 -0000 Author: amdmi3 Date: Tue Aug 25 14:58:22 2015 New Revision: 395295 URL: https://svnweb.freebsd.org/changeset/ports/395295 Log: - Add LICENSE_FILE - Switch to options helpers Modified: head/net-mgmt/spectools/Makefile head/net-mgmt/spectools/pkg-plist Modified: head/net-mgmt/spectools/Makefile ============================================================================== --- head/net-mgmt/spectools/Makefile Tue Aug 25 14:54:00 2015 (r395294) +++ head/net-mgmt/spectools/Makefile Tue Aug 25 14:58:22 2015 (r395295) @@ -13,56 +13,40 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tools for the Wi-Spy spectrum analyzers from MetaGeek LLC LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/GPL +BROKEN_ia64= does not build: duplicate definition of malloc +BROKEN_powerpc= does not build: duplicate definition of malloc +BROKEN_sparc64= does not build: duplicate definition of malloc + +USES= gmake pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake pkgconfig +ALL_TARGET= spectool_net spectool_raw PORTDOCS= README OPTIONS_DEFINE= GTK2 NCURSES DOCS OPTIONS_DEFAULT= GTK2 NCURSES +OPTIONS_SUB= yes -ALL_TARGET= spectool_net spectool_raw - -.include - -.if ${PORT_OPTIONS:MGTK2} -ALL_TARGET+= spectool_gtk -USE_GNOME= gtk20 -PLIST_SUB+= GTK="" -.else -PLIST_SUB+= GTK="@comment " -.endif - -.if ${PORT_OPTIONS:MNCURSES} -ALL_TARGET+= spectool_curses -PLIST_SUB+= NCURSES="" -.else -PLIST_SUB+= NCURSES="@comment " -.endif - -.include - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not build: duplicate definition of malloc -.endif +GTK2_ALL_TARGET= spectool_gtk +GTK2_USE= GNOME=gtk20 +NCURSES_ALL_TARGET= spectool_curses do-install: ${INSTALL_PROGRAM} ${WRKSRC}/spectool_net ${STAGEDIR}/${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/spectool_raw ${STAGEDIR}/${PREFIX}/bin -.if ${PORT_OPTIONS:MGTK2} + +do-install-GTK2-on: ${INSTALL_PROGRAM} ${WRKSRC}/spectool_gtk ${STAGEDIR}/${PREFIX}/bin -.endif -.if ${PORT_OPTIONS:MNCURSES} + +do-install-NCURSES-on: ${INSTALL_PROGRAM} ${WRKSRC}/spectool_curses ${STAGEDIR}/${PREFIX}/bin -.endif -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}/${DOCSDIR} -.endif -.include +.include Modified: head/net-mgmt/spectools/pkg-plist ============================================================================== --- head/net-mgmt/spectools/pkg-plist Tue Aug 25 14:54:00 2015 (r395294) +++ head/net-mgmt/spectools/pkg-plist Tue Aug 25 14:58:22 2015 (r395295) @@ -1,4 +1,4 @@ -%%GTK%%bin/spectool_gtk +%%GTK2%%bin/spectool_gtk %%NCURSES%%bin/spectool_curses bin/spectool_net bin/spectool_raw