From owner-svn-ports-head@FreeBSD.ORG Mon Feb 3 13:43:01 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 60A557AE; Mon, 3 Feb 2014 13:43:01 +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 3381119C8; Mon, 3 Feb 2014 13:43:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13Dh18S097943; Mon, 3 Feb 2014 13:43:01 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13Dh0th097941; Mon, 3 Feb 2014 13:43:00 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402031343.s13Dh0th097941@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 3 Feb 2014 13:43:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342442 - head/net/libnids 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.17 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, 03 Feb 2014 13:43:01 -0000 Author: mat Date: Mon Feb 3 13:43:00 2014 New Revision: 342442 URL: http://svnweb.freebsd.org/changeset/ports/342442 QAT: https://qat.redports.org/buildarchive/r342442/ Log: - Support staging - Use new options helpers a bit Sponsored by: Absolight Modified: head/net/libnids/Makefile head/net/libnids/pkg-plist Modified: head/net/libnids/Makefile ============================================================================== --- head/net/libnids/Makefile Mon Feb 3 13:40:41 2014 (r342441) +++ head/net/libnids/Makefile Mon Feb 3 13:43:00 2014 (r342442) @@ -17,27 +17,22 @@ OPTIONS_DEFINE= LIBNET10 LIBNET11 GLIB2 LIBNET10_DESC= Use libnet 1.0.x LIBNET11_DESC= Use libnet 1.1.x GLIB2_DESC= Use GLIB2 for multiprocessing support +OPTIONS_SUB= yes .if defined(WITH_LIBNET11) OPTIONS_DEFAULT= LIBNET11 GLIB2 .else OPTIONS_DEFAULT= LIBNET10 GLIB2 .endif +GLIB2_USE= gnome=glib20 +GLIB2_CONFIGURE_ENABLE= libglib + WANT_GNOME= yes USES= pkgconfig GNU_CONFIGURE= yes -MAN3= libnids.3 - -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MDOCS} -PLIST_SUB+= PORTDOCS="" -.else -PLIST_SUB+= PORTDOCS="@comment " -.endif - .if ${PORT_OPTIONS:MLIBNET10} LIBNET_VERSION= 10 BUILD_DEPENDS+= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet${LIBNET_VERSION} @@ -53,12 +48,6 @@ LIBNET_LIB= "`${LIBNET_CONFIG} --libs`" CONFIGURE_ARGS+= --disable-libnet .endif -.if ${PORT_OPTIONS:MGLIB2} -USE_GNOME+= glib20 -.else -CONFIGURE_ARGS+= --disable-libglib -.endif - post-patch: @${REINPLACE_CMD} -Ee \ 's|(LNET_CFLAGS=).*|\1"`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"|; \ @@ -66,16 +55,10 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} do-install: - ${INSTALL_DATA} ${WRKSRC}/src/nids.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/src/libnids.a ${PREFIX}/lib - ${INSTALL_MAN} ${WRKSRC}/src/libnids.3 ${PREFIX}/man/man3 - -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} -.for i in README doc/* - ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}/ -.endfor -.endif + ${INSTALL_DATA} ${WRKSRC}/src/nids.h ${STAGEDIR}${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/src/libnids.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_MAN} ${WRKSRC}/src/libnids.3 ${STAGEDIR}${MAN3PREFIX}/man/man3 + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README doc/* ${STAGEDIR}${DOCSDIR}) .include Modified: head/net/libnids/pkg-plist ============================================================================== --- head/net/libnids/pkg-plist Mon Feb 3 13:40:41 2014 (r342441) +++ head/net/libnids/pkg-plist Mon Feb 3 13:43:00 2014 (r342442) @@ -1,5 +1,6 @@ include/nids.h lib/libnids.a +man/man3/libnids.3.gz %%PORTDOCS%%%%DOCSDIR%%/API.html %%PORTDOCS%%%%DOCSDIR%%/API.txt %%PORTDOCS%%%%DOCSDIR%%/LINUX