Wed Sep 2 11:01:50 2009 UTC ()
Correctly use libtool's --mode argument, don't depend on deprecated
auto-sensing.


(joerg)
diff -r1.12 -r1.13 pkgsrc/net/adns/distinfo
diff -r1.1 -r1.2 pkgsrc/net/adns/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/net/adns/patches/patch-ab
cvs diff -r1.12 -r1.13 pkgsrc/net/adns/distinfo (expand / switch to unified diff)

--- pkgsrc/net/adns/distinfo 2006/02/07 03:54:25 1.12
+++ pkgsrc/net/adns/distinfo 2009/09/02 11:01:50 1.13
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.12 2006/02/07 03:54:25 minskim Exp $ 1$NetBSD: distinfo,v 1.13 2009/09/02 11:01:50 joerg Exp $
2 2
3SHA1 (adns-1.1.tar.gz) = cd47dfc819b147b3275eaf6316f17f15be7187e5 3SHA1 (adns-1.1.tar.gz) = cd47dfc819b147b3275eaf6316f17f15be7187e5
4RMD160 (adns-1.1.tar.gz) = c6198f864afc40657dd94b7a94cf59a483ab7581 4RMD160 (adns-1.1.tar.gz) = c6198f864afc40657dd94b7a94cf59a483ab7581
5Size (adns-1.1.tar.gz) = 211455 bytes 5Size (adns-1.1.tar.gz) = 211455 bytes
6SHA1 (patch-aa) = 17764ad5a7557bcda1fda5fdb62fbb7d4e0cd075 6SHA1 (patch-aa) = 7ac1403a5f3d5a69de3976c0931f41bfd512c277
7SHA1 (patch-ab) = 3eaa20dbe95de934693c00b73d42fbaf8ff5e5e9 7SHA1 (patch-ab) = 354afdcbdbcf733b13de93eaa9e896b9ea21c819
8SHA1 (patch-ac) = 2928cd6ccd224bc6d355e52b2f8dc149beaaff84 8SHA1 (patch-ac) = 2928cd6ccd224bc6d355e52b2f8dc149beaaff84
9SHA1 (patch-ad) = 5ce6a933673c82b2058ff67223057bbf18f5d8bb 9SHA1 (patch-ad) = 5ce6a933673c82b2058ff67223057bbf18f5d8bb
10SHA1 (patch-ae) = fdcc3815b880538ef2c124c7ff3c0ac74b25a14f 10SHA1 (patch-ae) = fdcc3815b880538ef2c124c7ff3c0ac74b25a14f
11SHA1 (patch-af) = f1372fe9216161d423602318a812e7f06e0f0a92 11SHA1 (patch-af) = f1372fe9216161d423602318a812e7f06e0f0a92
12SHA1 (patch-ag) = ffe081833324dbd28b15408ee7ce4b3a232382e2 12SHA1 (patch-ag) = ffe081833324dbd28b15408ee7ce4b3a232382e2
cvs diff -r1.1 -r1.2 pkgsrc/net/adns/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/adns/patches/patch-aa 2001/11/19 19:39:05 1.1
+++ pkgsrc/net/adns/patches/patch-aa 2009/09/02 11:01:50 1.2
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1$NetBSD: patch-aa,v 1.1 2001/11/19 19:39:05 jlam Exp $ 1$NetBSD: patch-aa,v 1.2 2009/09/02 11:01:50 joerg Exp $
2 2
3--- client/Makefile.in.orig Sat Sep 16 20:43:10 2000 3--- client/Makefile.in.orig Sat Sep 16 20:43:10 2000
4+++ client/Makefile.in 4+++ client/Makefile.in
5@@ -31,7 +31,7 @@ 5@@ -31,7 +31,7 @@
6 PROGRAMS_LOCAL= fanftest adnstest 6 PROGRAMS_LOCAL= fanftest adnstest
7 PROGRAMS_ALL= $(PROGRAMS) $(PROGRAMS_LOCAL) 7 PROGRAMS_ALL= $(PROGRAMS) $(PROGRAMS_LOCAL)
8  8
9-STATIC_LIB= $(ADNSDIR)/libadns.a 9-STATIC_LIB= $(ADNSDIR)/libadns.a
10+STATIC_LIB= $(ADNSDIR)/libadns.la 10+STATIC_LIB= $(ADNSDIR)/libadns.la
11  11
12 ifeq ($(ENABLE_DYNAMIC),elf) 12 ifeq ($(ENABLE_DYNAMIC),elf)
13 DYNAMIC_DEP= $(srcdir)/../dynamic/$(SHLIBFILE) 13 DYNAMIC_DEP= $(srcdir)/../dynamic/$(SHLIBFILE)
14@@ -60,13 +60,13 @@ 14@@ -60,13 +60,13 @@
15  15
16 install: $(TARG_INSTALL) 16 install: $(TARG_INSTALL)
17 set -xe; for f in $(TARG_INSTALL); \ 17 set -xe; for f in $(TARG_INSTALL); \
18- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done 18- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
19+ do ${LIBTOOL} $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done 19+ do ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
20  20
21 uninstall: 21 uninstall:
22 for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done 22 for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
23  23
24 adnshost: $(ADH_OBJS) $(DYNAMIC_DEP) 24 adnshost: $(ADH_OBJS) $(DYNAMIC_DEP)
25- $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) 25- $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
26+ $(LIBTOOL) $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) 26+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
27  27
28 adnshost_s: $(ADH_OBJS) $(STATIC_LIB) 28 adnshost_s: $(ADH_OBJS) $(STATIC_LIB)
29 $(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS) 29 $(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
30@@ -76,7 +76,7 @@ 30@@ -76,7 +76,7 @@
31 adnsresfilter.o: $(ADNSDIR)/tvarith.h 31 adnsresfilter.o: $(ADNSDIR)/tvarith.h
32  32
33 %: %.o $(DYNAMIC_DEP) 33 %: %.o $(DYNAMIC_DEP)
34- $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS) 34- $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
35+ ${LIBTOOL} $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS) 35+ ${LIBTOOL} --mode=link $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
36  36
37 %_s: %.o $(STATIC_LIB) 37 %_s: %.o $(STATIC_LIB)
38 $(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS) 38 $(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS)
cvs diff -r1.1 -r1.2 pkgsrc/net/adns/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/adns/patches/patch-ab 2001/11/19 19:39:05 1.1
+++ pkgsrc/net/adns/patches/patch-ab 2009/09/02 11:01:50 1.2
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-ab,v 1.1 2001/11/19 19:39:05 jlam Exp $ 1$NetBSD: patch-ab,v 1.2 2009/09/02 11:01:50 joerg Exp $
2 2
3--- src/Makefile.in.orig Sat Sep 16 20:24:24 2000 3--- src/Makefile.in.orig Sat Sep 16 20:24:24 2000
4+++ src/Makefile.in 4+++ src/Makefile.in
5@@ -24,13 +24,13 @@ 5@@ -24,13 +24,13 @@
6 srcdir= @srcdir@ 6 srcdir= @srcdir@
7 VPATH= @srcdir@ 7 VPATH= @srcdir@
8  8
9-TARGETS= libadns.a 9-TARGETS= libadns.a
10+TARGETS= libadns.la 10+TARGETS= libadns.la
11 include $(srcdir)/../settings.make 11 include $(srcdir)/../settings.make
12 include adns.make 12 include adns.make
13  13
14 install: 14 install:
15 set -xe; for f in $(TARGETS); \ 15 set -xe; for f in $(TARGETS); \
16- do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done 16- do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
17+ do ${LIBTOOL} $(INSTALL_DATA) $$f $(lib_dir)/$$f; done 17+ do ${LIBTOOL} --mode=install $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
18 $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h 18 $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h
19  19
20 uninstall: 20 uninstall:
21@@ -39,10 +39,10 @@ 21@@ -39,10 +39,10 @@
22  22
23 ALLOBJS= $(LIBOBJS) 23 ALLOBJS= $(LIBOBJS)
24  24
25-libadns.a: $(LIBOBJS) 25-libadns.a: $(LIBOBJS)
26- rm -f $@ 26- rm -f $@
27- $(AR) cqv $@.new $(LIBOBJS) 27- $(AR) cqv $@.new $(LIBOBJS)
28- $(RANLIB) $@.new 28- $(RANLIB) $@.new
29- mv -f $@.new $@ 29- mv -f $@.new $@
30+libadns.la: $(LIBOBJS) 30+libadns.la: $(LIBOBJS)
31+ ${LIBTOOL} $(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info $(MAJOR):$(MINOR) 31+ ${LIBTOOL} $(CC) --mode=link $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info $(MAJOR):$(MINOR)
32  32
33 $(LIBOBJS): adns.h internal.h config.h 33 $(LIBOBJS): adns.h internal.h config.h
34+ 34+
35+.c.o: 35+.c.o:
36+ ${LIBTOOL} $(CC) $(CFLAGS) -c $< 36+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c $<