From ce51d824e689657100d345764ef21065f787c579 Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Sat, 25 Aug 2007 14:00:20 +0000
Subject: Switch to New LibIdent, version 0.32.

libident 0.32
--------------
# A serious portability fix for *BSD and Solaris was submitted by:
  Nicolas Rachinsky <nicolas@rachinsky.de>.

# Build of sample programs ("testers") was fixed.


libident 0.31
--------------
# libtool is used instead of ranlib, so that a shared library can be built
  automatically if the OS supports it.


libident 0.30
--------------
#  This new release is meant to provide Internet Protocol version independant
  support: libident can now handles IPv6 addresses and perform queries over
  IPv6, as well as IPv4. The IP version is selected automatically.

# I also have ported the library to the GNU autotools (autoconf & automake),
  and removed support for non ANSI C platforms. If you use such an old system,
  do NOT update. It doesn't support IPv6 anyway.
---
 security/libident/Makefile         | 17 +++++---
 security/libident/distinfo         |  9 ++---
 security/libident/patches/patch-aa | 83 --------------------------------------
 3 files changed, 15 insertions(+), 94 deletions(-)
 delete mode 100644 security/libident/patches/patch-aa

diff --git a/security/libident/Makefile b/security/libident/Makefile
index 02af3bb81c0..9c59a93e202 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -1,17 +1,22 @@
-# $NetBSD: Makefile,v 1.19 2007/03/24 19:21:31 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/08/25 14:00:20 obache Exp $
 #
 
-DISTNAME=	libident-0.22
-PKGREVISION=	1
+VERSION=	0.32
+DISTNAME=	libident-${VERSION}
 CATEGORIES=	security devel net
-MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/ident/libs/
+MASTER_SITES=	http://www.remlab.net/files/libident/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.remlab.net/libident/
 COMMENT=	Small library to interface to the ident protocol server (rfc1413)
 
 USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
-BUILD_TARGET=	netbsd
-INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3
+# Need to specify shlib version for continuousness since old 0.2x version
+SUBST_CLASSES+=		libver
+SUBST_STAGE.libver=	pre-configure
+SUBST_FILES.libver=	Makefile.in
+SUBST_SED.libver=	-e "s/^\\(libident_la_LDFLAGS[	 ]*=\\).*/\\1 -version-info ${VERSION:S/./:/}/"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libident/distinfo b/security/libident/distinfo
index a552e0259ba..faf91888083 100644
--- a/security/libident/distinfo
+++ b/security/libident/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/06/21 18:33:19 minskim Exp $
+$NetBSD: distinfo,v 1.6 2007/08/25 14:00:20 obache Exp $
 
-SHA1 (libident-0.22.tar.gz) = cf70a9600880085c333d4e8623ece8056a196cc6
-RMD160 (libident-0.22.tar.gz) = ebbd3d3de7f1c22c6c8c620722c1ba25a4f5b4eb
-Size (libident-0.22.tar.gz) = 10716 bytes
-SHA1 (patch-aa) = 02557ca4f0d23a2dc0f81fdc6186dcb43301d144
+SHA1 (libident-0.32.tar.gz) = 4658807b017f21928a64f3442ee3a2b91f48d14e
+RMD160 (libident-0.32.tar.gz) = 45c01b3c54a441b085ea3b8dc451eb8c33b7bd2e
+Size (libident-0.32.tar.gz) = 294241 bytes
diff --git a/security/libident/patches/patch-aa b/security/libident/patches/patch-aa
deleted file mode 100644
index 767f573e9cd..00000000000
--- a/security/libident/patches/patch-aa
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2007/06/21 18:33:19 minskim Exp $
-
---- Makefile.orig	1997-01-17 11:10:55.000000000 -0800
-+++ Makefile
-@@ -4,25 +4,28 @@
- 
- MAKE=make
- SHELL=/bin/sh
--RM=rm -f
- RANLIB=ranlib
--AR=ar cq
-+RM=rm -f
-+AR=${LIBTOOL} --mode=link cc -rpath ${PREFIX}/lib -version-info 0:22 -o
-+CC=${LIBTOOL} --mode=compile cc
- 
--INSTROOT=/usr/local
-+INSTROOT=${PREFIX}
- LIBDIR=$(INSTROOT)/lib
- INCDIR=$(INSTROOT)/include
- MANDIR=$(INSTROOT)/man/man3
- 
-+.PHONY: install
-+
- #
- # Add -g for debugging information
- #
- # Add -DHAVE_ANSIHEADERS if your system have the ANSI C header files
- # needed for our purposes (stdlib, string, unistd).
- #
--CFLAGS = -O
-+#CFLAGS = -O
- 
- LDLIBS =
--LIBIDENT = libident.a
-+LIBIDENT = libident.la
- 
- OBJS = ident.o id_open.o id_close.o id_query.o id_parse.o support.o version.o
- 
-@@ -33,6 +36,7 @@ fail:
- 	@echo aix
- 	@echo bsd
- 	@echo bsd2.11
-+	@echo netbsd
- 	@echo dynix
- 	@echo hpux
- 	@echo irix
-@@ -52,8 +56,8 @@ all: 	$(LIBIDENT)
- 
- $(LIBIDENT):	$(OBJS)
- 	-$(RM) $(LIBIDENT)
--	$(AR) $(LIBIDENT) $(OBJS)
--	-$(RANLIB) $(LIBIDENT)
-+	$(AR) $(LIBIDENT) $(OBJS:.o=.lo)
-+#	-$(RANLIB) $(LIBIDENT)
- 
- testers: lookup-tester ident-tester
- 
-@@ -82,13 +86,9 @@ version:
- #
- 
- install:
--	-$(RM) $(LIBDIR)/$(LIBIDENT)
--	cp $(LIBIDENT) $(LIBDIR)/$(LIBIDENT)
--	-$(RANLIB) $(LIBDIR)/$(LIBIDENT)
--	-$(RM) $(INCDIR)/ident.h
--	cp ident.h $(INCDIR)/ident.h
--	-$(RM) $(MANDIR)/ident.3
--	cp ident.3 $(MANDIR)/ident.3
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBIDENT} ${PREFIX}/lib
-+	${BSD_INSTALL_DATA} ident.h ${INCDIR}/ident.h
-+	${BSD_INSTALL_DATA} ident.3 ${MANDIR}/ident.3
- 
- clean:
- 	-$(RM) $(LIBIDENT) ident-tester lookup-tester *~ core *.o \#*
-@@ -126,6 +126,8 @@ bsd:
- bsd2.11:
- 	@$(MAKE) all CC="$(CC)" CFLAGS="-O -DSIGRETURNTYPE=int -DHAVE_ANSIHEADERS"
- 
-+netbsd:
-+	@$(MAKE) all CC="$(CC)" CFLAGS="${CFLAGS} -Wall -DHAVE_ANSIHEADERS"
- 
- #
- #
-- 
cgit v1.2.3