cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak postfix/snapshot. jakob and i came up with the same diff.

Browse Source 
ok espie
This commit is contained in:
sthen 2008-03-03 10:03:18 +00:00
parent 93617dc5e1
commit 41d5a6add6
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/postfix/snapshot/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.178 2008/02/29 12:25:22 jakob Exp $
# $OpenBSD: Makefile,v 1.179 2008/03/03 10:03:18 sthen Exp $
VERSION= 2.6-20080216
PATCHLEVEL= 0
PATCHLEVEL= 1
MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/}

19
mail/postfix/snapshot/files/postfix-install
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: postfix-install,v 1.2 2008/02/01 16:53:58 jakob Exp $
# $OpenBSD: postfix-install,v 1.3 2008/03/03 10:03:18 sthen Exp $
#
# Post-installation setup of postfix
@ -40,17 +40,6 @@ MAILER
chmod 644 /etc/mailer.conf.postfix
}
# Function: update postfix scripts
#
update_scripts()
{
rm -f $CONFIG_DIR/{postfix-script,postfix-files,post-install}
install -o root -g wheel -m 544 \
$SAMPLE_CONFIG_DIR/{postfix-script,post-install} $CONFIG_DIR
install -o root -g wheel -m 444 \
$SAMPLE_CONFIG_DIR/postfix-files $CONFIG_DIR
}
# Function: install the postfix configuration files from the samples
#
do_configs()
@ -58,8 +47,6 @@ do_configs()
POSTFIX="${PREFIX}/sbin/postfix"
if [ -d $CONFIG_DIR ]; then
update_scripts
echo ""
$POSTFIX upgrade-configuration
echo ""
@ -68,16 +55,12 @@ do_configs()
echo "| The existing configuration files in $CONFIG_DIR have been preserved."
echo "| You may want to compare them to the current sample files,"
echo "| $SAMPLE_CONFIG_DIR, and update your configuration as needed."
echo "|"
echo "| $CONFIG_DIR/post{fix-{script,files},-install} has been updated."
echo "+---------------"
echo ""
else
install -d -o root -g wheel -m 755 $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/* $CONFIG_DIR
update_scripts
echo "+---------------"
echo "| Configuration files have been installed in $CONFIG_DIR."
echo "| Please update these files to meet your needs."