Commits

Zhang Huangbin committed 59c414f

Better PC-BSD support:
- explicitly add port net/openldap24-sasl-client
- Fix incorrect port option of devel/apr1

Thanks Lothar <info _at_ digi-quick.de> for the report.

Comments (0)

Files changed (3)

iRedMail/conf/core

     fi
 }
 
+ECHO_SKIP()
+{
+    if [ X"$1" == X"-n" ]; then
+        shift 1
+        if [ X"${TERM}" == X"xterm" -o X"${TERM}" == X"linux" -o X"${TERM}" == X"pcconsole" ]; then
+            echo -ne "\033[42m${_SKIP_FLAG}\033[0m $@"
+        else
+            echo -ne "${_SKIP_FLAG} $@"
+        fi
+    else
+        if [ X"${TERM}" == X"xterm" -o X"${TERM}" == X"linux" -o X"${TERM}" == X"pcconsole" ]; then
+            echo -e "\033[42m${_SKIP_FLAG}\033[0m $@"
+        else
+            echo -e "${_SKIP_FLAG} $@"
+        fi
+    fi
+}
 ECHO_QUESTION()
 {
     if [ X"$1" == X"-n" ]; then
     if [ X"$(eval echo \$${_status})" != X"DONE" ]; then
         $1
     else
-        if [ X"${TERM}" == X"xterm" -o X"${TERM}" == X"linux" -o X"${TERM}" == X"pcconsole" ]; then
-            echo -e "\033[46m<<< SKIP >>>\033[0m Skip function: $1."
-        else
-            echo -e "<<< SKIP >>> Skip function: $1."
-        fi
+        ECHO_SKIP "Function: $1."
     fi
 }
 

iRedMail/conf/global

 
 # Output flag.
 export _INFO_FLAG="< INFO >"
+export _SKIP_FLAG="< SKIP >"
 export _ERROR_FLAG="< ERROR >"
 export _QUESTION_FLAG="< Question >"
 export _BACKUP_FLAG="< Backup >"

iRedMail/functions/packages_freebsd.sh

 EOF
 
     if [ X"${BACKEND}" == X"OPENLDAP" ]; then
-        ALL_PORTS="${ALL_PORTS} net/openldap${WANT_OPENLDAP_VER}-server databases/mysql${WANT_MYSQL_VER}-server"
+        ALL_PORTS="${ALL_PORTS} net/openldap${WANT_OPENLDAP_VER}-sasl-client net/openldap${WANT_OPENLDAP_VER}-server databases/mysql${WANT_MYSQL_VER}-server"
         ENABLED_SERVICES="${ENABLED_SERVICES} ${OPENLDAP_RC_SCRIPT_NAME} ${MYSQL_RC_SCRIPT_NAME}"
     elif [ X"${BACKEND}" == X'MYSQL' ]; then
         ALL_PORTS="${ALL_PORTS} databases/mysql${WANT_MYSQL_VER}-server"
 
     # Apr. DEPENDENCE.
     cat > /var/db/ports/apr/options <<EOF
+OPTIONS_FILE_SET+=SSL
 OPTIONS_FILE_SET+=THREADS
 OPTIONS_FILE_SET+=IPV6
 OPTIONS_FILE_SET+=DEVRANDOM
 OPTIONS_FILE_UNSET+=NDBM
 OPTIONS_FILE_UNSET+=PGSQL
 OPTIONS_FILE_UNSET+=SQLITE
+OPTIONS_FILE_UNSET+=FREETDS
 EOF
 
     if [ X"${BACKEND}" == X'OPENLDAP' ]; then
 OPTIONS_FILE_SET+=SSL
 OPTIONS_FILE_SET+=SUEXEC
 OPTIONS_FILE_UNSET+=SUEXEC_RSRCLIMIT
+OPTIONS_FILE_SET+=SUEXEC_USERDIR
 OPTIONS_FILE_SET+=REQTIMEOUT
 OPTIONS_FILE_SET+=CGID
 EOF
 
     # Fetch all source tarballs.
     ECHO_INFO "Ports tree: ${PORT_WRKDIRPREFIX}"
-    ECHO_INFO "Fetching all distfiles for required packages (make fetch-recursive)"
+    ECHO_INFO "Fetching all distfiles for required ports (make fetch-recursive)"
 
     for i in ${ALL_PORTS}; do
         if [ X"${i}" != X'' ]; then
                     exit 255
                 fi
             else
-                ECHO_INFO "[SKIP] Fetching all distfiles for port ${i} and dependencies"
+                ECHO_SKIP "Fetching all distfiles for port ${i} and dependencies"
             fi
         fi
     done
                         exit 255
                     fi
             else
-                ECHO_INFO "[SKIP] Installing port: ${i}."
+                ECHO_SKIP "Installing port: ${i}."
             fi
         fi
     done