diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2003-11-28 07:54:53 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2003-11-28 07:54:53 +0000 |
| commit | 54844ff483e5eae66a9922881c98fec66f9322c8 (patch) | |
| tree | b3f4e65eeea4ffd6d672245bb99ff4ff1810a1ca /mail/vpopmail | |
| parent | Update qmailadmin to 1.0.29 for much better interoperability with vpopmail. (diff) | |
Looks like I seriously botched the last commit; somehow four lines from
the original Makefile.in got duplicated in the 'patched' one, leading
to a malformed sh(1) construct that would inevitably break the installation.
Thanks to Ronald Sebastian and Alex Dupre for pointing this out.
Noticed by: Ronald Sebastian <mailsagan@yahoo.com> and
Alex Dupre <sysadmin@alexdupre.com>, among others
While I'm here, remove the autoconf part of the Makefile.in patch, which
actually duplicates what I've been doing in the port's Makefile for
some time now :)
Notes
Notes:
svn path=/head/; revision=94818
Diffstat (limited to 'mail/vpopmail')
| -rw-r--r-- | mail/vpopmail/files/patch-Makefile.in | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/mail/vpopmail/files/patch-Makefile.in b/mail/vpopmail/files/patch-Makefile.in index 05603c4b036b..07dcc81a8990 100644 --- a/mail/vpopmail/files/patch-Makefile.in +++ b/mail/vpopmail/files/patch-Makefile.in @@ -1,20 +1,5 @@ ---- Makefile.in.old Thu Nov 27 11:26:31 2003 -+++ Makefile.in Thu Nov 27 11:28:06 2003 -@@ -43,10 +43,10 @@ - - top_builddir = . - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -+ACLOCAL = /usr/bin/true -+AUTOCONF = /usr/bin/true -+AUTOMAKE = /usr/bin/true -+AUTOHEADER = /usr/bin/true - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +--- Makefile.in.old Fri Nov 28 09:45:59 2003 ++++ Makefile.in Fri Nov 28 09:46:37 2003 @@ -723,6 +723,8 @@ echo "-I@vpopmaildir@/include" > @vpopmaildir@/etc/inc_deps echo "-L@vpopmaildir@/lib -lvpopmail @auth_libs@ @LIBS@" > @vpopmaildir@/etc/lib_deps @@ -24,7 +9,7 @@ if test ! -r $(VLIMITS); then \ $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \ vlimits.default $(VLIMITS); \ -@@ -740,12 +742,15 @@ +@@ -740,7 +742,6 @@ echo "# settings for each line:" >> $(MYSQLCONF); \ echo "# host|port|user|password|database" >> $(MYSQLCONF); \ echo "#" >> $(MYSQLCONF); \ @@ -32,12 +17,3 @@ echo "#" >> $(MYSQLCONF); \ echo "# Note:" >> $(MYSQLCONF); \ echo "# The value of host may be either a hostname or an IP address." >> $(MYSQLCONF); \ - echo "# If host is 'localhost', then sockets (Unix) or named pipes (Windows)" >> $(MYSQLCONF); \ - echo "# will be used instead of TCP/IP to connect to the server." >> $(MYSQLCONF); \ -+ fi ; \ -+ chown @vpopuser@ $(MYSQLCONF) ; \ -+ chgrp @vpopgroup@ $(MYSQLCONF) ; \ -+ chmod 0600 $(MYSQLCONF) ; \ - fi ; \ - chown @vpopuser@ $(MYSQLCONF) ; \ - chgrp @vpopgroup@ $(MYSQLCONF) ; \ |