pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/advi let advi compile and run happily with ocaml...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7c16c96e2b97
branches: trunk
changeset: 511684:7c16c96e2b97
user: tonio <tonio%pkgsrc.org@localhost>
date: Wed Apr 19 13:13:05 2006 +0000
description:
let advi compile and run happily with ocaml-3.09
Use the teTeX/module.mk and honor PKG_LOCALTEXMFPREFIX
make sure advi's makefile do not run texhash by itself (rely on module.mk for that)
Many patches removing warnings (from advi's cvs)
bump PKGREVISION, and remove broken-in
diffstat:
print/advi/Makefile | 32 +++++++++++++-------
print/advi/PLIST | 50 +++++++++++++++----------------
print/advi/distinfo | 16 +++++++++-
print/advi/patches/patch-aa | 29 ++++++++++++++++++
print/advi/patches/patch-ab | 23 ++++++++++++++
print/advi/patches/patch-ac | 13 ++++++++
print/advi/patches/patch-ad | 20 ++++++++++++
print/advi/patches/patch-ae | 13 ++++++++
print/advi/patches/patch-af | 21 +++++++++++++
print/advi/patches/patch-ag | 33 +++++++++++++++++++++
print/advi/patches/patch-ah | 22 ++++++++++++++
print/advi/patches/patch-ai | 31 +++++++++++++++++++
print/advi/patches/patch-aj | 70 +++++++++++++++++++++++++++++++++++++++++++++
print/advi/patches/patch-ak | 13 ++++++++
print/advi/patches/patch-al | 13 ++++++++
print/advi/patches/patch-am | 20 ++++++++++++
print/advi/patches/patch-an | 18 +++++++++++
17 files changed, 399 insertions(+), 38 deletions(-)
diffs (truncated from 563 to 300 lines):
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/Makefile
--- a/print/advi/Makefile Wed Apr 19 12:47:16 2006 +0000
+++ b/print/advi/Makefile Wed Apr 19 13:13:05 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2006/04/17 13:46:45 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/19 13:13:05 tonio Exp $
DISTNAME= advi-1.6.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
EXTRACT_SUFX= .tgz
@@ -10,14 +10,31 @@
HOMEPAGE= http://pauillac.inria.fr/advi/
COMMENT= Active-DVI Presenter
-BROKEN_IN= pkgsrc-2005Q4
-
BUILD_DEPENDS+= ocaml>=3.04:../../lang/ocaml
TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake gs:run
+CONFIGURE_ARGS+= --libdir=${PKG_LOCALTEXMFPREFIX:Q}
+
+# subst.mk ignores the files it thinks are not text files
+_SUBST_IS_TEXT_FILE= true
+
+SUBST_CLASSES+= gspath
+SUBST_MESSAGE.gspath= Fixing gs pathname in binary.
+SUBST_STAGE.gspath= pre-configure
+SUBST_FILES.gspath= config.ml.in
+SUBST_SED.gspath= -e "s,@PATH_GS@,${PREFIX}/bin/gs,g"
+
+SUBST_CLASSES+= conf
+SUBST_MESSAGE.paths= Fixing config file path
+SUBST_STAGE.paths= post-configure
+SUBST_FILES.paths= userfile.ml
+SUBST_SED.paths= -e "s:/etc/advirc:${PKG_SYSCONFDIR}/advirc:g"
+
+USE_DIRS+= texmf-1.0
+.include "../../print/teTeX/module.mk"
post-extract:
@${CP} ${WRKSRC}/tex/*.eps ${WRKSRC}/doc
@@ -25,12 +42,6 @@
@${MKDIR} ${WRKSRC}/doc.orig
@${CP} ${WRKSRC}/doc/*.dvi ${WRKSRC}/doc.orig
-post-configure:
- @for f in ${WRKSRC}/userfile.ml; do \
- ${SED} -e 's:/etc/advirc:${PKG_SYSCONFDIR}/advirc:g' \
- $$f >> $$f.tmp && ${MV} $$f.tmp $$f; \
- done
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/advi
cd ${WRKSRC}/doc && ${INSTALL_DATA} *.ps *.pdf \
@@ -52,5 +63,4 @@
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/lablgtk/buildlink3.mk"
.include "../../x11/ocaml-graphics/buildlink3.mk"
-.include "../../mk/tex.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/PLIST
--- a/print/advi/PLIST Wed Apr 19 12:47:16 2006 +0000
+++ b/print/advi/PLIST Wed Apr 19 13:13:05 2006 +0000
@@ -1,50 +1,48 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/04 21:50:25 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/19 13:13:05 tonio Exp $
bin/advi
man/man1/advi.1
+share/doc/advi/advi_remote.dvi
share/doc/advi/manual.dvi
share/doc/advi/manual.pdf
share/doc/advi/manual.ps
share/doc/advi/mathmode.dvi
-share/doc/advi/splash.dvi
-share/doc/advi/splash.ps
-share/doc/advi/advi_remote.dvi
share/doc/advi/scratch_draw_splash.dvi
share/doc/advi/scratch_draw_splash.ps
share/doc/advi/scratch_write_splash.dvi
share/doc/advi/scratch_write_splash.ps
+share/doc/advi/splash.dvi
+share/doc/advi/splash.ps
share/doc/html/advi/advi-j.jpg
share/doc/html/advi/advi.jpg
+share/doc/html/advi/advi_remote.html
share/doc/html/advi/advilogo.anim.gif
share/doc/html/advi/advilogo.gif
share/doc/html/advi/bar.gif
+share/doc/html/advi/eng.html
share/doc/html/advi/index.html
share/doc/html/advi/inria.gif
share/doc/html/advi/manual.dvi
+share/doc/html/advi/manual.html
share/doc/html/advi/manual.pdf
share/doc/html/advi/manual.ps
-share/doc/html/advi/style.css
-share/doc/html/advi/advi_remote.html
-share/doc/html/advi/eng.html
-share/doc/html/advi/manual.html
share/doc/html/advi/manual001.gif
share/doc/html/advi/manual002.gif
-share/texmf/tex/latex/advi/advi-annot.sty
-share/texmf/tex/latex/advi/advi-graphicx.sty
-share/texmf/tex/latex/advi/advi-slides.sty
-share/texmf/tex/latex/advi/advi.sty
-share/texmf/tex/latex/advi/advilogo.eps
-share/texmf/tex/latex/advi/argv.sty
-share/texmf/tex/latex/advi/bubble.sty
-share/texmf/tex/latex/advi/caml.eps
-share/texmf/tex/latex/advi/jpfonts.conf
-share/texmf/tex/latex/advi/splash.dvi
-share/texmf/tex/latex/advi/superpose.sty
-share/texmf/tex/latex/advi/bar.eps
-share/texmf/tex/latex/advi/scratch_draw_splash.dvi
-share/texmf/tex/latex/advi/scratch_write_splash.dvi
-share/texmf/tex/latex/advi/xwindows-colors.sty
-@unexec texhash
-@exec texhash
+share/doc/html/advi/style.css
+${PKG_LOCALTEXMFPREFIX}/advi/advi-annot.sty
+${PKG_LOCALTEXMFPREFIX}/advi/advi-graphicx.sty
+${PKG_LOCALTEXMFPREFIX}/advi/advi-slides.sty
+${PKG_LOCALTEXMFPREFIX}/advi/advi.sty
+${PKG_LOCALTEXMFPREFIX}/advi/advilogo.eps
+${PKG_LOCALTEXMFPREFIX}/advi/argv.sty
+${PKG_LOCALTEXMFPREFIX}/advi/bar.eps
+${PKG_LOCALTEXMFPREFIX}/advi/bubble.sty
+${PKG_LOCALTEXMFPREFIX}/advi/caml.eps
+${PKG_LOCALTEXMFPREFIX}/advi/jpfonts.conf
+${PKG_LOCALTEXMFPREFIX}/advi/scratch_draw_splash.dvi
+${PKG_LOCALTEXMFPREFIX}/advi/scratch_write_splash.dvi
+${PKG_LOCALTEXMFPREFIX}/advi/splash.dvi
+${PKG_LOCALTEXMFPREFIX}/advi/superpose.sty
+${PKG_LOCALTEXMFPREFIX}/advi/xwindows-colors.sty
+@dirrm ${PKG_LOCALTEXMFPREFIX}/advi
@dirrm share/doc/html/advi
@dirrm share/doc/advi
-@dirrm share/texmf/tex/latex/advi
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/distinfo
--- a/print/advi/distinfo Wed Apr 19 12:47:16 2006 +0000
+++ b/print/advi/distinfo Wed Apr 19 13:13:05 2006 +0000
@@ -1,5 +1,19 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:51:41 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/04/19 13:13:05 tonio Exp $
SHA1 (advi-1.6.0.tgz) = 8c033df906f3e208471506f64ffa0b175c1c5ee8
RMD160 (advi-1.6.0.tgz) = 55bc5f2742964f29bc694997c3dd9573f8c71964
Size (advi-1.6.0.tgz) = 11436152 bytes
+SHA1 (patch-aa) = 1e5eb89fc756d1a9a9aeca5e2da1a19d366da8e1
+SHA1 (patch-ab) = 2f9a2c22a2a8a6b79f09436a46332daf59c94638
+SHA1 (patch-ac) = 7461e39cfc42d476b5c9e07493415ee2013815ca
+SHA1 (patch-ad) = 5ec6fcdfac79cc9ceeb0314b937cec2e431c6c7c
+SHA1 (patch-ae) = 99eb3c8e731e0019a4e9012071403621fb9d670a
+SHA1 (patch-af) = 0096612f7cca942219df81d3a285ef6edad1d7bc
+SHA1 (patch-ag) = ecb347a6b95f90056335d9015824ac80c3860ae2
+SHA1 (patch-ah) = 6773de8e41be9dbc033ba28861da411170c017d1
+SHA1 (patch-ai) = c6a3d5f956dcdf79f9f4ad33d0f596a567efe72f
+SHA1 (patch-aj) = 87737dc00a68e7c020cec98b039eecf0f7cadf1a
+SHA1 (patch-ak) = 831b0bbc22b25e1160809ad7db981d03eb3388ca
+SHA1 (patch-al) = 97c591d60aefbc15c5ef1624f74b12be57daf6d8
+SHA1 (patch-am) = 8bacf3de7ef836183543b12b5dca66d97bfd4ae4
+SHA1 (patch-an) = 510871fce562c8a5989fbbdd976c175b7e9bc288
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/advi/patches/patch-aa Wed Apr 19 13:13:05 2006 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.3 2006/04/19 13:13:05 tonio Exp $
+
+--- misc.ml.orig 2004-08-12 00:08:06.000000000 +0200
++++ misc.ml
+@@ -114,7 +114,6 @@ let rec reverse_concat l1 = function
+
+ (* Strings auxilliaries. *)
+ let string_prefix char s =
+- let l = String.length s in
+ let i = String.index s char in
+ String.sub s 0 (i + 1);;
+
+@@ -180,7 +179,6 @@ let is_digit c = c >= '0' && c <= '9';;
+
+ let string_substitute_var f s =
+ let b = Buffer.create (String.length s * 2) in
+- let len = String.length s in
+ let rec loop ib =
+ Scanf.bscanf ib "%c" (function
+ | '@'
+@@ -192,7 +190,7 @@ let string_substitute_var f s =
+ end;
+ loop ib)
+ | c -> Buffer.add_char b c; loop ib) in
+- try loop (Scanf.Scanning.from_string s); Buffer.contents b with
++ try loop (Scanf.Scanning.from_string s) with
+ | _ -> Buffer.contents b;;
+
+ let string_replace pat templ str =
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/advi/patches/patch-ab Wed Apr 19 13:13:05 2006 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.3 2006/04/19 13:13:05 tonio Exp $
+
+--- gterm.ml.orig 2003-10-09 16:10:45.000000000 +0200
++++ gterm.ml
+@@ -361,7 +361,7 @@ let rec edit t =
+ (* Basic functions to input strings. *)
+ let rec flush_keys () =
+ if GraphicsY11.key_pressed () then
+- let c = GraphicsY11.read_key () in
++ let _c = GraphicsY11.read_key () in
+ flush_keys ();;
+
+ type prompt = string;;
+@@ -371,8 +371,7 @@ let get_line_prefill =
+ let b = Buffer.create 11 in
+ let get t =
+ flush_keys ();
+- let limx = t.cursor_x
+- and limy = t.cursor_y in
++ let limx = t.cursor_x in
+ let rec read t =
+ let c = get_next_key t in
+ match c with
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/advi/patches/patch-ac Wed Apr 19 13:13:05 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/04/19 13:13:05 tonio Exp $
+
+--- laser_pointer.ml.orig 2004-09-15 18:37:55.000000000 +0200
++++ laser_pointer.ml
+@@ -144,7 +144,7 @@ let rec treat_laser_event ptr q =
+ | { mouse_x = x; mouse_y = y;
+ button = btn;
+ keypressed = kp;
+- key = c; } as ev ->
++ key = c; } ->
+ show_pointer ptr x y;
+ if kp then begin
+ match c with
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/advi/patches/patch-ad Wed Apr 19 13:13:05 2006 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2006/04/19 13:13:05 tonio Exp $
+
+--- symbol.ml.orig 2004-10-01 13:13:35.000000000 +0200
++++ symbol.ml
+@@ -555,7 +555,6 @@ let valid position i = i >= 0 && i < Arr
+ let around b x y =
+ try
+ let position = position x y in
+- let space_ref = position.history.(position.first) in
+ let valid = valid position in
+ let rec skip_spaces move i =
+ if valid i then
+@@ -576,7 +575,6 @@ let around b x y =
+ | Rule (_, _) -> return w
+ | _ ->
+ if pre <> dummy_symbol && above pre h <> 0 then return w else
+- let c = symbol_name pre h in
+ let add x y = if move 0 > 0 then x ^ y else y ^ x in
+ word move i (add (true_symbol_name h) w) next
+ else -1, w in
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/advi/patches/patch-ae Wed Apr 19 13:13:05 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/04/19 13:13:05 tonio Exp $
+
+--- ttfont.ml.orig 2003-01-06 11:49:14.000000000 +0100
++++ ttfont.ml
+@@ -52,7 +52,7 @@ let load_face =
+
+ let build face dpi pt unicode =
+ set_char_size face (float dpi) (float dpi) pt pt;
+- let advx, advy = render_char face unicode [] Render_Mono in
++ let _advx, _advy = render_char face unicode [] Render_Mono in
+ let bitmapinfo = get_bitmap_info face in
+ let width = bitmapinfo.bitmap_width in
+ let height = bitmapinfo.bitmap_height in
diff -r aa3943efc2fd -r 7c16c96e2b97 print/advi/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/advi/patches/patch-af Wed Apr 19 13:13:05 2006 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2006/04/19 13:13:05 tonio Exp $
+
+--- gs.ml.orig 2004-07-16 09:51:35.000000000 +0200
++++ gs.ml
+@@ -63,7 +63,6 @@ let current_y = ref 0;;
+
+ let parse_pos s =
+ let c = String.index s ',' in
+- let bc = s.[3] in
+ (* y comes first, then x *)
Home |
Main Index |
Thread Index |
Old Index