[pkgsrc/pkgsrc-2006Q3]: pkgsrc/print/ja-ptex-bin Pullup ticket 1921 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e40339986dc2
branches:  pkgsrc-2006Q3
changeset: 519207:e40339986dc2
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Nov 27 10:01:46 2006 +0000

description:
Pullup ticket 1921 - requested by hira
install fix for ja-ptex-bin

- pkgsrc/print/ja-ptex-bin/distinfo             1.4
- pkgsrc/print/ja-ptex-bin/patches/patch-ad     1.3

   Module Name: pkgsrc
   Committed By:        hira
   Date:                Sun Nov 12 08:51:54 UTC 2006

   Modified Files:
        pkgsrc/print/ja-ptex-bin: distinfo
        pkgsrc/print/ja-ptex-bin/patches: patch-ad

   Log Message:
   Don't overwrite installed files.  This should close PR pkg/35036.

diffstat:

 print/ja-ptex-bin/distinfo         |  10 +++---
 print/ja-ptex-bin/patches/patch-ad |  55 +++++++++++++++++++++++++++++++++----
 2 files changed, 54 insertions(+), 11 deletions(-)

diffs (101 lines):

diff -r 0d80e438cd8a -r e40339986dc2 print/ja-ptex-bin/distinfo
--- a/print/ja-ptex-bin/distinfo        Fri Nov 24 15:09:02 2006 +0000
+++ b/print/ja-ptex-bin/distinfo        Mon Nov 27 10:01:46 2006 +0000
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.3 2006/06/24 10:52:23 hira Exp $
+$NetBSD: distinfo,v 1.3.4.1 2006/11/27 10:01:46 ghen Exp $
 
-SHA1 (teTeX/ptex-src-3.1.9.tar.gz) = 816ca1bb43f8835a81a8804a3d6068f1710984bf
-RMD160 (teTeX/ptex-src-3.1.9.tar.gz) = 05aca5199437a5d5a99d531f33d04f2a472ca2f7
-Size (teTeX/ptex-src-3.1.9.tar.gz) = 131943 bytes
 SHA1 (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = 1b4051fe443fcffe2b12199fcf2df01550c57f32
 RMD160 (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = f9c1a12b17e3d0c904bfe0bb145f84b59eb74eff
 Size (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = 26669 bytes
 SHA1 (teTeX/mendexk2.6d.tar.gz) = 462416b4e6c20cfdd8babad25e99c0468a048eb0
 RMD160 (teTeX/mendexk2.6d.tar.gz) = 79aa7aadb78c1db1fdb0247d2bb50fece9a37b7c
 Size (teTeX/mendexk2.6d.tar.gz) = 30503 bytes
+SHA1 (teTeX/ptex-src-3.1.9.tar.gz) = 816ca1bb43f8835a81a8804a3d6068f1710984bf
+RMD160 (teTeX/ptex-src-3.1.9.tar.gz) = 05aca5199437a5d5a99d531f33d04f2a472ca2f7
+Size (teTeX/ptex-src-3.1.9.tar.gz) = 131943 bytes
 SHA1 (patch-aa) = dc1d81face4bd3a401628527706d42fcaf8df778
 SHA1 (patch-ab) = 7015dfdaa6cbaf50a91afd5682231b30a9f17d22
 SHA1 (patch-ac) = 43c6d4e27cbdbaf043800fe07b346a0d865d96a3
-SHA1 (patch-ad) = 52f6e2fe5a70cf8f618357edab114a648288fb4d
+SHA1 (patch-ad) = 98e6edf48ff971ab9864336678a59afa44c92126
 SHA1 (patch-af) = c3d591ab2b9917c7a06355618b96662fe6a7b375
 SHA1 (patch-ai) = 4ad131be8273ff52ad0f3778a0b5bf3370f698eb
 SHA1 (patch-ak) = 2f0d690023d5dac50e99321e240992870f32304b
diff -r 0d80e438cd8a -r e40339986dc2 print/ja-ptex-bin/patches/patch-ad
--- a/print/ja-ptex-bin/patches/patch-ad        Fri Nov 24 15:09:02 2006 +0000
+++ b/print/ja-ptex-bin/patches/patch-ad        Mon Nov 27 10:01:46 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2006/06/24 10:52:23 hira Exp $
+$NetBSD: patch-ad,v 1.2.4.1 2006/11/27 10:01:46 ghen Exp $
 
---- texk/dvipsk/Makefile.in.orig       2006-05-11 16:30:49.000000000 +0900
-+++ texk/dvipsk/Makefile.in    2006-05-11 16:34:55.000000000 +0900
+--- texk/dvipsk/Makefile.in.orig       2006-11-12 17:09:31.000000000 +0900
++++ texk/dvipsk/Makefile.in    2006-11-12 17:21:04.000000000 +0900
 @@ -19,6 +19,7 @@
  ac_include ../make/cross.mk
  ac_include ../make/texi.mk
@@ -28,7 +28,19 @@
  afm2tfm: $(kpathsea) afm2tfm.o
        $(kpathsea_link) afm2tfm.o $(LOADLIBES) 
  # Omit LOADLIBES since no need to dynamically link with kpathsea.
-@@ -110,8 +114,8 @@
+@@ -87,11 +91,8 @@
+ install-exec: all
+       $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+       for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+-      rm -f $(bindir)/o$(program)
+-      ln -s $(program) $(bindir)/o$(program)
+ uninstall-exec:
+       for p in $(programs); do rm -f $(bindir)/$$p; done
+-      rm -f $(bindir)/o$(program)
+ 
+ install-data: $(program).info
+       $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(infodir) $(psheaderdir)/base
+@@ -110,31 +111,18 @@
  #       $(INSTALL_DATA) $(srcdir)/psfonts.map $(psheaderdir)/base/psfonts.map; \
  #        else true; fi
  # psfonts_jp.map.
@@ -37,5 +49,36 @@
 +      $(INSTALL) -d $(texmflcl)/fonts/map/dvips/ptex
 +      $(INSTALL_DATA) $(srcdir)/psfonts_jp.map $(texmflcl)/fonts/map/dvips/ptex/psfonts_jp.map
  # Info files.
-       cd $(srcdir) && for i in $(program).i*; do \
-         $(INSTALL_DATA) $$i $(infodir)/$$i; done
+-      cd $(srcdir) && for i in $(program).i*; do \
+-        $(INSTALL_DATA) $$i $(infodir)/$$i; done
+ # Man pages.
+-      $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
+-      rm -f $(man1dir)/o$(program).$(manext)
+-      ln -s $(program).$(manext) $(man1dir)/o$(program).$(manext)
+-      $(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(man1dir)/afm2tfm.$(manext)
+ # TeX macros.
+ #     cd $(srcdir)/tex && for m in *.tex; do \
+ #       $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done
+       $(POST_INSTALL)
+-      if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+-        install-info --info-dir=$(infodir) $(infodir)/$(program).info; \
+-      else true; fi
+ 
+ uninstall-data:
+       $(PRE_UNINSTALL)
+-      if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+-        install-info --delete --info-dir=$(infodir) $(infodir)/$(program).info; \
+-      else true; fi
+       $(NORMAL_UNINSTALL)
+-      rm -f $(infodir)/dvips.i*
+ #     for h in $(prologues); do rm -f $(psheaderdir)/base/$$h; done
+ #     cd $(srcdir)/reencode && for e in *.enc; do rm -f $(psheaderdir)/base/$$e; \
+ #       done
+@@ -146,7 +134,6 @@
+ #        else true; fi
+       rm -f $(texmf)/fonts/map/dvips/ptex/psfonts_jp.map
+       rmdir $(texmf)/fonts/map/dvips/ptex
+-      rm -f $(man1dir)/dvips.$(manext) $(man1dir)/afm2tfm.$(manext)
+ 
+ distname = dvipsk
+ program_files = *.texi *.info* *.lpro psfonts.map *.1 texc.script \