Ticket #38091: alpine-2.11_patch.diff

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                alpine
-version             2.00
-revision            4
+version             2.11
+revision            0
 categories          mail
 license             Apache-2
 maintainers         nomaintainer
 platforms           darwin
 
-homepage            http://www.washington.edu/alpine/
+homepage            http://patches.freeiz.com/alpine/release/
 description         alpine - a Program for Internet News and Email
 long_description    Alpine is a tool for reading, sending, and \
                     managing electronic messages that was designed \
                     with novice users in mind.
 
-master_sites        ftp://ftp.cac.washington.edu/alpine/ \
-                    ftp://ftp.cac.washington.edu/alpine/old/
-use_bzip2           yes
-checksums           md5 84e44cbf71ed674800a5d57eed9c1c52
+master_sites        http://patches.freeiz.com/alpine/release/src/
+use_lzma            yes
+checksums           md5 0eeea91bf9123ebdc004e0395406d984
 
-patchfiles          patch-Makefile.in.diff \
-                    patch-configure.diff \
+patchfiles          patch-configure.diff \
                     patch-imap_Makefile.diff
 patch.pre_args      -p1
 if {${os.platform} == "darwin" && ${os.major} >= 10} {
     patchfiles-append   alpine-osx-10.6.patch
 }
 post-patch {
-    reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/imap/Makefile
+    reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/imap/Makefile
 }
 
 default_variants    +without_tcl

files/patch-configure.diff

@@ -1 @@
---- alpine-2.00/configure.orig  2010-07-16 16:29:48.000000000 -0600
-+++ alpine-2.00/configure       2010-07-16 16:29:59.000000000 -0600
-@@ -25435,7 +25435,7 @@
- if test "$ac_res" != no; then
+--- alpine-2.11/configure.orig  2013-09-14 20:37:28.000000000 +0200
++++ alpine-2.11/configure       2013-09-14 20:38:07.000000000 +0200
+@@ -16720,7 +16720,7 @@
+ if test "$ac_res" != no; then :
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
 -      LIBS="$LIBS -lssl"
 +      LIBS="$LIBS -lssl -lcrypto"
  
- fi
- 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
+ $as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }

files/patch-imap_Makefile.diff

@@ -1 @@
---- alpine-2.00/imap/Makefile.orig      2008-06-05 04:43:35.000000000 +1000
-+++ alpine-2.00/imap/Makefile   2012-06-18 05:05:25.000000000 +1000
-@@ -419,12 +419,12 @@
+--- alpine-2.11/imap/Makefile.orig      2013-09-14 20:40:50.000000000 +0200
++++ alpine-2.11/imap/Makefile   2013-09-14 20:47:27.000000000 +0200
+@@ -421,7 +421,7 @@
         $(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
         PASSWDTYPE=pam \
         EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \
 -       SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/System/Library/OpenSSL/certs SSLKEYS=/System/Library/OpenSSL/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam"
 +       SPECIALS="SSLINCLUDE=__PREFIX__/include/openssl SSLLIB=__PREFIX__/lib GSSINCLUDE=__PREFIX__/include GSSLIB=__PREFIX__/lib PAMDLFLAGS=-lpam"
  
+ oxs:   an
+        $(TOUCH) ip6
+@@ -432,7 +432,7 @@
  osx:   osxok an
         $(TOUCH) ip6
         $(BUILD) BUILDTYPE=$@ IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \