Fix installing of xfig Library files that start with "-", such as those

in Libraries/Electronic/Schematic/More/simple_device-inch.
Fix PLIST, bump PKGREVISION.

4 files changed, 401 insertions, 18 deletions

diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index e76b0b72e99..0bc5e9cdbe6 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2005/11/12 16:08:21 itohy Exp $
+# $NetBSD: Makefile,v 1.44 2006/02/04 13:17:51 markd Exp $
 
 DISTNAME=	xfig.3.2.5-alpha5.full
 PKGNAME=	xfig-3.2.5alpha5
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://epb.lbl.gov/xfig/alpha/
 
diff --git a/graphics/xfig/PLIST b/graphics/xfig/PLIST
index b79d9eeee52..d1254149c99 100644
--- a/graphics/xfig/PLIST
+++ b/graphics/xfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/11/12 16:08:21 itohy Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/02/04 13:17:51 markd Exp $
 bin/xfig
 lib/X11/app-defaults/Fig
 lib/X11/app-defaults/Fig-color
@@ -405,13 +405,13 @@ lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74159.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/7416.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74160.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74161.fig.gz
-lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/7417.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74162.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74163.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74164.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74165.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74166.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74167.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/7417.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74170.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74172.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74173.fig.gz
@@ -660,6 +660,370 @@ lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74S350.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74S436.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74S64.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_TTL-metric/74S65.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-c.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-d.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-e.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-f.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-g.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-i.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-j.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-l.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-m.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-n.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-o.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-p.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-r.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-s.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-t.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-v.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-x.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/-z.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/3ph-servo_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/3ph-servo_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/3ph_servo.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ACsource.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/BNC-N.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/BNC-RCA.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/DCcurrent.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/JMono-sw.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/JMono.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/JStereo-sw.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/JStereo.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/OpAmp.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/VCC.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/VDD.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/VEE.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/VSS.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/and.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/and_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ant-dip.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ant-sqr.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ant.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/bat.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/bridge-a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/bridge-b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/buffer.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/buffer_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cap-pol_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cap-pol_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cap-pol_c.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cap-var_1.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cap-var_2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cap_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cap_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cap_c.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/choke.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/cmic.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/coax.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/coil-1.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/coil-2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/coil-3.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/coil-asym.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/coil-sym.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/coil-var_1.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/coil-var_2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/darlN_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/darlN_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/darlP_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/darlP_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/diac.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/diode-ir.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/diode-small.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/diode-zener.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/diode.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/dot-big.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/dot-small.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/dsp-half-CA.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/dsp-half-CK.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/dsp-half.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/dsp-whole-CA.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/dsp-whole-CK.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/dsp-whole.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/fuse.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/gnd-float.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/gnd-hearth.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/gnd_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/gnd_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ind.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/inv.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/inv_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/jfet-n.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/jfet-p.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/jfetn2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/jfetp2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/junction.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/lamp.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ldr_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ldr_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/led.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/meter-A.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/meter-Ohm.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/meter-V.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/mic.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/mike.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/motor-AC.fig
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/motor-DC.fig
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/motor-step.fig
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/motor.fig
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/nand.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/nand_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/neon.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/nmos.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/nmos2g.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/nmosenh-hot.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/nmosenh.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/nor.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/npn-hot.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/npn-small.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/npn.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/opto.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/or.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/or_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pmos.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pmosenh-hot.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pmosenh.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pnp-hot.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pnp-small.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pnp.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pnt-NEG.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pnt-POS.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pnt-test.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pot_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/pot_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/reed.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/relay-nosw.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/res-PNtc_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/res-PNtc_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/res-var_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/res-var_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/res_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/res_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/scr.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sig-cont.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sig-in.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sig-out.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/socket-F.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/socket-M.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/spkr.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-brk.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-nc.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-no.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-pbnc.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-pbno.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-rotX10.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-rotX3.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-rotX4.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/sw-spdt.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/switch.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/thyr.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/tr-line_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/tr-line_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/tr-line_c.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/tr-line_d.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/tr-self12.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/tr-self21.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/trans22.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/trans23.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/trans33.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/transa.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/transb.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/transc.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/transd.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/transup.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/triac.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/trimpot_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/trimpot_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/tunnel.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ujtn.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/ujtp.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/varicap.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/xnor.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/xor.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/xtal.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-inch/zener.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-c.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-d.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-e.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-f.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-g.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-i.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-j.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-l.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-m.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-n.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-o.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-p.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-r.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-s.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-t.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-v.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-x.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/-z.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/3ph-servo_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/3ph-servo_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/3ph_servo.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ACsource.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/BNC-N.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/BNC-RCA.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/DCcurrent.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/JMono-sw.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/JMono.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/JStereo-sw.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/JStereo.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/OpAmp.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/VCC.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/VDD.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/VEE.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/VSS.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/and.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/and_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ant-dip.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ant-sqr.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ant.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/bat.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/bridge-a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/bridge-b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/buffer.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/buffer_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cap-pol_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cap-pol_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cap-pol_c.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cap-var_1.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cap-var_2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cap_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cap_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cap_c.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/choke.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/cmic.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/coax.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/coil-1.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/coil-2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/coil-3.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/coil-asym.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/coil-sym.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/coil-var_1.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/coil-var_2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/darlN_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/darlN_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/darlP_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/darlP_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/diac.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/diode-ir.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/diode-small.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/diode-zener.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/diode.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/dot-big.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/dot-small.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/dsp-half-CA.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/dsp-half-CK.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/dsp-half.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/dsp-whole-CA.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/dsp-whole-CK.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/dsp-whole.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/fuse.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/gnd-float.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/gnd-hearth.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/gnd_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/gnd_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ind.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/inv.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/inv_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/jfet-n.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/jfet-p.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/jfetn2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/jfetp2.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/junction.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/lamp.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ldr_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ldr_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/led.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/meter-A.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/meter-Ohm.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/meter-V.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/mic.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/mike.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/motor-AC.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/motor-DC.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/motor-step.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/motor.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/nand.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/nand_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/neon.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/nmos.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/nmos2g.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/nmosenh-hot.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/nmosenh.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/nor.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/npn-hot.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/npn-small.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/npn.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/opto.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/or.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/or_st.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pmos.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pmosenh-hot.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pmosenh.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pnp-hot.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pnp-small.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pnp.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pnt-NEG.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pnt-POS.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pnt-test.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pot_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/pot_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/reed.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/relay-nosw.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/res-NPtc_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/res-NPtc_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/res-var_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/res-var_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/res_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/res_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/scr.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sig-cont.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sig-in.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sig-out.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/socket-F.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/socket-M.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/spkr.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-brk.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-nc.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-no.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-pbnc.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-pbno.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-rotX10.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-rotX3.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-rotX4.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/sw-spdt.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/switch.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/thyr.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/tr-line_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/tr-line_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/tr-line_c.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/tr-line_d.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/tr-self12.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/tr-self21.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/trans22.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/trans23.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/trans33.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/transa.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/transb.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/transc.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/transd.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/transup.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/triac.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/trimpot_a.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/trimpot_b.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/tunnel.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ujtn.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/ujtp.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/varicap.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/xnor.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/xor.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/xtal.fig.gz
+lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_device-metric/zener.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_misc/4x7x25grid-mil.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_misc/4x8x38grid-mil.fig.gz
 lib/X11/xfig/Libraries/Electronic/Schematic/More/simple_misc/Samsung-HDD.fig.gz
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index ea8e23755d8..cd3d0f6d48a 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2005/11/12 16:08:21 itohy Exp $
+$NetBSD: distinfo,v 1.14 2006/02/04 13:17:51 markd Exp $
 
 SHA1 (xfig.3.2.5-alpha5.full.tar.gz) = ed99caf4505bc401ac34ecbe3d4c0aa783c4cc62
 RMD160 (xfig.3.2.5-alpha5.full.tar.gz) = 47fd9d74b117518d1870297228e31591f312df2d
 Size (xfig.3.2.5-alpha5.full.tar.gz) = 5836544 bytes
 SHA1 (patch-aa) = 3ff914bd2ca913f7c4e2ea2a648a0776cd5098bf
-SHA1 (patch-ab) = ceedc22d4a9d2cd5939d1129361d68cdfc3bb661
+SHA1 (patch-ab) = 7fb6cdf47d980db3d95cba0797408247087148e0
 SHA1 (patch-ac) = 63ac4774439cab4bda5c75a3912103080bc1c6fd
 SHA1 (patch-ad) = 80ae2ce2eea6a747862d1b223ffff56feaa73f1a
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index c8c96225785..8ca6ed9e2fa 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
+$NetBSD: patch-ab,v 1.12 2006/02/04 13:17:51 markd Exp $
 
---- Imakefile.orig	Tue Apr 27 05:24:41 2004
-+++ Imakefile	Sat Nov 12 19:58:54 2005
-@@ -45,6 +45,7 @@
+--- Imakefile.orig	2004-04-27 08:24:41.000000000 +1200
++++ Imakefile
+@@ -45,6 +45,7 @@ XCOMM different tree than the "correct" 
  XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
  
  XCOMM XAPPLOADDIR = /home/user/xfig
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  
  XCOMM Uncomment the following definition for XAW3D if you want to use
  XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -58,21 +59,24 @@
+@@ -58,21 +59,24 @@ XCOMM #define XAW3D1_5E
  
  #ifdef XAW3D1_5E
      DUSEXAW3D = -DXAW3D -DXAW3D1_5E
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  ZLIBDIR = $(USRLIBDIR)
  
  XCOMM If don't want JPEG support, comment out the #define USEJPEG line
-@@ -92,8 +96,8 @@
+@@ -92,8 +96,8 @@ XCOMM You must have version 5b or newer 
  
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
@@ -53,7 +53,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  #else
  JPEGLIBDIR = ../jpeg
  JPEGINC = -I$(JPEGLIBDIR)
-@@ -115,8 +119,8 @@
+@@ -115,8 +119,8 @@ XCOMM Change XPMINC if necessary to poin
  #define USEXPM_ICON
  
  #ifdef USEXPM
@@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -157,7 +161,7 @@
+@@ -157,7 +161,7 @@ XCOMM uncomment the following line if yo
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -73,7 +73,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  
  XCOMM use (and change) the following if you want the multi-key data base file
  XCOMM somewhere other than the standard X11 library directory
-@@ -169,7 +173,7 @@
+@@ -169,7 +173,7 @@ XFIGLIBDIR = $(LIBDIR)/xfig
  
  XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
  XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
@@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  
  XCOMM MANDIR tells where the standard man pages should go (no need to change it
  XCOMM if you want the man pages installed in the standard place on your system
-@@ -229,7 +233,7 @@
+@@ -229,7 +233,7 @@ INSTDATFLAGS = -m 0644
  #ifdef USEJPEG
  
  #ifdef USEINSTALLEDJPEG
@@ -91,7 +91,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  #else
  JPEGCONF = configure
  JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
-@@ -266,7 +270,7 @@
+@@ -266,7 +270,7 @@ InstallManPageLong(file,dest,file)
  DUSESMALLICONS = -DUSE_SMALL_ICONS
  #endif /* USESMALLICONS */
  
@@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  
  #ifdef USEJPEG
  DUSEJPEG = -DUSE_JPEG
-@@ -276,7 +280,7 @@
+@@ -276,7 +280,7 @@ READJPEGO = f_readjpg.o
  
  #ifdef USEXPM
  DUSEXPM = -DUSE_XPM
@@ -109,7 +109,7 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  READXPMS = f_readxpm.c
  READXPMO = f_readxpm.o
  #ifdef USEXPM_ICON
-@@ -411,6 +415,8 @@
+@@ -411,6 +415,8 @@ install.html::
  install.rhtml::
  	@(cd Doc ; \
  	echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
@@ -118,3 +118,21 @@ $NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
  	$(INSTALL) -m 644 -c xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \
  	$(INSTALL) -m 644 -c xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
  	$(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
+@@ -469,13 +475,13 @@ install.libs::
+ 						else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ); fi ; \
+ 					    (cd $$l ; \
+ 						for m in * ; do \
+-						    $(INSTALL) -m 644 -c $$m $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \
++						    $(INSTALL) -m 644 -c ./$$m $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \
+ 						done ) ) ; \
+-					else ( $(INSTALL) -m 644 -c $$l $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \
++					else ( $(INSTALL) -m 644 -c ./$$l $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \
+ 				done) ) ; \
+-			    else ( $(INSTALL) -m 644 -c $$dd $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ) ; fi ; \
++			    else ( $(INSTALL) -m 644 -c ./$$dd $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ) ; fi ; \
+ 			done) ); \
+-		else ($(INSTALL) -m 644 -c $$f $(DESTDIR)$(OBJLIBDIR)/$$d ) ; fi ; \
++		else ($(INSTALL) -m 644 -c ./$$f $(DESTDIR)$(OBJLIBDIR)/$$d ) ; fi ; \
+ 	    done ) ; \
+ 	done ; ) ; \
+ 	else echo No Object Libraries to install ; \