Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2014 13:43:00 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342442 - head/net/libnids
Message-ID:  <201402031343.s13Dh0th097941@svn.freebsd.org>

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

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



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