Index: mail/anubis/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/anubis/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- mail/anubis/Makefile	11 Dec 2004 05:31:21 -0000	1.22
+++ mail/anubis/Makefile	20 Dec 2004 20:42:35 -0000
@@ -31,7 +31,8 @@
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=		MAKEINFO="makeinfo --no-split" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=		MAKEINFO="makeinfo --no-split" LDFLAGS="${LDFLAGS}" \
+			CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}"
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
@@ -57,7 +58,8 @@
 .if defined(WITHOUT_GPGME)
 CONFIGURE_ARGS+=	--without-gpgme
 .else
-LIB_DEPENDS+=		gpgme:${PORTSDIR}/security/gpgme03
+LIB_DEPENDS+=		gpgme03.9:${PORTSDIR}/security/gpgme03
+CFLAGS+=		-I${LOCALBASE}/include/gpgme03
 .endif
 
 # PCRE
Index: mail/anubis/files/patch-configure
===================================================================
RCS file: mail/anubis/files/patch-configure
diff -N mail/anubis/files/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mail/anubis/files/patch-configure	20 Dec 2004 20:34:23 -0000
@@ -0,0 +1,28 @@
+--- configure.orig	Mon Dec 20 20:32:43 2004
++++ configure	Mon Dec 20 20:34:13 2004
+@@ -8603,13 +8603,13 @@
+ 
+ else
+ 
+-echo "$as_me:$LINENO: checking for main in -lgpgme" >&5
+-echo $ECHO_N "checking for main in -lgpgme... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for main in -lgpgme03" >&5
++echo $ECHO_N "checking for main in -lgpgme03... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpgme_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgpgme  $LIBS"
++LIBS="-lgpgme03  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -8656,7 +8656,7 @@
+ #define HAVE_LIBGPGME 1
+ _ACEOF
+ 
+-  LIBS="-lgpgme $LIBS"
++  LIBS="-lgpgme03 $LIBS"
+ 
+ else
+   with_gpgme=no
Index: mail/sylpheed/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/sylpheed/Makefile,v
retrieving revision 1.92
diff -u -r1.92 Makefile
--- mail/sylpheed/Makefile	19 Dec 2004 20:04:43 -0000	1.92
+++ mail/sylpheed/Makefile	20 Dec 2004 20:45:16 -0000
@@ -55,7 +55,7 @@
 CONFIGURE_ARGS+=--disable-gdk-pixbuf
 .endif
 .if defined(WITH_GPGME)
-LIB_DEPENDS+=	gpgme.9:${PORTSDIR}/security/gpgme03
+LIB_DEPENDS+=	gpgme03.9:${PORTSDIR}/security/gpgme03
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
 CONFIGURE_ARGS+=--enable-gpgme
 .else
@@ -106,7 +106,8 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
+		s|-lresolv||g; s|-lpisock\"|-liconv &|g; \
+		s|gpgme-config|gpgme03-config|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|mime\.types|sylpheed-mime\.types|g' \
 		${WRKSRC}/src/procmime.c
 
Index: mail/sylpheed-claws/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/sylpheed-claws/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- mail/sylpheed-claws/Makefile	18 Dec 2004 16:37:35 -0000	1.61
+++ mail/sylpheed-claws/Makefile	20 Dec 2004 20:49:22 -0000
@@ -123,7 +123,7 @@
 .endif
 .if defined(WITH_GPGME) || defined(WITH_ALL)
 PLIST_SUB+=            GPGME=""
-LIB_DEPENDS+=          gpgme.9:${PORTSDIR}/security/gpgme03
+LIB_DEPENDS+=          gpgme03.9:${PORTSDIR}/security/gpgme03
 RUN_DEPENDS+=          gpg:${PORTSDIR}/security/gnupg
 .else
 PLIST_SUB+=           GPGME="@comment "
@@ -170,7 +170,8 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
+		's|-lresolv||g; s|-lpisock\"|-liconv &|g ;\
+		s|gpgme-config|gpgme03-config|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
 	@${REINPLACE_CMD} -e "s|po intl src|po src|" ${WRKSRC}/Makefile.in
Index: mail/sylpheed-gtk2/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/sylpheed-gtk2/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- mail/sylpheed-gtk2/Makefile	19 Dec 2004 20:11:12 -0000	1.20
+++ mail/sylpheed-gtk2/Makefile	20 Dec 2004 21:16:51 -0000
@@ -44,7 +44,7 @@
 .endif
 
 .if defined(WITH_GPGME)
-LIB_DEPENDS+=		gpgme.9:${PORTSDIR}/security/gpgme03
+LIB_DEPENDS+=		gpgme03.9:${PORTSDIR}/security/gpgme03
 RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
 CONFIGURE_ARGS+=	--enable-gpgme
 .endif
@@ -71,7 +71,8 @@
 		's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
 		 s|-lresolv||g; s|-lpisock\"|-liconv &|g; \
 		 s|^manualdir=.*|manualdir="${DOCSDIR}/manual"|g; \
-		 s|^faqdir=.*|faqdir="${DOCSDIR}/faq"|g' \
+		 s|^faqdir=.*|faqdir="${DOCSDIR}/faq"|g ;\
+		 s|gpgme-config|gpgme03-config|g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po src manual faq$$|SUBDIRS = ac po src|g' \
Index: mail/elmo/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/elmo/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- mail/elmo/Makefile	19 Dec 2004 20:11:12 -0000	1.12
+++ mail/elmo/Makefile	20 Dec 2004 21:17:38 -0000
@@ -29,8 +29,8 @@
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
-LIB_DEPENDS+=	gpgme:${PORTSDIR}/security/gpgme03
+.if exists(${LOCALBASE}/lib/libgpgme03.so) || defined(WITH_GPGME)
+LIB_DEPENDS+=	gpgme03:${PORTSDIR}/security/gpgme03
 .else
 pre-everything::
 	@${ECHO_CMD}
Index: mail/elmo-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/elmo-devel/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- mail/elmo-devel/Makefile	19 Dec 2004 20:11:12 -0000	1.14
+++ mail/elmo-devel/Makefile	20 Dec 2004 21:18:47 -0000
@@ -33,8 +33,8 @@
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
-LIB_DEPENDS+=	gpgme:${PORTSDIR}/security/gpgme03
+.if exists(${LOCALBASE}/lib/libgpgme03.so) || defined(WITH_GPGME)
+LIB_DEPENDS+=	gpgme03:${PORTSDIR}/security/gpgme03
 .else
 pre-everything::
 	@${ECHO_CMD}
Index: net/ayttm/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ayttm/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- net/ayttm/Makefile	11 Dec 2004 05:31:21 -0000	1.37
+++ net/ayttm/Makefile	20 Dec 2004 21:22:10 -0000
@@ -18,7 +18,7 @@
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		jasper.4:${PORTSDIR}/graphics/jasper \
-		gpgme.9:${PORTSDIR}/security/gpgme03 \
+		gpgme03.9:${PORTSDIR}/security/gpgme03 \
 		pspell.16:${PORTSDIR}/textproc/aspell
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
@@ -79,7 +79,8 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		 s|-pthread|${PTHREAD_CFLAGS:S/"//g}|g' ${WRKSRC}/configure
+		 s|-pthread|${PTHREAD_CFLAGS:S/"//g}|g; \
+		 s|gpgme-config|gpgme03-config|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|= pixmaps|=|g ; \
 		 s|^Utilities|#Utilities|g ; \
 		 s|^gnome|#gnome|g' ${WRKSRC}/Makefile.in
Index: security/cryptplug/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/cryptplug/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- security/cryptplug/Makefile	18 Dec 2004 19:43:33 -0000	1.12
+++ security/cryptplug/Makefile	20 Dec 2004 21:26:44 -0000
@@ -15,11 +15,16 @@
 MAINTAINER=	lofi@freebsd.org
 COMMENT=	A collection of plug-ins to cryptographic engines
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgpgme.so.9:${PORTSDIR}/security/gpgme03 \
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgpgme03.so.9:${PORTSDIR}/security/gpgme03 \
 		gpg-agent:${PORTSDIR}/security/gnupg-devel
 
 USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} 's/gpgme-config/gpgme03-config/g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: security/seahorse/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/seahorse/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- security/seahorse/Makefile	11 Dec 2004 05:33:49 -0000	1.29
+++ security/seahorse/Makefile	20 Dec 2004 21:28:40 -0000
@@ -18,7 +18,7 @@
 
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	gpgme.9:${PORTSDIR}/security/gpgme03
+LIB_DEPENDS=	gpgme03.9:${PORTSDIR}/security/gpgme03
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -31,7 +31,8 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		s|DATADIRNAME=lib|DATADIRNAME=share|g; \
+		s|gpgme-config|gpgme03-config|' ${WRKSRC}/configure
 	@${CP} ${WRKSRC}/data/seahorse.schemas.in ${WRKSRC}/data/seahorse.schemas
 
 .include <bsd.port.mk>
Index: security/ruby-gpgme/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/ruby-gpgme/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- security/ruby-gpgme/Makefile	11 Dec 2004 05:31:21 -0000	1.3
+++ security/ruby-gpgme/Makefile	20 Dec 2004 21:32:39 -0000
@@ -16,7 +16,7 @@
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby interface to GnuPG Made Easy (GPGME)
 
-LIB_DEPENDS=	gpgme.9:${PORTSDIR}/security/gpgme03
+LIB_DEPENDS=	gpgme03.9:${PORTSDIR}/security/gpgme03
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
Index: security/ruby-gpgme/files/patch-extconf.rb
===================================================================
RCS file: security/ruby-gpgme/files/patch-extconf.rb
diff -N security/ruby-gpgme/files/patch-extconf.rb
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/ruby-gpgme/files/patch-extconf.rb	20 Dec 2004 21:37:00 -0000
@@ -0,0 +1,9 @@
+--- extconf.rb.orig	Mon Dec 20 21:35:54 2004
++++ extconf.rb	Mon Dec 20 21:36:21 2004
+@@ -1,5 +1,5 @@
+ require 'mkmf'
+ 
+-if have_library('gpgme', 'gpgme_check_version') and have_header('gpgme.h')
++if have_library('gpgme03', 'gpgme_check_version') and have_header('gpgme03/gpgme.h')
+   create_makefile ('gpgme_n')
+ end
Index: security/ruby-gpgme/files/patch-gpgme_n.c
===================================================================
RCS file: security/ruby-gpgme/files/patch-gpgme_n.c
diff -N security/ruby-gpgme/files/patch-gpgme_n.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/ruby-gpgme/files/patch-gpgme_n.c	20 Dec 2004 21:39:09 -0000
@@ -0,0 +1,11 @@
+--- gpgme_n.c.orig	Mon Dec 20 21:38:14 2004
++++ gpgme_n.c	Mon Sep 29 21:35:59 2003
+@@ -34,7 +34,7 @@
+    this purpose.  */
+ 
+ #include "ruby.h"
+-#include "gpgme.h"
++#include "gpgme03/gpgme.h"
+ 
+ /* StringValuePtr is not available in 1.6. */
+ #ifndef StringValuePtr
Index: security/gpgme03/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gpgme03/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- security/gpgme03/Makefile	17 Dec 2004 08:07:07 -0000	1.24
+++ security/gpgme03/Makefile	20 Dec 2004 20:27:20 -0000
@@ -24,9 +24,13 @@
 
 USE_INC_LIBTOOL_VER=13
 USE_GMAKE=	yes
+USE_AUTOCONF_VER=	259
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	YES
 
-INFO=	gpgme
+INFO=	gpgme03
+
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/gpgme03
 
 .include <bsd.port.pre.mk>
 
@@ -40,4 +44,10 @@
 CONFIGURE_ARGS+=	--without-gpgsm
 .endif
 
+post-patch:
+.for i in tests tests/gpg tests/gpgsm
+	@${REINPLACE_CMD} -e 's/libgpgme.la/libgpgme03.la/' \
+		${WRKSRC}/${i}/Makefile.in
+.endfor
+
 .include <bsd.port.post.mk>
Index: security/gpgme03/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/gpgme03/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- security/gpgme03/pkg-plist	6 Jan 2004 14:18:02 -0000	1.7
+++ security/gpgme03/pkg-plist	20 Dec 2004 20:27:20 -0000
@@ -1,6 +1,7 @@
-bin/gpgme-config
-include/gpgme.h
-lib/libgpgme.a
-lib/libgpgme.so
-lib/libgpgme.so.9
-share/aclocal/gpgme.m4
+bin/gpgme03-config
+include/gpgme03/gpgme.h
+lib/libgpgme03.a
+lib/libgpgme03.so
+lib/libgpgme03.so.9
+share/aclocal/gpgme03.m4
+@dirrm include/gpgme03
Index: security/gpgme03/files/patch-configure.ac
===================================================================
RCS file: security/gpgme03/files/patch-configure.ac
diff -N security/gpgme03/files/patch-configure.ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/gpgme03/files/patch-configure.ac	20 Dec 2004 20:27:20 -0000
@@ -0,0 +1,11 @@
+--- configure.ac.orig	Mon Dec 20 10:46:39 2004
++++ configure.ac	Mon Dec 20 10:47:30 2004
+@@ -246,7 +246,7 @@
+ GNUPG_FIX_HDR_VERSION(gpgme/gpgme.h, GPGME_VERSION)
+ 
+ dnl Substitution used for gpgme-config 
+-GPGME_CONFIG_LIBS="-lgpgme"
++GPGME_CONFIG_LIBS="-lgpgme03"
+ GPGME_CONFIG_CFLAGS=""
+ AC_SUBST(GPGME_CONFIG_LIBS)
+ AC_SUBST(GPGME_CONFIG_CFLAGS)
Index: security/gpgme03/files/patch-doc:Makefile.in
===================================================================
RCS file: security/gpgme03/files/patch-doc:Makefile.in
diff -N security/gpgme03/files/patch-doc:Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/gpgme03/files/patch-doc:Makefile.in	20 Dec 2004 20:27:20 -0000
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	Wed Nov 19 09:55:09 2003
++++ doc/Makefile.in	Mon Dec 20 12:32:30 2004
+@@ -398,7 +398,7 @@
+ 	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
+                        $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+ 	    if test -f $$ifile; then \
+-	      relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
++	      relfile=`echo "$$ifile" | sed 's|^.*/||;s|gpgme|gpgme03|'`; \
+ 	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
+ 	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
+ 	    else : ; fi; \
+@@ -409,7 +409,7 @@
+ 	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+ 	  list='$(INFO_DEPS)'; \
+ 	  for file in $$list; do \
+-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
++	    relfile=`echo "$$file" | sed 's|^.*/||;s|gpgme|gpgme03|'`; \
+ 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
+ 	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\
+ 	  done; \
Index: security/gpgme03/files/patch-doc:gpgme.info
===================================================================
RCS file: security/gpgme03/files/patch-doc:gpgme.info
diff -N security/gpgme03/files/patch-doc:gpgme.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/gpgme03/files/patch-doc:gpgme.info	20 Dec 2004 20:27:20 -0000
@@ -0,0 +1,11 @@
+--- doc/gpgme.info.orig	Mon Dec 20 12:37:07 2004
++++ doc/gpgme.info	Mon Dec 20 12:37:25 2004
+@@ -2,7 +2,7 @@
+ 
+ INFO-DIR-SECTION GNU Libraries
+ START-INFO-DIR-ENTRY
+-* GPGME: (gpgme).          Adding support for cryptography to your program.
++* GPGME: (gpgme03).          Adding support for cryptography to your program.
+ END-INFO-DIR-ENTRY
+ 
+    This file documents the GPGME library.
Index: security/gpgme03/files/patch-gpgme:Makefile.in
===================================================================
RCS file: security/gpgme03/files/patch-gpgme:Makefile.in
diff -N security/gpgme03/files/patch-gpgme:Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/gpgme03/files/patch-gpgme:Makefile.in	20 Dec 2004 20:27:20 -0000
@@ -0,0 +1,47 @@
+--- gpgme/Makefile.in.orig	Wed Nov 19 09:55:10 2003
++++ gpgme/Makefile.in	Mon Dec 20 14:34:26 2004
+@@ -175,7 +175,7 @@
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = gpgme.m4
+ include_HEADERS = gpgme.h
+-lib_LTLIBRARIES = libgpgme.la
++lib_LTLIBRARIES = libgpgme03.la
+ 
+ libgpgme_la_LDFLAGS = -version-info \
+       @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
+@@ -277,7 +277,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++	$(AM_LDFLAGS) $(LDFLAGS) -o libgpgme03.la
+ DIST_SOURCES = $(am__libgpgme_la_SOURCES_DIST)
+ DATA = $(m4data_DATA)
+ 
+@@ -327,7 +327,7 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-libgpgme.la: $(libgpgme_la_OBJECTS) $(libgpgme_la_DEPENDENCIES) 
++libgpgme03.la: $(libgpgme_la_OBJECTS) $(libgpgme_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libgpgme_la_LDFLAGS) $(libgpgme_la_OBJECTS) $(libgpgme_la_LIBADD) $(LIBS)
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+@@ -336,7 +336,7 @@
+ 	@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 's|^.*/||;s|gpgme|gpgme03|'`; \
+ 	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
+ 	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+ 	  else :; fi; \
+@@ -450,7 +450,7 @@
+ 	$(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|^.*/||;s/gpgme/gpgme03/'`"; \
+ 	  echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \
+ 	  $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \
+ 	done