From owner-svn-ports-all@FreeBSD.ORG Wed Dec 25 12:45:40 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F0377AE; Wed, 25 Dec 2013 12:45:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6149C132E; Wed, 25 Dec 2013 12:45:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPCje1s020582; Wed, 25 Dec 2013 12:45:40 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPCjehO020581; Wed, 25 Dec 2013 12:45:40 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312251245.rBPCjehO020581@svn.freebsd.org> From: Pawel Pekala Date: Wed, 25 Dec 2013 12:45:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337410 - head/net/netscript 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.17 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, 25 Dec 2013 12:45:40 -0000 Author: pawel Date: Wed Dec 25 12:45:39 2013 New Revision: 337410 URL: http://svnweb.freebsd.org/changeset/ports/337410 Log: - Fix build on -current - Convert to new options framework - Use shebangfix for rulesets - Support staging - Switch to PLIST_FILES PR: ports/184842 Submitted by: KATO Tsuguru Deleted: head/net/netscript/pkg-plist Modified: head/net/netscript/Makefile (contents, props changed) Modified: head/net/netscript/Makefile ============================================================================== --- head/net/netscript/Makefile Wed Dec 25 12:19:57 2013 (r337409) +++ head/net/netscript/Makefile Wed Dec 25 12:45:39 2013 (r337410) @@ -3,41 +3,48 @@ PORTNAME= netscript PORTVERSION= 1.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF \ http://fakehalo.deadpig.org/%SUBDIR%/ - EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Portable/multi-platform lightweight TCP socket scripting -WANT_GNOME= yes - -NO_STAGE= yes -.include - -.if ${HAVE_GNOME:Mgtk12}!="" -USE_GNOME+= gtk12 -PKGNAMESUFFIX= -gtk -ALL_TARGET= gbsd -.else -ALL_TARGET= bsd -.endif +OPTIONS_DEFINE= DOCS EXAMPLES GTK1 -post-patch: - @${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile +USES= ncurses shebangfix +SHEBANG_FILES= examples/*.ruleset examples/gui/*.ruleset \ + examples/ncurses/*.ruleset +SHEBANG_LANG= netscript +netscript_OLD_CMD= /usr/bin/netscript +netscript_CMD= ${LOCALBASE}/bin/netscript + +CFLAGS+= -DNCURSES -DARPA -DBSD_T -Wl,--export-dynamic +LDFLAGS+= -lcurses + +PORTDOCS= * +PORTEXAMPLES= * +PLIST_FILES= bin/netscript + +GTK1_USE= GNOME=gtk12 +GTK1_CFLAGS= -DGTK +GTK1_CPPFLAGS= $$(gtk-config --cflags gthread) +GTK1_LDFLAGS= $$(gtk-config --libs gthread) + +do-build: + (cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} netscript.c \ + -o netscript ${LDFLAGS}) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/netscript ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} - ${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR} - @${CHMOD} -R og+r ${EXAMPLESDIR} - @${CHMOD} og+x ${EXAMPLESDIR}/gui ${EXAMPLESDIR}/ncurses -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} netscript \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README \ + ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${EXAMPLESDIR}) -.include +.include