kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use FILES_SUBST_SED instead of local make targets to do the same thing.

Browse source 
FILES_SUBST_SED substitutes for @FOO@, so use that format for things to
be replaced.
This commit is contained in:
jlam 2004-07-18 19:16:31 +00:00
parent f6a3323476
commit dcfd518826
5 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mail/postfix/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.133 2004/06/22 05:12:43 martti Exp $
# $NetBSD: Makefile,v 1.134 2004/07/18 19:16:31 jlam Exp $
DISTNAME= postfix-2.1.3
CATEGORIES= mail
@ -179,9 +179,7 @@ INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL
pre-configure:
@for i in ${POSTFIX_CONF_FILES}; do \
${CP} ${WRKSRC}/$${i} ${WRKSRC}/$${i}.dist; \
${SED} -e 's|__PREFIX|'${PREFIX}'|g' \
-e 's|__PKG_SYSCONFDIR|'${PKG_SYSCONFDIR}'|g' \
< ${WRKSRC}/$${i}.dist \
${SED} ${FILES_SUBST_SED} ${WRKSRC}/$${i}.dist \
> ${WRKSRC}/$${i}; \
done
@ -191,8 +189,8 @@ do-configure:
'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
post-build:
${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
<${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf \
> ${WRKDIR}/mailer.conf.postfix
pre-install:
${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}

6
mail/postfix/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.67 2004/06/22 05:12:44 martti Exp $
$NetBSD: distinfo,v 1.68 2004/07/18 19:16:31 jlam Exp $
SHA1 (postfix/postfix-2.1.3.tar.gz) = 1c08947afa33a1cf1477954d906aa8d95922ea6f
Size (postfix/postfix-2.1.3.tar.gz) = 1971632 bytes
@ -9,8 +9,8 @@ Size (postfix/tls+ipv6-1.25-pf-2.1.3.patch.gz) = 256591 bytes
SHA1 (patch-aa) = ca3d2739c35c89056b2f0c19a2cbcb9e018013c6
SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
SHA1 (patch-ae) = 98ff7efe8338d4e6e05e311d070237d726161af2
SHA1 (patch-af) = c5fc75f8f9499ed533bd30e162ec8784e446d288
SHA1 (patch-ae) = 3c0884fc2969d8353809895479f0f58897c5f133
SHA1 (patch-af) = 48f0f516f415b1faa1e9d2775e9446aa540d749d
SHA1 (patch-ag) = 292b3b5d87f4688930fd654edfc5cb83ca8a2652
SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40

14
mail/postfix/files/mailer.conf
View file

@ -1,10 +1,10 @@
# $NetBSD: mailer.conf,v 1.5 2002/03/19 08:24:01 martti Exp $
# $NetBSD: mailer.conf,v 1.6 2004/07/18 19:16:31 jlam Exp $
#
# Use "postfix" as replacement for "sendmail".
#
sendmail @@PREFIX@@/sbin/sendmail
send-mail @@PREFIX@@/sbin/sendmail
mailq @@PREFIX@@/sbin/sendmail
newaliases @@PREFIX@@/sbin/sendmail
hoststat @@PREFIX@@/sbin/sendmail
purgestat @@PREFIX@@/sbin/sendmail
sendmail @PREFIX@/sbin/sendmail
send-mail @PREFIX@/sbin/sendmail
mailq @PREFIX@/sbin/sendmail
newaliases @PREFIX@/sbin/sendmail
hoststat @PREFIX@/sbin/sendmail
purgestat @PREFIX@/sbin/sendmail

6
mail/postfix/patches/patch-ae
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ae,v 1.8 2004/06/21 16:13:23 martti Exp $
$NetBSD: patch-ae,v 1.9 2004/07/18 19:16:31 jlam Exp $
--- src/global/mail_params.h.orig 2004-04-21 14:56:04.000000000 -0400
+++ src/global/mail_params.h 2004-05-23 22:44:13.000000000 -0400
@ -16,14 +16,14 @@ $NetBSD: patch-ae,v 1.8 2004/06/21 16:13:23 martti Exp $
#define VAR_DAEMON_DIR "daemon_directory"
#ifndef DEF_DAEMON_DIR
-#define DEF_DAEMON_DIR "/usr/libexec/postfix"
+#define DEF_DAEMON_DIR "__PREFIX/libexec/postfix"
+#define DEF_DAEMON_DIR "@PREFIX@/libexec/postfix"
#endif
extern char *var_daemon_dir;
#define VAR_COMMAND_DIR "command_directory"
#ifndef DEF_COMMAND_DIR
-#define DEF_COMMAND_DIR "/usr/sbin"
+#define DEF_COMMAND_DIR "__PREFIX/sbin"
+#define DEF_COMMAND_DIR "@PREFIX@/sbin"
#endif
extern char *var_command_dir;

18
mail/postfix/patches/patch-af
View file

@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.19 2004/06/21 16:13:23 martti Exp $
$NetBSD: patch-af,v 1.20 2004/07/18 19:16:31 jlam Exp $
--- conf/main.cf.orig 2004-04-15 09:27:21.000000000 -0400
+++ conf/main.cf 2004-05-23 22:51:16.000000000 -0400
@ -7,19 +7,19 @@ $NetBSD: patch-af,v 1.19 2004/06/21 16:13:23 martti Exp $
# postXXX commands.
#
-command_directory = /usr/sbin
+command_directory = __PREFIX/sbin
+command_directory = @PREFIX@/sbin
# The daemon_directory parameter specifies the location of all Postfix
# daemon programs (i.e. programs listed in the master.cf file). This
# directory must be owned by root.
#
-daemon_directory = /usr/libexec/postfix
+daemon_directory = __PREFIX/libexec/postfix
+daemon_directory = @PREFIX@/libexec/postfix
+
+# Shared files and etc directory
+etc_directory = __PKG_SYSCONFDIR
+share_directory = __PREFIX/share/examples/postfix
+man_directory = __PREFIX/man
+etc_directory = @PKG_SYSCONFDIR@
+share_directory = @PREFIX@/share/examples/postfix
+man_directory = @PREFIX@/man
# QUEUE AND PROCESS OWNERSHIP
#
@ -46,15 +46,15 @@ $NetBSD: patch-af,v 1.19 2004/06/21 16:13:23 martti Exp $
# manpage_directory: The location of the Postfix on-line manual pages.
#
-manpage_directory =
+manpage_directory = __PREFIX/man
+manpage_directory = @PREFIX@/man
# sample_directory: The location of the Postfix sample configuration files.
# This parameter is obsolete as of Postfix 2.1.
#
-sample_directory =
+sample_directory = __PREFIX/share/examples/postfix
+sample_directory = @PREFIX@/share/examples/postfix
# readme_directory: The location of the Postfix README files.
#
-readme_directory =
+readme_directory = __PREFIX/share/doc/postfix
+readme_directory = @PREFIX@/share/doc/postfix