Update to latest version and get rid of some patches, ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.113
diff -u -p -r1.113 Makefile
--- Makefile 26 Sep 2017 17:30:37 -0000 1.113
+++ Makefile 24 Oct 2017 07:48:57 -0000
@@ -3,9 +3,8 @@
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
-V= 4.18.0
+V= 4.18.2
DISTNAME= courier-imap-${V}
-REVISION= 1
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
FULLPKGPATH-pop3= mail/courier-imap,-pop3
@@ -32,8 +31,6 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf automake
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
-# only libs/rfc822/configure.ac is patched
-AUTOCONF_DIR= ${WRKSRC} ${WRKSRC}/libs/rfc822
# AM_PROG_LIBTOOL, aclocal is run during build
BUILD_DEPENDS += devel/libtool
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/courier-imap/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 4 Aug 2017 23:15:45 -0000 1.25
+++ distinfo 24 Oct 2017 07:46:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-imap-4.18.0.tar.bz2) =
+owuO3EpXJ+hJN+tNQ9ogmPd9/KxVwny1E0PlyLefFI=
-SIZE (courier-imap-4.18.0.tar.bz2) = 3202389
+SHA256 (courier-imap-4.18.2.tar.bz2) =
9mzto+WqhT4T9BcwLfuDsxJwnpXxu82vzWIU12qU55o=
+SIZE (courier-imap-4.18.2.tar.bz2) = 3205230
Index: patches/patch-libs_rfc822_configure_ac
===================================================================
RCS file: patches/patch-libs_rfc822_configure_ac
diff -N patches/patch-libs_rfc822_configure_ac
--- patches/patch-libs_rfc822_configure_ac 26 Sep 2017 17:30:37 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-libs_rfc822_configure_ac,v 1.1 2017/09/26 17:30:37 giovanni
Exp $
-
-Index: libs/rfc822/configure.ac
---- libs/rfc822/configure.ac.orig
-+++ libs/rfc822/configure.ac
-@@ -64,23 +64,13 @@ AC_CACHE_CHECK([how to calculate alternate timezone],l
- AC_TRY_COMPILE([
- #include <time.h>
- ],[
--int main()
--{
- time_t t=altzone;
--
-- return (0);
--}
- ], librfc822_cv_SYS_TIMEZONE=altzone,
-
- AC_TRY_COMPILE([
- #include <time.h>
- ],[
--int main()
--{
- int n=daylight;
--
-- return (0);
--}
- ], librfc822_cv_SYS_TIMEZONE=daylight,
-
- AC_TRY_COMPILE([
-@@ -88,12 +78,7 @@ int n=daylight;
-
- extern struct tm dummy;
- ],[
--int main()
--{
- long n=dummy.tm_gmtoff;
--
-- return (0);
--}
- ] ,librfc822_cv_SYS_TIMEZONE=tm_gmtoff,
- librfc822_cv_SYS_TIMEZONE=unknown
- )
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/maildrop/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 29 Sep 2017 22:05:30 -0000 1.67
+++ Makefile 24 Oct 2017 07:50:14 -0000
@@ -3,8 +3,7 @@
COMMENT-main= mail delivery agent with filtering abilities
COMMENT-utils= quota tools for the Courier mail suite
-V= 2.9.0
-REVISION= 0
+V= 2.9.2
DISTNAME= maildrop-$V
PKGNAME-main= maildrop-$V
FULLPKGNAME-utils= courier-utils-$V
@@ -29,8 +28,6 @@ COMPILER = gcc
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
-# only libs/rfc822/configure.ac is patched
-AUTOCONF_DIR= ${WRKSRC}/libs/rfc822
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="${CFLAGS:C/ *$//} -I${LOCALBASE}/include" \
@@ -106,12 +103,6 @@ DOCFILES= README \
libs/maildir/README.sharedfolders.txt \
libs/maildir/README.maildirquota.txt \
libs/maildir/quotawarnmsg
-
-# avoid triggering autotools cascade after patching configure.ac
-pre-configure:
- @for d in ${AUTOCONF_DIR}; do \
- touch -r $$d/aclocal.m4 $$d/configure.ac; \
- done
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/maildrop
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/maildrop/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 4 Aug 2017 23:17:27 -0000 1.21
+++ distinfo 24 Oct 2017 07:50:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (maildrop-2.9.0.tar.bz2) = bxstuCKjTYJW2cwqAR5aLGt+bdAe1miBzW/Ob061mBw=
-SIZE (maildrop-2.9.0.tar.bz2) = 2075698
+SHA256 (maildrop-2.9.2.tar.bz2) = WZNB5jt+Qwy3GaEpX40qlIzp7U/c/mfgUgPPJ3J858U=
+SIZE (maildrop-2.9.2.tar.bz2) = 2078713
Index: patches/patch-libs_rfc822_configure_ac
===================================================================
RCS file: patches/patch-libs_rfc822_configure_ac
diff -N patches/patch-libs_rfc822_configure_ac
--- patches/patch-libs_rfc822_configure_ac 26 Sep 2017 17:37:51 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-libs_rfc822_configure_ac,v 1.1 2017/09/26 17:37:51 giovanni
Exp $
-
-Index: libs/rfc822/configure.ac
---- libs/rfc822/configure.ac.orig
-+++ libs/rfc822/configure.ac
-@@ -64,23 +64,13 @@ AC_CACHE_CHECK([how to calculate alternate timezone],l
- AC_TRY_COMPILE([
- #include <time.h>
- ],[
--int main()
--{
- time_t t=altzone;
--
-- return (0);
--}
- ], librfc822_cv_SYS_TIMEZONE=altzone,
-
- AC_TRY_COMPILE([
- #include <time.h>
- ],[
--int main()
--{
- int n=daylight;
--
-- return (0);
--}
- ], librfc822_cv_SYS_TIMEZONE=daylight,
-
- AC_TRY_COMPILE([
-@@ -88,12 +78,7 @@ int n=daylight;
-
- extern struct tm dummy;
- ],[
--int main()
--{
- long n=dummy.tm_gmtoff;
--
-- return (0);
--}
- ] ,librfc822_cv_SYS_TIMEZONE=tm_gmtoff,
- librfc822_cv_SYS_TIMEZONE=unknown
- )
