Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Aug 2015 14:58:23 +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: r395295 - head/net-mgmt/spectools
Message-ID:  <201508251458.t7PEwN3V083854@repo.freebsd.org>

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

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



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