Rename this package to gpgme03, and rename all installed files to include

the '03' suffix, so that this can coexist with the gpgme package.

7 files changed, 183 insertions, 22 deletions

diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 7b988471b27..8038b67d07b 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/02/17 01:52:31 chris Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/11 12:26:28 jmmv Exp $
 #
 
 DISTNAME=	gpgme-0.3.16
+PKGNAME=	${DISTNAME:S/-/03-/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
 
@@ -22,6 +23,4 @@ PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--without-pth --without-pth-test
 .endif
 
-INFO_FILES=		gpgme.info
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gpgme03/PLIST b/security/gpgme03/PLIST
index a57a8289588..b698ecef4a9 100644
--- a/security/gpgme03/PLIST
+++ b/security/gpgme03/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/10 00:22:43 seb Exp $
-bin/gpgme-config
-include/gpgme.h
-lib/libgpgme.a
-lib/libgpgme.la
-lib/libgpgme.so
-lib/libgpgme.so.9
-lib/libgpgme.so.9.7
-share/aclocal/gpgme.m4
+@comment $NetBSD: PLIST,v 1.4 2004/03/11 12:26:28 jmmv Exp $
+bin/gpgme03-config
+include/gpgme03.h
+lib/libgpgme03.a
+lib/libgpgme03.la
+lib/libgpgme03.so
+lib/libgpgme03.so.9
+lib/libgpgme03.so.9.7
+share/aclocal/gpgme03.m4
diff --git a/security/gpgme03/buildlink3.mk b/security/gpgme03/buildlink3.mk
index 063f5246531..109f109b801 100644
--- a/security/gpgme03/buildlink3.mk
+++ b/security/gpgme03/buildlink3.mk
@@ -1,18 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 12:26:28 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GPGME_BUILDLINK3_MK:=	${GPGME_BUILDLINK3_MK}+
+GPGME03_BUILDLINK3_MK:=	${GPGME03_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gpgme
+BUILDLINK_DEPENDS+=	gpgme03
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpgme}
-BUILDLINK_PACKAGES+=	gpgme
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpgme03}
+BUILDLINK_PACKAGES+=	gpgme03
 
-.if !empty(GPGME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpgme+=	gpgme-0.3.[0-9]*
-BUILDLINK_PKGSRCDIR.gpgme?=	../../security/gpgme03
-.endif	# GPGME_BUILDLINK3_MK
+.if !empty(GPGME03_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gpgme03+=	gpgme03>=0.3.16
+BUILDLINK_PKGSRCDIR.gpgme03?=	../../security/gpgme03
+
+BUILDLINK_FILES.gpgme03+=	bin/gpgme03-config
+BUILDLINK_TRANSFORM.gpgme03+=	-e 's|/gpgme03-config|/gpgme-config|g'
+BUILDLINK_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
index f1ebacf59bf..98d4c56e3e8 100644
--- a/security/gpgme03/distinfo
+++ b/security/gpgme03/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2004/02/17 01:52:31 chris Exp $
+$NetBSD: distinfo,v 1.3 2004/03/11 12:26:28 jmmv Exp $
 
 SHA1 (gpgme-0.3.16.tar.gz) = a59a48e920eb01b4f3af57f8f02fbedfaa63b0a9
 Size (gpgme-0.3.16.tar.gz) = 679430 bytes
+SHA1 (patch-aa) = faf0cdffd99d648aef82481b935a2cdf4b2d23db
 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
new file mode 100644
index 00000000000..21e1d0381da
--- /dev/null
+++ b/security/gpgme03/patches/patch-aa
@@ -0,0 +1,128 @@
+$NetBSD: patch-aa,v 1.1 2004/03/11 12:26:28 jmmv Exp $
+
+--- gpgme/Makefile.in.orig	2003-11-19 09:55:10.000000000 +0100
++++ 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-ac b/security/gpgme03/patches/patch-ac
new file mode 100644
index 00000000000..1b9cceb3794
--- /dev/null
+++ b/security/gpgme03/patches/patch-ac
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..b2f9b94255d
--- /dev/null
+++ b/security/gpgme03/patches/patch-ad
@@ -0,0 +1,13 @@
+$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=""
+ 
+