Attachment #57690 for bug #87024

View | Details | Raw Unified | Return to bug 87024 | Differences between
Collapse All | Expand All





GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--program-prefix=xbox
USE_GMAKE=	yes

PLIST_FILES=	bin/xboxproxy

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500000
# FreeBSD 4.x requires the libpcap port
BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
# Without this, configure picks up the pcap lib in /usr/lib
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I/usr/include" LDFLAGS="-L${LOCALBASE}/lib -L/usr/lib"
CONFIGURE_ARGS+=	--with-libpcap=${LOCALBASE}
.endif

.include <bsd.port.post.mk>




--- src/main.c	Thu Sep 22 01:16:07 2005
+++ src/main.c	Fri Oct  7 10:52:40 2005
@@ -519,9 +519,9 @@
 		int size = sizeof(struct sockaddr_in); /* sizeof(srcaddr) */
 		int sel;
 		struct timeval timeout;
+		struct fd_set proxycopy;
 		timeout.tv_sec = 10;
 		timeout.tv_usec = 0;
-		fd_set proxycopy;
 
 		/* Some sort of select() thing here */
 
@@ -735,6 +735,7 @@
 	char errbuf[PCAP_ERRBUF_SIZE];
 	//int *pthread_return;
 	char ch;
+	pthread_t pcapthread, proxythread;
 
 	progname = argv[0];
 
@@ -743,7 +744,6 @@
 	proxies = hash_create(HASHSIZE, compareip, haship);
 	set_log_level(0);
 
-	pthread_t pcapthread, proxythread;
 
 	/* Argument Processing */
 	while ((ch = getopt(argc, argv, "B:bxmus:i:d:h?p:f:")) != -1) {

Return to bug 87024

Lines 17-30 Link Here

(-)Makefile (-2 / +5 lines)
17		17
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS= --program-prefix=xbox	19	CONFIGURE_ARGS= --program-prefix=xbox
20	USE_GMAKE= yes
21		20
22	PLIST_FILES= bin/xboxproxy	21	PLIST_FILES= bin/xboxproxy
23		22
24	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>
25		24
26	.if ${OSVERSION} < 500000	25	.if ${OSVERSION} < 500000
27	BROKEN= "Doesn't build on FreeBSD < 5.x"	26	# FreeBSD 4.x requires the libpcap port
		27	BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
		28	# Without this, configure picks up the pcap lib in /usr/lib
		29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I/usr/include" LDFLAGS="-L${LOCALBASE}/lib -L/usr/lib"
		30	CONFIGURE_ARGS+= --with-libpcap=${LOCALBASE}
28	.endif	31	.endif
29		32
30	.include <bsd.port.post.mk>	33	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-main.c (+29 lines)
	1	--- src/main.c Thu Sep 22 01:16:07 2005
	2	+++ src/main.c Fri Oct 7 10:52:40 2005
	3	@@ -519,9 +519,9 @@
	4	int size = sizeof(struct sockaddr_in); /* sizeof(srcaddr) */
	5	int sel;
	6	struct timeval timeout;
	7	+ struct fd_set proxycopy;
	8	timeout.tv_sec = 10;
	9	timeout.tv_usec = 0;
	10	- fd_set proxycopy;
	11
	12	/* Some sort of select() thing here */
	13
	14	@@ -735,6 +735,7 @@
	15	char errbuf[PCAP_ERRBUF_SIZE];
	16	//int *pthread_return;
	17	char ch;
	18	+ pthread_t pcapthread, proxythread;
	19
	20	progname = argv[0];
	21
	22	@@ -743,7 +744,6 @@
	23	proxies = hash_create(HASHSIZE, compareip, haship);
	24	set_log_level(0);
	25
	26	- pthread_t pcapthread, proxythread;
	27
	28	/* Argument Processing */
	29	while ((ch = getopt(argc, argv, "B:bxmus:i:d:h?p:f:")) != -1) {