Fix the build of several dependent ports by actually installing

the inc_deps and lib_deps files.  This should fix qmailadmin,
courier-imap and possibly others, after I broke them by my configure
changes to not create and populate ${PREFIX}/vpopmail/etc/ at
configure time.
Add a couple of configuration knobs.
Bump PORTREVISION for the inc_deps/lib_deps fix.

Reported by:	a multitude of innocents :(
Pointy hat:	roam (myself)

9 files changed, 123 insertions, 18 deletions

diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index 8c572c8d1452..18b2e4a76ea2 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vpopmail
 PORTVERSION=	4.9.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
 
@@ -21,6 +21,10 @@ RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 
+VCFGDIR?=	${WRKDIR}/vcfg
+VCFGFILES?=	inc_deps lib_deps tcp.smtp
+
+CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
 CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 		--enable-tcprules-bin=${LOCALBASE}/bin/tcprules \
 		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
@@ -32,8 +36,11 @@ CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 #
 # WITH_PASSWD   - allow authentication off /etc/passwd
 # WITH_MYSQL	- allow authentitation via mysql
+# WITH_MYSQL_LARGE_SITE - enables large site layout
 # WITH_APOP     - allow apop authentication
 # WITHOUT_ROAMING - disallow roaming users
+# WITH_IP_ALIAS - enables IP aliasing
+# WITH_DELIVER_FILTER - enables the experimental vdelivermail filter
 #
 # Set these to the values you'd prefer
 #
@@ -103,12 +110,23 @@ LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql=y \
 			--enable-sqlincdir=${LOCALBASE}/include/mysql \
 			--enable-sqllibdir=${LOCALBASE}/lib/mysql
+.if defined(WITH_MYSQL_LARGE_SITE)
+CONFIGURE_ARGS+=	--enable-large-site=y
+.endif
 .endif
 
 .if defined(DEFAULT_DOMAIN)
 CONFIGURE_ARGS+=	--enable-default-domain=${DEFAULT_DOMAIN}
 .endif
 
+.if defined(WITH_IP_ALIAS)
+CONFIGURE_ARGS+=	--enable-ip-alias-domains=y
+.endif
+
+.if defined(WITH_DELIVER_FILTER)
+CONFIGURE_ARGS+=	--enable-deliver-filter=y
+.endif
+
 #
 # This port doesn't honour PREFIX, it honours vpopmail's home directory.
 # Since we create vpopmail if it doesn't exist, we set it so that it
@@ -128,8 +146,18 @@ pre-configure:
 	${PERL} -pi -e "s/(#define MYSQL_DATABASE.*)vpopmail(.*)/\$$1${WITH_MYSQL_DB}\$$2/" ${WRKSRC}/vmysql.h
 .endif
 .endif
+	${MKDIR} ${VCFGDIR}
 
 post-install:
 	${CHMOD} o-rwx ${PREFIX}/vpopmail/bin ${PREFIX}/vpopmail/lib
+	${MKDIR} ${PREFIX}/vpopmail/etc
+	if [ ! -f "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
+		if [ -f "${VCFGDIR}/tcp.smtp" ]; then \
+			${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/; \
+		else \
+			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
+		fi; \
+	fi
+	${INSTALL_DATA} ${VCFGDIR}/inc_deps ${VCFGDIR}/lib_deps ${PREFIX}/vpopmail/etc/
 
 .include <bsd.port.mk>
diff --git a/mail/vpopmail-devel/files/patch-configure b/mail/vpopmail-devel/files/patch-configure
index 67eba685ec3c..e35289927dce 100644
--- a/mail/vpopmail-devel/files/patch-configure
+++ b/mail/vpopmail-devel/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.old	Wed Jul  4 17:14:16 2001
-+++ configure	Wed Jul  4 17:14:54 2001
+--- configure.old	Fri Nov  2 20:50:19 2001
++++ configure	Fri Nov  2 20:50:35 2001
 @@ -1613,16 +1613,6 @@
  rm -f vpopusername 
  
@@ -17,27 +17,30 @@
  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 @@
+@@ -1658,7 +1648,7 @@
    
          if test "$tcpserver_file" = ""
          then
 -	    echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp
++	    echo "127.:allow,RELAYCLIENT=\"\"" > "$VCFGDIR"/tcp.smtp
      	    tcpserver_file="$vpopmaildir"/etc/tcp.smtp
  	
              echo "configure: warning: Unable to find your tcpserver relay file." 1>&2
-@@ -1873,7 +1862,6 @@
+@@ -1873,7 +1863,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" > $VCFGDIR/lib_deps
  		
          ;;
  *)
-@@ -2007,14 +1995,12 @@
+@@ -2007,14 +1997,14 @@
  		authlib=
  		
  		auth_inc="-Icdb"
 -		echo "-L$vpopmaildir/lib -lvpopmail" > $vpopmaildir/etc/lib_deps
++		echo "-L$vpopmaildir/lib -lvpopmail" > $VCFGDIR/lib_deps
  		
          ;;
  *)
@@ -45,6 +48,7 @@
  esac
  
 -echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps
++echo "-I$vpopmaildir/include" > $VCFGDIR/inc_deps
  
  # Check whether --enable-roaming-users or --disable-roaming-users was given.
  if test "${enable_roaming_users+set}" = set; then
diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist
index b438c9a634b4..4c38189c8252 100644
--- a/mail/vpopmail-devel/pkg-plist
+++ b/mail/vpopmail-devel/pkg-plist
@@ -29,6 +29,9 @@ vpopmail/doc/man_html/vdeluser.html
 vpopmail/doc/man_html/vpasswd.html
 vpopmail/doc/man_html/vpopbull.html
 vpopmail/doc/man_html/vsetuserquota.html
+vpopmail/etc/inc_deps
+vpopmail/etc/lib_deps
+@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
 vpopmail/include/config.h
 vpopmail/include/vauth.h
 vpopmail/include/vpopmail.h
diff --git a/mail/vpopmail-stable/Makefile b/mail/vpopmail-stable/Makefile
index 8c572c8d1452..18b2e4a76ea2 100644
--- a/mail/vpopmail-stable/Makefile
+++ b/mail/vpopmail-stable/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vpopmail
 PORTVERSION=	4.9.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
 
@@ -21,6 +21,10 @@ RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 
+VCFGDIR?=	${WRKDIR}/vcfg
+VCFGFILES?=	inc_deps lib_deps tcp.smtp
+
+CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
 CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 		--enable-tcprules-bin=${LOCALBASE}/bin/tcprules \
 		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
@@ -32,8 +36,11 @@ CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 #
 # WITH_PASSWD   - allow authentication off /etc/passwd
 # WITH_MYSQL	- allow authentitation via mysql
+# WITH_MYSQL_LARGE_SITE - enables large site layout
 # WITH_APOP     - allow apop authentication
 # WITHOUT_ROAMING - disallow roaming users
+# WITH_IP_ALIAS - enables IP aliasing
+# WITH_DELIVER_FILTER - enables the experimental vdelivermail filter
 #
 # Set these to the values you'd prefer
 #
@@ -103,12 +110,23 @@ LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql=y \
 			--enable-sqlincdir=${LOCALBASE}/include/mysql \
 			--enable-sqllibdir=${LOCALBASE}/lib/mysql
+.if defined(WITH_MYSQL_LARGE_SITE)
+CONFIGURE_ARGS+=	--enable-large-site=y
+.endif
 .endif
 
 .if defined(DEFAULT_DOMAIN)
 CONFIGURE_ARGS+=	--enable-default-domain=${DEFAULT_DOMAIN}
 .endif
 
+.if defined(WITH_IP_ALIAS)
+CONFIGURE_ARGS+=	--enable-ip-alias-domains=y
+.endif
+
+.if defined(WITH_DELIVER_FILTER)
+CONFIGURE_ARGS+=	--enable-deliver-filter=y
+.endif
+
 #
 # This port doesn't honour PREFIX, it honours vpopmail's home directory.
 # Since we create vpopmail if it doesn't exist, we set it so that it
@@ -128,8 +146,18 @@ pre-configure:
 	${PERL} -pi -e "s/(#define MYSQL_DATABASE.*)vpopmail(.*)/\$$1${WITH_MYSQL_DB}\$$2/" ${WRKSRC}/vmysql.h
 .endif
 .endif
+	${MKDIR} ${VCFGDIR}
 
 post-install:
 	${CHMOD} o-rwx ${PREFIX}/vpopmail/bin ${PREFIX}/vpopmail/lib
+	${MKDIR} ${PREFIX}/vpopmail/etc
+	if [ ! -f "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
+		if [ -f "${VCFGDIR}/tcp.smtp" ]; then \
+			${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/; \
+		else \
+			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
+		fi; \
+	fi
+	${INSTALL_DATA} ${VCFGDIR}/inc_deps ${VCFGDIR}/lib_deps ${PREFIX}/vpopmail/etc/
 
 .include <bsd.port.mk>
diff --git a/mail/vpopmail-stable/files/patch-configure b/mail/vpopmail-stable/files/patch-configure
index 67eba685ec3c..e35289927dce 100644
--- a/mail/vpopmail-stable/files/patch-configure
+++ b/mail/vpopmail-stable/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.old	Wed Jul  4 17:14:16 2001
-+++ configure	Wed Jul  4 17:14:54 2001
+--- configure.old	Fri Nov  2 20:50:19 2001
++++ configure	Fri Nov  2 20:50:35 2001
 @@ -1613,16 +1613,6 @@
  rm -f vpopusername 
  
@@ -17,27 +17,30 @@
  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 @@
+@@ -1658,7 +1648,7 @@
    
          if test "$tcpserver_file" = ""
          then
 -	    echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp
++	    echo "127.:allow,RELAYCLIENT=\"\"" > "$VCFGDIR"/tcp.smtp
      	    tcpserver_file="$vpopmaildir"/etc/tcp.smtp
  	
              echo "configure: warning: Unable to find your tcpserver relay file." 1>&2
-@@ -1873,7 +1862,6 @@
+@@ -1873,7 +1863,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" > $VCFGDIR/lib_deps
  		
          ;;
  *)
-@@ -2007,14 +1995,12 @@
+@@ -2007,14 +1997,14 @@
  		authlib=
  		
  		auth_inc="-Icdb"
 -		echo "-L$vpopmaildir/lib -lvpopmail" > $vpopmaildir/etc/lib_deps
++		echo "-L$vpopmaildir/lib -lvpopmail" > $VCFGDIR/lib_deps
  		
          ;;
  *)
@@ -45,6 +48,7 @@
  esac
  
 -echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps
++echo "-I$vpopmaildir/include" > $VCFGDIR/inc_deps
  
  # Check whether --enable-roaming-users or --disable-roaming-users was given.
  if test "${enable_roaming_users+set}" = set; then
diff --git a/mail/vpopmail-stable/pkg-plist b/mail/vpopmail-stable/pkg-plist
index b438c9a634b4..4c38189c8252 100644
--- a/mail/vpopmail-stable/pkg-plist
+++ b/mail/vpopmail-stable/pkg-plist
@@ -29,6 +29,9 @@ vpopmail/doc/man_html/vdeluser.html
 vpopmail/doc/man_html/vpasswd.html
 vpopmail/doc/man_html/vpopbull.html
 vpopmail/doc/man_html/vsetuserquota.html
+vpopmail/etc/inc_deps
+vpopmail/etc/lib_deps
+@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
 vpopmail/include/config.h
 vpopmail/include/vauth.h
 vpopmail/include/vpopmail.h
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 8c572c8d1452..18b2e4a76ea2 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vpopmail
 PORTVERSION=	4.9.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
 
@@ -21,6 +21,10 @@ RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 
+VCFGDIR?=	${WRKDIR}/vcfg
+VCFGFILES?=	inc_deps lib_deps tcp.smtp
+
+CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
 CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 		--enable-tcprules-bin=${LOCALBASE}/bin/tcprules \
 		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
@@ -32,8 +36,11 @@ CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 #
 # WITH_PASSWD   - allow authentication off /etc/passwd
 # WITH_MYSQL	- allow authentitation via mysql
+# WITH_MYSQL_LARGE_SITE - enables large site layout
 # WITH_APOP     - allow apop authentication
 # WITHOUT_ROAMING - disallow roaming users
+# WITH_IP_ALIAS - enables IP aliasing
+# WITH_DELIVER_FILTER - enables the experimental vdelivermail filter
 #
 # Set these to the values you'd prefer
 #
@@ -103,12 +110,23 @@ LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql=y \
 			--enable-sqlincdir=${LOCALBASE}/include/mysql \
 			--enable-sqllibdir=${LOCALBASE}/lib/mysql
+.if defined(WITH_MYSQL_LARGE_SITE)
+CONFIGURE_ARGS+=	--enable-large-site=y
+.endif
 .endif
 
 .if defined(DEFAULT_DOMAIN)
 CONFIGURE_ARGS+=	--enable-default-domain=${DEFAULT_DOMAIN}
 .endif
 
+.if defined(WITH_IP_ALIAS)
+CONFIGURE_ARGS+=	--enable-ip-alias-domains=y
+.endif
+
+.if defined(WITH_DELIVER_FILTER)
+CONFIGURE_ARGS+=	--enable-deliver-filter=y
+.endif
+
 #
 # This port doesn't honour PREFIX, it honours vpopmail's home directory.
 # Since we create vpopmail if it doesn't exist, we set it so that it
@@ -128,8 +146,18 @@ pre-configure:
 	${PERL} -pi -e "s/(#define MYSQL_DATABASE.*)vpopmail(.*)/\$$1${WITH_MYSQL_DB}\$$2/" ${WRKSRC}/vmysql.h
 .endif
 .endif
+	${MKDIR} ${VCFGDIR}
 
 post-install:
 	${CHMOD} o-rwx ${PREFIX}/vpopmail/bin ${PREFIX}/vpopmail/lib
+	${MKDIR} ${PREFIX}/vpopmail/etc
+	if [ ! -f "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
+		if [ -f "${VCFGDIR}/tcp.smtp" ]; then \
+			${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/; \
+		else \
+			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
+		fi; \
+	fi
+	${INSTALL_DATA} ${VCFGDIR}/inc_deps ${VCFGDIR}/lib_deps ${PREFIX}/vpopmail/etc/
 
 .include <bsd.port.mk>
diff --git a/mail/vpopmail/files/patch-configure b/mail/vpopmail/files/patch-configure
index 67eba685ec3c..e35289927dce 100644
--- a/mail/vpopmail/files/patch-configure
+++ b/mail/vpopmail/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.old	Wed Jul  4 17:14:16 2001
-+++ configure	Wed Jul  4 17:14:54 2001
+--- configure.old	Fri Nov  2 20:50:19 2001
++++ configure	Fri Nov  2 20:50:35 2001
 @@ -1613,16 +1613,6 @@
  rm -f vpopusername 
  
@@ -17,27 +17,30 @@
  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 @@
+@@ -1658,7 +1648,7 @@
    
          if test "$tcpserver_file" = ""
          then
 -	    echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp
++	    echo "127.:allow,RELAYCLIENT=\"\"" > "$VCFGDIR"/tcp.smtp
      	    tcpserver_file="$vpopmaildir"/etc/tcp.smtp
  	
              echo "configure: warning: Unable to find your tcpserver relay file." 1>&2
-@@ -1873,7 +1862,6 @@
+@@ -1873,7 +1863,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" > $VCFGDIR/lib_deps
  		
          ;;
  *)
-@@ -2007,14 +1995,12 @@
+@@ -2007,14 +1997,14 @@
  		authlib=
  		
  		auth_inc="-Icdb"
 -		echo "-L$vpopmaildir/lib -lvpopmail" > $vpopmaildir/etc/lib_deps
++		echo "-L$vpopmaildir/lib -lvpopmail" > $VCFGDIR/lib_deps
  		
          ;;
  *)
@@ -45,6 +48,7 @@
  esac
  
 -echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps
++echo "-I$vpopmaildir/include" > $VCFGDIR/inc_deps
  
  # Check whether --enable-roaming-users or --disable-roaming-users was given.
  if test "${enable_roaming_users+set}" = set; then
diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist
index b438c9a634b4..4c38189c8252 100644
--- a/mail/vpopmail/pkg-plist
+++ b/mail/vpopmail/pkg-plist
@@ -29,6 +29,9 @@ vpopmail/doc/man_html/vdeluser.html
 vpopmail/doc/man_html/vpasswd.html
 vpopmail/doc/man_html/vpopbull.html
 vpopmail/doc/man_html/vsetuserquota.html
+vpopmail/etc/inc_deps
+vpopmail/etc/lib_deps
+@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
 vpopmail/include/config.h
 vpopmail/include/vauth.h
 vpopmail/include/vpopmail.h