From 78f8f283da9dc157a7bf5940149c649b19cb56f7 Mon Sep 17 00:00:00 2001 From: jakob Date: Sun, 3 Feb 2008 19:08:30 +0000 Subject: [PATCH] merge ldns and drill into one tree. rename ldns package to libldns. --- net/Makefile | 3 +- net/drill/Makefile | 32 --------------- net/drill/pkg/PLIST | 3 -- net/ldns/Makefile | 39 ++----------------- net/ldns/drill/Makefile | 14 +++++++ net/{ => ldns}/drill/distinfo | 0 net/{ => ldns}/drill/pkg/DESCR | 0 net/ldns/drill/pkg/PLIST | 3 ++ net/ldns/libldns/Makefile | 18 +++++++++ net/ldns/libldns/distinfo | 5 +++ .../{ => libldns}/patches/patch-Makefile_in | 2 +- net/ldns/{ => libldns}/pkg/DESCR | 0 net/ldns/libldns/pkg/PFRAG.shared | 2 + net/ldns/{ => libldns}/pkg/PLIST | 2 +- net/ldns/pkg/PFRAG.shared | 2 - 15 files changed, 49 insertions(+), 76 deletions(-) delete mode 100644 net/drill/Makefile delete mode 100644 net/drill/pkg/PLIST create mode 100644 net/ldns/drill/Makefile rename net/{ => ldns}/drill/distinfo (100%) rename net/{ => ldns}/drill/pkg/DESCR (100%) create mode 100644 net/ldns/drill/pkg/PLIST create mode 100644 net/ldns/libldns/Makefile create mode 100644 net/ldns/libldns/distinfo rename net/ldns/{ => libldns}/patches/patch-Makefile_in (94%) rename net/ldns/{ => libldns}/pkg/DESCR (100%) create mode 100644 net/ldns/libldns/pkg/PFRAG.shared rename net/ldns/{ => libldns}/pkg/PLIST (99%) delete mode 100644 net/ldns/pkg/PFRAG.shared diff --git a/net/Makefile b/net/Makefile index 8137d8eb024..126e77aa144 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.507 2008/01/25 03:19:58 okan Exp $ +# $OpenBSD: Makefile,v 1.508 2008/02/03 19:08:30 jakob Exp $ # $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $ # @@ -57,7 +57,6 @@ SUBDIR += dnsreflector SUBDIR += dnstracer SUBDIR += doc - SUBDIR += drill SUBDIR += dsocks SUBDIR += dss SUBDIR += dxpc diff --git a/net/drill/Makefile b/net/drill/Makefile deleted file mode 100644 index 7c345b8aa02..00000000000 --- a/net/drill/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $OpenBSD: Makefile,v 1.7 2007/11/30 06:59:23 jakob Exp $ - -COMMENT= DNS debugger - -VERSION= 1.2.2 -DISTNAME= ldns-${VERSION} -PKGNAME= drill-${VERSION} -CATEGORIES= net - -MASTER_SITES+= http://www.nlnetlabs.nl/downloads/ - -HOMEPAGE= http://www.nlnetlabs.nl/ldns/ - -MAINTAINER= Jakob Schlyter - -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -WANTLIB= c ssl crypto -LIB_DEPENDS+= ldns::net/ldns - -SEPARATE_BUILD= concurrent -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --with-ldns=${LOCALBASE} -USE_LIBTOOL= Yes -USE_GMAKE= Yes - -WRKSRC= ${WRKDIST}/drill - -.include diff --git a/net/drill/pkg/PLIST b/net/drill/pkg/PLIST deleted file mode 100644 index 718e4356b7f..00000000000 --- a/net/drill/pkg/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.2 2007/09/11 08:25:26 jakob Exp $ -bin/drill -@man man/man1/drill.1 diff --git a/net/ldns/Makefile b/net/ldns/Makefile index 20e8777f259..48f350982ec 100644 --- a/net/ldns/Makefile +++ b/net/ldns/Makefile @@ -1,37 +1,6 @@ -# $OpenBSD: Makefile,v 1.6 2007/11/30 06:59:23 jakob Exp $ +# $OpenBSD: Makefile,v 1.7 2008/02/03 19:08:30 jakob Exp $ -COMMENT= DNS library modelled after Net::DNS +SUBDIR+= libldns +SUBDIR+= drill -DISTNAME= ldns-1.2.2 -PKGNAME= ${DISTNAME} -SHARED_LIBS += ldns 0.0 # .0.0 -CATEGORIES= net - -MASTER_SITES= http://www.nlnetlabs.nl/downloads/ - -HOMEPAGE= http://www.nlnetlabs.nl/ldns/ - -MAINTAINER= Jakob Schlyter - -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -WANTLIB= crypto - -SEPARATE_BUILD= simple -CONFIGURE_STYLE= gnu -CONFIGURE_ENV= ac_cv_prog_doxygen= -USE_LIBTOOL= Yes -USE_GMAKE= Yes -NO_REGRESS= Yes - -post-build: - mkdir ${WRKBUILD}/doc - cd ${WRKBUILD} && ${MAKE_PROGRAM} doc - -post-install: - @chown -R ${MANOWN}:${MANGRP} ${PREFIX}/man/man3 - -.include +.include diff --git a/net/ldns/drill/Makefile b/net/ldns/drill/Makefile new file mode 100644 index 00000000000..6f30c1d639a --- /dev/null +++ b/net/ldns/drill/Makefile @@ -0,0 +1,14 @@ +# $OpenBSD: Makefile,v 1.1 2008/02/03 19:08:30 jakob Exp $ + +COMMENT= DNS debugger + +PKGNAME= drill-${VERSION}p0 + +WANTLIB= c ssl crypto +LIB_DEPENDS+= ldns::net/ldns/libldns + +WRKSRC= ${WRKDIST}/drill + +CONFIGURE_ARGS+= --with-ldns=${LOCALBASE} + +.include diff --git a/net/drill/distinfo b/net/ldns/drill/distinfo similarity index 100% rename from net/drill/distinfo rename to net/ldns/drill/distinfo diff --git a/net/drill/pkg/DESCR b/net/ldns/drill/pkg/DESCR similarity index 100% rename from net/drill/pkg/DESCR rename to net/ldns/drill/pkg/DESCR diff --git a/net/ldns/drill/pkg/PLIST b/net/ldns/drill/pkg/PLIST new file mode 100644 index 00000000000..d347fc02830 --- /dev/null +++ b/net/ldns/drill/pkg/PLIST @@ -0,0 +1,3 @@ +@comment $OpenBSD: PLIST,v 1.1 2008/02/03 19:08:30 jakob Exp $ +bin/drill +@man man/man1/drill.1 diff --git a/net/ldns/libldns/Makefile b/net/ldns/libldns/Makefile new file mode 100644 index 00000000000..b1e72135256 --- /dev/null +++ b/net/ldns/libldns/Makefile @@ -0,0 +1,18 @@ +# $OpenBSD: Makefile,v 1.1 2008/02/03 19:08:30 jakob Exp $ + +COMMENT= DNS library modelled after Net::DNS + +PKGNAME= libldns-${VERSION} +SHARED_LIBS += ldns 0.0 # .0.0 + +WANTLIB= crypto + + +post-build: + mkdir ${WRKBUILD}/doc + cd ${WRKBUILD} && ${MAKE_PROGRAM} doc + +post-install: + @chown -R ${MANOWN}:${MANGRP} ${PREFIX}/man/man3 + +.include diff --git a/net/ldns/libldns/distinfo b/net/ldns/libldns/distinfo new file mode 100644 index 00000000000..e7aeed7390b --- /dev/null +++ b/net/ldns/libldns/distinfo @@ -0,0 +1,5 @@ +MD5 (ldns-1.2.2.tar.gz) = y6XgYbZjd86yXiMJ0s8X8w== +RMD160 (ldns-1.2.2.tar.gz) = MpmzhW4+TicR3zmrJmIN0vvtpKo= +SHA1 (ldns-1.2.2.tar.gz) = 5z0TzTZJBIXpKSShhX2rErNRJhM= +SHA256 (ldns-1.2.2.tar.gz) = RlEvRvnNeI+xuICfVv3SKd3jMiTN07/NKBGYvi5H9nM= +SIZE (ldns-1.2.2.tar.gz) = 723900 diff --git a/net/ldns/patches/patch-Makefile_in b/net/ldns/libldns/patches/patch-Makefile_in similarity index 94% rename from net/ldns/patches/patch-Makefile_in rename to net/ldns/libldns/patches/patch-Makefile_in index a9468f29351..c4078c78ad8 100644 --- a/net/ldns/patches/patch-Makefile_in +++ b/net/ldns/libldns/patches/patch-Makefile_in @@ -1,4 +1,4 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2007/10/23 22:46:18 naddy Exp $ +$OpenBSD: patch-Makefile_in,v 1.1 2008/02/03 19:08:30 jakob Exp $ --- Makefile.in.orig Thu Aug 9 10:52:04 2007 +++ Makefile.in Tue Oct 23 16:28:50 2007 @@ -12,7 +12,7 @@ datarootdir = @datarootdir@ diff --git a/net/ldns/pkg/DESCR b/net/ldns/libldns/pkg/DESCR similarity index 100% rename from net/ldns/pkg/DESCR rename to net/ldns/libldns/pkg/DESCR diff --git a/net/ldns/libldns/pkg/PFRAG.shared b/net/ldns/libldns/pkg/PFRAG.shared new file mode 100644 index 00000000000..0bab91fb092 --- /dev/null +++ b/net/ldns/libldns/pkg/PFRAG.shared @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1 2008/02/03 19:08:30 jakob Exp $ +@lib lib/libldns.so.${LIBldns_VERSION} diff --git a/net/ldns/pkg/PLIST b/net/ldns/libldns/pkg/PLIST similarity index 99% rename from net/ldns/pkg/PLIST rename to net/ldns/libldns/pkg/PLIST index 786eda94be3..d6689662cb0 100644 --- a/net/ldns/pkg/PLIST +++ b/net/ldns/libldns/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2007/10/23 22:46:18 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.1 2008/02/03 19:08:30 jakob Exp $ %%SHARED%% include/ldns/ include/ldns/buffer.h diff --git a/net/ldns/pkg/PFRAG.shared b/net/ldns/pkg/PFRAG.shared deleted file mode 100644 index d63f31f0544..00000000000 --- a/net/ldns/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2007/10/23 22:46:18 naddy Exp $ -@lib lib/libldns.so.${LIBldns_VERSION}