Date: Sat, 8 Jun 2013 13:01:16 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320248 - in head/net/pchar: . files Message-ID: <201306081301.r58D1GZd056375@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sat Jun 8 13:01:16 2013 New Revision: 320248 URL: http://svnweb.freebsd.org/changeset/ports/320248 Log: - Fix build with clang and warnings [1] - Use PLIST_FILES instead of pkg-plist - NOPORTDOCS -> PORT_OPTIONS:MDOCS PR: ports/178350 [1] Submitted by: nork [1] Approved by: culot / jpaetzel (mentors, implicit) Added: head/net/pchar/files/ head/net/pchar/files/patch-Pctest.h (contents, props changed) head/net/pchar/files/patch-PctestIpv4.h (contents, props changed) head/net/pchar/files/patch-PctestIpv6.h (contents, props changed) head/net/pchar/files/patch-main.cc (contents, props changed) Deleted: head/net/pchar/pkg-plist Modified: head/net/pchar/Makefile Modified: head/net/pchar/Makefile ============================================================================== --- head/net/pchar/Makefile Sat Jun 8 12:56:56 2013 (r320247) +++ head/net/pchar/Makefile Sat Jun 8 13:01:16 2013 (r320248) @@ -14,14 +14,19 @@ COMMENT= Sandia Internet path characteri GNU_CONFIGURE= yes MAN8= pchar.8 -.include <bsd.port.pre.mk> - CONFIGURE_ARGS= --with-pcap +CONFIGURE_ENV+= ac_cv_sizeof_bool=1 + +PLIST_FILES= sbin/pchar + +PORTDOCS= README CHANGES FAQ + +.include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} ; ${INSTALL_DATA} README CHANGES FAQ ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/net/pchar/files/patch-Pctest.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pchar/files/patch-Pctest.h Sat Jun 8 13:01:16 2013 (r320248) @@ -0,0 +1,11 @@ +--- Pctest.h.orig 2005-02-13 05:32:18.000000000 +0900 ++++ Pctest.h 2013-05-06 00:39:43.413338781 +0900 +@@ -86,7 +86,7 @@ + virtual char *GetPrintableAddress() = 0; + virtual char *GetPrintableAddress(void *a) = 0; + virtual char *GetName(void *a) = 0; +- virtual char *GetAddressFamilyString() = 0; ++ virtual const char *GetAddressFamilyString() = 0; + virtual int GetAddressFamily() = 0; + + // Get input and output sockets needed Added: head/net/pchar/files/patch-PctestIpv4.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pchar/files/patch-PctestIpv4.h Sat Jun 8 13:01:16 2013 (r320248) @@ -0,0 +1,11 @@ +--- PctestIpv4.h.orig 2005-02-13 05:32:18.000000000 +0900 ++++ PctestIpv4.h 2013-05-06 00:36:17.432762986 +0900 +@@ -77,7 +77,7 @@ + virtual char *GetPrintableAddress(); + virtual char *GetPrintableAddress(void *a); + virtual char *GetName(void *a); +- virtual char *GetAddressFamilyString() { return "AF_INET"; }; ++ virtual const char *GetAddressFamilyString() { return "AF_INET"; }; + virtual int GetAddressFamily() { return (AF_INET); }; + + protected: Added: head/net/pchar/files/patch-PctestIpv6.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pchar/files/patch-PctestIpv6.h Sat Jun 8 13:01:16 2013 (r320248) @@ -0,0 +1,11 @@ +--- PctestIpv6.h.orig 2005-02-13 05:32:18.000000000 +0900 ++++ PctestIpv6.h 2013-05-06 00:36:41.683117194 +0900 +@@ -82,7 +82,7 @@ + virtual char *GetPrintableAddress(); + virtual char *GetPrintableAddress(void *a); + virtual char *GetName(void *a); +- virtual char *GetAddressFamilyString() { return "AF_INET6"; } ++ virtual const char *GetAddressFamilyString() { return "AF_INET6"; } + virtual int GetAddressFamily() { return (AF_INET6); } + + protected: Added: head/net/pchar/files/patch-main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pchar/files/patch-main.cc Sat Jun 8 13:01:16 2013 (r320248) @@ -0,0 +1,20 @@ +--- main.cc.orig 2005-02-13 05:32:18.000000000 +0900 ++++ main.cc 2013-05-06 00:41:42.842653383 +0900 +@@ -292,7 +292,7 @@ + // + // Output: ASCII representation of network protocol name. + // +-char *GetPrintableNetworkProtocol(NetworkProtocolType np) ++const char *GetPrintableNetworkProtocol(NetworkProtocolType np) + { + switch (np) { + case (NetworkProtocolIpv4Udp): +@@ -371,7 +371,7 @@ + case 'b': { + Burst = atoi(optarg); + if (Burst < 1) { +- fprintf(stderr, "Warning: burst size %d too small; resetting to 1\n"); ++ fprintf(stderr, "Warning: burst size %u too small; resetting to 1\n", Burst); + Burst = 1; + } + break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306081301.r58D1GZd056375>