Ticket #11531: gnupg2-1.9.20_to_2.0.2.diff

File gnupg2-1.9.20_to_2.0.2.diff, 4.9 KB (added by boeyms@…, 18 years ago)
  • mail/gnupg2/Portfile

    diff -Naur dports/mail/gnupg2/Portfile dports-devel/mail/gnupg2/Portfile
    old new  
    22
    33PortSystem      1.0
    44name            gnupg2
    5 version         1.9.20
     5version         2.0.2
    66categories      mail security
    77maintainers     waqar@macports.org
    88description     GNU pretty-good-privacy package
     
    1919                ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
    2020
    2121use_bzip2       yes
    22 checksums       ${distfiles} md5 93899203fc0530f03e146d49b65c1e28
     22checksums       ${distfiles} md5 9f972c78135a7dea1bae66bb9f263980 \
     23                             sha1 1a3165c5b601f3244b8885143d02bea4210495e3 \
     24                             rmd160 6cc52da761927e17842842c00598c4974208affa
    2325
    2426configure.env   CPPFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
    25 configure.args  --mandir=${prefix}/share/man            \
    26                 --infodir=${prefix}/share/info          \
    27                 --disable-asm --disable-dynload         \
    28                 --enable-gpg --disable-agent            \
    29                 --with-libiconv-prefix=${prefix}        \
    30                 --with-libintl-prefix=${prefix}         \
    31                 --with-zlib=${prefix}                   \
    32                 --with-bzip2=${prefix}
     27configure.args  --disable-agent
    3328
    3429depends_lib     port:libiconv           \
    3530                port:gettext            \
     
    4237                port:libgpg-error       \
    4338                port:pth
    4439
    45 patchfiles      patch-g10_Makefile.in patch-tools_Makefile.in
     40patchfiles      patch-configure
    4641
    4742test.run        yes
    48 test.dir        ${worksrcpath}/checks
     43test.dir        ${worksrcpath}/tests
    4944test.target     check
    5045
    51 variant darwin {
     46platform darwin {
    5247        configure.env-append    MACOSX_DEPLOYMENT_TARGET=10.3
    5348        build.env-append                MACOSX_DEPLOYMENT_TARGET=10.3
    5449}
     
    5752        configure.env-delete    LDFLAGS="-L${prefix}/lib"
    5853        configure.env-append    LDFLAGS="-L${prefix}/lib -framework IOKit"
    5954}
    60 
    61 platform darwin 8 {
    62         patchfiles-append       patch-tools_gpgparsemail.c
    63 }
    64 
    65 platform sunos  {
    66         configure.args-delete --disable-asm --disable-dynload
    67 }
    68 
    69 post-destroot   {
    70         file delete -force ${destroot}${prefix}/share/info/dir \
    71                 ${destroot}${prefix}/share/locale/locale.alias \
    72                 ${destroot}${prefix}/lib/charset.alias
    73 }
    74 
  • mail/gnupg2/files/patch-configure

    diff -Naur dports/mail/gnupg2/files/patch-configure dports-devel/mail/gnupg2/files/patch-configure
    old new  
     1--- configure   2007-01-31 14:09:31.000000000 +0000
     2+++ configure.new       2007-02-16 14:06:34.000000000 +0000
     3@@ -557,7 +557,7 @@
     4 SHELL=${CONFIG_SHELL-/bin/sh}
     5 
     6 # Identity of this package.
     7-PACKAGE_NAME='gnupg'
     8+PACKAGE_NAME='gnupg2'
     9 PACKAGE_TARNAME='gnupg'
     10 PACKAGE_VERSION='2.0.2'
     11 PACKAGE_STRING='gnupg 2.0.2'
  • mail/gnupg2/files/patch-g10_Makefile.in

    diff -Naur dports/mail/gnupg2/files/patch-g10_Makefile.in dports-devel/mail/gnupg2/files/patch-g10_Makefile.in
    old new  
    1 --- g10/Makefile.in.orig        2005-12-20 02:49:33.000000000 -0700
    2 +++ g10/Makefile.in     2006-03-22 02:09:45.000000000 -0700
    3 @@ -446,7 +446,7 @@
    4  #             ks-db.c \
    5  #             ks-db.h \
    6  #             $(common_source)
    7 -LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@
    8 +LDADD = $(needed_libs) @PTH_LIBS@ @LIBINTL@ @CAPLIBS@ @W32LIBS@
    9  gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error
    10  gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error
    11  all: all-am
  • mail/gnupg2/files/patch-tools_Makefile.in

    diff -Naur dports/mail/gnupg2/files/patch-tools_Makefile.in dports-devel/mail/gnupg2/files/patch-tools_Makefile.in
    old new  
    1 --- tools/Makefile.in.orig      2005-12-20 02:49:35.000000000 -0700
    2 +++ tools/Makefile.in   2006-03-22 02:10:44.000000000 -0700
    3 @@ -406,7 +406,8 @@
    4  gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
    5  gpg_connect_agent_LDADD = ../jnlib/libjnlib.a \
    6                            ../common/libcommon.a ../gl/libgnu.a \
    7 -                          $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
    8 +                          $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
    9 +                          $(PTH_LIBS)
    10  
    11  gpgkey2ssh_SOURCES = gpgkey2ssh.c
    12  gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
  • mail/gnupg2/files/patch-tools_gpgparsemail.c

    diff -Naur dports/mail/gnupg2/files/patch-tools_gpgparsemail.c dports-devel/mail/gnupg2/files/patch-tools_gpgparsemail.c
    old new  
    1 --- tools/gpgparsemail.c.orig   2005-12-14 03:45:28.000000000 -0700
    2 +++ tools/gpgparsemail.c        2006-03-22 14:29:47.000000000 -0700
    3 @@ -145,6 +145,7 @@
    4    return p;
    5  }
    6  
    7 +#if 0
    8  static char *
    9  stpcpy (char *a,const char *b)
    10  {
    11 @@ -154,6 +155,7 @@
    12    
    13    return (char*)a;
    14  }
    15 +#endif
    16  
    17  
    18  static int