check-interpreter fix. Use subst.mk for substitution.

4 files changed, 22 insertions, 23 deletions

diff --git a/print/bg5ps/Makefile b/print/bg5ps/Makefile
index 5d2fd5d4e8e..5cef62582dd 100644
--- a/print/bg5ps/Makefile
+++ b/print/bg5ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2011/04/22 13:44:31 obache Exp $
+# $NetBSD: Makefile,v 1.19 2011/07/03 20:44:45 jym Exp $
 
 DISTNAME=	bg5ps-1.3.0
 PKGREVISION=	4
@@ -15,10 +15,15 @@ DEPENDS+=	arphic-ttf>=2.11:../../fonts/arphic-ttf
 
 PKG_SYSCONFSUBDIR?=	bg5ps
 
-post-patch:
-	@${SED} 's|%%ETCDIR%%|${PKG_SYSCONFDIR}|g' \
-		${WRKSRC}/bg5ps > ${WRKSRC}/bg5ps.new
+REPLACE_PYTHON+=	bg5ps
 
+SUBST_CLASSES+=		config
+SUBST_MESSAGE.config=	Fixing configuration files path.
+SUBST_STAGE.config=	post-configure
+SUBST_FILES.config=	bg5ps
+SUBST_VARS.config=	PKG_SYSCONFDIR
+
+.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/bg5ps/distinfo b/print/bg5ps/distinfo
index f0f77f759e0..c825fc281b8 100644
--- a/print/bg5ps/distinfo
+++ b/print/bg5ps/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/06/20 01:09:32 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/07/03 20:44:45 jym Exp $
 
 SHA1 (bg5ps-1.3.0.tar.gz) = b7fc700ff1336b74fe447fd4b13bca7ed3604aa8
 RMD160 (bg5ps-1.3.0.tar.gz) = c35fcd17eedf4fb85db4bb53b6f0ea44a185ba6d
 Size (bg5ps-1.3.0.tar.gz) = 120390 bytes
-SHA1 (patch-aa) = d435845acda2363af9389cbccccc783073735d38
+SHA1 (patch-aa) = 07b7bcfd6475e57c448d3e9db11ac7837a96269b
 SHA1 (patch-ab) = 1def7918c5809dc08da8cbc2916cfae5e46f5b41
-SHA1 (patch-ac) = 4f6ec31cd46082d4e9bdaa3431dd2527beb66dde
+SHA1 (patch-ac) = b27f8ecfdfbf700416f7e6cfcec36044cadc7014
diff --git a/print/bg5ps/patches/patch-aa b/print/bg5ps/patches/patch-aa
index b89fc82e1cf..06e6cf3007a 100644
--- a/print/bg5ps/patches/patch-aa
+++ b/print/bg5ps/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:32 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2011/07/03 20:44:45 jym Exp $
 
 --- Makefile.orig	2000-02-14 20:41:27.000000000 +0000
 +++ Makefile
@@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.3 2008/06/20 01:09:32 joerg Exp $
 +	mkdir -p ${DESTDIR}$(ETCDIR)
 +	mkdir -p ${DESTDIR}$(BINDIR)
 +	$(INSTALL) -m644 bg5ps.conf ${DESTDIR}$(ETCDIR)/bg5ps.conf
-+	$(INSTALL) -m755 bg5ps.new ${DESTDIR}$(BINDIR)/bg5ps
++	$(INSTALL) -m755 bg5ps ${DESTDIR}$(BINDIR)/bg5ps
 +	$(INSTALL) -m755 ttf2psm ${DESTDIR}$(BINDIR)
  
  clean:
diff --git a/print/bg5ps/patches/patch-ac b/print/bg5ps/patches/patch-ac
index e51f9247b8d..ab5a6ffe83e 100644
--- a/print/bg5ps/patches/patch-ac
+++ b/print/bg5ps/patches/patch-ac
@@ -1,23 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/15 08:22:18 shell Exp $
+$NetBSD: patch-ac,v 1.2 2011/07/03 20:44:45 jym Exp $
 
---- bg5ps.orig	Tue Feb 15 04:46:43 2000
+--- bg5ps.orig	2000-02-14 20:46:43.000000000 +0000
 +++ bg5ps
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- ################################################################################
- # bg5ps.py which use the ttf2ps program to convert the Big5 Coding chinese     #
- # text into printable postscript file.  Since it uses true type font, the      #
 @@ -11,7 +11,7 @@
  #
  # Revision 1.5  2000/02/14 20:40:04  platin
  #
 -# Change default config file to /etc/chinese/bg5ps.conf
-+# Change default config file to %%ETCDIR%%/bg5ps.conf
++# Change default config file to @PKG_SYSCONFDIR@/bg5ps.conf
  #
  # Revision 1.4  2000/02/14 20:28:35  platin
  # Automatic selection of fontName in echo Encoding.
-@@ -443,10 +443,10 @@
+@@ -443,10 +443,10 @@ mpage -2 big5.txt | bg5ps -en big5 -nps 
                  exec l
              cf.close()
          else:
@@ -25,10 +19,10 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/06/15 08:22:18 shell Exp $
 -            if os.path.isfile("/etc/chinese/bg5ps.conf"):
 -                sys.stderr.write("\n /etc/chinese/bg5ps.conf found. Use configuration file /etc/chinese/bg5ps.conf")
 -                cf=open("/etc/chinese/bg5ps.conf","r")
-+            sys.stderr.write("\n~/.bg5ps.conf not found.\n Trying %%ETCDIR%%/bg5ps.conf.")
-+            if os.path.isfile("%%ETCDIR%%/bg5ps.conf"):
-+                sys.stderr.write("\n %%ETCDIR%%/bg5ps.conf found. Use configuration file %%ETCDIR%%/bg5ps.conf")
-+                cf=open("%%ETCDIR%%/bg5ps.conf","r")
++            sys.stderr.write("\n~/.bg5ps.conf not found.\n Trying @PKG_SYSCONFDIR@/bg5ps.conf.")
++            if os.path.isfile("@PKG_SYSCONFDIR@/bg5ps.conf"):
++                sys.stderr.write("\n @PKG_SYSCONFDIR@/bg5ps.conf found. Use configuration file @PKG_SYSCONFDIR@/bg5ps.conf")
++                cf=open("@PKG_SYSCONFDIR@/bg5ps.conf","r")
                  for l in cf.readlines():
                      exec l
                  cf.close()