From 37dbc3c0d2ecdeb4e02c00219ed703143c244242 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 19 Nov 2001 19:39:04 +0000 Subject: Strongly buildlinkify and libtoolize (NetBSD's interesting contributions to technical vocabulary). --- net/adns/Makefile | 10 +++++++--- net/adns/PLIST | 5 ++++- net/adns/buildlink.mk | 34 ++++++++++++++++++++++++++++++++++ net/adns/distinfo | 4 +++- net/adns/patches/patch-aa | 38 ++++++++++++++++++++++++++++++++++++++ net/adns/patches/patch-ab | 36 ++++++++++++++++++++++++++++++++++++ 6 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 net/adns/buildlink.mk create mode 100644 net/adns/patches/patch-aa create mode 100644 net/adns/patches/patch-ab (limited to 'net/adns') diff --git a/net/adns/Makefile b/net/adns/Makefile index b1d0e9b6aea..e037a4c9a17 100644 --- a/net/adns/Makefile +++ b/net/adns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/03/08 10:22:21 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/11/19 19:39:04 jlam Exp $ # DISTNAME= adns-1.0 @@ -9,7 +9,11 @@ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.chiark.greenend.org.uk/~ian/adns/ COMMENT= Asynchronous-capable DNS client library and utilities -GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GMAKE= YES +USE_BUILDLINK_ONLY= YES +USE_LIBTOOL= YES + +GNU_CONFIGURE= YES +CONFIGURE_ARGS= --disable-dynamic .include "../../mk/bsd.pkg.mk" diff --git a/net/adns/PLIST b/net/adns/PLIST index 657e4af4c8a..a3a4e0cb6b2 100644 --- a/net/adns/PLIST +++ b/net/adns/PLIST @@ -1,7 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:45 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/11/19 19:39:04 jlam Exp $ bin/adnshost bin/adnslogres bin/adnsresfilter include/adns.h lib/libadns.a +lib/libadns.la +lib/libadns.so +lib/libadns.so.1 lib/libadns.so.1.0 diff --git a/net/adns/buildlink.mk b/net/adns/buildlink.mk new file mode 100644 index 00000000000..38afbf8347e --- /dev/null +++ b/net/adns/buildlink.mk @@ -0,0 +1,34 @@ +# $NetBSD: buildlink.mk,v 1.1 2001/11/19 19:39:04 jlam Exp $ +# +# This Makefile fragment is included by packages that use adns. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.adns to the dependency pattern +# for the version of adns desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(ADNS_BUILDLINK_MK) +ADNS_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.adns?= adns>=1.0 +DEPENDS+= ${BUILDLINK_DEPENDS.adns}:../../net/adns + +EVAL_PREFIX+= BUILDLINK_PREFIX.adns=adns +BUILDLINK_PREFIX.adns_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.adns= include/adns.h +BUILDLINK_FILES.adns+= lib/libadns.* + +BUILDLINK_TARGETS.adns= adns-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.adns} + +pre-configure: ${BUILDLINK_TARGETS.adns} +adns-buildlink: _BUILDLINK_USE + +.endif # ADNS_BUILDLINK_MK diff --git a/net/adns/distinfo b/net/adns/distinfo index 2c49731cc89..dee0fe7de00 100644 --- a/net/adns/distinfo +++ b/net/adns/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:08 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/11/19 19:39:04 jlam Exp $ SHA1 (adns-1.0.tar.gz) = 7675da67c7829f2db9a6fafd64f1f90c7bce412a Size (adns-1.0.tar.gz) = 208741 bytes +SHA1 (patch-aa) = 17764ad5a7557bcda1fda5fdb62fbb7d4e0cd075 +SHA1 (patch-ab) = 3eaa20dbe95de934693c00b73d42fbaf8ff5e5e9 diff --git a/net/adns/patches/patch-aa b/net/adns/patches/patch-aa new file mode 100644 index 00000000000..d775ade7ccc --- /dev/null +++ b/net/adns/patches/patch-aa @@ -0,0 +1,38 @@ +$NetBSD: patch-aa,v 1.1 2001/11/19 19:39:05 jlam Exp $ + +--- client/Makefile.in.orig Sat Sep 16 20:43:10 2000 ++++ client/Makefile.in +@@ -31,7 +31,7 @@ + PROGRAMS_LOCAL= fanftest adnstest + PROGRAMS_ALL= $(PROGRAMS) $(PROGRAMS_LOCAL) + +-STATIC_LIB= $(ADNSDIR)/libadns.a ++STATIC_LIB= $(ADNSDIR)/libadns.la + + ifeq ($(ENABLE_DYNAMIC),elf) + DYNAMIC_DEP= $(srcdir)/../dynamic/$(SHLIBFILE) +@@ -60,13 +60,13 @@ + + install: $(TARG_INSTALL) + set -xe; for f in $(TARG_INSTALL); \ +- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done ++ do ${LIBTOOL} $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done + + uninstall: + for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done + + adnshost: $(ADH_OBJS) $(DYNAMIC_DEP) +- $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) ++ $(LIBTOOL) $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) + + adnshost_s: $(ADH_OBJS) $(STATIC_LIB) + $(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS) +@@ -76,7 +76,7 @@ + adnsresfilter.o: $(ADNSDIR)/tvarith.h + + %: %.o $(DYNAMIC_DEP) +- $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS) ++ ${LIBTOOL} $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS) + + %_s: %.o $(STATIC_LIB) + $(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS) diff --git a/net/adns/patches/patch-ab b/net/adns/patches/patch-ab new file mode 100644 index 00000000000..acead38ebb0 --- /dev/null +++ b/net/adns/patches/patch-ab @@ -0,0 +1,36 @@ +$NetBSD: patch-ab,v 1.1 2001/11/19 19:39:05 jlam Exp $ + +--- src/Makefile.in.orig Sat Sep 16 20:24:24 2000 ++++ src/Makefile.in +@@ -24,13 +24,13 @@ + srcdir= @srcdir@ + VPATH= @srcdir@ + +-TARGETS= libadns.a ++TARGETS= libadns.la + include $(srcdir)/../settings.make + include adns.make + + install: + set -xe; for f in $(TARGETS); \ +- do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done ++ do ${LIBTOOL} $(INSTALL_DATA) $$f $(lib_dir)/$$f; done + $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h + + uninstall: +@@ -39,10 +39,10 @@ + + ALLOBJS= $(LIBOBJS) + +-libadns.a: $(LIBOBJS) +- rm -f $@ +- $(AR) cqv $@.new $(LIBOBJS) +- $(RANLIB) $@.new +- mv -f $@.new $@ ++libadns.la: $(LIBOBJS) ++ ${LIBTOOL} $(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info $(MAJOR):$(MINOR) + + $(LIBOBJS): adns.h internal.h config.h ++ ++.c.o: ++ ${LIBTOOL} $(CC) $(CFLAGS) -c $< -- cgit v1.2.3