diff options
Diffstat (limited to 'print')
-rw-r--r-- | print/advi/Makefile | 62 | ||||
-rw-r--r-- | print/advi/PLIST | 47 | ||||
-rw-r--r-- | print/advi/distinfo | 25 | ||||
-rw-r--r-- | print/advi/patches/patch-Makefile.in | 13 | ||||
-rw-r--r-- | print/advi/patches/patch-aa | 29 | ||||
-rw-r--r-- | print/advi/patches/patch-ab | 23 | ||||
-rw-r--r-- | print/advi/patches/patch-ac | 13 | ||||
-rw-r--r-- | print/advi/patches/patch-ad | 20 | ||||
-rw-r--r-- | print/advi/patches/patch-ae | 13 | ||||
-rw-r--r-- | print/advi/patches/patch-af | 21 | ||||
-rw-r--r-- | print/advi/patches/patch-ag | 33 | ||||
-rw-r--r-- | print/advi/patches/patch-ah | 22 | ||||
-rw-r--r-- | print/advi/patches/patch-ai | 31 | ||||
-rw-r--r-- | print/advi/patches/patch-aj | 70 | ||||
-rw-r--r-- | print/advi/patches/patch-ak | 13 | ||||
-rw-r--r-- | print/advi/patches/patch-al | 13 | ||||
-rw-r--r-- | print/advi/patches/patch-am | 20 | ||||
-rw-r--r-- | print/advi/patches/patch-an | 27 | ||||
-rw-r--r-- | print/advi/patches/patch-configure | 45 | ||||
-rw-r--r-- | print/advi/patches/patch-src_Makefile.in | 13 |
20 files changed, 126 insertions, 427 deletions
diff --git a/print/advi/Makefile b/print/advi/Makefile index a9ce0cead9a..39d71ed6d08 100644 --- a/print/advi/Makefile +++ b/print/advi/Makefile @@ -1,65 +1,63 @@ -# $NetBSD: Makefile,v 1.36 2011/04/22 13:44:31 obache Exp $ +# $NetBSD: Makefile,v 1.37 2011/08/07 20:40:58 wiz Exp $ -DISTNAME= advi-1.6.0 -PKGREVISION= 11 +DISTNAME= advi-1.10.1 CATEGORIES= print -MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/ -EXTRACT_SUFX= .tgz +MASTER_SITES= http://gallium.inria.fr/advi/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://cristal.inria.fr/advi/ +HOMEPAGE= http://gallium.inria.fr/advi/ COMMENT= Active-DVI Presenter +LICENSE= gnu-lgpl-v2 + +PKG_DESTDIR_SUPPORT= user-destdir BUILD_DEPENDS+= ocaml>=3.04:../../lang/ocaml +BUILD_DEPENDS+= ocaml-findlib>=1.2.6:../../devel/ocaml-findlib +DEPENDS+= camlimages>=4.0.0:../../graphics/camlimages +DEPENDS+= texlive-tetex>=2010:../../print/texlive-tetex -TEX_ACCEPTED= 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 +CONFIGURE_ARGS+= --libdir=${PREFIX}/share/texmf-dist +CONFIGURE_ARGS+= --with-gs=${PREFIX}/bin/gs -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" +INSTALL_UNSTRIPPED= yes -SUBST_CLASSES+= paths -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" +SUBST_CLASSES+= gs +SUBST_STAGE.gs= post-configure +SUBST_FILES.gs= src/config.ml.in +SUBST_SED.gs= -e 's,@GS@,gs,' +SUBST_MESSAGE.gs= Fixing hard-coded path to gs -.include "../../print/teTeX/module.mk" +INSTALLATION_DIRS= share/doc/advi share/doc/html/advi post-extract: ${CP} ${WRKSRC}/tex/*.eps ${WRKSRC}/doc - ${CP} ${WRKSRC}/doc/eng.htm ${WRKSRC}/doc/index.html ${MKDIR} ${WRKSRC}/doc.orig ${CP} ${WRKSRC}/doc/*.dvi ${WRKSRC}/doc.orig post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/advi cd ${WRKSRC}/doc && ${INSTALL_DATA} *.ps *.pdf \ - ${PREFIX}/share/doc/advi + ${DESTDIR}${PREFIX}/share/doc/advi cd ${WRKSRC}/doc.orig && ${INSTALL_DATA} *.dvi \ - ${PREFIX}/share/doc/advi - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/advi - cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.css *.jpg *.gif \ - ${PREFIX}/share/doc/html/advi - cd ${PREFIX}/share/doc/html/advi && ${LN} -sf ../../advi/manual.* . + ${DESTDIR}${PREFIX}/share/doc/advi + cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif \ + ${DESTDIR}${PREFIX}/share/doc/html/advi + cd ${DESTDIR}${PREFIX}/share/doc/html/advi && ${LN} -sf ../../advi/manual.* . +.include "../../print/kpathsea/texmf.mk" .include "../../lang/ocaml/buildlink3.mk" .include "../../graphics/camlimages/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../devel/nspr/buildlink3.mk" .include "../../mk/giflib.buildlink3.mk" -.include "../../graphics/gdk-pixbuf/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../x11/lablgtk1/buildlink3.mk" +.include "../../x11/lablgtk/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/ocaml-graphics/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/advi/PLIST b/print/advi/PLIST index 6240852cbaa..2a54f0703a2 100644 --- a/print/advi/PLIST +++ b/print/advi/PLIST @@ -1,45 +1,34 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:11:53 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2011/08/07 20:40:58 wiz Exp $ bin/advi -man/man1/advi.1 -share/doc/advi/advi_remote.dvi +bin/advi.byt +lib/ocaml/stublibs/dlladvi.so share/doc/advi/manual.dvi share/doc/advi/manual.pdf share/doc/advi/manual.ps -share/doc/advi/mathmode.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/faq.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/manual001.gif -share/doc/html/advi/manual002.gif -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 +share/doc/html/advi/manualxxx.html +share/doc/html/advi/screen-shots.html +share/texmf-dist/tex/latex/advi/advi-annot.sty +share/texmf-dist/tex/latex/advi/advi-graphicx.sty +share/texmf-dist/tex/latex/advi/advi-slides.sty +share/texmf-dist/tex/latex/advi/advi.sty +share/texmf-dist/tex/latex/advi/advilogo.eps +share/texmf-dist/tex/latex/advi/argv.sty +share/texmf-dist/tex/latex/advi/bar.eps +share/texmf-dist/tex/latex/advi/bubble.sty +share/texmf-dist/tex/latex/advi/caml.eps +share/texmf-dist/tex/latex/advi/pgfsys-dvips.def +share/texmf-dist/tex/latex/advi/superpose.sty +share/texmf-dist/tex/latex/advi/xwindows-colors.sty diff --git a/print/advi/distinfo b/print/advi/distinfo index 7ff149ee3c9..60e6fc37811 100644 --- a/print/advi/distinfo +++ b/print/advi/distinfo @@ -1,19 +1,8 @@ -$NetBSD: distinfo,v 1.5 2010/05/28 16:45:12 joerg Exp $ +$NetBSD: distinfo,v 1.6 2011/08/07 20:40:58 wiz 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) = 85bc55e6409e1be813693425e5b7d7cc2ca6f23d +SHA1 (advi-1.10.1.tar.gz) = eedadf8d461b233eb352ba90fd312c094e643344 +RMD160 (advi-1.10.1.tar.gz) = 9962992f6512d185ead94d2a44ef11e454b80563 +Size (advi-1.10.1.tar.gz) = 9769604 bytes +SHA1 (patch-Makefile.in) = 81947381ac464c8aa1de84d337ef82bfbf9caf54 +SHA1 (patch-configure) = cd53f7190a217beddff8e9988c489a4280e8d007 +SHA1 (patch-src_Makefile.in) = ce197feab5b1b3e575b4c745e424ce7fb8559325 diff --git a/print/advi/patches/patch-Makefile.in b/print/advi/patches/patch-Makefile.in new file mode 100644 index 00000000000..e9b35d21b95 --- /dev/null +++ b/print/advi/patches/patch-Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-Makefile.in,v 1.1 2011/08/07 20:40:58 wiz Exp $ + +--- Makefile.in.orig 2011-08-07 14:15:44.000000000 +0000 ++++ Makefile.in 2011-08-07 14:16:03.000000000 +0000 +@@ -225,7 +225,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src tex doc ++SUBDIRS = src tex + # SUBDIRS = src + DIST_SUBDIRS = $(SUBDIRS) examples + CVSRELEASETAG = Release-$(subst .,_,$(VERSION)) diff --git a/print/advi/patches/patch-aa b/print/advi/patches/patch-aa deleted file mode 100644 index fd8dfc639a9..00000000000 --- a/print/advi/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$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 --git a/print/advi/patches/patch-ab b/print/advi/patches/patch-ab deleted file mode 100644 index 62a6b80f322..00000000000 --- a/print/advi/patches/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ -$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 --git a/print/advi/patches/patch-ac b/print/advi/patches/patch-ac deleted file mode 100644 index f5f7f5c1396..00000000000 --- a/print/advi/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$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 --git a/print/advi/patches/patch-ad b/print/advi/patches/patch-ad deleted file mode 100644 index 3a4a415d64b..00000000000 --- a/print/advi/patches/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ -$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 --git a/print/advi/patches/patch-ae b/print/advi/patches/patch-ae deleted file mode 100644 index 00efcfa40a6..00000000000 --- a/print/advi/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$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 --git a/print/advi/patches/patch-af b/print/advi/patches/patch-af deleted file mode 100644 index 575d8df0d92..00000000000 --- a/print/advi/patches/patch-af +++ /dev/null @@ -1,21 +0,0 @@ -$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 *) - let y = String.sub s 3 (c - 3) in - let x = String.sub s (c + 1) (String.length s - c - 1) in -@@ -106,7 +105,7 @@ let rec select fd_in fd_out fd_exn timeo - try - Unix.select fd_in fd_out fd_exn timeout - with -- Unix.Unix_error (Unix.EINTR, _, _) as exn -> -+ | Unix.Unix_error (Unix.EINTR, _, _) -> - let now = Unix.gettimeofday () in - let remaining = start +. timeout -. now in - if remaining > 0.0 then select fd_in fd_out fd_exn timeout else [], [], [] diff --git a/print/advi/patches/patch-ag b/print/advi/patches/patch-ag deleted file mode 100644 index b3c30fdf741..00000000000 --- a/print/advi/patches/patch-ag +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/04/19 13:13:05 tonio Exp $ - ---- grdev.ml.orig 2004-09-03 17:08:55.000000000 +0200 -+++ grdev.ml -@@ -429,8 +429,8 @@ let make_funviewport bkgd_data viewport - within the background viewport we choose it; - otherwise, we choose the center of the background viewport. *) - let make_center xcr ycr -- ({vx = x; vy = y; vw = w; vh = h} as bgviewport) -- ({vx = fx; vy = fy; vw = fw; vh = fh} as funviewport) = -+ ({vx = x; vy = y; vw = w; vh = h} as _bgviewport) -+ ({vx = fx; vy = fy; vw = fw; vh = fh} as _funviewport) = - let xc = match xcr with - | Some xcr -> - (* Get the center coordinates integer values in the funviewport. *) -@@ -917,7 +917,7 @@ module H = - Graphics.set_color (get_color ()) - - let make_anchors tag all_draw = -- let make_anchor draw (x, y as orig) w h voff = -+ let make_anchor draw (x, y as _orig) w h voff = - let anchor = {tag = tag; draw = List.rev draw} in - let bw = - match tag with -@@ -1607,7 +1607,7 @@ let wait_event () = - try match H.find ev.mouse_x ev.mouse_y with - | {A.action = {H.tag = H.Href h; H.draw = d}} as act -> - if ev.button then -- let ev' = GraphicsY11.wait_next_event button_up in -+ let _ev' = GraphicsY11.wait_next_event button_up in - send (Href h) else - if H.up_to_date act emph then event emph b else begin - H.deemphasize true emph; diff --git a/print/advi/patches/patch-ah b/print/advi/patches/patch-ah deleted file mode 100644 index 737c5144280..00000000000 --- a/print/advi/patches/patch-ah +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2006/04/19 13:13:05 tonio Exp $ - ---- addons.ml.orig 2003-10-10 14:45:27.000000000 +0200 -+++ addons.ml -@@ -86,7 +86,7 @@ let dgradient = d1gradient;; - - let cgradient { - argcolor = c0; argcolorstart = c1; argcolorstop = c2; -- argfunviewport = {vx = x; vy = y; vw = w; vh = h} as viewport; -+ argfunviewport = {vx = x; vy = y; vw = w; vh = h} as _viewport; - argxcenter = xc; argycenter = yc; - argviewport = _; - } = -@@ -96,7 +96,7 @@ let cgradient { - - let circgradient { - argcolor = c0; argcolorstart = c1; argcolorstop = c2; -- argfunviewport = {vx = x; vy = y; vw = w; vh = h} as viewport; -+ argfunviewport = {vx = x; vy = y; vw = w; vh = h} as _viewport; - argxcenter = xc; argycenter = yc; - argviewport = _; - } = diff --git a/print/advi/patches/patch-ai b/print/advi/patches/patch-ai deleted file mode 100644 index 3b632bac138..00000000000 --- a/print/advi/patches/patch-ai +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2006/04/19 13:13:05 tonio Exp $ - ---- driver.ml.orig 2004-10-01 13:13:35.000000000 +0200 -+++ driver.ml -@@ -437,7 +437,7 @@ let color_special st s = - | "color" :: "pop" :: [] -> - color_pop st - | "color" :: args -> -- let c = Dvicolor.parse_color_args args in -+ let _c = Dvicolor.parse_color_args args in - Misc.warning "global color special is not supported" - | _ -> ill_formed_special s;; - -@@ -557,8 +557,6 @@ let psfile_special st s = - let y = st.y_origin + Misc.round (st.conv *. float st.v) in - if !visible then - if drawbygs then -- let dx = st.x_origin in -- let dy = st.y_origin in - Dev.draw_ps_by_gs file bbox (rwi, rhi) - (x - st.x_origin) (y - st.y_origin) - else -@@ -1685,8 +1683,6 @@ let unfreeze_glyphs cdvi dpi = - let sdpi = Misc.round (mag *. ldexp dpi 16) - and mtable = ref dummy_mtable - and gtable = ref dummy_gtable in -- let headers = ref [] -- and xrefs = cdvi.base_dvi.Cdvi.xrefs in - let otherwise = function - | Dvicommands.C_fnt n -> - let (mt, gt) = diff --git a/print/advi/patches/patch-aj b/print/advi/patches/patch-aj deleted file mode 100644 index 49b09b99652..00000000000 --- a/print/advi/patches/patch-aj +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2006/04/19 13:13:05 tonio Exp $ - ---- dviview.ml.orig 2004-09-03 16:31:33.000000000 +0200 -+++ dviview.ml -@@ -320,9 +320,7 @@ let init_geometry all st = - | In f -> float attr.geom.Ageometry.height /. (h_in +. 2.0 *. f) - | _ -> assert false in - let base_dpi = min wdpi hdpi in -- let width = Misc.round (base_dpi *. w_in) -- and height = Misc.round (base_dpi *. h_in) -- and real_width = Misc.round (base_dpi *. w_in *. st.ratio) -+ let real_width = Misc.round (base_dpi *. w_in *. st.ratio) - and real_height = Misc.round (base_dpi *. h_in *. st.ratio) in - let fwidth = base_dpi *. w_in - and fheight = base_dpi *. h_in in -@@ -371,7 +369,6 @@ let init master filename = - try (Unix.stat filename).Unix.st_mtime - with _ -> 0.0 in - Gs.init_do_ps (); -- let npages = Array.length dvi.Cdvi.pages in - let st = - let npages = Array.length dvi.Cdvi.pages in - { filename = filename; -@@ -680,7 +677,6 @@ let make_thumbnails st = - let num_nails = Array.length page_nails in - let r_fit = int_of_float (ceil (sqrt (float_of_int num_nails))) in - let r = min r_fit !thumbnail_limit in -- let pages = num_nails - 1 / r / r in - let ist = - { st with - size_x = st.size_x / r; -@@ -765,14 +761,6 @@ let rec reload foreground st = - st.last_modified <- reload_time st; - let dvi = Cdvi.load st.filename in - let cdvi = Driver.cook_dvi dvi in -- let dvi_res = !dpi_resolution -- and mag = float dvi.Cdvi.preamble.Dvicommands.pre_mag /. 1000.0 in -- let w_sp = dvi.Cdvi.postamble.Dvicommands.post_width -- and h_sp = dvi.Cdvi.postamble.Dvicommands.post_height in -- let w_in = mag *. ldexp (float w_sp /. dvi_res) (-16) -- and h_in = mag *. ldexp (float h_sp /. dvi_res) (-16) in -- let width = Misc.round (w_in *. st.base_dpi *. st.ratio) -- and height = Misc.round (h_in *. st.base_dpi *. st.ratio) in - let npages = Array.length dvi.Cdvi.pages in - st.dvi <- dvi; - st.cdvi <- cdvi; -@@ -830,7 +818,6 @@ let show_thumbnails st r page = - let size_y = Graphics.size_y () in - let dx = size_x / r - and dy = size_y / r in -- let pages = Array.length page / r / r in - Array.iteri - (fun p' (p, img) -> - let x = size_x * (p' mod r) / r in -@@ -1354,13 +1341,13 @@ module B = - let search_forward st = - let re_string = ask_to_search "Search Forward (re): " in - Misc.warning (Printf.sprintf "Search forward %s" re_string); -- let re = Str.regexp re_string in -+ let _re = Str.regexp re_string in - () - - let search_backward st = - let re_string = ask_to_search "Search Backward (re): " in - Misc.warning (Printf.sprintf "Search backward %s" re_string); -- let re = Str.regexp re_string in -+ let _re = Str.regexp re_string in - () - - let duplex = duplex_switch false diff --git a/print/advi/patches/patch-ak b/print/advi/patches/patch-ak deleted file mode 100644 index 15cc059a153..00000000000 --- a/print/advi/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2006/04/19 13:13:05 tonio Exp $ - ---- grY11.c.orig 2004-04-06 09:54:05.000000000 +0200 -+++ grY11.c -@@ -473,7 +473,7 @@ value caml_gr_move_window (value wid, va - return Val_unit; - } - --value caml_gr_resize_window (value wid, value w, value h) -+value caml_gr_resize_subwindow (value wid, value w, value h) - { - Window win; - diff --git a/print/advi/patches/patch-al b/print/advi/patches/patch-al deleted file mode 100644 index 9f3a0d041f1..00000000000 --- a/print/advi/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2006/04/19 13:13:05 tonio Exp $ - ---- graphicsY11.ml.orig 2004-04-06 09:54:05.000000000 +0200 -+++ graphicsY11.ml -@@ -109,7 +109,7 @@ external raw_move_window : window_id -> - = "caml_gr_move_window";; - - external raw_resize_window : window_id -> int -> int -> unit -- = "caml_gr_resize_window";; -+ = "caml_gr_resize_subwindow";; - - let resize_subwindow wid height width = - if wid != null_window then begin diff --git a/print/advi/patches/patch-am b/print/advi/patches/patch-am deleted file mode 100644 index 083cc231118..00000000000 --- a/print/advi/patches/patch-am +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-am,v 1.1 2006/04/19 13:13:05 tonio Exp $ - ---- configure.orig 2004-10-02 23:10:57.000000000 +0200 -+++ configure -@@ -4782,11 +4782,11 @@ test "x$myexec_prefix" = xNONE && myexec - mylibdir=$libdir - test "x$libdir" = 'x${exec_prefix}/lib' && mylibdir="$myexec_prefix/lib" - --if test -d $TEXMFMAIN/tex/latex; then -- ADVI_LOC=$TEXMFMAIN/tex/latex/advi --else -+#if test -d $TEXMFMAIN/tex/latex; then -+# ADVI_LOC=$TEXMFMAIN/tex/latex/advi -+#else - ADVI_LOC=$mylibdir/advi --fi -+#fi - - - diff --git a/print/advi/patches/patch-an b/print/advi/patches/patch-an deleted file mode 100644 index aae52d361d4..00000000000 --- a/print/advi/patches/patch-an +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-an,v 1.2 2010/05/28 16:45:12 joerg Exp $ - ---- Makefile.orig 2004-10-02 21:35:09.000000000 +0000 -+++ Makefile -@@ -83,7 +83,7 @@ MODULES = $(MISC) $(OPTIONS) $(GRAPHIC - $(EFFECTS) grdev addons \ - $(GUI) main - --LIBRARIES = graphics unix str $(CAMLIMAGESLIBS) -+LIBRARIES = unix str $(CAMLIMAGESLIBS) - CLIBS = graphics unix str - - COBJS = events.o grwm.o grY11.o -@@ -172,13 +172,6 @@ installopt:: $(INSTALLTARGET) $(HELPFILE - - install -d $(MANDIR)/man$(MANEXT) - if [ -f conf/jpfonts.conf ]; then \ - install -m 644 conf/jpfonts.conf $(ADVI_LOC); fi -- texhash -- @ if test "x`kpsewhich advi.sty`" = "x"; then \ -- echo '*** NOTE BEFORE USE ***' ;\ -- echo Please add $(ADVI_LOC); \ -- echo to your TEXINPUTS environment variable\!; \ -- echo '***********************' ;\ -- fi - - installman: - install -m 644 $(MANFILES) $(MANDIR)/man$(MANEXT) diff --git a/print/advi/patches/patch-configure b/print/advi/patches/patch-configure new file mode 100644 index 00000000000..338b266bc28 --- /dev/null +++ b/print/advi/patches/patch-configure @@ -0,0 +1,45 @@ +$NetBSD: patch-configure,v 1.1 2011/08/07 20:40:58 wiz Exp $ + +--- configure.orig 2011-08-04 13:40:01.000000000 +0000 ++++ configure 2011-08-07 15:50:51.000000000 +0000 +@@ -5624,7 +5624,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking TeX root path" >&5 + $as_echo_n "checking TeX root path... " >&6; } +-texdir=`$KPSEXPAND '$TEXMFMAIN'` ++texdir=`$KPSEXPAND '$TEXMFDIST'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $texdir" >&5 + $as_echo "$texdir" >&6; } + if test -z "$texdir"; then +@@ -5633,9 +5633,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LaTeX root path" >&5 + $as_echo_n "checking LaTeX root path... " >&6; } +-if test -d "$texdir/tex/latex"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $texdir/tex/latex" >&5 +-$as_echo "$texdir/tex/latex" >&6; } ++#if test -d "$texdir/tex/latex"; then + # this ugly stuff, shamelessly stolen from lispdir computation, is supposed + # to find latex resources installation directory expressed in term of prefix + # the ugly [^\/] is meant to express [^\/] regexp +@@ -5643,12 +5641,14 @@ + -e 's,/$,,' \ + -e '/.*\/lib\/[^\/]*\/tex\/latex$/{s,.*/lib/\([^\/]*\/tex\/latex\)$,${libdir}/\1,;p;q;}' \ + -e '/.*\/share\/[^\/]*\/tex\/latex$/{s,.*/share/\([^\/]*\/tex\/latex\),${datadir}/\1,;p;q;}'` +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +-$as_echo "not found" >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no LaTeX root path found, check your setup" >&5 +-$as_echo "$as_me: WARNING: no LaTeX root path found, check your setup" >&2;} +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ($texdir/tex/latex) -> $latexdir" >&5 ++$as_echo "($texdir/tex/latex) -> $latexdir" >&6; } ++#else ++# { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 ++#$as_echo "not found" >&6; } ++# { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no LaTeX root path found, check your setup" >&5 ++#$as_echo "$as_me: WARNING: no LaTeX root path found, check your setup" >&2;} ++#fi + + + # # Checking gunzip and bunzip2. not mandatory. diff --git a/print/advi/patches/patch-src_Makefile.in b/print/advi/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..22dd5a101d0 --- /dev/null +++ b/print/advi/patches/patch-src_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2011/08/07 20:40:58 wiz Exp $ + +--- src/Makefile.in.orig 2011-08-07 14:43:38.000000000 +0000 ++++ src/Makefile.in 2011-08-07 14:44:05.000000000 +0000 +@@ -624,7 +624,7 @@ + $(OCAMLMKLIB) -o advi \ + $(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \ + $(COBJS) \ +- $(CAMLIMAGES_MKLIBS) $(CAMLIMAGES_LPATH) $(XINERAMA_MKLIB) ++ $(CAMLIMAGES_MKLIBS) $(CAMLIMAGES_LPATH) $(X_LIBS) $(XINERAMA_MKLIB) + + advi.byt$(EXEEXT): dlladvi.so $(OCAMLBYTOBJS) + $(OCAMLC) -o advi.byt$(EXEEXT) \ |