mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

Looks like I seriously botched the last commit; somehow four lines from

Browse Source 
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 :)
This commit is contained in:
Peter Pentchev 2003-11-28 07:54:53 +00:00
parent f953b139e5
commit 54844ff483
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=94818
2 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mail/vpopmail-devel/files/patch-Makefile.in
View File

@ -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) ; \

30
mail/vpopmail/files/patch-Makefile.in
View File

@ -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) ; \