update to 2.9.2, remove a patch committed upstream

This commit is contained in:
giovanni 2017-10-31 07:46:37 +00:00
parent 706b262625
commit 536d0d84e6
3 changed files with 4 additions and 55 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.67 2017/09/29 22:05:30 naddy Exp $
# $OpenBSD: Makefile,v 1.68 2017/10/31 07:46:37 giovanni Exp $
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" \
@ -107,12 +104,6 @@ DOCFILES= README \
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
.for f in ${DOCFILES}

View File

@ -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

View File

@ -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
)