From owner-svn-ports-all@FreeBSD.ORG Wed Jan 21 09:10:22 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 230A5D7B; Wed, 21 Jan 2015 09:10:22 +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 02933E91; Wed, 21 Jan 2015 09:10:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0L9ALwV078944; Wed, 21 Jan 2015 09:10:21 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0L9ALuS078933; Wed, 21 Jan 2015 09:10:21 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201501210910.t0L9ALuS078933@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Wed, 21 Jan 2015 09:10:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377579 - in head/net/openpgm: . files 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.18-1 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: Wed, 21 Jan 2015 09:10:22 -0000 Author: rm Date: Wed Jan 21 09:10:20 2015 New Revision: 377579 URL: https://svnweb.freebsd.org/changeset/ports/377579 QAT: https://qat.redports.org/buildarchive/r377579/ Log: net/openpgm: fix build with python3 - fix build with python3 (trivial change) - clarify license (it's LGPL21+) and add LICENSE_FILE - simplify docs and examples installation - whitespace fixes - bump PORTREVISION because default package changed - examples now installed to EXAMPLESDIR instead of EXAMPLESDIR/examples) Approved by: vg (maintainer) Added: head/net/openpgm/files/ head/net/openpgm/files/patch-version__generator.py (contents, props changed) Modified: head/net/openpgm/Makefile head/net/openpgm/pkg-descr head/net/openpgm/pkg-plist Modified: head/net/openpgm/Makefile ============================================================================== --- head/net/openpgm/Makefile Wed Jan 21 09:03:09 2015 (r377578) +++ head/net/openpgm/Makefile Wed Jan 21 09:10:20 2015 (r377579) @@ -3,7 +3,7 @@ PORTNAME= openpgm PORTVERSION= 5.2.122 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net devel MASTER_SITES= GOOGLE_CODE DISTNAME= libpgm-${PORTVERSION} @@ -11,23 +11,23 @@ DISTNAME= libpgm-${PORTVERSION} MAINTAINER= vg@FreeBSD.org COMMENT= Implementation of the PGM reliable multicast protocol -LICENSE= LGPL3 +LICENSE= LGPL21 # and newer +LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES= pathfix perl5 tar:bzip2 libtool python:2,build +USES= pathfix perl5 tar:bzip2 libtool python:build USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME}/openpgm/pgm INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS EXAMPLES -DOCS_DESC= Install documetation -EXAMPLES_DESC= Install examples +PORTDOCS= draft-ietf-rmt-bb-pgmcc-03.txt rfc3208.txt +PORTEXAMPLES= * post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/../doc/draft-ietf-rmt-bb-pgmcc-03.txt ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/../doc/rfc3208.txt ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} examples ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../doc/,} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include Added: head/net/openpgm/files/patch-version__generator.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openpgm/files/patch-version__generator.py Wed Jan 21 09:10:20 2015 (r377579) @@ -0,0 +1,19 @@ +--- version_generator.py.orig 2012-12-04 02:57:22 UTC ++++ version_generator.py +@@ -8,7 +8,7 @@ build_date = time.strftime ("%Y-%m-%d") + build_time = time.strftime ("%H:%M:%S") + build_rev = filter (str.isdigit, "$Revision: 1487 $") + +-print """ ++print(""" + /* vim:ts=8:sts=8:sw=4:noai:noexpandtab + * + * OpenPGM version. +@@ -50,6 +50,6 @@ const char* pgm_build_revision = "%s"; + + + /* eof */ +-"""%(build_date, build_time, platform.system(), platform.machine(), build_rev) ++"""%(build_date, build_time, platform.system(), platform.machine(), build_rev)) + + # end of file Modified: head/net/openpgm/pkg-descr ============================================================================== --- head/net/openpgm/pkg-descr Wed Jan 21 09:03:09 2015 (r377578) +++ head/net/openpgm/pkg-descr Wed Jan 21 09:10:20 2015 (r377579) @@ -6,12 +6,12 @@ PGM is a receiver-reliable protocol, whi for ensuring all data is received, absolving the sender of reception responsibility. PGM runs over a best effort datagram service, currently OpenPGM uses IP multicast but could be implemented above switched fabrics such as -InfiniBand. +InfiniBand. PGM is appropriate for applications that require duplicate-free multicast data delivery from multiple sources to multiple receivers. PGM does not support acknowledged delivery, nor does it guarantee ordering of packets from multiple -senders. +senders. PGM is primarly used on internal networks to help integrate disparate systems through a common communication platform. A lack of IPv4 multicast-enabled Modified: head/net/openpgm/pkg-plist ============================================================================== --- head/net/openpgm/pkg-plist Wed Jan 21 09:03:09 2015 (r377578) +++ head/net/openpgm/pkg-plist Wed Jan 21 09:10:20 2015 (r377579) @@ -25,30 +25,3 @@ lib/libpgm-5.2.so.0.0.122 lib/libpgm.a lib/libpgm.so libdata/pkgconfig/openpgm-5.2.pc -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-rmt-bb-pgmcc-03.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc3208.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/SConscript -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/SConscript89 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/async.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/async.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/blocksyncrecv.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/daytime.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/enonblocksyncrecv.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/enonblocksyncrecvmsg.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/enonblocksyncrecvmsgv.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/getopt.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/getopt.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/heatmap.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/pgmdump.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/pgmping.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/pgmrecv.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/pgmsend.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/pgmtop.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/ping.proto -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/pnonblocksyncrecv.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/purinrecv.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/purinrecvcc.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/purinsend.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/purinsendcc.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/shortcakerecv.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/snonblocksyncrecv.c