mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Use PCRE explicitly. If PCRE was installed, the header of PCRE was

Browse Source 
picked upped.  However, since there was bash-ism in the configure
script, libpcre was not linked, correctly.  As the result, the regex
in our libc was used, but the header of PCRE was referred.
This commit is contained in:
Hajimu UMEMOTO 2010-11-26 15:23:45 +00:00
parent 524624e83b
commit d97299712d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=265186
6 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/cyrus-imapd23/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.3.16
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
http://ftp.andrew.cmu.edu/pub/cyrus/ \
@ -17,7 +17,8 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
pcre.0:${PORTSDIR}/devel/pcre
CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].*
@ -36,6 +37,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
--with-com_err \
--with-openssl=${OPENSSLBASE} \
--with-perl=${PERL5}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
MAKE_JOBS_UNSAFE= yes
OPTIONS= AUTOCREATE "Use autocreate INBOX patch (UoA)" off \

13
mail/cyrus-imapd23/files/extra-patch-configure.in
View File

@ -1,7 +1,16 @@
Index: configure.in
diff -u configure.in.orig configure.in
--- configure.in.orig 2009-12-21 23:17:00.962723262 +0900
+++ configure.in 2009-12-21 23:18:07.032701766 +0900
--- configure.in.orig 2010-11-26 14:14:12.403327543 +0900
+++ configure.in 2010-11-26 14:14:47.834464148 +0900
@@ -391,7 +391,7 @@
AC_CHECK_LIB(fl,main)
AC_CHECK_HEADERS(pcreposix.h rxposix.h)
- if test "$ac_cv_header_pcreposix_h" == "yes"; then
+ if test "$ac_cv_header_pcreposix_h" = "yes"; then
LIBS="$LIBS -lpcre -lpcreposix";
AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
else
@@ -1145,7 +1145,7 @@
dnl libraries will be compiled as PIC if perl requires PIC objects
dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris --

13
mail/cyrus-imapd23/files/patch-configure
View File

@ -1,7 +1,7 @@
Index: configure
diff -u configure.orig configure
--- configure.orig 2009-12-21 23:20:56.817376076 +0900
+++ configure 2009-12-21 23:21:49.196653299 +0900
--- configure.orig 2010-11-26 14:08:32.950506060 +0900
+++ configure 2010-11-26 14:10:19.298911330 +0900
@@ -642,6 +642,7 @@
IMAP_COM_ERR_LIBS
LIB_RT
@ -10,6 +10,15 @@ diff -u configure.orig configure
SNMP_CONFIG
LIB_WRAP
SNMP_SUBDIRS
@@ -12402,7 +12403,7 @@
done
- if test "$ac_cv_header_pcreposix_h" == "yes"; then
+ if test "$ac_cv_header_pcreposix_h" = "yes"; then
LIBS="$LIBS -lpcre -lpcreposix";
cat >>confdefs.h <<\_ACEOF
@@ -20173,7 +20174,7 @@
PERL_SUBDIRS="imap"
PERL="${with_perl}"

6
mail/cyrus-imapd24/Makefile
View File

@ -7,14 +7,15 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.4.4
#PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/
MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
pcre.0:${PORTSDIR}/devel/pcre
CONFLICTS= cyrus-1.* cyrus-imapd-2.[^4].*
@ -33,6 +34,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
--with-com_err \
--with-openssl=${OPENSSLBASE} \
--with-perl=${PERL5}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
MAKE_JOBS_UNSAFE= yes
LICENSE= BSD

13
mail/cyrus-imapd24/files/extra-patch-configure.in
View File

@ -1,7 +1,16 @@
Index: configure.in
diff -u configure.in.orig configure.in
--- configure.in.orig 2009-12-21 23:17:00.962723262 +0900
+++ configure.in 2009-12-21 23:18:07.032701766 +0900
--- configure.in.orig 2010-11-26 15:06:26.364699467 +0900
+++ configure.in 2010-11-26 15:27:53.983587395 +0900
@@ -391,7 +391,7 @@
AC_CHECK_LIB(fl,main)
AC_CHECK_HEADERS(pcreposix.h rxposix.h)
- if test "$ac_cv_header_pcreposix_h" == "yes"; then
+ if test "$ac_cv_header_pcreposix_h" = "yes"; then
LIBS="$LIBS -lpcre -lpcreposix";
AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
else
@@ -1145,7 +1145,7 @@
dnl libraries will be compiled as PIC if perl requires PIC objects
dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris --

15
mail/cyrus-imapd24/files/patch-configure
View File

@ -1,8 +1,17 @@
Index: configure
diff -u configure.orig configure
--- configure.orig 2010-10-18 23:52:21.754710579 +0900
+++ configure 2010-10-18 23:53:29.402517775 +0900
@@ -10372,7 +10372,7 @@
--- configure.orig 2010-11-26 15:06:26.419690432 +0900
+++ configure 2010-11-26 15:27:39.897910842 +0900
@@ -7162,7 +7162,7 @@
done
- if test "$ac_cv_header_pcreposix_h" == "yes"; then
+ if test "$ac_cv_header_pcreposix_h" = "yes"; then
LIBS="$LIBS -lpcre -lpcreposix";
$as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
@@ -10411,7 +10411,7 @@
PERL_SUBDIRS="imap"
PERL="${with_perl}"
case "${target_os}" in