Attachment 38644 Details for Bug 61096 – file.diff

[patch] file.diff

file.diff (text/plain), 3.94 KB, created by edwin on 2004-01-08 22:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: edwin

Created: 2004-01-08 22:10:04 UTC

Size: 3.94 KB

patch

obsolete

>diff -rNu /usr/ports/net/libpcap/Makefile /usr/home/edwin/cvs/ports/net/libpcap/Makefile
>--- /usr/ports/net/libpcap/Makefile	Thu Dec 11 05:32:12 2003
>+++ /usr/home/edwin/cvs/ports/net/libpcap/Makefile	Thu Jan  8 17:14:00 2004
>@@ -7,9 +7,10 @@
> 
> PORTNAME=	libpcap
> PORTVERSION=	0.8.1
>+PORTREVISION=	351
> CATEGORIES=	net
> MASTER_SITES=	http://www.tcpdump.org/beta/
>-DISTNAME=	${PORTNAME}-${PORTVERSION}-316
>+DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTREVISION}
> 
> MAINTAINER=	bms@FreeBSD.org
> COMMENT=	Ubiquitous network traffic capture library
>@@ -22,12 +23,31 @@
> 
> GNU_CONFIGURE=	yes
> 
>+.if defined(LIBPCAP_OVERWRITE_BASE)
>+PREFIX=		/usr
>+PKGNAMESUFFIX=	-overwrite-base
>+MANPREFIX=	${PREFIX}/share
>+CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man
>+PLIST_SUB+=	NOTBASE="@comment "
>+PLIST_SUB+=	BASE=""
>+EXTRA_PATCHES+=	${FILESDIR}/patchbase-Makefile.in
>+PKGMESSAGE=	${FILESDIR}/pkg-message-base
>+.else
>+PLIST_SUB+=	BASE="@comment "
>+PLIST_SUB+=	NOTBASE=""
>+.endif
>+
> .if !defined(WITHOUT_IPV6)
> CONFIGURE_ARGS+=	--enable-ipv6
> .endif
> 
> .if !defined(WITH_DAG)
> CONFIGURE_ARGS+=	--without-dag
>+.endif
>+
>+.if defined(LIBPCAP_OVERWRITE_BASE)
>+post-install:
>+	${CAT} ${PKGMESSAGE}
> .endif
> 
> .include <bsd.port.mk>
>diff -rNu /usr/ports/net/libpcap/distinfo /usr/home/edwin/cvs/ports/net/libpcap/distinfo
>--- /usr/ports/net/libpcap/distinfo	Thu Dec 11 05:32:12 2003
>+++ /usr/home/edwin/cvs/ports/net/libpcap/distinfo	Thu Jan  8 16:01:37 2004
>@@ -1 +1 @@
>-MD5 (libpcap-0.8.1-316.tar.gz) = ab8f17ca785b9e0272f98010dc16e13b
>+MD5 (libpcap-0.8.1-351.tar.gz) = 7e40804221dfa9d10a41f129b9edf3b4
>diff -rNu /usr/ports/net/libpcap/files/patchbase-Makefile.in /usr/home/edwin/cvs/ports/net/libpcap/files/patchbase-Makefile.in
>--- /usr/ports/net/libpcap/files/patchbase-Makefile.in	Thu Jan  1 10:00:00 1970
>+++ /usr/home/edwin/cvs/ports/net/libpcap/files/patchbase-Makefile.in	Thu Jan  8 17:02:49 2004
>@@ -0,0 +1,30 @@
>+--- Makefile.in.orig	Thu Jan  8 16:38:30 2004
>++++ Makefile.in	Thu Jan  8 16:41:40 2004
>+@@ -96,13 +96,17 @@
>+ 
>+ CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
>+ 
>+-all: libpcap.a
>++all: libpcap.a libpcap.so.2
>+ 
>+ libpcap.a: $(OBJ)
>+ 	@rm -f $@
>+ 	ar rc $@ $(OBJ) $(LIBS)
>+ 	$(RANLIB) $@
>+ 
>++libpcap.so.2: $(OBJ)
>++	@rm -f $@
>++	$(CC) -shared -Wl,-x  -o libpcap.so.2 -Wl,-soname,libpcap.so.2  `lorder *.o | tsort -q`
>++
>+ scanner.c: $(srcdir)/scanner.l
>+ 	@rm -f $@
>+ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
>+@@ -154,6 +158,8 @@
>+ install:
>+ 	[ -d $(DESTDIR)$(libdir) ] || \
>+ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
>++	$(INSTALL_DATA) libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so.2
>++	ln -fs $(DESTDIR)$(libdir)/libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so
>+ 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
>+ 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
>+ 	[ -d $(DESTDIR)$(includedir) ] || \
>diff -rNu /usr/ports/net/libpcap/files/pkg-message-base /usr/home/edwin/cvs/ports/net/libpcap/files/pkg-message-base
>--- /usr/ports/net/libpcap/files/pkg-message-base	Thu Jan  1 10:00:00 1970
>+++ /usr/home/edwin/cvs/ports/net/libpcap/files/pkg-message-base	Thu Jan  8 17:13:22 2004
>@@ -0,0 +1,13 @@
>+***************************************
>+* You might run into troubles running *
>+* tcpdump, you should recompile it if *
>+* it segfaults:                       *
>+* $ cd /usr/src/usr.sbin/tcpdump      *
>+* $ make && make install              *
>+***************************************
>+* You can always reinstall the older  *
>+* libraries via the source directory  *
>+* of the base system:                 *
>+* $ cd /usr/src/lib/libpcap           *
>+* $ make && make install              *
>+***************************************
>diff -rNu /usr/ports/net/libpcap/pkg-plist /usr/home/edwin/cvs/ports/net/libpcap/pkg-plist
>--- /usr/ports/net/libpcap/pkg-plist	Thu Dec 11 05:32:12 2003
>+++ /usr/home/edwin/cvs/ports/net/libpcap/pkg-plist	Thu Jan  8 17:03:07 2004
>@@ -1,4 +1,6 @@
> lib/libpcap.a
>+%%BASE%%lib/libpcap.so.2
>+%%BASE%%lib/libpcap.so
> include/pcap.h
> include/pcap-namedb.h
> include/pcap-bpf.h

Actions: View | Diff

Attachments on bug 61096: 38644