cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix build with clang and warnings [1]

Browse Source 
- 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)
This commit is contained in:
William Grzybowski 2013-06-08 13:01:16 +00:00
parent d34aa11e75
commit 1dd955e03e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=320248
6 changed files with 63 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/pchar/Makefile
View File

@ -14,14 +14,19 @@ COMMENT= Sandia Internet path characterization tool
GNU_CONFIGURE= yes
MAN8= pchar.8
.include <bsd.port.pre.mk>
CONFIGURE_ARGS= --with-pcap
CONFIGURE_ENV+= ac_cv_sizeof_bool=1
.if !defined(NOPORTDOCS)
PLIST_FILES= sbin/pchar
PORTDOCS= README CHANGES FAQ
.include <bsd.port.options.mk>
.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>

11
net/pchar/files/patch-Pctest.h Normal file
View File

@ -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

11
net/pchar/files/patch-PctestIpv4.h Normal file
View File

@ -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:

11
net/pchar/files/patch-PctestIpv6.h Normal file
View File

@ -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:

20
net/pchar/files/patch-main.cc Normal file
View File

@ -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;

6
net/pchar/pkg-plist
View File

@ -1,6 +0,0 @@
@comment $FreeBSD$
sbin/pchar
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%