[pkgsrc/trunk]: pkgsrc/net/netatalk Redo fixing of hardcoded paths, including...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b680e7920b8
branches:  trunk
changeset: 487031:4b680e7920b8
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Jan 07 12:29:02 2005 +0000

description:
Redo fixing of hardcoded paths, including actually using the value of
${RCD_SCRIPTS_EXAMPLEDIR} rather than just its default.

diffstat:

 net/netatalk/Makefile         |  12 +++++++-----
 net/netatalk/distinfo         |   3 +--
 net/netatalk/patches/patch-ab |  13 -------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diffs (57 lines):

diff -r 2cf2622f2fb7 -r 4b680e7920b8 net/netatalk/Makefile
--- a/net/netatalk/Makefile     Fri Jan 07 12:00:07 2005 +0000
+++ b/net/netatalk/Makefile     Fri Jan 07 12:29:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/01/05 10:30:44 markd Exp $
+# $NetBSD: Makefile,v 1.36 2005/01/07 12:29:02 markd Exp $
 
 DISTNAME=      netatalk-2.0.2
 CATEGORIES=    net print
@@ -45,10 +45,12 @@
                        --with-gssapi --enable-krbV-uam
 CONFIGURE_ENV+=        GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
 
-post-patch:
-       mv ${WRKSRC}/etc/psf/etc2ps.sh ${WRKSRC}/etc/psf/etc2ps.sh.tmp
-       ${SED} -e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3," \
-               < ${WRKSRC}/etc/psf/etc2ps.sh.tmp > ${WRKSRC}/etc/psf/etc2ps.sh
+SUBST_CLASSES+=                paths
+SUBST_MESSAGE.paths=   "Fixing hardcoded paths."
+SUBST_STAGE.paths=     post-patch
+SUBST_FILES.paths=     etc/psf/etc2ps.sh distrib/initscripts/Makefile.in
+SUBST_SED.paths=       -e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3,"
+SUBST_SED.paths+=      -e "s,\(NETBSD.*\)/etc/rc.d,\1${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR},"
 
 pre-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters
diff -r 2cf2622f2fb7 -r 4b680e7920b8 net/netatalk/distinfo
--- a/net/netatalk/distinfo     Fri Jan 07 12:00:07 2005 +0000
+++ b/net/netatalk/distinfo     Fri Jan 07 12:29:02 2005 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.15 2005/01/04 12:57:03 markd Exp $
+$NetBSD: distinfo,v 1.16 2005/01/07 12:29:02 markd Exp $
 
 SHA1 (netatalk-2.0.2.tar.bz2) = 32ed755af1131982395a67faa48634b8efa02cb6
 Size (netatalk-2.0.2.tar.bz2) = 1470047 bytes
 SHA1 (patch-aa) = 038971eea8da4fbab0596b87aa0c2f8d01493a15
-SHA1 (patch-ab) = fd514b914b74b8109e941ab8699bce80d82a45fb
 SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
diff -r 2cf2622f2fb7 -r 4b680e7920b8 net/netatalk/patches/patch-ab
--- a/net/netatalk/patches/patch-ab     Fri Jan 07 12:00:07 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2005/01/04 12:57:03 markd Exp $
-
---- distrib/initscripts/Makefile.in.orig       2004-08-27 23:24:05.000000000 +1200
-+++ distrib/initscripts/Makefile.in
-@@ -246,7 +246,7 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
- #
- # checking for NetBSD init scripts
- #
--@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
-+@USE_NETBSD_TRUE@sysvdir = ${prefix}/share/examples/rc.d# pkgsrc *only*!
- 
- 
- #