From owner-svn-ports-all@FreeBSD.ORG Sat Nov 16 20:09:43 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 DED7A82B; Sat, 16 Nov 2013 20:09:43 +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 BF98422F5; Sat, 16 Nov 2013 20:09:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGK9hcZ050777; Sat, 16 Nov 2013 20:09:43 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGK9gmr050769; Sat, 16 Nov 2013 20:09:42 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201311162009.rAGK9gmr050769@svn.freebsd.org> From: Dirk Meyer Date: Sat, 16 Nov 2013 20:09:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334028 - in head/net: libnet libnet10 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.16 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: Sat, 16 Nov 2013 20:09:43 -0000 Author: dinoex Date: Sat Nov 16 20:09:42 2013 New Revision: 334028 URL: http://svnweb.freebsd.org/changeset/ports/334028 Log: - use STAGEDIR Modified: head/net/libnet/Makefile head/net/libnet/pkg-plist head/net/libnet10/Makefile head/net/libnet10/pkg-plist Modified: head/net/libnet/Makefile ============================================================================== --- head/net/libnet/Makefile Sat Nov 16 20:07:54 2013 (r334027) +++ head/net/libnet/Makefile Sat Nov 16 20:09:42 2013 (r334028) @@ -13,7 +13,6 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= A C library for creating IP packets LATEST_LINK= ${PORTNAME}${SHORT_VER} -NO_STAGE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes @@ -29,7 +28,6 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${ USE_LDCONFIG= ${PREFIX}/lib/${SHORT_NAME} PLIST_SUB= SVER=${SHORT_VER} SNAME=${SHORT_NAME} VERSION=${PORTVERSION} -MAN3= libnet-functions.h.3 libnet-macros.h.3 libnet.h.3 DOCS= README doc/CHANGELOG doc/CONTRIB doc/COPYING \ doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \ doc/RAWSOCKET_NON_SEQUITUR doc/TODO @@ -60,17 +58,17 @@ post-patch: ${WRKSRC}/src/Makefile.in post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${PREFIX}/bin/${SHORT_NAME}-config - @cd ${PREFIX}/lib && \ + ${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${STAGEDIR}${PREFIX}/bin/${SHORT_NAME}-config + @cd ${STAGEDIR}${PREFIX}/lib && \ ${LN} -sf ${SHORT_NAME}/libnet.so libnet-${PORTVERSION}.so.8 && \ ${LN} -sf libnet-${PORTVERSION}.so.8 libnet-${PORTVERSION}.so .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/ .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ .endif .include Modified: head/net/libnet/pkg-plist ============================================================================== --- head/net/libnet/pkg-plist Sat Nov 16 20:07:54 2013 (r334027) +++ head/net/libnet/pkg-plist Sat Nov 16 20:09:42 2013 (r334028) @@ -12,6 +12,9 @@ lib/%%SNAME%%/libnet.so lib/%%SNAME%%/libnet.so.8 lib/libnet-%%VERSION%%.so lib/libnet-%%VERSION%%.so.8 +man/man3/libnet-functions.h.3.gz +man/man3/libnet-macros.h.3.gz +man/man3/libnet.h.3.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/CONTRIB %%PORTDOCS%%%%DOCSDIR%%/COPYING Modified: head/net/libnet10/Makefile ============================================================================== --- head/net/libnet10/Makefile Sat Nov 16 20:07:54 2013 (r334027) +++ head/net/libnet10/Makefile Sat Nov 16 20:09:42 2013 (r334028) @@ -14,8 +14,6 @@ PKGNAMESUFFIX= 10 MAINTAINER= dinoex@FreeBSD.org COMMENT= A C library for creating IP packets -NO_STAGE= yes - CFLAGS+= -fPIC USE_AUTOTOOLS= autoconf @@ -23,7 +21,7 @@ WRKSRC= ${WRKDIR}/Libnet-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} MAN3= libnet${PKGNAMESUFFIX}.3 -.include +.include post-patch: ${REINPLACE_CMD} -e 's|bpf0|null|' ${WRKSRC}/configure @@ -33,18 +31,18 @@ post-patch: post-install: ${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 \ - ${MANPREFIX}/man/man3/libnet${PKGNAMESUFFIX}.3 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/ancillary ${DOCSDIR}/examples + ${STAGEDIR}${MANPREFIX}/man/man3/libnet${PKGNAMESUFFIX}.3 +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/ancillary ${STAGEDIR}${DOCSDIR}/examples .for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1 - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/ .endfor .for i in README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets - ${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${DOCSDIR}/ancillary + ${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${STAGEDIR}${DOCSDIR}/ancillary/ .endfor .for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c - ${INSTALL_DATA} ${WRKSRC}/example/${i} ${DOCSDIR}/examples + ${INSTALL_DATA} ${WRKSRC}/example/${i} ${STAGEDIR}${DOCSDIR}/examples/ .endfor .endif -.include +.include Modified: head/net/libnet10/pkg-plist ============================================================================== --- head/net/libnet10/pkg-plist Sat Nov 16 20:07:54 2013 (r334027) +++ head/net/libnet10/pkg-plist Sat Nov 16 20:09:42 2013 (r334028) @@ -8,6 +8,7 @@ include/libnet10/libnet/libnet-ospf.h include/libnet10/libnet/libnet-structures.h lib/libnet10/libnet.a lib/libnet10/libpwrite.a +man/man3/libnet10.3.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG-NEWFUNCTIONS %%PORTDOCS%%%%DOCSDIR%%/COPYING