Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Mar 2016 18:35:56 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411473 - head/net/libnet
Message-ID:  <201603201835.u2KIZubf022934@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Mar 20 18:35:56 2016
New Revision: 411473
URL: https://svnweb.freebsd.org/changeset/ports/411473

Log:
  - Cleanup Makefile: remove PLIST_SUB
  - Use PORTDOCS and PORTEXAMPLES
  - Convert to new options target helper

Modified:
  head/net/libnet/Makefile
  head/net/libnet/pkg-plist

Modified: head/net/libnet/Makefile
==============================================================================
--- head/net/libnet/Makefile	Sun Mar 20 18:18:20 2016	(r411472)
+++ head/net/libnet/Makefile	Sun Mar 20 18:35:56 2016	(r411473)
@@ -24,26 +24,26 @@ USE_CSTD=	gnu89
 USE_LDCONFIG=	yes
 USES=		libtool
 
-PLIST_SUB=	VERSION=${PORTVERSION}
-
-DOCS=		README doc/CHANGELOG doc/CONTRIB \
-		doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
-		doc/RAWSOCKET_NON_SEQUITUR doc/TODO
-EXAMPLES=	sample/*.c
+DOCS=		CHANGELOG CONTRIB DESIGN_NOTES MIGRATION PACKET_BUILDING PORTED RAWSOCKET_NON_SEQUITUR README TODO
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 BPF_CONFIGURE_OFF=	--with-link-layer=none
 BPF_CONFIGURE_ON=	--with-link-layer=bpf
 
 post-patch:
+	@${MV} ${WRKSRC}/README ${WRKSRC}/doc/
 	@${REINPLACE_CMD} \
 		-e 's|@LIBNET_CONFIG_LIBS@|@LIBNET_CONFIG_LIBS@ -L@prefix@/lib|' \
 		-e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I@prefix@/include|' \
 			${WRKSRC}/libnet-config.in
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
+
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/sample/*.c ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>

Modified: head/net/libnet/pkg-plist
==============================================================================
--- head/net/libnet/pkg-plist	Sun Mar 20 18:18:20 2016	(r411472)
+++ head/net/libnet/pkg-plist	Sun Mar 20 18:35:56 2016	(r411473)
@@ -13,60 +13,3 @@ lib/libnet.so.1.7.0
 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%%/DESIGN_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/MIGRATION
-%%PORTDOCS%%%%DOCSDIR%%/PACKET_BUILDING
-%%PORTDOCS%%%%DOCSDIR%%/PORTED
-%%PORTDOCS%%%%DOCSDIR%%/RAWSOCKET_NON_SEQUITUR
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp4_hdr.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp4_notification.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp4_open.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp4_update.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cdp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dhcp_discover.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dns.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot1x.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fddi_tcp1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fddi_tcp2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/get_addr.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gre.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hsrp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icmp6_echoreq.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icmp6_unreach.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icmp_echo_cq.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icmp_redirect.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icmp_timeexceed.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icmp_timestamp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icmp_unreach.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ieee.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ip_link.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ip_raw.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/isl.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mpls.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ntp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ospf_hello.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ospf_lsa.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ping_of_death.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpc_tcp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpc_udp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sebek.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smurf.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synflood.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synflood6.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synflood6_frag.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_ipv4.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_ipv4_options.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_ipv6_icmpv4.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tftp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tring_tcp1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tring_tcp2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp2.c



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