cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix update to 5.17

Browse Source 
switch to devel/pcre2
This commit is contained in:
giovanni 2022-03-06 10:53:45 +00:00
parent 979b0213ec
commit acb79d7578
7 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/courier-imap/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.124 2021/12/14 07:51:25 giovanni Exp $
# $OpenBSD: Makefile,v 1.125 2022/03/06 10:53:45 giovanni Exp $
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
V= 5.1.4
V= 5.1.7
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
@ -23,9 +23,9 @@ PERMIT_PACKAGE= Yes
COMPILER = base-clang ports-gcc
WANTLIB= c courierauth courierauthcommon courierauthsasl courier-unicode
WANTLIB+= gdbm iconv intl idn m pcre ${COMPILER_LIBCXX}
WANTLIB+= gdbm iconv intl idn m pcre2-8 ${COMPILER_LIBCXX}
WANTLIB-pop3= c courierauth courierauthcommon courierauthsasl courier-unicode
WANTLIB-pop3+= iconv intl idn m pcre ${COMPILER_LIBCXX}
WANTLIB-pop3+= iconv intl idn m pcre2-8 ${COMPILER_LIBCXX}
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
@ -45,7 +45,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
LIB_DEPENDS= mail/courier-authlib \
devel/libidn \
devel/pcre
devel/pcre2
EXAMPLE_DIR= ${PREFIX}/share/examples/courier
SYSCONFDIR= /etc/courier

4
mail/courier-imap/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (courier-imap-5.1.4.tar.bz2) = 5vMPD63U/OLlXBIYG6hDNL1fvE1F8JQZBwpQ0hnaAWc=
SIZE (courier-imap-5.1.4.tar.bz2) = 3363196
SHA256 (courier-imap-5.1.7.tar.bz2) = vzd1RCWZPXsVsucrCvYGHkHTILxZjJxi4IbWUPcRUt8=
SIZE (courier-imap-5.1.7.tar.bz2) = 3364221

3
mail/courier-imap/patches/patch-Makefile_in
View File

@ -1,8 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.9 2019/06/19 21:59:01 giovanni Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -416,10 +416,10 @@ CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_
@@ -417,10 +417,10 @@ CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_
databindir = $(datadir)
databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \

3
mail/courier-imap/patches/patch-libs_maildir_Makefile_in
View File

@ -1,8 +1,7 @@
$OpenBSD: patch-libs_maildir_Makefile_in,v 1.5 2021/12/14 07:51:25 giovanni Exp $
Index: libs/maildir/Makefile.in
--- libs/maildir/Makefile.in.orig
+++ libs/maildir/Makefile.in
@@ -634,7 +634,7 @@ clean-noinstLTLIBRARIES:
@@ -636,7 +636,7 @@ clean-noinstLTLIBRARIES:
}
libmaildir.la: $(libmaildir_la_OBJECTS) $(libmaildir_la_DEPENDENCIES) $(EXTRA_libmaildir_la_DEPENDENCIES)

30
mail/courier-imap/patches/patch-libs_maildir_configure
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-libs_maildir_configure,v 1.5 2021/12/14 07:51:25 giovanni Exp $
Index: libs/maildir/configure
--- libs/maildir/configure.orig
+++ libs/maildir/configure
@@ -17342,7 +17342,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
-for ac_header in sys/stat.h sys/wait.h fcntl.h unistd.h sysexits.h utime.h pcre.h pcre/pcre.h
+for ac_header in sys/stat.h sys/wait.h fcntl.h unistd.h sysexits.h utime.h pcre.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -17360,16 +17360,6 @@ ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv
if test "x$ac_cv_header_pcre_h" = xyes; then :
LIBPCRE=-lpcre
fi
-
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "pcre/pcre.h" "ac_cv_header_pcre_pcre_h" "$ac_includes_default"
-if test "x$ac_cv_header_pcre_pcre_h" = xyes; then :
- LIBPCRE=-lpcre
-fi
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5

1
mail/courier-imap/pkg/PLIST-main
View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-main,v 1.16 2019/09/09 07:44:45 giovanni Exp $
@conflict imap-uw-*
@conflict courier-utils-*
@pkgpath ${BASE_PKGPATH}

1
mail/courier-imap/pkg/PLIST-pop3
View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-pop3,v 1.14 2019/06/19 21:59:01 giovanni Exp $
@pkgpath courier/imap,-pop3,no_trashquota
@pkgpath courier/imap,-pop3,no_trashquota,imap_bugs
@pkgpath courier/imap,-pop3,imap_bugs