Date: 7 Oct 2001 17:38:38 -0000 From: svenasse@polaris.ca To: FreeBSD-gnats-submit@freebsd.org Cc: nbm@freebsd.org Subject: ports/31101: Update port: mail/vpopmail various required fixes Message-ID: <20011007173838.84819.qmail@pris.polaris.ca>
next in thread | raw e-mail | index | archive | help
>Number: 31101 >Category: ports >Synopsis: Update port: mail/vpopmail various required fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 07 10:40:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Seamus Venasse >Release: FreeBSD 4.3-STABLE i386 >Organization: Polaris Computing >Environment: System: FreeBSD pris 4.3-STABLE FreeBSD 4.3-STABLE #3: Tue Sep 4 01:09:13 PDT 2001 root@kaiser-old.polaris.ca:/usr/obj/usr/src/sys/NEXUS7 i386 >Description: This change updates the port so that the user can specify which MySQL server to connect to. Additionally, two files, which are required from the building of the mail/qmailadmin port are installed. Without these files, the qmailadmin port will fail on compilation. Removed files/patch-configure Added files/patch-aa Added files/patch-ab >How-To-Repeat: >Fix: diff -ruN /usr/ports/mail/vpopmail/Makefile vpopmail/Makefile --- /usr/ports/mail/vpopmail/Makefile Sat Sep 8 03:48:49 2001 +++ vpopmail/Makefile Sun Oct 7 10:13:27 2001 @@ -2,12 +2,12 @@ # Date created: 21 Sep 2000 # Whom: Neil Blakey-Milner # -# $FreeBSD: ports/mail/vpopmail/Makefile,v 1.12 2001/09/08 10:48:49 roam Exp $ +# $FreeBSD: ports/mail/vpopmail/Makefile,v 1.11 2001/07/04 15:34:48 roam Exp $ # PORTNAME= vpopmail PORTVERSION= 4.9.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.inter7.com/vpopmail/ @@ -48,6 +48,7 @@ # WITH_MYSQL_USER - the username for connecting to the MySQL server (root) # WITH_MYSQL_PASSWD - the password for connecting to the MySQL server (gipgap) # WITH_MYSQL_DB - the name of the MySQL database to use (vpopmail) +# WITH_MYSQL_SERVER - the name of the server with MySQL database (localhost) # VCHKPW_GID - the group ID of the new vchkpw group (89) # VPOPMAIL_UID - the user ID of the new vpopmail user (89) # @@ -126,6 +127,9 @@ .endif .if defined(WITH_MYSQL_DB) ${PERL} -pi -e "s/(#define MYSQL_DATABASE.*)vpopmail(.*)/\$$1${WITH_MYSQL_DB}\$$2/" ${WRKSRC}/vmysql.h +.endif +.if defined(WITH_MYSQL_SERVER) + ${PERL} -pi -e "s/(#define MYSQL_SERVER.*)localhost(.*)/\$$1${WITH_MYSQL_SERVER}\$$2/" ${WRKSRC}/vmysql.h .endif .endif diff -ruN /usr/ports/mail/vpopmail/files/patch-aa vpopmail/files/patch-aa --- /usr/ports/mail/vpopmail/files/patch-aa Wed Dec 31 16:00:00 1969 +++ vpopmail/files/patch-aa Thu Sep 6 23:32:53 2001 @@ -0,0 +1,43 @@ +--- configure.old Sun Mar 4 15:46:15 2001 ++++ configure Thu Sep 6 23:31:06 2001 +@@ -1613,14 +1613,6 @@ + rm -f vpopusername + + +-if test ! -d $vpopmaildir/etc +-then +- mkdir $vpopmaildir/etc +- chown $vpopmailuid "$vpopmaildir"/etc +- chgrp $vpopmailgid "$vpopmaildir"/etc +- chmod 755 "$vpopmaildir"/etc +- echo "configure: warning: making a vpopmail etc directory " 1>&2 +-fi + + + open_smtp_cur="$vpopmaildir/etc/open-smtp" +@@ -1873,7 +1865,7 @@ + fi + auth_libs="-L$sqllibdir -lmysqlclient -lz" + +- echo "-L$vpopmaildir/lib -lvpopmail -L$sqllibdir -lmysqlclient -lz" > $vpopmaildir/etc/lib_deps ++ echo "-L$vpopmaildir/lib -lvpopmail -L$sqllibdir -lmysqlclient -lz" > lib_deps + + ;; + *) +@@ -2007,14 +1999,14 @@ + authlib= + + auth_inc="-Icdb" +- echo "-L$vpopmaildir/lib -lvpopmail" > $vpopmaildir/etc/lib_deps ++ echo "-L$vpopmaildir/lib -lvpopmail" > lib_deps + + ;; + *) + ;; + esac + +-echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps ++echo "-I$vpopmaildir/include" > inc_deps + + # Check whether --enable-roaming-users or --disable-roaming-users was given. + if test "${enable_roaming_users+set}" = set; then diff -ruN /usr/ports/mail/vpopmail/files/patch-ab vpopmail/files/patch-ab --- /usr/ports/mail/vpopmail/files/patch-ab Wed Dec 31 16:00:00 1969 +++ vpopmail/files/patch-ab Thu Sep 6 23:37:28 2001 @@ -0,0 +1,12 @@ +--- Makefile.old Thu Sep 6 23:36:10 2001 ++++ Makefile.in Thu Sep 6 23:36:47 2001 +@@ -635,6 +635,9 @@ + $(mkinstalldirs) $(DESTDIR)@vpopmaildir@/doc/man_html + $(mkinstalldirs) $(DESTDIR)@vpopmaildir@/doc/doc_html + ++ cp inc_deps $(DESTDIR)@vpopmaildir@/etc ++ cp lib_deps $(DESTDIR)@vpopmaildir@/etc ++ + cp libvpopmail.a $(DESTDIR)@vpopmaildir@/lib + cp vpopmail.h $(DESTDIR)@vpopmaildir@/include + cp config.h $(DESTDIR)@vpopmaildir@/include diff -ruN /usr/ports/mail/vpopmail/files/patch-configure vpopmail/files/patch-configure --- /usr/ports/mail/vpopmail/files/patch-configure Wed Jul 4 08:34:50 2001 +++ vpopmail/files/patch-configure Wed Dec 31 16:00:00 1969 @@ -1,50 +0,0 @@ ---- configure.old Wed Jul 4 17:14:16 2001 -+++ configure Wed Jul 4 17:14:54 2001 -@@ -1613,16 +1613,6 @@ - rm -f vpopusername - - --if test ! -d $vpopmaildir/etc --then -- mkdir $vpopmaildir/etc -- chown $vpopmailuid "$vpopmaildir"/etc -- chgrp $vpopmailgid "$vpopmaildir"/etc -- chmod 755 "$vpopmaildir"/etc -- echo "configure: warning: making a vpopmail etc directory " 1>&2 --fi -- -- - open_smtp_cur="$vpopmaildir/etc/open-smtp" - open_smtp_tmp="$vpopmaildir/etc/open-smtp.tmp" - open_smtp_lok="$vpopmaildir/etc/open-smtp.lock" -@@ -1658,7 +1648,6 @@ - - if test "$tcpserver_file" = "" - then -- echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp - tcpserver_file="$vpopmaildir"/etc/tcp.smtp - - echo "configure: warning: Unable to find your tcpserver relay file." 1>&2 -@@ -1873,7 +1862,6 @@ - fi - auth_libs="-L$sqllibdir -lmysqlclient -lz" - -- echo "-L$vpopmaildir/lib -lvpopmail -L$sqllibdir -lmysqlclient -lz" > $vpopmaildir/etc/lib_deps - - ;; - *) -@@ -2007,14 +1995,12 @@ - authlib= - - auth_inc="-Icdb" -- echo "-L$vpopmaildir/lib -lvpopmail" > $vpopmaildir/etc/lib_deps - - ;; - *) - ;; - esac - --echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps - - # Check whether --enable-roaming-users or --disable-roaming-users was given. - if test "${enable_roaming_users+set}" = set; then diff -ruN /usr/ports/mail/vpopmail/pkg-plist vpopmail/pkg-plist --- /usr/ports/mail/vpopmail/pkg-plist Wed Jul 4 08:34:48 2001 +++ vpopmail/pkg-plist Thu Sep 6 23:26:40 2001 @@ -14,6 +14,8 @@ vpopmail/bin/vpopbull vpopmail/bin/vsetuserquota vpopmail/bin/vuserinfo +vpopmail/etc/inc_deps +vpopmail/etc/lib_deps vpopmail/doc/doc_html/vpopmail.html vpopmail/doc/doc_html/vpopmailapi.png vpopmail/doc/man_html/clearopensmtp.html >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011007173838.84819.qmail>