Remove libassuan, no users left in pkgsrc.

Everyone uses libassuan2.

11 files changed, 1 insertions, 330 deletions

diff --git a/security/Makefile b/security/Makefile
index 99186cf6ec5..a866f6f28e3 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.588 2016/07/09 21:45:22 rillig Exp $
+# $NetBSD: Makefile,v 1.589 2016/07/17 17:36:52 wiz Exp $
 #
 
 COMMENT=	Security tools
@@ -139,7 +139,6 @@ SUBDIR+=	kstart
 SUBDIR+=	kwallet
 SUBDIR+=	kwalletmanager
 SUBDIR+=	lasso
-SUBDIR+=	libassuan
 SUBDIR+=	libassuan2
 SUBDIR+=	libbf
 SUBDIR+=	libcrack
diff --git a/security/libassuan/DESCR b/security/libassuan/DESCR
deleted file mode 100644
index 7d5d1561c80..00000000000
--- a/security/libassuan/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-IPC library used by gnupg-devel.
diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile
deleted file mode 100644
index d47a292e706..00000000000
--- a/security/libassuan/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:52 wiz Exp $
-#
-
-DISTNAME=		libassuan-1.0.5
-PKGREVISION=		1
-CATEGORIES=		security
-MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/libassuan/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/libassuan/
-COMMENT=		The IPC library used by some GnuPG related software
-
-GNU_CONFIGURE=		yes
-INFO_FILES=		yes
-USE_TOOLS+=		autoconf autoreconf automake
-USE_LIBTOOL=		yes
-###
-### XXX By default, this package will build with -fPIC on linux.
-###	Instead, let's patch it to use libtool and use --with-pic
-###	to build position-independent code when possible.
-CONFIGURE_ARGS+=	--with-pic
-TEST_TARGET=		check
-
-LIBS.SunOS+=		-lrt
-
-BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
-
-pre-configure:
-	cd ${WRKSRC} && libtoolize
-	cd ${WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} autogen.sh
-
-.include "../../security/libgpg-error/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/libassuan/PLIST b/security/libassuan/PLIST
deleted file mode 100644
index 3b50bfd1709..00000000000
--- a/security/libassuan/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2008/09/07 02:40:53 bjs Exp $
-bin/libassuan-config
-include/assuan.h
-info/assuan.info
-lib/libassuan.la
-share/aclocal/libassuan.m4
diff --git a/security/libassuan/buildlink3.mk b/security/libassuan/buildlink3.mk
deleted file mode 100644
index cccedd65841..00000000000
--- a/security/libassuan/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:53:56 dholland Exp $
-
-BUILDLINK_TREE+=	libassuan
-
-.if !defined(LIBASSUAN_BUILDLINK3_MK)
-LIBASSUAN_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libassuan+=	libassuan>=1.0.0
-BUILDLINK_API_DEPENDS.libassuan+=	libassuan<2.0.0
-BUILDLINK_ABI_DEPENDS.libassuan+=	libassuan>=1.0.5nb1
-BUILDLINK_PKGSRCDIR.libassuan?=	../../security/libassuan
-
-.include "../../security/libgpg-error/buildlink3.mk"
-.endif # LIBASSUAN_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-libassuan
diff --git a/security/libassuan/distinfo b/security/libassuan/distinfo
deleted file mode 100644
index 8b5e3d791d5..00000000000
--- a/security/libassuan/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 01:17:48 agc Exp $
-
-SHA1 (libassuan-1.0.5.tar.bz2) = f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
-RMD160 (libassuan-1.0.5.tar.bz2) = 7c4a75c71a3117cf140ea66ca89765349f39218e
-SHA512 (libassuan-1.0.5.tar.bz2) = 45f9c60469db1d08f2939532ed6827f18ebc7f7ed7c145cfb7e7618922b4460db71d34e666e09ff26281a92565397a4acdd8cb650039551c6fc728cccb3525a0
-Size (libassuan-1.0.5.tar.bz2) = 297786 bytes
-SHA1 (patch-aa) = 89707efd069a5113fbdaba2464405e91c9173ca6
-SHA1 (patch-ab) = c6af201ae6c8030310c8af7be5af88a7ce02c6c5
-SHA1 (patch-ac) = 8dbb703833c8b0a63b5b355309c91cd189235468
-SHA1 (patch-ad) = a44a1486852d88b098a860cb8aa41ed41f98e35b
-SHA1 (patch-tests_Makefile.in) = 941d2d6073024e61c8830a18a6cc470fac0e393b
diff --git a/security/libassuan/patches/patch-aa b/security/libassuan/patches/patch-aa
deleted file mode 100644
index e1192e5f8af..00000000000
--- a/security/libassuan/patches/patch-aa
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/09/07 02:40:53 bjs Exp $
-
---- configure.ac.orig	2008-05-25 03:58:25.000000000 -0400
-+++ configure.ac
-@@ -18,7 +18,7 @@
- 
- # Process this file with autoconf to produce a configure script.
- 
--AC_PREREQ(2.61)
-+AC_PREREQ(2.62)
- min_automake_version="1.10"
- 
- # Remember to change the version number immediately *after* a release.
-@@ -27,10 +27,7 @@ min_automake_version="1.10"
- m4_define([my_version], [1.0.5])
- m4_define([my_issvn], [no])
- 
--m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
--            || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
--AC_INIT([libassuan], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
--        [bug-libassuan@gnupg.org])
-+AC_INIT([libassuan],[1.0.5],[bug-libassuan@gnupg.org])
- # Note, that this is not yet available as a shared library.
- 
- PACKAGE=$PACKAGE_NAME
-@@ -39,11 +36,11 @@ VERSION=$PACKAGE_VERSION
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR(src/assuan.h)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- AC_CANONICAL_HOST
- AB_INIT
- 
--AC_GNU_SOURCE
-+AC_USE_SYSTEM_EXTENSIONS
- 
- 
- AC_SUBST(PACKAGE)
-@@ -72,7 +69,7 @@ fi
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- #AC_ARG_PROGRAM
- 
- if test "$GCC" = yes; then
-@@ -106,11 +103,11 @@ AH_BOTTOM([
- have_dosish_system=no
- have_w32_system=no
- case "${host}" in
--    *-linux*)
--        if test "$GCC" = yes; then
--          CFLAGS="$CFLAGS -fPIC -DPIC"
--        fi
--        ;;
-+dnl    *-linux*)
-+dnl        if test "$GCC" = yes; then
-+dnl          CFLAGS="$CFLAGS -fPIC -DPIC"
-+dnl        fi
-+dnl        ;;
-     *-mingw32*)
-         have_dosish_system=yes
-         have_w32_system=yes
-@@ -177,7 +174,13 @@ AC_C_CONST
- AC_C_INLINE
- AC_TYPE_SIZE_T
- AC_TYPE_SIGNAL
--AC_DECL_SYS_SIGLIST
-+AC_CHECK_DECLS([sys_siglist],[],[],[#include <signal.h>
-+/* NetBSD declares sys_siglist in unistd.h.  */
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif
-+])
-+
- 
- gl_HEADER_SYS_SOCKET
- gl_TYPE_SOCKLEN_T
-@@ -243,12 +246,9 @@ AC_REPLACE_FUNCS(setenv)
- #
- AC_MSG_CHECKING(for SO_PEERCRED)
- AC_CACHE_VAL(assuan_cv_sys_so_peercred,
--      [AC_TRY_COMPILE([#include <sys/socket.h>], 
--         [struct ucred cr; 
-+      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[struct ucred cr; 
-           int cl = sizeof cr;
--          getsockopt (1, SOL_SOCKET, SO_PEERCRED, &cr, &cl);],
--          assuan_cv_sys_so_peercred=yes,
--          assuan_cv_sys_so_peercred=no)
-+          getsockopt (1, SOL_SOCKET, SO_PEERCRED, &cr, &cl);]])],[assuan_cv_sys_so_peercred=yes],[assuan_cv_sys_so_peercred=no])
-        ])
- AC_MSG_RESULT($assuan_cv_sys_so_peercred) 
- if test $assuan_cv_sys_so_peercred = yes; then
diff --git a/security/libassuan/patches/patch-ab b/security/libassuan/patches/patch-ab
deleted file mode 100644
index 1e7a2c25a6e..00000000000
--- a/security/libassuan/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/09/07 02:40:53 bjs Exp $
-
---- src/Makefile.am.orig	2007-08-24 01:29:48.000000000 -0400
-+++ src/Makefile.am
-@@ -23,7 +23,7 @@ BUILT_SOURCES = assuan-errors.c
- MOSTLYCLEANFILES = assuan-errors.c
- 
- if HAVE_PTH
--libassuan_pth = libassuan-pth.a
-+libassuan_pth = libassuan-pth.la
- else
- libassuan_pth = 
- endif
-@@ -31,7 +31,7 @@ endif
- bin_SCRIPTS = libassuan-config
- m4datadir = $(datadir)/aclocal
- m4data_DATA = libassuan.m4
--lib_LIBRARIES = libassuan.a $(libassuan_pth)
-+lib_LTLIBRARIES = libassuan.la $(libassuan_pth)
- include_HEADERS = assuan.h
- 
- 
-@@ -51,15 +51,15 @@ common_sources = \
- 	assuan-socket-connect.c \
- 	assuan-uds.c \
- 	assuan-logging.c \
--	assuan-socket.c
-+	assuan-socket.c 
- 
--libassuan_a_SOURCES = $(common_sources) assuan-io.c
--libassuan_a_LIBADD = @LIBOBJS@
-+libassuan_la_SOURCES = $(common_sources) assuan-io.c 
-+libassuan_la_LIBADD = @LTLIBOBJS@
- 
- if HAVE_PTH
--libassuan_pth_a_SOURCES = $(common_sources) assuan-io-pth.c
--libassuan_pth_a_CFLAGS = $(AM_CFLAGS) $(PTH_CFLAGS)
--libassuan_pth_a_LIBADD = @LIBOBJS@
-+libassuan_pth_la_SOURCES = $(common_sources) assuan-io-pth.c
-+libassuan_pth_la_CFLAGS = $(AM_CFLAGS) $(PTH_CFLAGS)
-+libassuan_pth_la_LIBADD = @LTLIBOBJS@
- endif
- 
- assuan-errors.c : assuan.h mkerrors
diff --git a/security/libassuan/patches/patch-ac b/security/libassuan/patches/patch-ac
deleted file mode 100644
index 89ae037aead..00000000000
--- a/security/libassuan/patches/patch-ac
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/09/07 02:40:53 bjs Exp $
-
---- aclocal.m4.orig	2008-09-06 22:03:58.000000000 -0400
-+++ aclocal.m4
-@@ -940,3 +940,66 @@ m4_include([m4/gnupg-pth.m4])
- m4_include([m4/onceonly.m4])
- m4_include([m4/socklen.m4])
- m4_include([m4/sys_socket_h.m4])
-+
-+# AC_USE_SYSTEM_EXTENSIONS
-+# ------------------------
-+# Enable extensions on systems that normally disable them,
-+# typically due to standards-conformance issues.
-+#
-+# Remember that #undef in AH_VERBATIM gets replaced with #define by
-+# AC_DEFINE.  The goal here is to define all known feature-enabling
-+# macros, then, if reports of conflicts are made, disable macros that
-+# cause problems on some platforms (such as __EXTENSIONS__).
-+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
-+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
-+
-+  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
-+  if test "$MINIX" = yes; then
-+    AC_DEFINE([_POSIX_SOURCE], [1],
-+      [Define to 1 if you need to in order for `stat' and other
-+       things to work.])
-+    AC_DEFINE([_POSIX_1_SOURCE], [2],
-+      [Define to 2 if the system does not provide POSIX.1 features
-+       except with this defined.])
-+    AC_DEFINE([_MINIX], [1],
-+      [Define to 1 if on MINIX.])
-+  fi
-+
-+  AH_VERBATIM([__EXTENSIONS__],
-+[/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+])
-+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-+    [ac_cv_safe_to_define___extensions__],
-+    [AC_COMPILE_IFELSE(
-+       [AC_LANG_PROGRAM([
-+#	  define __EXTENSIONS__ 1
-+	  AC_INCLUDES_DEFAULT])],
-+       [ac_cv_safe_to_define___extensions__=yes],
-+       [ac_cv_safe_to_define___extensions__=no])])
-+  test $ac_cv_safe_to_define___extensions__ = yes &&
-+    AC_DEFINE([__EXTENSIONS__])
-+  AC_DEFINE([_ALL_SOURCE])
-+  AC_DEFINE([_GNU_SOURCE])
-+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-+  AC_DEFINE([_TANDEM_SOURCE])
-+])# AC_USE_SYSTEM_EXTENSIONS
diff --git a/security/libassuan/patches/patch-ad b/security/libassuan/patches/patch-ad
deleted file mode 100644
index 4a136b9a4b6..00000000000
--- a/security/libassuan/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2013/02/26 11:00:59 joerg Exp $
-
---- tests/Makefile.am.orig	2007-07-05 17:10:06.000000000 +0000
-+++ tests/Makefile.am
-@@ -35,5 +35,7 @@ AM_CFLAGS = # $(GPG_ERROR_CFLAGS)
- 
- noinst_HEADERS = common.h
- noinst_PROGRAMS = $(TESTS)
--LDADD =  ../src/libassuan.a  $(NETLIBS) # $(GPG_ERROR_LIBS)
-+LDADD =  ../src/libassuan.la  $(NETLIBS) # $(GPG_ERROR_LIBS)
- 
-+fdpassing$(EXEEXT): fdpassing.$(OBJEXT)
-+	$(CCLD) fdpassing.$(OBJEXT) -o fdpassing$(EXEEXT) $(LDADD)
diff --git a/security/libassuan/patches/patch-tests_Makefile.in b/security/libassuan/patches/patch-tests_Makefile.in
deleted file mode 100644
index ab91afe3a59..00000000000
--- a/security/libassuan/patches/patch-tests_Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-tests_Makefile.in,v 1.1 2013/02/26 11:00:59 joerg Exp $
-
---- tests/Makefile.in.orig	2008-05-25 08:00:34.000000000 +0000
-+++ tests/Makefile.in
-@@ -74,13 +74,13 @@ fdpassing_SOURCES = fdpassing.c
- fdpassing_OBJECTS = fdpassing.$(OBJEXT)
- fdpassing_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
--fdpassing_DEPENDENCIES = ../src/libassuan.a $(am__DEPENDENCIES_1)
-+fdpassing_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
-+CCLD = libtool --mode=link $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = fdpassing.c
- DIST_SOURCES = fdpassing.c
-@@ -199,7 +199,7 @@ BUILT_SOURCES = 
- CLEANFILES = 
- AM_CFLAGS = # $(GPG_ERROR_CFLAGS)
- noinst_HEADERS = common.h
--LDADD = ../src/libassuan.a  $(NETLIBS) # $(GPG_ERROR_LIBS)
-+LDADD = ../src/libassuan.la  $(NETLIBS) # $(GPG_ERROR_LIBS)
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-@@ -518,3 +518,6 @@ uninstall-am:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+fdpassing$(EXEEXT): fdpassing.$(OBJEXT)
-+	$(CCLD) fdpassing.$(OBJEXT) -o fdpassing$(EXEEXT) $(LDADD)