- install the language filters into $PREFIX/libdata/subtitleripper, not

  $PREFIX/share/doc/subtitleripper.
- patch pgm2txt to look in $PREFIX/libdata/subtitleripper instead of
  $HOME/sourceforge/subtitleripper/src
- bump PKGREVISION.

4 files changed, 30 insertions, 11 deletions

diff --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile
index 34139d01d12..05902554dcd 100644
--- a/textproc/subtitleripper/Makefile
+++ b/textproc/subtitleripper/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/10/16 20:23:14 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/02 19:51:05 mrg Exp $
 #
 
 DISTNAME=	subtitleripper-0.3-1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=subtitleripper/}
 EXTRACT_SUFX=	.tgz
@@ -18,15 +18,19 @@ WRKSRC=			${WRKDIR}/subtitleripper
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pgm2txt ${PREFIX}/bin
+	${SED} -e "s,@PREFIX@,${PREFIX}," <${WRKSRC}/pgm2txt >${WRKDIR}/pgm2txt
+	${INSTALL_SCRIPT} ${WRKDIR}/pgm2txt ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/subtitle2pgm ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/srttool ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/subtitle2vobsub ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/subtitleripper
 	cd ${WRKSRC}; ${INSTALL_DATA} README README.gocr README.srttool \
-		README.subtitle2pgm README.vobsub gocrfilter_en.sed \
-		gocrfilter_fr.sed gocrfilter_nl.sed  gocrfilter_none.sed \
+		README.subtitle2pgm README.vobsub \
 		${PREFIX}/share/doc/subtitleripper
+	${INSTALL_DATA_DIR} ${PREFIX}/libdata/subtitleripper
+	cd ${WRKSRC}; ${INSTALL_DATA} gocrfilter_en.sed \
+		gocrfilter_fr.sed gocrfilter_nl.sed gocrfilter_none.sed \
+		${PREFIX}/libdata/subtitleripper
 
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/subtitleripper/PLIST b/textproc/subtitleripper/PLIST
index 0586a9530fa..7d767c31056 100644
--- a/textproc/subtitleripper/PLIST
+++ b/textproc/subtitleripper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/23 07:20:55 mrg Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/12/02 19:51:05 mrg Exp $
 bin/pgm2txt
 bin/srttool
 bin/subtitle2pgm
@@ -8,8 +8,9 @@ share/doc/subtitleripper/README.gocr
 share/doc/subtitleripper/README.srttool
 share/doc/subtitleripper/README.subtitle2pgm
 share/doc/subtitleripper/README.vobsub
-share/doc/subtitleripper/gocrfilter_en.sed
-share/doc/subtitleripper/gocrfilter_fr.sed
-share/doc/subtitleripper/gocrfilter_nl.sed
-share/doc/subtitleripper/gocrfilter_none.sed
+libdata/subtitleripper/gocrfilter_en.sed
+libdata/subtitleripper/gocrfilter_fr.sed
+libdata/subtitleripper/gocrfilter_nl.sed
+libdata/subtitleripper/gocrfilter_none.sed
 @dirrm share/doc/subtitleripper
+@dirrm libdata/subtitleripper
diff --git a/textproc/subtitleripper/distinfo b/textproc/subtitleripper/distinfo
index cf9aa744aba..82d35ab21a8 100644
--- a/textproc/subtitleripper/distinfo
+++ b/textproc/subtitleripper/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/02 19:51:05 mrg Exp $
 
 SHA1 (subtitleripper-0.3-1.tgz) = d34aac07e834fd462c89484db8fcb27bebcb8ef5
 RMD160 (subtitleripper-0.3-1.tgz) = e75c2ea9ab8b5d96c57b860ab15021b9af5a9500
 Size (subtitleripper-0.3-1.tgz) = 42382 bytes
 SHA1 (patch-aa) = b93e8276813bb6bf2a3aee797619bd1bff0f7eca
+SHA1 (patch-ab) = 22335a412899b7cdb552185ff051c7d2f2e1ba59
diff --git a/textproc/subtitleripper/patches/patch-ab b/textproc/subtitleripper/patches/patch-ab
new file mode 100644
index 00000000000..8991c362b0e
--- /dev/null
+++ b/textproc/subtitleripper/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/12/02 19:51:05 mrg Exp $
+
+--- pgm2txt.orig	2005-11-29 22:01:54.000000000 -0800
++++ pgm2txt	2005-11-29 22:02:34.000000000 -0800
+@@ -16,7 +16,7 @@
+ # Adjust this path to where the files
+ # gocrfilter_en.sed  gocrfilter_fr.sed  gocrfilter_none.sed
+ # are located
+-PATH_TO_LANGUAGE_FILTER=~/sourceforge/subtitleripper/src/
++PATH_TO_LANGUAGE_FILTER=@PREFIX@/libdata/subtitleripper/
+ 
+ # set your options for gocr. Please read the gocr
+ # docs to find out more about this