gpgme 1.x and 0.3 conflict

[Clement Laforet]

On Mon, 20 Dec 2004 15:41:33 +0100
Michael Nottebrock <michaelnottebrock at gmx.net> wrote:

> On Monday, 20. December 2004 15:11, Clement Laforet wrote:
> 
> > I've made a patch to fix the conflict, but... third apps like
> > sylpheed* need patching. To minimize the amount of patches (just
> > replacing gpgme-config with gpgme03-config), we should move gpgme.h
> > header to${LOCALBASE}/include/gpgpme directory. [lofi's Cc'd for
> > review]
> 
> Not entirely sure what you're proposing, but I'll gladly review any
> patches.

I fixed all file-based conflicts. But there's one more, at compilation
time. Since gpgme is in ${LOCALBASE}/include, gpgme03-config --cflags
output is useless. Instead of changing all gpgme.h includes to
gpgme03/gpgme.h, it's easier to move gpgme.h from {PREFIX}/include to
${PREFIX}/include/gpgme in security/gpgme. So, if all ports rely on
gpgme-config, we just have to patch configure scripts to use
gpgme03-config instead of gpgme-config.

You can find patch for gpgme 1.x here:
http://www.cotds.org/~clement/wip/gpgme-1.x.diff

For gpgme 0.3.x:
http://www.cotds.org/~clement/wip/gpgme-0.3.x.diff

clem
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20041220/7c6b4fe5/attachment.bin