aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorbms <bms@FreeBSD.org>2006-08-02 19:22:45 +0800
committerbms <bms@FreeBSD.org>2006-08-02 19:22:45 +0800
commit8e27c3e8bac818e1fbdde50f818415d01a4aff1e (patch)
tree192565afcc11da7a75809c140161b3948057d90b /net
parent96d6bc9b0bc47edf9067d9a06dc529946098e954 (diff)
downloadfreebsd-ports-gnome-8e27c3e8bac818e1fbdde50f818415d01a4aff1e.tar.gz
freebsd-ports-gnome-8e27c3e8bac818e1fbdde50f818415d01a4aff1e.tar.zst
freebsd-ports-gnome-8e27c3e8bac818e1fbdde50f818415d01a4aff1e.zip
Fix port for values of LIBPCAP_OVERWRITE_BASE which are defined.
PR: ports/95060 Submitted by: Craig Leres
Diffstat (limited to 'net')
-rw-r--r--net/libpcap/files/patchbase-Makefile.in28
1 files changed, 18 insertions, 10 deletions
diff --git a/net/libpcap/files/patchbase-Makefile.in b/net/libpcap/files/patchbase-Makefile.in
index 6f234ab0d9d7..a0726b5359b5 100644
--- a/net/libpcap/files/patchbase-Makefile.in
+++ b/net/libpcap/files/patchbase-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Thu Jan 8 16:38:30 2004
-+++ Makefile.in Thu Jan 8 16:41:40 2004
-@@ -96,13 +96,17 @@
+--- Makefile.in.orig Sun Apr 16 17:17:57 2006
++++ Makefile.in Sun Apr 16 17:18:08 2006
+@@ -97,22 +97,18 @@
CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
@@ -12,15 +12,23 @@
ar rc $@ $(OBJ) $(LIBS)
$(RANLIB) $@
+-shared: libpcap.$(DYEXT)
++#shared: libpcap.$(DYEXT)
+
+-#
+-# XXX - this works with GNU ld, but won't necessarily work with native
+-# ld on, for example, various SVR4-flavored platforms, or Digital UNIX.
+-#
+-libpcap.so: $(OBJ)
+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:
+- ld -shared -o $@.`cat VERSION` $(OBJ)
++ $(CC) -shared -Wl,-x -o libpcap.so.2 -Wl,-soname,libpcap.so.2 `lorder *.o | tsort -q`
+
+ # the following rule succeeds, but the result is untested.
+ libpcap.dylib: $(OBJ)
+@@ -173,6 +169,8 @@
+ install: libpcap.a
[ -d $(DESTDIR)$(libdir) ] || \
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ $(INSTALL_DATA) libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so.2