Index: configure
--- configure.orig	2010-10-31 18:13:38.000000000 +0100
+++ configure	2018-01-11 11:08:46.734001000 +0100
@@ -3028,9 +3028,6 @@
 fi
 
 
-if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -Wall -W"
-fi
 
 # Checks for libraries.
 { echo "$as_me:$LINENO: checking for library containing socket" >&5
Index: dlib/src/dnet.c
--- dlib/src/dnet.c.orig	2010-09-21 01:44:48.000000000 +0200
+++ dlib/src/dnet.c	2018-01-11 11:09:10.115027000 +0100
@@ -15,11 +15,11 @@
 #endif
 
 #ifdef HAVE_LIBSSL
-#include <openssl/ssl.h>
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/rand.h>
+#include "openssl/ssl.h"
+#include "openssl/crypto.h"
+#include "openssl/x509.h"
+#include "openssl/pem.h"
+#include "openssl/rand.h"
 #endif
 
 #include "dutil.h"
Index: email.address.template
--- email.address.template.orig	2010-10-31 18:09:15.000000000 +0100
+++ email.address.template	2018-01-11 11:08:46.734128000 +0100
@@ -1,23 +1,10 @@
-# This is the Address book for 'email'
-# Groups should be comma delimited email addresses with 
-# Spaces are allowed, and newline escapes are too. Newline escapes are '\'
-#
-# Example:
-#group: MyGroup = Dean, John, Geekoid \ 
-#                 Scott, Josh, John
-#
-# See? The newline escape char let's you specify stuff on a seperate line.  kinda cool, eh?
-# Have fun!
-#
-
-# These are regular email addresses
-single: Tim               = tim@somedomain.org        #This is me!
-single: Someone            = someone@somedomain.org   #Just someone...
-single: Her                = hot_girl@somedomain.org  #Yeah right...
-single: "Geekoid Software" = software@somedomain.org
-
-# This is my group of friends...
-group: All = Dean, 'Geekoid Software', \
-		Someone, Her
+##
+##  email.address -- Email address book
+##
 
+#single: foo                = foo@example.com           # Mr. Foo
+#single: bar.baz            = bar@example.com           # Mr. Bar
+#single: "Mr. Quux"         = quux@example.com          # Mr. Quux
+#group:  All                = foo, bar.baz \
+#                             'Mr. Quux'
 
Index: email.conf
--- email.conf.orig	2010-10-31 18:09:15.000000000 +0100
+++ email.conf	2018-01-11 11:08:46.734249000 +0100
@@ -1,8 +1,6 @@
-# This is the DEFAULT configuration file for email. 
-#
-# Please CHANGE THE VALUES below to suit your environment.
-# Don't forget to set the shell environment variable EDITOR
-############################################################
+##
+##  email.conf -- Email main configuration
+##
 
 ############################################################
 # SMTP Server and Port number you use
@@ -47,7 +45,7 @@
 # want address book functionality, just comment it out and
 # use regular email addresses.
 ############################################################
-ADDRESS_BOOK = '&/email.address.template'
+#ADDRESS_BOOK = '&/email.address'
 
 ############################################################
 # If you would like to have a copy Of your final email saved
@@ -76,7 +74,7 @@
 # just putting "gpg" will suffice if GPG is in your PATH
 # environment variable path.
 ############################################################
-# GPG_BIN = '/usr/bin/gpg'
+# GPG_BIN = '@l_prefix@/bin/gpg'
 
 ###########################################################
 # You can bypass email asking you for a password for gpg
Index: email.sig
--- email.sig.orig	2010-10-31 18:09:15.000000000 +0100
+++ email.sig	2018-01-11 11:08:46.734345000 +0100
@@ -1,7 +1,5 @@
 
 --
-Sent using Email %v
-http://www.cleancode.org/projects/email
-
-Sent on: %c
-On System: %h
+Time:   %c
+Agent:  OpenPKG's Email %v
+System: %h
Index: install.sh
--- install.sh.orig	2010-10-31 18:09:15.000000000 +0100
+++ install.sh	2018-01-11 11:08:46.734463000 +0100
@@ -251,16 +251,5 @@
     exit 2
 fi
 
-echo " Success!"
-cat << EOF
-
-#######################################################
-# Done installing E-Mail client.                      #
-# Please read README for information on setup and use.#
-#                                                     #
-# If you have any questions or concerns...            #
-# Please e-mail: software@cleancode.org               #
-#######################################################
-EOF