diff options
author | Vsevolod Stakhov <vsevolod@FreeBSD.org> | 2005-09-11 21:42:42 +0000 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@FreeBSD.org> | 2005-09-11 21:42:42 +0000 |
commit | 69a6a2783a17a345063818063bd1b37e9a7e4fb3 (patch) | |
tree | 0b4929a30bf0f2a76908041b1004eb4604ba19f2 /mail/postfix22 | |
parent | Update LIB_DEPENDS to spf2.2 (diff) |
Update PORTREVISION because libspf2 is moved
Update LIB_DEPENDS to mail/libspf2-10
Use builtin echo
Use REINPLACE instead then scripts/configure and scripts/fix-files-list
PR: 85000
Submitted by: Marcus Grando <marcus@corp.grupos.com.br>
Approved by: Vivek Khera (maintainer)
Notes
Notes:
svn path=/head/; revision=142482
Diffstat (limited to 'mail/postfix22')
-rw-r--r-- | mail/postfix22/Makefile | 62 | ||||
-rw-r--r-- | mail/postfix22/distinfo | 4 | ||||
-rw-r--r-- | mail/postfix22/pkg-install | 54 | ||||
-rw-r--r-- | mail/postfix22/scripts/configure | 8 | ||||
-rw-r--r-- | mail/postfix22/scripts/configure.postfix | 168 | ||||
-rw-r--r-- | mail/postfix22/scripts/fix-files-list | 12 |
6 files changed, 144 insertions, 164 deletions
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index 8947c1225319..5506badbdc49 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -7,7 +7,7 @@ # To pre-select options in batch mode, run make like this: # -# make -DBATCH POSTFIX_OPTIONS="DB3 TLS" +# make -DBATCH POSTFIX_OPTIONS="DB43 TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -85,13 +86,9 @@ POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif -post-patch: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) - pre-patch: - @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html + @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ + > ${WRKSRC}/html/body_checks.5.html @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ done @@ -102,6 +99,16 @@ pre-patch: ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ done +post-patch: +# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below. + @${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \ + ${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h + +do-configure: + (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ + CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ + ${ECHO} "all: default" >> Makefile) + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -126,33 +133,28 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} + @${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail + +. for file in ${BINTEST} + @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin +. endfor + @${MKDIR} ${PREFIX}/etc/postfix/dist -.for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist -.endfor - - @${INSTALL_SCRIPT} \ - ${WRKSRC}/auxiliary/rmail/rmail \ - ${PREFIX}/bin/rmail - -# optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin -.endfor - -.if !defined(NOPORTDOCS) - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ - ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" -.endif +. for f in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist +. endfor + +. if !defined(NOPORTDOCS) + @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} + @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ + ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" +. endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them after this step, and -# if we run etc/postfix/post-install again during package installation, -# it will complain about missing files. - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list +# Fix compressed man pages + @${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files + @${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak @${CAT} ${PKGMESSAGE} post-clean: diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo index 59ac523435fa..4421a9911493 100644 --- a/mail/postfix22/distinfo +++ b/mail/postfix22/distinfo @@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.5.tar.gz) = 9c13d58494c64012bfd8ab0d6967305c SIZE (postfix/postfix-2.2.5.tar.gz) = 2428594 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 -MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f -SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712 +MD5 (postfix/postfix-2.2.5-vda.patch.gz) = 6fb8fdac842e561ca19cc1ed6cd9f810 +SIZE (postfix/postfix-2.2.5-vda.patch.gz) = 7684 diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install index e912b1a051e2..fe0c6c6f0243 100644 --- a/mail/postfix22/pkg-install +++ b/mail/postfix22/pkg-install @@ -34,7 +34,7 @@ ask() { if [ x${answer} = x ]; then answer=${default} fi - /bin/echo ${answer} + echo ${answer} } yesno() { @@ -48,7 +48,7 @@ yesno() { [Yy]*) return 0;; [Nn]*) return 1;; esac - /bin/echo "Please answer yes or no." + echo "Please answer yes or no." done } @@ -61,51 +61,51 @@ if [ x"$2" = xPRE-INSTALL ]; then GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP}\", so I will use it." + echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID} then - /bin/echo "Added group \"${GROUP}\"." + echo "Added group \"${GROUP}\"." else - /bin/echo "Adding group \"${GROUP}\" failed..." - /bin/echo "Please create it, and try again." + echo "Adding group \"${GROUP}\" failed..." + echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP2}\", so I will use it." + echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then - /bin/echo "Added group \"${GROUP2}\"." + echo "Added group \"${GROUP2}\"." else - /bin/echo "Adding group \"${GROUP2}\" failed..." - /bin/echo "Please create it, and try again." + echo "Adding group \"${GROUP2}\" failed..." + echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - /bin/echo "You already have a user \"${USER}\", so I will use it." + echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then - /bin/echo "Added user \"${USER}\"." + echo "Added user \"${USER}\"." else - /bin/echo "Adding user \"${USER}\" failed..." - /bin/echo "Please create it, and try again." + echo "Adding user \"${USER}\" failed..." + echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." + echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else - /bin/echo "You need user \"${USER}\" added to group \"mail\"." + echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit - /bin/echo "Done." + echo "Done." else - /bin/echo "Please create it, and try again." + echo "Please create it, and try again." exit 1 fi fi @@ -161,21 +161,21 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then if [ ${OSVERSION} -ge 400014 ]; then if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - /bin/echo "#" > /etc/mail/mailer.conf - /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "#" >> /etc/mail/mailer.conf - /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - /bin/echo "Done." + echo "Done." fi fi fi diff --git a/mail/postfix22/scripts/configure b/mail/postfix22/scripts/configure deleted file mode 100644 index 93c5b95ec561..000000000000 --- a/mail/postfix22/scripts/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \ - mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \ - rm $f.orig -done diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix index ed113fcea056..125d3b3395d2 100644 --- a/mail/postfix22/scripts/configure.postfix +++ b/mail/postfix22/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.64 2005-08-30 17:54:17 garga Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.65 2005-09-11 21:42:42 vsevolod Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -49,10 +49,10 @@ Test "SMTP/LMTP test server and generator" "$status_Test" \ case $retval in 0) if [ -z "$*" ]; then - /bin/echo "Nothing selected" + echo "Nothing selected" fi ;; - 1) /bin/echo "Cancel pressed." + 1) echo "Cancel pressed." exit 1 ;; esac @@ -61,7 +61,7 @@ fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -/bin/echo "PREFIX= ${PREFIX}" +echo "PREFIX= ${PREFIX}" SUB_TEST="@comment " SUB_SPF="@comment " @@ -69,15 +69,15 @@ SUB_SPF="@comment " while [ "$1" ]; do case $1 in NOPCRE) - /bin/echo "WITHOUT_PCRE= yes" - /bin/echo "NOPCRE_SUFFIX= +nopcre" + echo "WITHOUT_PCRE= yes" + echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) - /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" + echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" + echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" + echo "SASL_SUFFIX= +sasl" if [ -f ${LOCALBASE}/lib/libsasl.a ]; then if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then SASL_USE_MYSQL="YES" @@ -85,10 +85,10 @@ while [ "$1" ]; do fi ;; SASL2) - /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" + echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" + echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" + echo "SASL_SUFFIX= +sasl2" if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then SASL_USE_MYSQL="YES" @@ -96,29 +96,28 @@ while [ "$1" ]; do fi ;; SASLKRB) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" + echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; SASLKRB5) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" + echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" ;; SPF) # see http://www.ipnet6.org/postfix/spf/ - /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" - /bin/echo "PATCH_DIST_STRIP= -p1" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - /bin/echo "SPF_SUFFIX= +spf" -# /bin/echo "README+= SPF_README" - /bin/echo "" + echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2-10" + echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" + echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" + echo "PATCH_DIST_STRIP= -p1" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" + echo "SPF_SUFFIX= +spf" + echo "" SUB_SPF="" ;; TLS) - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" + echo "USE_OPENSSL= yes" + echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" + echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" + echo "TLS_SUFFIX= +tls" ;; DB3) if [ "X$BDB_SELECTED" != "X" ]; then @@ -126,10 +125,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" + echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB_SUFFIX= +db3" BDB_SELECTED="3" ;; DB40) @@ -138,10 +137,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" + echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" + echo "DB_SUFFIX= +db40" BDB_SELECTED="40" ;; DB41) @@ -150,10 +149,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" + echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" + echo "DB_SUFFIX= +db41" BDB_SELECTED="41" ;; DB42) @@ -162,10 +161,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" + echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" + echo "DB_SUFFIX= +db42" BDB_SELECTED="42" ;; DB43) @@ -174,60 +173,59 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" + echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" + echo "DB_SUFFIX= +db43" BDB_SELECTED="43" ;; MySQL) - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" + echo "USE_MYSQL=YES" + echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" + echo "USE_OPENSSL= yes" + echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" + echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" fi fi - /bin/echo "MYSQL_SUFFIX= +mysql" + echo "MYSQL_SUFFIX= +mysql" MYSQL_SELECTED="YES" ;; PgSQL) - /bin/echo "USE_PGSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - /bin/echo "PGSQL_SUFFIX= +pgsql" + echo "USE_PGSQL=YES" + echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" + echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP) - /bin/echo "USE_OPENLDAP=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - /bin/echo "OPENLDAP_SUFFIX= +openldap" + echo "USE_OPENLDAP=YES" + echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" + echo "OPENLDAP_SUFFIX= +openldap" ;; CDB) - /bin/echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb" - /bin/echo "POSTFIX_CCARGS+= -DHAS_CDB -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lcdb" - /bin/echo "CDB_SUFFIX= +cdb" + echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb" + echo "POSTFIX_CCARGS+= -DHAS_CDB -I\${LOCALBASE}/include" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lcdb" + echo "CDB_SUFFIX= +cdb" ;; NIS) - /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" + echo "POSTFIX_CCARGS+= -DHAS_NIS" + echo "NIS_SUFFIX= +nis" ;; VDA) - /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - /bin/echo "PATCHFILES+= postfix-2.2.4-vda.patch.gz" - /bin/echo "PATCH_DIST_STRIP= -p1" + echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" + echo "PATCHFILES+= postfix-2.2.5-vda.patch.gz" + echo "PATCH_DIST_STRIP= -p1" ;; Test) - /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" -# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" + echo "BINTEST= smtp-sink smtp-source qmqp-source" SUB_TEST="" ;; *) - /bin/echo "Unknown option(s): $*" > /dev/stderr + echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; @@ -239,25 +237,25 @@ if [ -z "${BATCH}" ]; then if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr if [ $? = 0 ]; then - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" + echo "USE_MYSQL=YES" + echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" + echo "USE_OPENSSL= yes" + echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" + echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" fi fi fi fi fi -/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" +echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" +echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. -#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${CDB_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" +#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" diff --git a/mail/postfix22/scripts/fix-files-list b/mail/postfix22/scripts/fix-files-list deleted file mode 100644 index cc4a1083a814..000000000000 --- a/mail/postfix22/scripts/fix-files-list +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them later, and if we -# run post-install it will complain about missing files -# (script from Simon J. Mudd) - -ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1 -%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ -w -q -EOF |