diff options
| author | markd <markd@pkgsrc.org> | 2005-01-07 12:29:02 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2005-01-07 12:29:02 +0000 |
| commit | b7e57420af65910e6591a16eb40b2202f6a67021 (patch) | |
| tree | f13b9f65b260989b423d26ec6303ee5e2d63ae6b /net | |
| parent | d9dea87ff547084f1e852ef3d1f07d117c7593a4 (diff) | |
| download | pkgsrc-b7e57420af65910e6591a16eb40b2202f6a67021.tar.gz | |
Redo fixing of hardcoded paths, including actually using the value of
${RCD_SCRIPTS_EXAMPLEDIR} rather than just its default.
Diffstat (limited to 'net')
| -rw-r--r-- | net/netatalk/Makefile | 12 | ||||
| -rw-r--r-- | net/netatalk/distinfo | 3 | ||||
| -rw-r--r-- | net/netatalk/patches/patch-ab | 13 |
3 files changed, 8 insertions, 20 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index e5c6b508c04..41096dd5f41 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -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 @@ CONFIGURE_ARGS+= --enable-netbsd \ --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 --git a/net/netatalk/distinfo b/net/netatalk/distinfo index cb575663e8a..e3665a70014 100644 --- a/net/netatalk/distinfo +++ b/net/netatalk/distinfo @@ -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 --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab deleted file mode 100644 index 03d13bd518c..00000000000 --- a/net/netatalk/patches/patch-ab +++ /dev/null @@ -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*! - - - # |