fix shared library, miscellaneous cleanup; agreed by jakob@

This commit is contained in:
naddy 2007-10-23 22:46:18 +00:00
parent f6b6062096
commit ea58df3f2b
4 changed files with 30 additions and 16 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2007/10/10 12:13:00 jakob Exp $
# $OpenBSD: Makefile,v 1.5 2007/10/23 22:46:18 naddy Exp $
COMMENT= DNS library modelled after Net::DNS
VERSION= 1.2.1
DISTNAME= ldns-${VERSION}
PKGNAME= ldns-${VERSION}
SHARED_LIBS= ldns ${VERSION}
DISTNAME= ldns-1.2.1
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += ldns 0.0 # .0.0
CATEGORIES= net
MASTER_SITES= http://www.nlnetlabs.nl/downloads/
@ -21,18 +20,18 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= crypto
SEPARATE_BUILD= concurrent
SEPARATE_BUILD= simple
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= ac_cv_prog_doxygen=
USE_LIBTOOL= Yes
USE_GMAKE= Yes
SUBST_VARS+= VERSION
NO_REGRESS= Yes
post-build:
mkdir ${WRKBUILD}/doc
cd ${WRKBUILD} && ${MAKE_PROGRAM} doc
post-install:
@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/man/man3
@chown -R ${MANOWN}:${MANGRP} ${PREFIX}/man/man3
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/10/10 12:13:00 jakob Exp $
--- Makefile.in.orig Wed Oct 10 13:13:18 2007
+++ Makefile.in Wed Oct 10 13:13:19 2007
$OpenBSD: patch-Makefile_in,v 1.2 2007/10/23 22:46:18 naddy 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@
datadir = @datadir@
libdir = @libdir@
@ -10,3 +10,20 @@ $OpenBSD: patch-Makefile_in,v 1.1 2007/10/10 12:13:00 jakob Exp $
glibtool = @glibtool@
libtool = @libtool@
ifdef glibtool
@@ -68,7 +68,7 @@ ALL_SOURCES = $(LIBDNS_SOURCES)
COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
COMP_LIB = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
LINK = $(CC) $(CFLAGS) $(LDFLAGS)
-LINK_LIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -release $(VERSION)
+LINK_LIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
%.o: $(srcdir)/%.c $(LIBDNS_HEADERS) ldns/util.h ldns/config.h
$(COMP_LIB) -c $> $<
@@ -133,7 +133,6 @@ uninstall-h:
install-lib: lib
$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
$(LIBTOOL) --mode=install cp libldns.la $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
uninstall-lib:
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libldns.la

View File

@ -1,3 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2007/10/10 12:13:00 jakob Exp $
lib/libldns-${VERSION}.so
lib/libldns.so
@comment $OpenBSD: PFRAG.shared,v 1.3 2007/10/23 22:46:18 naddy Exp $
@lib lib/libldns.so.${LIBldns_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2007/10/10 12:13:00 jakob Exp $
@comment $OpenBSD: PLIST,v 1.3 2007/10/23 22:46:18 naddy Exp $
%%SHARED%%
include/ldns/
include/ldns/buffer.h
@ -26,7 +26,6 @@ include/ldns/wire2host.h
include/ldns/zone.h
lib/libldns.a
lib/libldns.la
@owner root
@man man/man3/ldns_bget_token.3
@man man/man3/ldns_bgetc.3
@man man/man3/ldns_bskipcs.3