From owner-svn-ports-head@FreeBSD.ORG Mon Jul 14 16:23:05 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 67D65DE3; Mon, 14 Jul 2014 16:23:05 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 54BC928D5; Mon, 14 Jul 2014 16:23:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6EGN5N3056264; Mon, 14 Jul 2014 16:23:05 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6EGN4sc056261; Mon, 14 Jul 2014 16:23:04 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201407141623.s6EGN4sc056261@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 14 Jul 2014 16:23:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361798 - head/net/libnet 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.18 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, 14 Jul 2014 16:23:05 -0000 Author: sunpoet Date: Mon Jul 14 16:23:04 2014 New Revision: 361798 URL: http://svnweb.freebsd.org/changeset/ports/361798 QAT: https://qat.redports.org/buildarchive/r361798/ Log: - Add LICENSE - Fix LN in post-install: - Convert to new options helper - Remove unnecessary MASTER_SITE_SUBDIR and SVER - Silence post-patch: - Simplify Makefile - Cosmetic change - Update pkg-descr and WWW - Take maintainership Modified: head/net/libnet/Makefile head/net/libnet/pkg-descr Modified: head/net/libnet/Makefile ============================================================================== --- head/net/libnet/Makefile Mon Jul 14 16:21:00 2014 (r361797) +++ head/net/libnet/Makefile Mon Jul 14 16:23:04 2014 (r361798) @@ -7,65 +7,54 @@ PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF/libnet-dev -MASTER_SITE_SUBDIR= distfiles -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= C library for creating IP packets -USES= libtool -USE_LDCONFIG= yes -USE_CSTD= gnu89 +LICENSE= BSD2CLAUSE + +OPTIONS_DEFINE= BPF DOCS EXAMPLES +OPTIONS_DEFAULT=BPF +BPF_DESC= link layer bpf + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-link-layer=${LIBNET_LINK} INSTALL_TARGET= install-strip +USE_CSTD= gnu89 +USE_LDCONFIG= yes +USES= libtool -SHORT_VER= 11 -SHORT_NAME= ${PORTNAME}${SHORT_VER} +SHORT_NAME= ${PORTNAME}11 DOCSDIR= ${PREFIX}/share/doc/${SHORT_NAME} EXAMPLESDIR= ${PREFIX}/share/examples/${SHORT_NAME} USE_LDCONFIG= ${PREFIX}/lib/${SHORT_NAME} -PLIST_SUB= SVER=${SHORT_VER} SNAME=${SHORT_NAME} VERSION=${PORTVERSION} +PLIST_SUB= SNAME=${SHORT_NAME} VERSION=${PORTVERSION} DOCS= README doc/CHANGELOG doc/CONTRIB doc/COPYING \ doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \ doc/RAWSOCKET_NON_SEQUITUR doc/TODO EXAMPLES= sample/*.c -OPTIONS_DEFINE= EXAMPLES DOCS BPF -OPTIONS_DEFAULT= BPF -BPF_DESC= link layer bpf - -.include - -LIBNET_LINK= none - -.if ${PORT_OPTIONS:MBPF} -LIBNET_LINK= bpf -.endif +BPF_CONFIGURE_OFF= --with-link-layer=none +BPF_CONFIGURE_ON= --with-link-layer=bpf post-patch: - ${REINPLACE_CMD} \ - -e 's|@LIBNET_CONFIG_LIBS@|@LIBNET_CONFIG_LIBS@ -L@prefix@/lib/${SHORT_NAME}|' \ - -e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I@prefix@/include/${SHORT_NAME}|' \ - ${WRKSRC}/libnet-config.in - ${REINPLACE_CMD} -e 's|^includedir =.*|includedir = @includedir@/${SHORT_NAME}|' \ + @${REINPLACE_CMD} \ + -e 's|@LIBNET_CONFIG_LIBS@|@LIBNET_CONFIG_LIBS@ -L@prefix@/lib/${SHORT_NAME}|' \ + -e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I@prefix@/include/${SHORT_NAME}|' \ + ${WRKSRC}/libnet-config.in + @${REINPLACE_CMD} -e 's|^includedir =.*|includedir = @includedir@/${SHORT_NAME}|' \ ${WRKSRC}/include/Makefile.in \ ${WRKSRC}/include/libnet/Makefile.in - ${REINPLACE_CMD} -e 's|^libdir =.*|libdir = @libdir@/${SHORT_NAME}|' \ + @${REINPLACE_CMD} -e 's|^libdir =.*|libdir = @libdir@/${SHORT_NAME}|' \ -e 's|^libnet_la_LDFLAGS =\(.*\)|libnet_la_LDFLAGS =\1 -soname=libnet-${SHORT_NAME}.so.1|' \ ${WRKSRC}/src/Makefile.in post-install: ${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${STAGEDIR}${PREFIX}/bin/${SHORT_NAME}-config - @cd ${STAGEDIR}${PREFIX}/lib && \ - ${LN} -sf ${SHORT_NAME}/libnet-${PORTVERSION}.so.1 -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/ -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ -.endif + ${LN} -fs ${SHORT_NAME}/libnet.so.1 ${STAGEDIR}${PREFIX}/lib/libnet-${PORTVERSION}.so.1 + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/ .include Modified: head/net/libnet/pkg-descr ============================================================================== --- head/net/libnet/pkg-descr Mon Jul 14 16:21:00 2014 (r361797) +++ head/net/libnet/pkg-descr Mon Jul 14 16:23:04 2014 (r361798) @@ -14,6 +14,5 @@ Using libnet, quick and simple packet as with little effort. With a bit more time, more complex programs can be written (Traceroute and ping were easily rewritten using libnet and libpcap). -Libnet is distributed under the BSD license. - -WWW: http://www.packetfactory.net/projects/libnet/ +WWW: http://sourceforge.net/projects/libnet-dev/ +WWW: https://github.com/sam-github/libnet