Attachment #138381 for bug #184325

Lines 2-8 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libpcap	4	PORTNAME= libpcap
5	PORTVERSION= 1.4.0	5	PORTVERSION= 1.5.1
6	CATEGORIES= net ipv6	6	CATEGORIES= net ipv6
7	MASTER_SITES= http://www.tcpdump.org/release/	7	MASTER_SITES= http://www.tcpdump.org/release/
8		8
Lines 114-120 Link Here
114		114
115	OPTIONS_DEFAULT= IPV6	115	OPTIONS_DEFAULT= IPV6
116		116
117	NO_STAGE= yes	117	#NO_STAGE= yes
118	.include <bsd.port.options.mk>	118	.include <bsd.port.options.mk>
119		119
120	.if ${PORT_OPTIONS:MIPV6}	120	.if ${PORT_OPTIONS:MIPV6}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (libpcap-1.4.0.tar.gz) = 7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406	1	SHA256 (libpcap-1.5.1.tar.gz) = 259db4fe1e9f0b6b9c43a057ec5916dec7d0a821b00d6d6c4dff7db2445fa7e4
2	SIZE (libpcap-1.4.0.tar.gz) = 619045	2	SIZE (libpcap-1.5.1.tar.gz) = 640233




--- Makefile.in.orig
+++ Makefile.in
@@ -564,49 +564,19 @@
 		    $(DESTDIR)$(includedir)/$$i; done
 	[ -d $(DESTDIR)$(bindir) ] || \
 	    (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))

+		j=$$(echo $$i | sed -e 's/3pcap/3/') ; \
 		$(INSTALL_DATA) $$i \
-		    $(DESTDIR)$(mandir)/man3/$$i; done
-	(cd $(DESTDIR)$(mandir)/man3 && \
-	rm -f pcap_datalink_val_to_description.3pcap && \
-	$(LN_S) pcap_datalink_val_to_name.3pcap \
-		 pcap_datalink_val_to_description.3pcap && \
-	rm -f pcap_dump_fopen.3pcap && \
-	$(LN_S) pcap_dump_open.3pcap pcap_dump_fopen.3pcap && \
-	rm -f pcap_freealldevs.3pcap && \
-	$(LN_S) pcap_findalldevs.3pcap pcap_freealldevs.3pcap && \
-	rm -f pcap_perror.3pcap && \
-	$(LN_S) pcap_geterr.3pcap pcap_perror.3pcap && \
-	rm -f pcap_sendpacket.3pcap && \
-	$(LN_S) pcap_inject.3pcap pcap_sendpacket.3pcap && \
-	rm -f pcap_free_datalinks.3pcap && \
-	$(LN_S) pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap && \
-	rm -f pcap_free_tstamp_types.3pcap && \
-	$(LN_S) pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap && \
-	rm -f pcap_dispatch.3pcap && \
-	$(LN_S) pcap_loop.3pcap pcap_dispatch.3pcap && \
-	rm -f pcap_minor_version.3pcap && \
-	$(LN_S) pcap_major_version.3pcap pcap_minor_version.3pcap && \
-	rm -f pcap_next.3pcap && \
-	$(LN_S) pcap_next_ex.3pcap pcap_next.3pcap && \
-	rm -f pcap_open_dead_with_tstamp_precision.3pcap && \
-	$(LN_S) pcap_open_dead.3pcap \
-		 pcap_open_dead_with_tstamp_precision.3pcap && \
-	rm -f pcap_open_offline_with_tstamp_precision.3pcap && \
-	$(LN_S) pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap && \
-	rm -f pcap_fopen_offline.3pcap && \
-	$(LN_S) pcap_open_offline.3pcap pcap_fopen_offline.3pcap && \
-	rm -f pcap_fopen_offline_with_tstamp_precision.3pcap && \
-	$(LN_S) pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap && \
-	rm -f pcap_getnonblock.3pcap && \
-	$(LN_S) pcap_setnonblock.3pcap pcap_getnonblock.3pcap)
-	rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
-	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
-		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
+		    $(DESTDIR)$(mandir)/man3/$$j; done
 	for i in $(MANFILE); do \
 		$(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \

Return to bug 184325

Lines 1-6 Link Here

(-)files/patch-Makefile.in (-39 / +36 lines)
1	--- ./Makefile.in.orig 2012-01-07 23:10:56.713381055 -0500	1	--- Makefile.in.orig
2	+++ ./Makefile.in 2012-01-07 23:10:38.819379443 -0500	2	+++ Makefile.in
3	@@ -548,52 +548,19 @@	3	@@ -564,49 +564,19 @@
4	$(DESTDIR)$(includedir)/$$i; done	4	$(DESTDIR)$(includedir)/$$i; done
5	[ -d $(DESTDIR)$(bindir) ] \|\| \	5	[ -d $(DESTDIR)$(bindir) ] \|\| \
6	(mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))	6	(mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
Lines 19-60 Link Here
19	+ j=$$(echo $$i \| sed -e 's/3pcap/3/') ; \	19	+ j=$$(echo $$i \| sed -e 's/3pcap/3/') ; \
20	$(INSTALL_DATA) $$i \	20	$(INSTALL_DATA) $$i \
21	- $(DESTDIR)$(mandir)/man3/$$i; done	21	- $(DESTDIR)$(mandir)/man3/$$i; done
22	- rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap	22	- (cd $(DESTDIR)$(mandir)/man3 && \
23	- ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \	23	- rm -f pcap_datalink_val_to_description.3pcap && \
24	- $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap	24	- $(LN_S) pcap_datalink_val_to_name.3pcap \
25	- rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap	25	- pcap_datalink_val_to_description.3pcap && \
26	- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \	26	- rm -f pcap_dump_fopen.3pcap && \
27	- $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap	27	- $(LN_S) pcap_dump_open.3pcap pcap_dump_fopen.3pcap && \
28	- rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap	28	- rm -f pcap_freealldevs.3pcap && \
29	- ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3pcap \	29	- $(LN_S) pcap_findalldevs.3pcap pcap_freealldevs.3pcap && \
30	- $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap	30	- rm -f pcap_perror.3pcap && \
31	- rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap	31	- $(LN_S) pcap_geterr.3pcap pcap_perror.3pcap && \
32	- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \	32	- rm -f pcap_sendpacket.3pcap && \
33	- $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap	33	- $(LN_S) pcap_inject.3pcap pcap_sendpacket.3pcap && \
34	- rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap	34	- rm -f pcap_free_datalinks.3pcap && \
35	- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \	35	- $(LN_S) pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap && \
36	- $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap	36	- rm -f pcap_free_tstamp_types.3pcap && \
37	- rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap	37	- $(LN_S) pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap && \
38	- ln $(DESTDIR)$(mandir)/man3/pcap_list_datalinks.3pcap \	38	- rm -f pcap_dispatch.3pcap && \
39	- $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap	39	- $(LN_S) pcap_loop.3pcap pcap_dispatch.3pcap && \
40	- rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap	40	- rm -f pcap_minor_version.3pcap && \
41	- ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3pcap \	41	- $(LN_S) pcap_major_version.3pcap pcap_minor_version.3pcap && \
42	- $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap	42	- rm -f pcap_next.3pcap && \
43	- rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap	43	- $(LN_S) pcap_next_ex.3pcap pcap_next.3pcap && \
44	- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \	44	- rm -f pcap_open_dead_with_tstamp_precision.3pcap && \
45	- $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap	45	- $(LN_S) pcap_open_dead.3pcap \
46	- rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap	46	- pcap_open_dead_with_tstamp_precision.3pcap && \
47	- ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \	47	- rm -f pcap_open_offline_with_tstamp_precision.3pcap && \
48	- $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap	48	- $(LN_S) pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap && \
49	- rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap	49	- rm -f pcap_fopen_offline.3pcap && \
50	- ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \	50	- $(LN_S) pcap_open_offline.3pcap pcap_fopen_offline.3pcap && \
51	- $(DESTDIR)$(mandir)/man3/pcap_next.3pcap	51	- rm -f pcap_fopen_offline_with_tstamp_precision.3pcap && \
52	- rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap	52	- $(LN_S) pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap && \
53	- ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \	53	- rm -f pcap_getnonblock.3pcap && \
54	- $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap	54	- $(LN_S) pcap_setnonblock.3pcap pcap_getnonblock.3pcap)
55	- rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
56	- ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
57	- $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
58	+ $(DESTDIR)$(mandir)/man3/$$j; done	55	+ $(DESTDIR)$(mandir)/man3/$$j; done
59	for i in $(MANFILE); do \	56	for i in $(MANFILE); do \
60	$(INSTALL_DATA) `echo $$i \| sed 's/.manfile.in/.manfile/'` \	57	$(INSTALL_DATA) `echo $$i \| sed 's/.manfile.in/.manfile/'` \