Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
popt
pkgsrc-ng/net/libpcap/patches/patch-ac
Lionel Sambuc 4af1cdf7a9 Import of pkgsrc-2015Q1
2016-01-21 23:40:00 +01:00

235 lines
9.3 KiB
Plaintext
Raw Permalink Blame History

$NetBSD: patch-ac,v 1.9 2015/03/11 21:05:09 tnn Exp $
Add libtoolization
Fix manpage installation
--- Makefile.in.orig 2015-03-09 19:22:07.000000000 +0000
+++ Makefile.in
@@ -43,7 +43,7 @@ VPATH = @srcdir@
#
LD = /usr/bin/ld
-CC = @CC@
+CC = ${LIBTOOL} --mode=compile @CC@
AR = @AR@
LN_S = @LN_S@
MKDEP = @MKDEP@
@@ -80,7 +80,8 @@ YACC = @V_YACC@
# Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
# Also, gcc does not remove the .o before forking 'as', which can be a
# problem if you don't own the file but can write to the directory.
-.c.o:
+.SUFFIXES: .lo
+.c.lo:
@rm -f $@
$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
@@ -91,13 +92,13 @@ CSRC = pcap.c inet.c gencode.c optimize.
savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
bpf_image.c bpf_dump.c
GENSRC = scanner.c grammar.c bpf_filter.c version.c
-LIBOBJS = @LIBOBJS@
+LIBOBJS = @LTLIBOBJS@
SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
# We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
# hack the extra indirection
-OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
+OBJ = $(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS)
PUBHDR = \
pcap.h \
pcap-bpf.h \
@@ -358,12 +359,10 @@ EXTRA_DIST = \
Win32/Src/inet_net.c \
Win32/Src/inet_pton.c
-all: libpcap.a shared pcap-config
+all: libpcap.la pcap-config
-libpcap.a: $(OBJ)
- @rm -f $@
- $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
- $(RANLIB) $@
+libpcap.la: $(OBJ)
+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) $(LIBS) -o libpcap.la
shared: libpcap.$(DYEXT)
@@ -450,10 +449,10 @@ scanner.c: $(srcdir)/scanner.l
cat $@.top $@.bottom > $@
@rm $@.bottom
-scanner.o: scanner.c tokdefs.h
+scanner.lo: scanner.c tokdefs.h
$(CC) $(FULL_CFLAGS) -c scanner.c
-pcap.o: version.h
+pcap.lo: version.h
tokdefs.h: grammar.c
grammar.c: $(srcdir)/grammar.y
@@ -462,17 +461,17 @@ grammar.c: $(srcdir)/grammar.y
mv y.tab.c grammar.c
mv y.tab.h tokdefs.h
-grammar.o: grammar.c
+grammar.lo: grammar.c
@rm -f $@
$(CC) $(FULL_CFLAGS) -Dyylval=pcap_lval -c grammar.c
-version.o: version.c
+version.lo: version.c
$(CC) $(FULL_CFLAGS) -c version.c
-snprintf.o: $(srcdir)/missing/snprintf.c
+snprintf.lo: $(srcdir)/missing/snprintf.c
$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
-version.c: $(srcdir)/VERSION
+version.c: #$(srcdir)/VERSION
@rm -f $@
if grep GIT ${srcdir}/VERSION >/dev/null; then \
read ver <${srcdir}/VERSION; \
@@ -489,7 +488,7 @@ version.c: $(srcdir)/VERSION
# so we make the version string static and return it from
# a function, which does work.
#
-version.h: $(srcdir)/VERSION
+version.h: #$(srcdir)/VERSION
@rm -f $@
if grep GIT ${srcdir}/VERSION >/dev/null; then \
read ver <${srcdir}/VERSION; \
@@ -503,7 +502,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
rm -f bpf_filter.c
ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
-bpf_filter.o: bpf_filter.c
+bpf_filter.lo: bpf_filter.c
$(CC) $(FULL_CFLAGS) -c bpf_filter.c
#
@@ -549,7 +548,7 @@ selpolltest: tests/selpolltest.c libpcap
valgrindtest: tests/valgrindtest.c libpcap.a
$(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS)
-install: install-shared install-archive pcap-config
+install: libpcap.la pcap-config
[ -d $(DESTDIR)$(libdir) ] || \
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
[ -d $(DESTDIR)$(includedir) ] || \
@@ -564,56 +563,73 @@ install: install-shared install-archive
(mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
[ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
(mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
for i in $(PUBHDR); do \
$(INSTALL_DATA) $(srcdir)/$$i \
$(DESTDIR)$(includedir)/$$i; done
[ -d $(DESTDIR)$(bindir) ] || \
(mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
+ $(BSD_INSTALL_SCRIPT) pcap-config $(DESTDIR)$(bindir)/pcap-config
for i in $(MAN1); do \
$(INSTALL_DATA) $(srcdir)/$$i \
$(DESTDIR)$(mandir)/man1/$$i; done
- for i in $(MAN3PCAP_NOEXPAND); do \
- $(INSTALL_DATA) $(srcdir)/$$i \
+ for i in $(MAN3PCAP_NOEXPAND:.3pcap=.3); do \
+ $(INSTALL_DATA) $(srcdir)/$${i}pcap \
$(DESTDIR)$(mandir)/man3/$$i; done
- for i in $(MAN3PCAP_EXPAND:.in=); do \
- $(INSTALL_DATA) $$i \
+ for i in $(MAN3PCAP_EXPAND:.3pcap.in=.3); do \
+ $(INSTALL_DATA) $${i}pcap \
$(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_tstamp_type_val_to_description.3pcap && \
- $(LN_S) pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap && \
- rm -f pcap_getnonblock.3pcap && \
- $(LN_S) pcap_setnonblock.3pcap pcap_getnonblock.3pcap)
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_perror.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_inject.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_list_datalinks.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_loop.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_next.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_open_dead_with_tstamp_precision.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_open_dead.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_open_dead_with_tstamp_precision.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_open_offline_with_tstamp_precision.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_open_offline_with_tstamp_precision.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline_with_tstamp_precision.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline_with_tstamp_precision.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_description.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_name.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_description.3
+ rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
+ ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3 \
+ $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
for i in $(MANFILE); do \
$(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
$(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
Reference in New Issue View Git Blame Copy Permalink