pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/postfix-current resolve conflicts
details: https://anonhg.NetBSD.org/pkgsrc/rev/aeb25f10a7b3
branches: trunk
changeset: 470094:aeb25f10a7b3
user: grant <grant%pkgsrc.org@localhost>
date: Sat Mar 06 15:08:32 2004 +0000
description:
resolve conflicts
diffstat:
mail/postfix-current/Makefile | 220 +++++++++++++++++++++++++++++++++
mail/postfix-current/files/mailer.conf | 10 +
mail/postfix-current/patches/patch-aa | 53 +++++++
mail/postfix-current/patches/patch-ab | 23 +++
mail/postfix-current/patches/patch-ac | 23 +++
mail/postfix-current/patches/patch-ad | 13 +
mail/postfix-current/patches/patch-ae | 40 ++++++
mail/postfix-current/patches/patch-af | 55 ++++++++
mail/postfix-current/patches/patch-ah | 23 +++
mail/postfix-current/patches/patch-ai | 27 ++++
mail/postfix-current/patches/patch-bd | 12 +
mail/postfix-current/patches/patch-be | 30 ++++
12 files changed, 529 insertions(+), 0 deletions(-)
diffs (truncated from 577 to 300 lines):
diff -r 0fdaedcc2ce6 -r aeb25f10a7b3 mail/postfix-current/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix-current/Makefile Sat Mar 06 15:08:32 2004 +0000
@@ -0,0 +1,220 @@
+# $NetBSD: Makefile,v 1.25 2004/03/06 15:08:32 grant Exp $
+
+DISTNAME= postfix-2.0.18-20040209
+PKGNAME= postfix-20040209
+CATEGORIES= mail
+MASTER_SITES= http://public.planetmirror.com.au/pub/postfix/experimental/
+
+MAINTAINER= tech-pkg%NetBSD.org@localhost
+HOMEPAGE= http://www.postfix.org/
+COMMENT= Postfix SMTP server and tools
+
+DIST_SUBDIR= postfix
+
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
+USE_PKGINSTALL= yes
+
+PKG_SYSCONFSUBDIR= postfix
+POSTFIX_SPOOL= /var/spool/postfix
+
+OWN_DIRS= ${POSTFIX_SPOOL}
+
+CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
+CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
+CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
+CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
+CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
+CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
+
+.include "../../mk/bsd.prefs.mk"
+
+# NetBSD 1.5 and above has /etc/rc.d/postfix already which is
+# suitable.
+.if empty(MACHINE_PLATFORM:MNetBSD-1.[5-9]*-*)
+RCD_SCRIPTS= postfix
+.endif
+
+FIX_RPATH+= AUXLIBS
+
+BUILD_DEFS+= POSTFIX_USE_INET6
+#BUILD_DEFS+= POSTFIX_USE_TLS
+BUILD_DEFS+= POSTFIX_USE_PCRE
+BUILD_DEFS+= POSTFIX_USE_LDAP
+BUILD_DEFS+= POSTFIX_USE_MYSQL
+BUILD_DEFS+= POSTFIX_USE_PGSQL
+BUILD_DEFS+= USE_SASL
+BUILD_DEFS+= USE_SASL2
+
+#.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
+#. include "../../security/openssl/buildlink3.mk"
+#PATCHFILES+= tls+ipv6-1.21-pf-2.0.18.patch.gz
+#PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.21/
+#PATCH_DIST_STRIP= -p1
+#
+#CCARGS+= -DHAS_SSL
+#AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
+# -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
+# -lssl -lcrypto
+#
+#PLIST_SRC+= ${PKGDIR}/PLIST.tls
+#MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls
+#.endif
+
+.if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"
+. include "../../devel/pcre/buildlink3.mk"
+CCARGS+= -DHAS_PCRE
+AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \
+ -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \
+ -lpcre
+.else
+CCARGS+= -DNO_PCRE
+.endif
+
+.if defined(POSTFIX_USE_LDAP) && ${POSTFIX_USE_LDAP} == "YES"
+. include "../../databases/openldap/buildlink3.mk"
+CCARGS+= -DHAS_LDAP
+AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \
+ -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
+ -lldap -llber
+.endif
+
+.if defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
+. include "../../databases/mysql-client/buildlink3.mk"
+CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
+ -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
+ -lmysqlclient -lz -lm
+.endif
+
+.if defined(POSTFIX_USE_PGSQL) && ${POSTFIX_USE_PGSQL} == "YES"
+. include "../../databases/postgresql-lib/buildlink3.mk"
+. include "../../security/openssl/buildlink3.mk"
+PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch
+PATCH_SITES+= http://www.mat.cc/postfix/
+PATCH_DIST_STRIP= -p1
+
+CCARGS+= -DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
+AUXLIBS+= -L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \
+ -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt
+.endif
+
+.if defined(USE_SASL2) && ${USE_SASL2} == "YES"
+USING_SASL=YES
+. include "../../security/cyrus-sasl2/buildlink3.mk"
+CCARGS+= -DUSE_SASL2_AUTH
+AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ -lsasl2
+.elif defined(USE_SASL) && ${USE_SASL} == "YES"
+USING_SASL=YES
+. include "../../security/cyrus-sasl/buildlink3.mk"
+CCARGS+= -DUSE_SASL_AUTH
+AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ -lsasl
+.endif
+
+.if defined(USING_SASL)
+PLIST_SRC+= ${PKGDIR}/PLIST.sasl
+MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+.endif
+
+MESSAGE_SRC+= ${PKGDIR}/MESSAGE
+.if exists(${PKGDIR}/MESSAGE.${OPSYS})
+MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
+.endif
+PLIST_SRC+= ${PKGDIR}/PLIST
+ALL_TARGET= #empty
+MAKE_ENV= CC="${CC}" OPT="${CFLAGS}"
+MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+
+POSTFIX_CONF_FILES= conf/main.cf src/util/sys_defs.h postfix-install
+POSTFIX_CONF_FILES+= conf/sample-misc.cf src/global/mail_params.h
+
+FILES_SUBST+= SHAREDIR=${SHAREDIR}
+MESSAGE_SUBST+= SHAREDIR=${SHAREDIR}
+PLIST_SUBST+= POSTFIX_SPOOL=${POSTFIX_SPOOL}
+
+PKG_GROUPS?= postfix maildrop
+PKG_USERS?= postfix:postfix::Postfix\\ User:${POSTFIX_SPOOL}
+
+LIBEXECDIR= ${PREFIX}/libexec/${PKGBASE}
+SHAREDIR= ${PREFIX}/share/examples/${PKGBASE}
+
+CONF_FILES= ${SHAREDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf
+CONF_FILES+= ${SHAREDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf
+.if defined(USING_SASL)
+. if defined(USE_SASL2)
+MAKE_DIRS+= ${PREFIX}/lib/sasl2
+CONF_FILES+= ${SHAREDIR}/smtpd.conf ${PREFIX}/lib/sasl2/smtpd.conf
+. else
+MAKE_DIRS+= ${PREFIX}/lib/sasl
+CONF_FILES+= ${SHAREDIR}/smtpd.conf ${PREFIX}/lib/sasl/smtpd.conf
+. endif
+.endif
+CONF_FILES_PERMS= # empty
+.for confscr in post-install postfix-files postfix-script
+CONF_FILES_PERMS+= ${SHAREDIR}/${confscr} ${PKG_SYSCONFDIR}/${confscr} \
+ ${ROOT_USER} ${ROOT_GROUP} 755
+.endfor
+.undef confscr
+
+INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL
+
+pre-configure:
+ @for i in ${POSTFIX_CONF_FILES}; do \
+ ${CP} ${WRKSRC}/$${i} ${WRKSRC}/$${i}.dist; \
+ ${SED} -e 's|__PREFIX|'${PREFIX}'|g' \
+ -e 's|__PKG_SYSCONFDIR|'${PKG_SYSCONFDIR}'|g' \
+ < ${WRKSRC}/$${i}.dist \
+ > ${WRKSRC}/$${i}; \
+ done
+
+do-configure:
+ cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
+ 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
+
+post-build:
+ ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
+ <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix
+
+pre-install:
+ ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
+ ${INSTALL_DATA_DIR} ${SHAREDIR}
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix
+ ${INSTALL_DATA_DIR} ${LIBEXECDIR}
+ ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${SHAREDIR} ${LIBEXECDIR}
+ ${CHMOD} 755 ${SHAREDIR} ${LIBEXECDIR}
+ -${RM} -f ${WRKSRC}/conf/*.orig
+.if defined(USING_SASL)
+. if defined(USE_SASL2)
+ ${ECHO} "pwcheck_method: auxprop" > ${WRKDIR}/smtpd.conf
+. else
+ ${ECHO} "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
+. endif
+ ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${SHAREDIR}
+.endif
+ ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${SHAREDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${SHAREDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${SHAREDIR}
+ ${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${SHAREDIR}
+ ${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${SHAREDIR}
+ ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${SHAREDIR}/mailer.conf
+
+do-install:
+ cd ${WRKSRC} && ${SETENV} config_directory="${SHAREDIR}" \
+ ${SH} postfix-install -non-interactive
+
+.if ${OPSYS} == "Linux"
+.include "../../databases/db/buildlink3.mk"
+CCARGS+= -I${BUILDLINK_PREFIX.db}/include/db2
+AUXLIBS+= -L${BUILDLINK_PREFIX.db}/lib \
+ -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db}/lib \
+ -ldb2
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff -r 0fdaedcc2ce6 -r aeb25f10a7b3 mail/postfix-current/files/mailer.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix-current/files/mailer.conf Sat Mar 06 15:08:32 2004 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: mailer.conf,v 1.3 2004/03/06 15:08:32 grant Exp $
+#
+# Use "postfix" as replacement for "sendmail".
+#
+sendmail @@PREFIX@@/sbin/sendmail
+send-mail @@PREFIX@@/sbin/sendmail
+mailq @@PREFIX@@/sbin/sendmail
+newaliases @@PREFIX@@/sbin/sendmail
+hoststat @@PREFIX@@/sbin/sendmail
+purgestat @@PREFIX@@/sbin/sendmail
diff -r 0fdaedcc2ce6 -r aeb25f10a7b3 mail/postfix-current/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix-current/patches/patch-aa Sat Mar 06 15:08:32 2004 +0000
@@ -0,0 +1,53 @@
+$NetBSD: patch-aa,v 1.11 2004/03/06 15:08:32 grant Exp $
+
+--- postfix-install.orig 2003-03-21 20:04:53.000000000 +0100
++++ postfix-install
+@@ -338,33 +338,13 @@ README files. Specify \"no\" if you do n
+ : ${tempdir=`pwd`}
+ : ${config_directory=`bin/postconf -h -d config_directory`}
+
+-# Find out the location of installed configuration files.
+-
+-test -z "$non_interactive" && for name in install_root tempdir config_directory
+-do
+- while :
+- do
+- echo
+- eval echo Please specify \$${name}_prompt | ${FMT}
+- eval echo \$n "$name: [\$$name]\ \$c"
+- read ans
+- case $ans in
+- "") break;;
+- *) case $ans in
+- /*) eval $name=$ans; break;;
+- *) echo; echo $0: Error: $name should be an absolute path name. 1>&2;;
+- esac;;
+- esac
+- done
+-done
+-
+ # In case some systems special-case pathnames beginning with //.
+
+ case $install_root in
+ /) install_root=
+ esac
+
+-CONFIG_DIRECTORY=$install_root$config_directory
++CONFIG_DIRECTORY=conf
+
+ # If a parameter is not set via the command line or environment,
+ # try to use settings from installed configuration files.
+@@ -652,13 +632,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+ "sample_directory = $sample_directory" \
+ "readme_directory = $readme_directory" \
+ || exit 1
+-
+-# If Postfix is being installed locally from source code, do the
+-# post-install processing now.
+-
+-test -n "$install_root" || {
+- export daemon_directory command_directory queue_directory sendmail_path \
+- newaliases_path mailq_path mail_owner setgid_group manpage_directory \
+- sample_directory readme_directory
+- ${SHELL} conf/post-install $post_install_options || exit 1
+-}
diff -r 0fdaedcc2ce6 -r aeb25f10a7b3 mail/postfix-current/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix-current/patches/patch-ab Sat Mar 06 15:08:32 2004 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.5 2004/03/06 15:08:32 grant Exp $
Home |
Main Index |
Thread Index |
Old Index