Update to 1.1:

	* much improved threading (Michael)
	* much improved docs (Gustavo Carneiro)
	* cygwin support (Masahiro Sakai)
	* Unix socket length fix (Masahiro)
	* OSF/1 True64 support (mmokrejs)

While here, enable OpenSSL support.

5 files changed, 30 insertions, 17 deletions

diff --git a/net/linc/Makefile b/net/linc/Makefile
index 3ee91d24cac..f8c22aa7608 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,25 +1,30 @@
-# $NetBSD: Makefile,v 1.19 2003/12/09 06:54:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/14 19:41:40 jmmv Exp $
 #
 
-DISTNAME=		linc-1.0.3
+DISTNAME=		linc-1.1.1
 CATEGORIES=		net gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/linc/1.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/linc/1.1/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Network client/server library
 
+CONFLICTS=		ORBit2>=2.8
+
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/linc.pc.in
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-openssl
 
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/linc/PLIST b/net/linc/PLIST
index 83a5f15649f..1d5f4d1c1d7 100644
--- a/net/linc/PLIST
+++ b/net/linc/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2003/12/09 07:01:29 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/12/14 19:41:40 jmmv Exp $
+bin/linc-cleanup-sockets
 bin/linc-config
 include/linc-1.0/linc/linc-config.h
 include/linc-1.0/linc/linc-connection.h
 include/linc-1.0/linc/linc-protocol.h
 include/linc-1.0/linc/linc-server.h
+include/linc-1.0/linc/linc-source.h
 include/linc-1.0/linc/linc-types.h
 include/linc-1.0/linc/linc.h
 lib/liblinc.a
@@ -13,14 +15,19 @@ lib/liblinc.so.1
 lib/liblinc.so.1.0
 lib/pkgconfig/linc.pc
 share/aclocal/linc.m4
-share/doc/html/linc/c4.html
+share/doc/html/linc/home.png
 share/doc/html/linc/index.html
 share/doc/html/linc/index.sgml
+share/doc/html/linc/left.png
+share/doc/html/linc/linc-LINCConnection.html
+share/doc/html/linc/linc-LINCServer.html
+share/doc/html/linc/linc-linc-config.html
 share/doc/html/linc/linc-linc-protocol.html
 share/doc/html/linc/linc-linc-types.html
 share/doc/html/linc/linc-linc.html
-share/doc/html/linc/linc-lincconnection.html
-share/doc/html/linc/linc-lincserver.html
+share/doc/html/linc/linc.devhelp
+share/doc/html/linc/right.png
+share/doc/html/linc/up.png
 @dirrm share/doc/html/linc
 @dirrm include/linc-1.0/linc
 @dirrm include/linc-1.0
diff --git a/net/linc/buildlink2.mk b/net/linc/buildlink2.mk
index 3c455f51f76..8e32a50fc2f 100644
--- a/net/linc/buildlink2.mk
+++ b/net/linc/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/12/09 06:54:29 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/12/14 19:41:40 jmmv Exp $
 
 .if !defined(LINC_BUILDLINK2_MK)
 LINC_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		linc
-BUILDLINK_DEPENDS.linc?=	linc>=1.0.1nb2
+BUILDLINK_DEPENDS.linc?=	linc>=1.1.1
 BUILDLINK_PKGSRCDIR.linc?=	../../net/linc
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.linc=linc
@@ -13,6 +13,7 @@ BUILDLINK_FILES.linc=	include/linc-1.0/linc/*
 BUILDLINK_FILES.linc+=	lib/liblinc.*
 
 .include "../../devel/glib2/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	linc-buildlink
 
diff --git a/net/linc/distinfo b/net/linc/distinfo
index da5a4f563f1..0b8217315a4 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2003/12/09 06:54:29 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2003/12/14 19:41:40 jmmv Exp $
 
-SHA1 (linc-1.0.3.tar.bz2) = 865833a7b1f31689226b6e39ab5afaa1c4426dcd
-Size (linc-1.0.3.tar.bz2) = 244636 bytes
-SHA1 (patch-aa) = bc149585bc4adc65dfa8448fff78d437c3044465
+SHA1 (linc-1.1.1.tar.bz2) = efebe15c4e29f9c03dfda04191161e557b1e1982
+Size (linc-1.1.1.tar.bz2) = 204064 bytes
+SHA1 (patch-aa) = 965071a6cdfb7dca2bd976ac96e566f671df6ede
diff --git a/net/linc/patches/patch-aa b/net/linc/patches/patch-aa
index fcb04597477..25a3a725a3d 100644
--- a/net/linc/patches/patch-aa
+++ b/net/linc/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2003/01/04 23:08:23 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2003/12/14 19:41:40 jmmv Exp $
 
---- docs/Makefile.in.orig	Fri Oct 18 12:00:50 2002
+--- docs/Makefile.in.orig	2003-05-03 02:31:12.000000000 +0200
 +++ docs/Makefile.in
-@@ -267,6 +267,7 @@ mostlyclean-generic distclean-generic cl
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+@@ -323,6 +323,7 @@ uninstall-am: uninstall-info-am uninstal
+ 	uninstall-local
  
  
 +@ENABLE_GTK_DOC_FALSE@all-local: