From f2f2af60fe7a87fae8a09c208c56e21421246493 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 17 Feb 2009 13:17:10 +0000
Subject: Retire gpgme03.

---
 doc/CHANGES-2009                  |   3 +-
 security/Makefile                 |   3 +-
 security/gpgme03/DESCR            |   7 ---
 security/gpgme03/Makefile         |  30 ---------
 security/gpgme03/PLIST            |   5 --
 security/gpgme03/buildlink3.mk    |  25 --------
 security/gpgme03/distinfo         |   9 ---
 security/gpgme03/patches/patch-aa | 128 --------------------------------------
 security/gpgme03/patches/patch-ab |  14 -----
 security/gpgme03/patches/patch-ac |  13 ----
 security/gpgme03/patches/patch-ad |  13 ----
 11 files changed, 3 insertions(+), 247 deletions(-)
 delete mode 100644 security/gpgme03/DESCR
 delete mode 100644 security/gpgme03/Makefile
 delete mode 100644 security/gpgme03/PLIST
 delete mode 100644 security/gpgme03/buildlink3.mk
 delete mode 100644 security/gpgme03/distinfo
 delete mode 100644 security/gpgme03/patches/patch-aa
 delete mode 100644 security/gpgme03/patches/patch-ab
 delete mode 100644 security/gpgme03/patches/patch-ac
 delete mode 100644 security/gpgme03/patches/patch-ad

diff --git a/doc/CHANGES-2009 b/doc/CHANGES-2009
index b2470fe164b..0d75d076c13 100644
--- a/doc/CHANGES-2009
+++ b/doc/CHANGES-2009
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.610 2009/02/17 10:42:42 adam Exp $
+$NetBSD: CHANGES-2009,v 1.611 2009/02/17 13:17:10 joerg Exp $
 
 Changes to the packages collection and infrastructure in 2009:
 
@@ -833,3 +833,4 @@ Changes to the packages collection and infrastructure in 2009:
 	Updated misc/dvtm to 0.5.1 [tnn 2009-02-17]
 	Updated math/fftw to 3.2.1 [adam 2009-02-17]
 	Updated math/fftwf to 3.2.1 [adam 2009-02-17]
+	Removed security/gpgme03 [joerg 2009-02-17]
diff --git a/security/Makefile b/security/Makefile
index 2f95d8d6e84..ed3d10237b7 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.341 2009/02/15 20:33:49 tonnerre Exp $
+# $NetBSD: Makefile,v 1.342 2009/02/17 13:17:10 joerg Exp $
 #
 
 COMMENT=	Security tools
@@ -69,7 +69,6 @@ SUBDIR+=	gpa
 SUBDIR+=	gpass
 SUBDIR+=	gpg2dot
 SUBDIR+=	gpgme
-SUBDIR+=	gpgme03
 SUBDIR+=	gsasl
 SUBDIR+=	gss
 SUBDIR+=	gtk-systrace
diff --git a/security/gpgme03/DESCR b/security/gpgme03/DESCR
deleted file mode 100644
index c0c3cb2cd78..00000000000
--- a/security/gpgme03/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
-easier for applications. It provides a High-Level Crypto API for
-encryption, decryption, signing, signature verification and key
-management.
-
-This is the 0.3 branch of the package; for newer versions
-look into the ``gpgme'' package.
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
deleted file mode 100644
index ddc1ced331e..00000000000
--- a/security/gpgme03/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2009/02/17 13:02:20 joerg Exp $
-#
-
-DISTNAME=	gpgme-0.3.16
-PKGNAME=	${DISTNAME:S/-/03-/}
-PKGREVISION=	2
-CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnupg.org/related_software/gpgme/
-COMMENT=	GnuPG Made Easy (0.3 branch)
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-DEPENDS+=	gnupg>=1.2.0:../../security/gnupg
-
-USE_LIBTOOL=		YES
-GNU_CONFIGURE=		YES
-PTHREAD_OPTS+=		require
-
-CONFIGURE_ARGS+=	--without-gpgsm
-
-.include "../../mk/pthread.buildlink3.mk"
-
-.if ${PTHREAD_TYPE} == "native"
-CONFIGURE_ARGS+=	--without-pth --without-pth-test
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/gpgme03/PLIST b/security/gpgme03/PLIST
deleted file mode 100644
index 144e03febfb..00000000000
--- a/security/gpgme03/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:52 jlam Exp $
-bin/gpgme03-config
-include/gpgme03.h
-lib/libgpgme03.la
-share/aclocal/gpgme03.m4
diff --git a/security/gpgme03/buildlink3.mk b/security/gpgme03/buildlink3.mk
deleted file mode 100644
index 230e1e4ba42..00000000000
--- a/security/gpgme03/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/01/17 03:11:19 rillig Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GPGME03_BUILDLINK3_MK:=	${GPGME03_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gpgme03
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpgme03}
-BUILDLINK_PACKAGES+=	gpgme03
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gpgme03
-
-.if !empty(GPGME03_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gpgme03+=	gpgme03>=0.3.16
-BUILDLINK_ABI_DEPENDS.gpgme03+=	gpgme03>=0.3.16nb2
-BUILDLINK_PKGSRCDIR.gpgme03?=	../../security/gpgme03
-
-BUILDLINK_FILES.gpgme03+=	bin/gpgme03-config
-BUILDLINK_FNAME_TRANSFORM.gpgme03+=	-e 's|/gpgme03-config|/gpgme-config|g'
-BUILDLINK_FNAME_TRANSFORM.gpgme03+=	-e 's|/gpgme03.h|/gpgme.h|g'
-BUILDLINK_TRANSFORM+=		l:gpgme:gpgme03
-.endif	# GPGME03_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gpgme03/distinfo b/security/gpgme03/distinfo
deleted file mode 100644
index c6b91e5dec3..00000000000
--- a/security/gpgme03/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:10:06 agc Exp $
-
-SHA1 (gpgme-0.3.16.tar.gz) = a59a48e920eb01b4f3af57f8f02fbedfaa63b0a9
-RMD160 (gpgme-0.3.16.tar.gz) = 6d41c2707dabb9e28ae9e6863375103ac51c5487
-Size (gpgme-0.3.16.tar.gz) = 679430 bytes
-SHA1 (patch-aa) = 77f58df8e29037babdd6c0be182a9b8b5ba0dc50
-SHA1 (patch-ab) = d73b151c643d6ae5b2a321e58291a6b48892fd03
-SHA1 (patch-ac) = d04178a5e3fe8d71c1ebf19290b597d3e21810f0
-SHA1 (patch-ad) = e07cce6ec27248be0ca8192a70f652dbcfae8e6d
diff --git a/security/gpgme03/patches/patch-aa b/security/gpgme03/patches/patch-aa
deleted file mode 100644
index 5c7879a4663..00000000000
--- a/security/gpgme03/patches/patch-aa
+++ /dev/null
@@ -1,128 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/03/23 22:54:54 minskim Exp $
-
---- gpgme/Makefile.in.orig	2003-11-19 02:55:10.000000000 -0600
-+++ gpgme/Makefile.in
-@@ -175,9 +175,9 @@ bin_SCRIPTS = gpgme-config
- m4datadir = $(datadir)/aclocal
- m4data_DATA = gpgme.m4
- include_HEADERS = gpgme.h
--lib_LTLIBRARIES = libgpgme.la
-+lib_LTLIBRARIES = libgpgme03.la
- 
--libgpgme_la_LDFLAGS = -version-info \
-+libgpgme03_la_LDFLAGS = -version-info \
-       @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
- 
- @BUILD_ASSUAN_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/assuan
-@@ -193,7 +193,7 @@ ath_components = ath.h ath.c ${ath_compo
- @HAVE_DOSISH_SYSTEM_TRUE@system_components = w32-util.c w32-sema.c w32-io.c
- @HAVE_DOSISH_SYSTEM_FALSE@system_components = ${ath_components} posix-util.c posix-sema.c posix-io.c
- 
--libgpgme_la_SOURCES = \
-+libgpgme03_la_SOURCES = \
- 	gpgme.h types.h util.h util.c conversion.c context.h ops.h	\
- 	data.c recipient.c signers.c wait.c wait.h op-support.c		\
- 	encrypt.c encrypt-sign.c decrypt.c decrypt-verify.c verify.c	\
-@@ -205,7 +205,7 @@ libgpgme_la_SOURCES = \
- 	sema.h io.h ${system_components}				\
- 	debug.c debug.h gpgme.c version.c errors.c
- 
--libgpgme_la_LIBADD = ${assuan_libobjs} @LTLIBOBJS@
-+libgpgme03_la_LIBADD = ${assuan_libobjs} @LTLIBOBJS@
- subdir = gpgme
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -213,10 +213,10 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = gpgme-config
- LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--@BUILD_ASSUAN_TRUE@libgpgme_la_DEPENDENCIES = ../assuan/libassuan.la \
-+@BUILD_ASSUAN_TRUE@libgpgme03_la_DEPENDENCIES = ../assuan/libassuan.la \
- @BUILD_ASSUAN_TRUE@	@LTLIBOBJS@
--@BUILD_ASSUAN_FALSE@libgpgme_la_DEPENDENCIES = @LTLIBOBJS@
--am__libgpgme_la_SOURCES_DIST = gpgme.h types.h util.h util.c \
-+@BUILD_ASSUAN_FALSE@libgpgme03_la_DEPENDENCIES = @LTLIBOBJS@
-+am__libgpgme03_la_SOURCES_DIST = gpgme.h types.h util.h util.c \
- 	conversion.c context.h ops.h data.c recipient.c signers.c \
- 	wait.c wait.h op-support.c encrypt.c encrypt-sign.c decrypt.c \
- 	decrypt-verify.c verify.c sign.c passphrase.c progress.c key.h \
-@@ -235,13 +235,13 @@ am__objects_3 = ath.lo $(am__objects_1) 
- @HAVE_DOSISH_SYSTEM_TRUE@	w32-io.lo
- @HAVE_DOSISH_SYSTEM_FALSE@am__objects_4 = $(am__objects_3) posix-util.lo \
- @HAVE_DOSISH_SYSTEM_FALSE@	posix-sema.lo posix-io.lo
--am_libgpgme_la_OBJECTS = util.lo conversion.lo data.lo recipient.lo \
-+am_libgpgme03_la_OBJECTS = util.lo conversion.lo data.lo recipient.lo \
- 	signers.lo wait.lo op-support.lo encrypt.lo encrypt-sign.lo \
- 	decrypt.lo decrypt-verify.lo verify.lo sign.lo passphrase.lo \
- 	progress.lo key.lo keylist.lo trustlist.lo import.lo export.lo \
- 	genkey.lo delete.lo edit.lo engine.lo rungpg.lo engine-gpgsm.lo \
- 	$(am__objects_4) debug.lo gpgme.lo version.lo errors.lo
--libgpgme_la_OBJECTS = $(am_libgpgme_la_OBJECTS)
-+libgpgme03_la_OBJECTS = $(am_libgpgme03_la_OBJECTS)
- SCRIPTS = $(bin_SCRIPTS)
- 
- 
-@@ -278,14 +278,14 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(am__libgpgme_la_SOURCES_DIST)
-+DIST_SOURCES = $(am__libgpgme03_la_SOURCES_DIST)
- DATA = $(m4data_DATA)
- 
- HEADERS = $(include_HEADERS)
- 
- DIST_COMMON = $(include_HEADERS) ChangeLog Makefile.am Makefile.in \
- 	fopencookie.c gpgme-config.in stpcpy.c vasprintf.c
--SOURCES = $(libgpgme_la_SOURCES)
-+SOURCES = $(libgpgme03_la_SOURCES)
- 
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
-@@ -327,8 +327,8 @@ clean-libLTLIBRARIES:
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
--libgpgme.la: $(libgpgme_la_OBJECTS) $(libgpgme_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(libgpgme_la_LDFLAGS) $(libgpgme_la_OBJECTS) $(libgpgme_la_LIBADD) $(LIBS)
-+libgpgme03.la: $(libgpgme03_la_OBJECTS) $(libgpgme03_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(libdir) $(libgpgme03_la_LDFLAGS) $(libgpgme03_la_OBJECTS) $(libgpgme03_la_LIBADD) $(LIBS)
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
-@@ -336,7 +336,7 @@ install-binSCRIPTS: $(bin_SCRIPTS)
- 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  if test -f $$d$$p; then \
--	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	    f=`echo "$$p" | sed -e 's|^.*/||' -e 's|gpgme|gpgme03|'`; \
- 	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
- 	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
- 	  else :; fi; \
-@@ -345,7 +345,7 @@ install-binSCRIPTS: $(bin_SCRIPTS)
- uninstall-binSCRIPTS:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
--	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	  f=`echo "$$p" | sed -e 's|^.*/||' -e 's|gpgme|gpgme03|''`; \
- 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- 	  rm -f $(DESTDIR)$(bindir)/$$f; \
- 	done
-@@ -450,7 +450,7 @@ install-m4dataDATA: $(m4data_DATA)
- 	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
- 	@list='$(m4data_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  f="`echo $$p | sed -e 's|^.*/||' -e 's|gpgme|gpgme03|'`"; \
- 	  echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \
- 	  $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \
- 	done
-@@ -468,7 +468,7 @@ install-includeHEADERS: $(include_HEADER
- 	$(mkinstalldirs) $(DESTDIR)$(includedir)
- 	@list='$(include_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  f="`echo $$p | sed -e 's|^.*/||' -e 's|gpgme|gpgme03|'`"; \
- 	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
- 	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
- 	done
diff --git a/security/gpgme03/patches/patch-ab b/security/gpgme03/patches/patch-ab
deleted file mode 100644
index f2351ef6ec2..00000000000
--- a/security/gpgme03/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/14 17:51:04 wiz Exp $
---- tests/gpg/mkdemodirs.orig	Wed Oct 17 06:08:55 2001
-+++ tests/gpg/mkdemodirs	Wed Jan 30 14:17:56 2002
-@@ -25,7 +25,9 @@
- echo -n "Creating:"
- for name in $NAMES; do
-     echo -n " $name"
--    [ -d $name ] && rm -r $name
-+    if [ -d $name ]; then
-+       rm -r $name
-+    fi
-     mkdir $name
-     $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg
-     $GPG --homedir $name --allow-secret-key-import --import $name/Secret.gpg
diff --git a/security/gpgme03/patches/patch-ac b/security/gpgme03/patches/patch-ac
deleted file mode 100644
index 1b9cceb3794..00000000000
--- a/security/gpgme03/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/03/11 12:26:28 jmmv Exp $
-
---- Makefile.in.orig	2003-11-19 09:55:08.000000000 +0100
-+++ Makefile.in
-@@ -182,7 +182,7 @@ EXTRA_DIST = README-alpha autogen.sh gpg
- 
- @RUN_GPG_TESTS_TRUE@tests = tests
- 
--SUBDIRS = ${assuan} gpgme ${tests} doc ${bonobo} ${complus}
-+SUBDIRS = ${assuan} gpgme
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/security/gpgme03/patches/patch-ad b/security/gpgme03/patches/patch-ad
deleted file mode 100644
index b2f9b94255d..00000000000
--- a/security/gpgme03/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/03/11 12:26:28 jmmv Exp $
-
---- configure.orig	2003-11-19 09:16:06.000000000 +0100
-+++ configure
-@@ -9998,7 +9998,7 @@ echo "$as_me: WARNING: fixed the GPGME_V
-     fi
- 
- 
--GPGME_CONFIG_LIBS="-lgpgme"
-+GPGME_CONFIG_LIBS="-lgpgme03"
- GPGME_CONFIG_CFLAGS=""
- 
- 
-- 
cgit v1.2.3