pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/exim3 Use SUBST framework instead of FILES_SUBST_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/936a7b8bc19d
branches:  trunk
changeset: 506708:936a7b8bc19d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jan 20 23:09:42 2006 +0000

description:
Use SUBST framework instead of FILES_SUBST_SED. Rename temporary file
from Makefile.NetBSD to Makefile.pkgsrc (cosmetic only). Use PERL5
instead of PREFIX/bin/perl when looking for Perl interpreter.

diffstat:

 mail/exim3/Makefile         |  16 ++++++++++++----
 mail/exim3/distinfo         |   4 ++--
 mail/exim3/patches/patch-aa |   8 ++++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 284905d00d44 -r 936a7b8bc19d mail/exim3/Makefile
--- a/mail/exim3/Makefile       Fri Jan 20 22:44:50 2006 +0000
+++ b/mail/exim3/Makefile       Fri Jan 20 23:09:42 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/01/08 19:38:54 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/01/20 23:09:42 joerg Exp $
 
 DISTNAME=      exim-3.36
 PKGREVISION=   5
@@ -63,17 +63,25 @@
 MAKE_ENV+=             LOOKUP_INCLUDE=${LOOKUP_INCLUDE:Q}
 MAKE_ENV+=             LOOKUP_LIBS=${LOOKUP_LIBS:Q}
 
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     Local/Makefile.pkgsrc
+SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+=      -e 's,@GZIP_CMD@,${GZIP_CMD},g'
+SUBST_SED.paths+=      -e 's,@GZCAT@,${GZCAT},g'
+SUBST_SED.paths+=      -e 's,@PERL5@,${PERL5},g'
+SUBST_STAGE.paths=     post-patch
+
 post-extract:
        ${CP} ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \
                ${WRKSRC}/OS/
 
 pre-patch:
        ${MKDIR} ${WRKSRC}/Local
-       ${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.netbsd
+       ${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
 
 pre-configure:
-       @${SED} ${FILES_SUBST_SED} ${WRKSRC}/Local/Makefile.netbsd \
-               > ${WRKSRC}/Local/Makefile
+       ${CP} ${WRKSRC}/Local/Makefile.pkgsrc ${WRKSRC}/Local/Makefile
        @for f in ${WRKSRC}/OS/Makefile-*; do \
                ${SED} -e 's/^CFLAGS.*/& $$(CPPFLAGS)/' \
                -e '/^DBMLIB/d' $$f > $$f.subst; \
diff -r 284905d00d44 -r 936a7b8bc19d mail/exim3/distinfo
--- a/mail/exim3/distinfo       Fri Jan 20 22:44:50 2006 +0000
+++ b/mail/exim3/distinfo       Fri Jan 20 23:09:42 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/09/06 08:10:58 abs Exp $
+$NetBSD: distinfo,v 1.7 2006/01/20 23:09:42 joerg Exp $
 
 SHA1 (exim-3.36.tar.bz2) = 2a06a2858ebf8cdedf2e41fa3f258b5e468e270d
 RMD160 (exim-3.36.tar.bz2) = 2654601eaf54fc15c1ebeabfee53c828f2fd22dd
 Size (exim-3.36.tar.bz2) = 982104 bytes
-SHA1 (patch-aa) = f137e07e597a72fede1ee8d2e78f2f284e0061c6
+SHA1 (patch-aa) = b0d23fa0763a16a932e051a79b70b2d708ab69fc
 SHA1 (patch-ab) = 6664ab8fa62ad56e933d87319abb4505abcf7a5b
 SHA1 (patch-ac) = 3a74d412a1c6c00cb23ae63ed018d02002fa4595
 SHA1 (patch-ad) = d4962927418489f77a8e0234f7f95628ed506026
diff -r 284905d00d44 -r 936a7b8bc19d mail/exim3/patches/patch-aa
--- a/mail/exim3/patches/patch-aa       Fri Jan 20 22:44:50 2006 +0000
+++ b/mail/exim3/patches/patch-aa       Fri Jan 20 23:09:42 2006 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2004/05/07 17:47:32 abs Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/20 23:09:42 joerg Exp $
 
---- Local/Makefile.netbsd.orig Fri May  7 18:36:39 2004
-+++ Local/Makefile.netbsd
+--- Local/Makefile.pkgsrc.orig Fri May  7 18:36:39 2004
++++ Local/Makefile.pkgsrc
 @@ -78,7 +78,7 @@
  # CHGRP_COMMAND=/usr/bin/chgrp
  # MV_COMMAND=/bin/mv
  # RM_COMMAND=/bin/rm
 -# PERL_COMMAND=/usr/bin/perl
-+PERL_COMMAND=@PREFIX@/bin/perl
++PERL_COMMAND=@PERL5@
  
  
  # The following macro can be used to change the command for building a library



Home | Main Index | Thread Index | Old Index