To make it totally clear:
Any objections to removing x11/xfm?
On 2016/01/28 14:00, Stuart Henderson wrote:
> It's difficult to separate these as old versions don't build with
> new Xaw3d, with these diffs everything that builds against Xaw3d
> still builds and runs OK with one exception: x11/xfm. There is a
> patch in pkgsrc for that, but it segfaults at startup - since it
> doesn't really seem all that useful any more I propose to remove it.
>
> Any xfig/gv power users wanting to test?
>
> (Note that I've added a crash-at-window-close fix for xfig which
> affects the in-tree version too).
>
> Any OKs/objections?
>
> Index: x11/Xaw3d/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/Xaw3d/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- x11/Xaw3d/Makefile 16 Mar 2015 18:07:58 -0000 1.31
> +++ x11/Xaw3d/Makefile 28 Jan 2016 13:56:11 -0000
> @@ -2,31 +2,23 @@
>
> COMMENT= 3D Athena Widget set that looks like Motif
>
> -DISTNAME= Xaw3d-1.5
> -REVISION= 3
> -SHARED_LIBS= Xaw3d 11.0
> +PKGNAME= Xaw3d-1.6.2
> +DISTNAME= lib${PKGNAME}
> +
> +SHARED_LIBS += Xaw3d 12.0 # 8.0
> +
> CATEGORIES= x11
>
> -MASTER_SITES= ${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
> +MASTER_SITES= http://xorg.freedesktop.org/archive/individual/lib/
>
> # X11/badly worded
> PERMIT_PACKAGE_CDROM= Yes
> -WANTLIB= ICE SM X11 Xext Xmu Xpm Xt Xau Xdmcp
> -
>
> -CONFIGURE_STYLE=imake
> -MAKE_FLAGS= SOXAWREV=${LIBXaw3d_VERSION}
> +WANTLIB += ICE SM X11 Xext Xmu Xt xcb
>
> -WRKDIST= ${WRKDIR}/xc/lib/Xaw3d
> -
> -post-extract:
> - @mkdir -p ${WRKSRC}/X11/Xaw3d
> - @cd ${WRKSRC}/X11/Xaw3d; ln -sf ../../*.h .
> +CONFIGURE_STYLE= gnu
> +#CONFIGURE_ARGS= --enable-arrow-scrollbars
>
> NO_TEST= Yes
> -
> -post-install:
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw3d
> - ${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
>
> .include <bsd.port.mk>
> Index: x11/Xaw3d/distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/Xaw3d/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- x11/Xaw3d/distinfo 18 Jan 2015 03:15:51 -0000 1.4
> +++ x11/Xaw3d/distinfo 28 Jan 2016 13:56:11 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (Xaw3d-1.5.tar.gz) = QYZsSSb213x+1fh3bBwCzQYNWTgwESsorU5dQ8FD3wg=
> -SIZE (Xaw3d-1.5.tar.gz) = 284420
> +SHA256 (libXaw3d-1.6.2.tar.gz) = hH2rAa6sFEiRbjtO20QlWUs6wollYtnHFBqkrGyJi6k=
> +SIZE (libXaw3d-1.6.2.tar.gz) = 672986
> Index: x11/Xaw3d/patches/patch-Imakefile
> ===================================================================
> RCS file: x11/Xaw3d/patches/patch-Imakefile
> diff -N x11/Xaw3d/patches/patch-Imakefile
> --- x11/Xaw3d/patches/patch-Imakefile 31 Dec 2005 17:29:38 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-Imakefile,v 1.2 2005/12/31 17:29:38 naddy Exp $
> ---- Imakefile.orig Tue Oct 15 16:41:19 1996
> -+++ Imakefile Sat Dec 31 16:32:15 2005
> -@@ -39,9 +39,9 @@ DEFINES = XawI18nDefines
> -
> - LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
> -
> --# EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
> -+EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
> -
> --# EXTRA_INCLUDES = -I.
> -+EXTRA_INCLUDES = -I.
> -
> - HEADERS = \
> - AllWidgets.h \
> Index: x11/Xaw3d/patches/patch-XawI18n_h
> ===================================================================
> RCS file: x11/Xaw3d/patches/patch-XawI18n_h
> diff -N x11/Xaw3d/patches/patch-XawI18n_h
> --- x11/Xaw3d/patches/patch-XawI18n_h 3 Nov 2004 23:46:11 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-XawI18n_h,v 1.1 2004/11/03 23:46:11 naddy Exp $
> ---- XawI18n.h.orig Thu Nov 4 00:32:53 2004
> -+++ XawI18n.h Thu Nov 4 00:33:46 2004
> -@@ -29,10 +29,12 @@ in this Software without prior written a
> -
> - #ifdef HAS_WCTYPE_H
> - #include <wctype.h>
> -+#ifndef NO_WIDEC_H
> - #include <widec.h>
> - #define wcslen(c) wslen(c)
> - #define wcscpy(d,s) wscpy(d,s)
> - #define wcsncpy(d,s,l) wsncpy(d,s,l)
> -+#endif
> - #endif
> -
> - #ifdef HAS_WCHAR_H
> Index: x11/Xaw3d/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/Xaw3d/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- x11/Xaw3d/pkg/PLIST 16 Mar 2015 18:07:58 -0000 1.8
> +++ x11/Xaw3d/pkg/PLIST 28 Jan 2016 13:56:11 -0000
> @@ -55,9 +55,6 @@ include/X11/Xaw3d/SmeThreeD.h
> include/X11/Xaw3d/SmeThreeDP.h
> include/X11/Xaw3d/StripCharP.h
> include/X11/Xaw3d/StripChart.h
> -include/X11/Xaw3d/Template.c
> -include/X11/Xaw3d/Template.h
> -include/X11/Xaw3d/TemplateP.h
> include/X11/Xaw3d/Text.h
> include/X11/Xaw3d/TextP.h
> include/X11/Xaw3d/TextSink.h
> @@ -66,6 +63,8 @@ include/X11/Xaw3d/TextSrc.h
> include/X11/Xaw3d/TextSrcP.h
> include/X11/Xaw3d/ThreeD.h
> include/X11/Xaw3d/ThreeDP.h
> +include/X11/Xaw3d/Tip.h
> +include/X11/Xaw3d/TipP.h
> include/X11/Xaw3d/Toggle.h
> include/X11/Xaw3d/ToggleP.h
> include/X11/Xaw3d/Tree.h
> @@ -73,9 +72,12 @@ include/X11/Xaw3d/TreeP.h
> include/X11/Xaw3d/VendorEP.h
> include/X11/Xaw3d/Viewport.h
> include/X11/Xaw3d/ViewportP.h
> +include/X11/Xaw3d/Xaw3dP.h
> include/X11/Xaw3d/XawImP.h
> include/X11/Xaw3d/XawInit.h
> lib/libXaw3d.a
> +lib/libXaw3d.la
> @lib lib/libXaw3d.so.${LIBXaw3d_VERSION}
> -share/doc/Xaw3d/
> -share/doc/Xaw3d/README.XAW3D
> +lib/pkgconfig/xaw3d.pc
> +share/doc/libXaw3d/
> +share/doc/libXaw3d/README.XAW3D
> Index: print/gv/Makefile
> ===================================================================
> RCS file: /cvs/ports/print/gv/Makefile,v
> retrieving revision 1.40
> diff -u -p -r1.40 Makefile
> --- print/gv/Makefile 9 Nov 2013 23:19:03 -0000 1.40
> +++ print/gv/Makefile 28 Jan 2016 13:56:11 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= PostScript and PDF previewer
>
> -DISTNAME= gv-3.7.1
> -REVISION= 1
> +DISTNAME= gv-3.7.4
> CATEGORIES= print
>
> HOMEPAGE= https://www.gnu.org/software/gv/
> Index: print/gv/distinfo
> ===================================================================
> RCS file: /cvs/ports/print/gv/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- print/gv/distinfo 18 Jan 2015 03:14:57 -0000 1.5
> +++ print/gv/distinfo 28 Jan 2016 13:56:11 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (gv-3.7.1.tar.gz) = 2ofhCk88TpIJB36rAZ7HGtG8/I8ZFGFGIHzvTuW4gRQ=
> -SIZE (gv-3.7.1.tar.gz) = 747166
> +SHA256 (gv-3.7.4.tar.gz) = IWKzs6lUgdOFWzxOKPl0YX7vZ4JFI+VuILVvEv4gGmE=
> +SIZE (gv-3.7.4.tar.gz) = 759287
> Index: print/gv/patches/patch-src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/print/gv/patches/patch-src_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_Makefile_in
> --- print/gv/patches/patch-src_Makefile_in 14 Sep 2010 08:50:07 -0000
> 1.1
> +++ print/gv/patches/patch-src_Makefile_in 28 Jan 2016 13:56:11 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 20
>
> - Fix linking (needs libiconv)
>
> ---- src/Makefile.in.orig Tue Jun 8 19:59:16 2010
> -+++ src/Makefile.in Tue Sep 14 10:41:13 2010
> -@@ -423,7 +423,7 @@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
> +--- src/Makefile.in.orig Sun Mar 17 11:20:10 2013
> ++++ src/Makefile.in Thu Jan 28 12:36:55 2016
> +@@ -415,7 +415,7 @@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
> LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
> LIBINTL = @LIBINTL@
> LIBOBJS = @LIBOBJS@
> Index: print/gv/patches/patch-src_dialog_c
> ===================================================================
> RCS file: print/gv/patches/patch-src_dialog_c
> diff -N print/gv/patches/patch-src_dialog_c
> --- print/gv/patches/patch-src_dialog_c 14 Sep 2010 08:50:07 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-src_dialog_c,v 1.1 2010/09/14 08:50:07 jasper Exp $
> -
> -Fix a segmentation fault which may occur when printing.
> -From FreeBSD ports/149066.
> -
> ---- src/dialog.c.orig Tue Sep 14 10:41:40 2010
> -+++ src/dialog.c Tue Sep 14 10:42:02 2010
> -@@ -292,9 +292,9 @@ void DialogPopupSetText(s)
> - if (!s) {INFMESSAGE(no text) ENDMESSAGE(DialogPopupSetText) return;}
> - if (!dialogPopupCreated) makeDialogPopup();
> - response = XtNameToWidget(DIALOG_POPUP, "*dialog_text");
> -+ n=0;
> - #ifdef HAVE_XAW3D_INTERNATIONAL
> - vw = (VlistWidget)response;
> -- n=0;
> - if( vw->simple.international == True ) {
> - XtSetArg(args[n], XtNfontSet, &fontset); n++;
> - } else {
> Index: print/gv/patches/patch-src_gv_misc_res_dat
> ===================================================================
> RCS file: print/gv/patches/patch-src_gv_misc_res_dat
> diff -N print/gv/patches/patch-src_gv_misc_res_dat
> --- print/gv/patches/patch-src_gv_misc_res_dat 5 Jun 2011 15:03:09
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-src_gv_misc_res_dat,v 1.1 2011/06/05 15:03:09 jasper Exp $
> -
> -Fix Unknown keysym name: apLineDel.
> -From FreeBSD ports/50074.
> -
> ---- src/gv_misc_res.dat.orig Sun Jun 5 16:58:53 2011
> -+++ src/gv_misc_res.dat Sun Jun 5 16:59:02 2011
> -@@ -476,7 +476,6 @@ GV.control.baseTranslations:#replace \n\
> - <Key>BackSpace: GV_Page(up,left-bottom,!page-1,bottom-rightedge)\n\
> - <Key>Insert: GV_Page(page-5) \n\
> - <Key>Delete: GV_Page(page+5) \n\
> -- <Key>apLineDel: GV_Page(page+5) \n\
> - <Key>Home: GV_Page(page=0) \n\
> - <Key>End: GV_Page(page=99999) \n\
> - <Key>Prior: GV_Page(page-1) \n\
> Index: print/gv/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/print/gv/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- print/gv/pkg/PLIST 14 Sep 2010 08:50:07 -0000 1.5
> +++ print/gv/pkg/PLIST 28 Jan 2016 13:56:11 -0000
> @@ -6,12 +6,6 @@ lib/X11/app-defaults/GV
> @man man/man1/gv-update-userconfig.1
> @man man/man1/gv.1
> share/gv/
> -share/gv/gv_class.ad
> -share/gv/gv_copyright.dat
> -share/gv/gv_spartan.dat
> @comment no checksum
> share/gv/gv_system.ad
> -share/gv/gv_user.ad
> -share/gv/gv_user_res.dat
> -share/gv/gv_widgetless.dat
> share/gv/safe-gs-workdir/
> Index: games/xmine/Makefile
> ===================================================================
> RCS file: /cvs/ports/games/xmine/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- games/xmine/Makefile 28 Aug 2015 14:22:14 -0000 1.32
> +++ games/xmine/Makefile 28 Jan 2016 13:56:11 -0000
> @@ -4,13 +4,13 @@ COMMENT= Athena port of xminesweeper
>
> DISTNAME= xmine-1.0.3-Xaw
> PKGNAME= xmine-1.0.3
> -REVISION = 4
> +REVISION= 5
> CATEGORIES= games
>
> -# License: BSD
> +# BSD
> PERMIT_PACKAGE_CDROM= Yes
>
> -WANTLIB= ICE SM Xau Xdmcp X11 Xext Xmu Xpm Xt c pthread-stubs xcb Xaw3d
> +WANTLIB += ICE SM X11 Xau Xaw3d Xdmcp Xext Xmu Xpm Xt c
>
> LIB_DEPENDS= x11/Xaw3d
>
> Index: graphics/xfig/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/xfig/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- graphics/xfig/Makefile 11 Mar 2013 11:10:56 -0000 1.51
> +++ graphics/xfig/Makefile 28 Jan 2016 13:56:11 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT= CAD drawing program for X11
>
> -VERSION= 3.2.5b
> +VERSION= 3.2.5c
> DISTNAME= xfig.${VERSION}.full
> PKGNAME= xfig-${VERSION}
> -REVISION = 6
> CATEGORIES= graphics x11
>
> HOMEPAGE= http://www.xfig.org/
> @@ -13,20 +12,23 @@ HOMEPAGE= http://www.xfig.org/
> # MIT
> PERMIT_PACKAGE_CDROM= Yes
>
> -WANTLIB += ICE SM X11 Xmu Xpm Xt c m z jpeg>=62 png>=2
> -WANTLIB += Xaw3d>=6.1
> +WANTLIB += ICE SM X11 Xaw3d Xmu Xpm Xt c jpeg m png z
>
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcj/}
>
> -FAKE= lib
> PATCHORIG= .pat.orig
> LIB_DEPENDS= graphics/jpeg \
> graphics/png \
> - x11/Xaw3d
> + x11/Xaw3d>=1.6
> RUN_DEPENDS= print/transfig \
> textproc/xpdf
>
> -MAKE_FLAGS= XAPPLOADDIR="${PREFIX}/lib/X11/app-defaults" \
> +MAKE_FLAGS= CDEBUGFLAGS="${CFLAGS}" \
> + PNGLIBDIR="${LOCALBASE}/lib" \
> + PNGINC="-I${LOCALBASE}/include" \
> + XPMLIBDIR="${X11BASE}/lib" \
> + XPMINC="-I${X11BASE}/include/X11" \
> + XAPPLOADDIR="${PREFIX}/lib/X11/app-defaults" \
> XFIGDOCDIR="${PREFIX}/share/doc/xfig" \
> XFIGLIBDIR="${PREFIX}/lib/X11/xfig"
>
> @@ -35,13 +37,11 @@ CONFIGURE_STYLE= imake
> INSTALL_TARGET= install install.all
>
> WRKDIST= ${WRKDIR}/xfig.${VERSION}
> -
> NO_TEST= Yes
> -
> -USE_GROFF = Yes
> +USE_GROFF= Yes
>
> post-extract:
> - chmod -R a+rX,go-w ${WRKSRC}/Libraries ${WRKSRC}/Doc
> - find ${WRKSRC}/Libraries ${WRKSRC}/Doc -type f -exec chmod -x "{}" \;
> + chmod -R u=rwX,go=rX ${WRKSRC}; find ${WRKSRC} -type f -print0 | xargs
> -0 chmod -x
> + find ${WRKSRC}/Doc/html -name '*.orig' -print0 | xargs -0 rm
>
> .include <bsd.port.mk>
> Index: graphics/xfig/distinfo
> ===================================================================
> RCS file: /cvs/ports/graphics/xfig/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- graphics/xfig/distinfo 18 Jan 2015 03:14:15 -0000 1.7
> +++ graphics/xfig/distinfo 28 Jan 2016 13:56:11 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (xfig.3.2.5b.full.tar.gz) =
> XAHPbXn03gTj2e/J8+TqBG6IDWYQ8hDIVRuwpxPphcI=
> -SIZE (xfig.3.2.5b.full.tar.gz) = 5821049
> +SHA256 (xfig.3.2.5c.full.tar.gz) =
> 6mKPl1t5qxdaspIgzBGCdEZkl/YhfymJkoMXvimTofk=
> +SIZE (xfig.3.2.5c.full.tar.gz) = 6078933
> Index: graphics/xfig/patches/patch-Imakefile
> ===================================================================
> RCS file: /cvs/ports/graphics/xfig/patches/patch-Imakefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 patch-Imakefile
> --- graphics/xfig/patches/patch-Imakefile 4 Jun 2013 15:41:23 -0000
> 1.11
> +++ graphics/xfig/patches/patch-Imakefile 28 Jan 2016 13:56:11 -0000
> @@ -1,77 +1,18 @@
> $OpenBSD: patch-Imakefile,v 1.11 2013/06/04 15:41:23 naddy Exp $
> ---- Imakefile.pat.orig Mon Mar 30 11:53:05 2009
> -+++ Imakefile Tue Jun 4 11:17:07 2013
> -@@ -68,15 +68,16 @@ XCOMM #define XAW3D1_5E
> - XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
> - XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
> - # ifdef XAW3D
> -- DUSEXAW3D = -DXAW3D
> -+ DUSEXAW3D = -DXAW3D
> -+ XAWLIB = -lXaw3d
> - # endif /* XAW3D */
> - #endif /* XAW3D1_5E */
> -
> - XCOMM Redefine the following if your PNG library, zlib library and/or
> include file
> - XCOMM are in different places
> -
> --PNGLIBDIR = $(USRLIBDIR)
> --PNGINC = -I/usr/local/include
> -+PNGLIBDIR = ${LOCALBASE}/lib
> -+PNGINC = -I${LOCALBASE}/include
> - ZLIBDIR = $(USRLIBDIR)
> -
> - XCOMM If don't want JPEG support, comment out the #define USEJPEG line
> -@@ -95,13 +96,13 @@ XCOMM You must have version 5b or newer of the jpeg li
> - #define USEINSTALLEDJPEG
> +--- Imakefile.pat.orig Thu Aug 9 18:14:15 2012
> ++++ Imakefile Thu Jan 28 13:00:31 2016
> +@@ -96,8 +96,8 @@ XCOMM You must have version 5b or newer of the jpeg li
>
> #ifdef USEJPEG
> -- #ifdef USEINSTALLEDJPEG
> + # ifdef USEINSTALLEDJPEG
> - JPEGLIBDIR = /usr/local/lib
> - JPEGINC = -I/usr/include/X11
> -- #else
> -- JPEGLIBDIR = ../jpeg
> -- JPEGINC = -I$(JPEGLIBDIR)
> -- #endif /* USEINSTALLEDJPEG */
> -+#ifdef USEINSTALLEDJPEG
> +JPEGLIBDIR = ${LOCALBASE}/lib
> +JPEGINC = -I${LOCALBASE}/include
> -+#else
> -+JPEGLIBDIR = ../jpeg
> -+JPEGINC = -I$(JPEGLIBDIR)
> -+#endif /* USEINSTALLEDJPEG */
> - #endif /* USEJPEG */
> -
> - XCOMM Uncomment the #define for USEXPM if you want to use the XPM
> -@@ -119,8 +120,8 @@ XCOMM Change XPMINC if necessary to point to the inclu
> - #define USEXPM_ICON
> -
> - #ifdef USEXPM
> --XPMLIBDIR = /usr/local/lib
> --XPMINC = -I/usr/local/include/X11
> -+XPMLIBDIR = ${X11BASE}/lib
> -+XPMINC = -I${X11BASE}/include/X11
> - #endif
> -
> - XCOMM Uncomment the following definiton if you want to use the small icons
> -@@ -154,14 +155,16 @@ XCOMM #define I18N
> -
> - XCOMM If using an input tablet uncomment the following
> -
> -+#if BuildInputExt == YES
> - TABLIB = $(XILIB)
> - USETAB = -DUSE_TAB
> -+#endif
> -
> - XCOMM uncomment the following line if your compiler supports
> - XCOMM inline functions. With the "INLINE" keyword, you should notice that
> - XCOMM the display will be a bit faster in complex figures
> -
> --XCOMM USEINLINE = -DUSE_INLINE
> -+USEINLINE = -DUSE_INLINE
> -
> - XCOMM use (and change) the following if you want the multi-key data base
> file
> - XCOMM somewhere other than the standard X11 library directory
> -@@ -177,7 +180,7 @@ XFIGDOCDIR = /usr/local/xfig/doc
> + # else
> + JPEGLIBDIR = ../jpeg
> + JPEGINC = -I$(JPEGLIBDIR)
> +@@ -178,7 +178,7 @@ XFIGDOCDIR = /usr/local/xfig/doc
>
> 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
> @@ -80,16 +21,15 @@ $OpenBSD: patch-Imakefile,v 1.11 2013/06
> XCOMM MANDIR = /usr/local/xfig/man
>
> XCOMM If your system doesn't have strstr undefine the following definition
> -@@ -251,7 +254,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
> - #endif /* USEJPEG */
> -
> - #ifdef I18N
> --I18N_DEFS = -DI18N -DSETLOCALE
> -+I18N_DEFS = -DI18N
> - I18N_SRC = w_i18n.c
> - I18N_OBJ = w_i18n.o
> - #endif
> -@@ -450,7 +453,7 @@ install.libs::
> +@@ -428,7 +428,6 @@ install.rhtml::
> + echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
> + if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \
> + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html ); fi ; \
> +- $(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) ; \
> + if [ -d html ]; then \
> +@@ -451,7 +450,7 @@ install.libs::
> @if [ -d $(DESTDIR)$(OBJLIBDIR) ]; then set +x; \
> else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR) ; set +x; );
> fi
> @if [ -d Libraries ]; then \
> Index: graphics/xfig/patches/patch-f_readold_c
> ===================================================================
> RCS file: graphics/xfig/patches/patch-f_readold_c
> diff -N graphics/xfig/patches/patch-f_readold_c
> --- graphics/xfig/patches/patch-f_readold_c 27 Dec 2009 22:09:24 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,58 +0,0 @@
> -$OpenBSD: patch-f_readold_c,v 1.1 2009/12/27 22:09:24 jasper Exp $
> -
> -Security fix for CVE-2009-4227.
> -Xfig ".fig" File Parsing Buffer Overflow
> -
> -Patch from RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=543905
> -
> ---- f_readold.c.pat.orig Thu Mar 29 02:23:14 2007
> -+++ f_readold.c Sun Dec 27 23:07:04 2009
> -@@ -471,7 +471,7 @@ read_1_3_textobject(FILE *fp)
> - F_text *t;
> - int n;
> - int dum;
> -- char buf[128];
> -+ char buf[512];
> - PR_SIZE tx_dim;
> -
> - if ((t = create_text()) == NULL)
> -@@ -485,22 +485,34 @@ read_1_3_textobject(FILE *fp)
> - t->pen_style = -1;
> - t->angle = 0.0;
> - t->next = NULL;
> -+ if (!fgets(buf, sizeof(buf), fp)) {
> -+ file_msg("Incomplete text data");
> -+ free((char *) t);
> -+ return (NULL);
> -+ }
> -+
> -+ /* Note using strlen(buf) here will waste a few bytes, as the
> -+ various text attributes are counted into this length too. */
> -+ if ((t->cstring = new_string(strlen(buf))) == NULL)
> -+ return (NULL);
> -+
> - /* ascent and length will be recalculated later */
> -- n = fscanf(fp, " %d %d %d %d %d %d %d %[^\n]",
> -+ n = sscanf(buf, " %d %d %d %d %d %d %d %[^\n]",
> - &t->font, &dum, &dum, &t->ascent, &t->length,
> -- &t->base_x, &t->base_y, buf);
> -+ &t->base_x, &t->base_y, t->cstring);
> - if (n != 8) {
> - file_msg("Incomplete text data");
> -+ free(t->cstring);
> - free((char *) t);
> - return (NULL);
> - }
> -- if ((t->cstring = new_string(strlen(buf))) == NULL) {
> -+
> -+ if (!strlen(t->cstring)) {
> -+ free(t->cstring);
> - free((char *) t);
> - file_msg("Empty text string at line %d.", line_no);
> - return (NULL);
> - }
> -- /* put string in structure */
> -- strcpy(t->cstring, buf);
> -
> - /* get the font struct */
> - t->zoom = zoomscale;
> Index: graphics/xfig/patches/patch-f_readpng_c
> ===================================================================
> RCS file: graphics/xfig/patches/patch-f_readpng_c
> diff -N graphics/xfig/patches/patch-f_readpng_c
> --- graphics/xfig/patches/patch-f_readpng_c 8 Jul 2011 20:36:09 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,52 +0,0 @@
> -$OpenBSD: patch-f_readpng_c,v 1.1 2011/07/08 20:36:09 naddy Exp $
> -
> -Fix build with png-1.5.
> -
> ---- f_readpng.c.pat.orig Wed Mar 28 18:23:14 2007
> -+++ f_readpng.c Wed Jul 6 11:06:59 2011
> -@@ -44,6 +44,8 @@ read_png(FILE *file, int filetype, F_pic *pic)
> - int num_palette;
> - png_colorp palette;
> - png_color_16 background;
> -+ double gamma;
> -+ png_color_16p file_background;
> -
> - /* make scale factor smaller for metric */
> - float scale = (appres.INCHES ?
> -@@ -73,7 +75,7 @@ read_png(FILE *file, int filetype, F_pic *pic)
> - }
> -
> - /* set long jump recovery here */
> -- if (setjmp(png_ptr->jmpbuf)) {
> -+ if (setjmp(png_jmpbuf(png_ptr))) {
> - /* if we get here there was a problem reading the file */
> - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
> - close_picfile(file,filetype);
> -@@ -90,14 +92,14 @@ read_png(FILE *file, int filetype, F_pic *pic)
> - png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
> - &interlace_type, &compression_type, &filter_type);
> -
> -- if (info_ptr->valid & PNG_INFO_gAMA)
> -- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
> -+ if (png_get_gAMA(png_ptr, info_ptr, &gamma))
> -+ png_set_gamma(png_ptr, 2.2, gamma);
> - else
> - png_set_gamma(png_ptr, 2.2, 0.45);
> -
> -- if (info_ptr->valid & PNG_INFO_bKGD)
> -+ if (png_get_bKGD(png_ptr, info_ptr, &file_background))
> - /* set the background to the one supplied */
> -- png_set_background(png_ptr, &info_ptr->background,
> -+ png_set_background(png_ptr, file_background,
> - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
> - else {
> - /* blend the canvas background using the alpha channel */
> -@@ -136,7 +138,7 @@ read_png(FILE *file, int filetype, F_pic *pic)
> -
> - if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
> - png_get_hIST(png_ptr, info_ptr, &histogram);
> -- png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
> -+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
> - }
> - }
> - if (color_type == PNG_COLOR_TYPE_GRAY || color_type ==
> PNG_COLOR_TYPE_GRAY_ALPHA) {
> Index: graphics/xfig/patches/patch-f_wrpng_c
> ===================================================================
> RCS file: graphics/xfig/patches/patch-f_wrpng_c
> diff -N graphics/xfig/patches/patch-f_wrpng_c
> --- graphics/xfig/patches/patch-f_wrpng_c 8 Jul 2011 20:36:09 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,23 +0,0 @@
> -$OpenBSD: patch-f_wrpng_c,v 1.1 2011/07/08 20:36:09 naddy Exp $
> -
> -Fix build with png-1.5.
> -
> ---- f_wrpng.c.pat.orig Wed Mar 28 18:23:14 2007
> -+++ f_wrpng.c Wed Jul 6 11:06:59 2011
> -@@ -20,6 +20,7 @@
> - #include "w_msgpanel.h"
> - #include "w_setup.h"
> - #include <png.h>
> -+#include <zlib.h>
> -
> - /*
> - * Write PNG file from rgb data
> -@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *data, int type, u
> - }
> -
> - /* set long jump recovery here */
> -- if (setjmp(png_ptr->jmpbuf)) {
> -+ if (setjmp(png_jmpbuf(png_ptr))) {
> - /* if we get here there was a problem reading the file */
> - png_destroy_write_struct(&png_ptr, &info_ptr);
> - return False;
> Index: graphics/xfig/patches/patch-fig_h
> ===================================================================
> RCS file: /cvs/ports/graphics/xfig/patches/patch-fig_h,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-fig_h
> --- graphics/xfig/patches/patch-fig_h 9 Jun 2009 13:19:44 -0000 1.2
> +++ graphics/xfig/patches/patch-fig_h 28 Jan 2016 13:56:11 -0000
> @@ -1,13 +1,12 @@
> $OpenBSD: patch-fig_h,v 1.2 2009/06/09 13:19:44 jasper Exp $
> ---- fig.h.pat.orig Tue Jun 9 14:59:04 2009
> -+++ fig.h Tue Jun 9 14:59:24 2009
> -@@ -374,7 +374,8 @@ extern double drand48();
> - extern long random();
> - extern void srandom(unsigned int);
> -
> --#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) &&
> !defined(__FreeBSD__) && !defined(__GLIBC__)
> -+#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && \
> -+ !defined(__FreeBSD__) && !defined(__GLIBC__) && !defined(__OpenBSD__)
> - extern void srandom(int);
> -
> - #endif
> +--- fig.h.pat.orig Fri Feb 18 19:43:48 2011
> ++++ fig.h Thu Jan 28 12:52:39 2016
> +@@ -375,7 +375,7 @@ extern double drand48();
>
> + extern long random();
>
> + extern void srandom(unsigned int);
>
> +
>
> +-#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) &&
> !defined(__FreeBSD__) && !defined(__GLIBC__)
>
> ++#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) &&
> !defined(__FreeBSD__) && !defined(__GLIBC__) && !defined(__OpenBSD__)
>
> + extern void srandom(int);
>
> +
>
> + #endif
>
> Index: graphics/xfig/patches/patch-u_error_c
> ===================================================================
> RCS file: graphics/xfig/patches/patch-u_error_c
> diff -N graphics/xfig/patches/patch-u_error_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ graphics/xfig/patches/patch-u_error_c 28 Jan 2016 13:56:11 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Avoids null deref->segfault->core seen if you exit by closing the window.
> +
> +--- u_error.c.pat.orig Thu Jan 28 13:21:16 2016
> ++++ u_error.c Thu Jan 28 13:23:12 2016
> +@@ -67,6 +67,9 @@ int X_error_handler(Display *d, XErrorEvent *err_ev)
> + /* uninstall error handlers so we don't recurse if another error
> happens! */
> + XSetErrorHandler(NULL);
> + XSetIOErrorHandler((XIOErrorHandler) NULL);
> ++ if (!err_ev) {
> ++ return 0;
> ++ }
> + XGetErrorText(tool_d, (int) (err_ev->error_code), err_msg, MAXERRMSGLEN
> - 1);
> + (void) fprintf(stderr,
> + "xfig%s.%s: X error trapped - error message follows:\n%s\n",
> Index: graphics/xfig/patches/patch-w_keyboard_c
> ===================================================================
> RCS file: /cvs/ports/graphics/xfig/patches/patch-w_keyboard_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-w_keyboard_c
> --- graphics/xfig/patches/patch-w_keyboard_c 9 Jun 2009 13:19:44 -0000
> 1.2
> +++ graphics/xfig/patches/patch-w_keyboard_c 28 Jan 2016 13:56:11 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-w_keyboard_c,v 1.2 2009/06/09 13:19:44 jasper Exp $
> ---- w_keyboard.c.pat.orig Tue May 20 21:38:18 2008
> -+++ w_keyboard.c Tue Jun 9 15:12:20 2009
> +--- w_keyboard.c.pat.orig Fri Sep 30 20:27:36 2011
> ++++ w_keyboard.c Thu Jan 28 12:51:55 2016
> @@ -17,8 +17,9 @@
> */
>
> @@ -13,7 +13,7 @@ $OpenBSD: patch-w_keyboard_c,v 1.2 2009/
> #endif
> #include <string.h>
> @@ -41,7 +42,8 @@
> - #define REG_NOERROR REG_OKAY
> + #define REG_NOERROR 0
> #endif
>
> -#if defined(__FreeBSD__) && !defined(REG_NOERROR)
> Index: graphics/xfig/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/graphics/xfig/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- graphics/xfig/pkg/PLIST 11 Oct 2013 20:39:35 -0000 1.12
> +++ graphics/xfig/pkg/PLIST 28 Jan 2016 13:56:11 -0000
> @@ -76,6 +76,7 @@ lib/X11/xfig/Libraries/Computers/Scenic-
> lib/X11/xfig/Libraries/Computers/cd_disk.fig
> lib/X11/xfig/Libraries/Computers/dat-drive.fig
> lib/X11/xfig/Libraries/Computers/dat-drive2.fig
> +lib/X11/xfig/Libraries/Computers/datacard.fig
> lib/X11/xfig/Libraries/Computers/desktop1.fig
> lib/X11/xfig/Libraries/Computers/desktop2.fig
> lib/X11/xfig/Libraries/Computers/desktop3.fig
> @@ -98,6 +99,7 @@ lib/X11/xfig/Libraries/Computers/printer
> lib/X11/xfig/Libraries/Computers/qic-drive.fig
> lib/X11/xfig/Libraries/Computers/r320.fig
> lib/X11/xfig/Libraries/Computers/scanner.fig
> +lib/X11/xfig/Libraries/Computers/screen.fig
> lib/X11/xfig/Libraries/Computers/server.fig
> lib/X11/xfig/Libraries/Computers/sparc5.fig
> lib/X11/xfig/Libraries/Computers/sun_d1000.fig
> @@ -112,6 +114,7 @@ lib/X11/xfig/Libraries/Computers/tower2.
> lib/X11/xfig/Libraries/Computers/tower3.fig
> lib/X11/xfig/Libraries/Computers/ultra2.fig
> lib/X11/xfig/Libraries/Computers/ultra30.fig
> +lib/X11/xfig/Libraries/Computers/usbpen.fig
> lib/X11/xfig/Libraries/Computers/va-jbot.fig
> lib/X11/xfig/Libraries/Computers/va-server-11xx.fig
> lib/X11/xfig/Libraries/Computers/va-server-1hd.fig
> @@ -123,6 +126,7 @@ lib/X11/xfig/Libraries/Computers/va-serv
> lib/X11/xfig/Libraries/Computers/va-server-4hd.fig
> lib/X11/xfig/Libraries/Computers/va-server-5df.fig
> lib/X11/xfig/Libraries/Computers/va-server-nhs.fig
> +lib/X11/xfig/Libraries/Computers/xbox.fig
> lib/X11/xfig/Libraries/Computers/xterminal.fig
> lib/X11/xfig/Libraries/DSP/
> lib/X11/xfig/Libraries/DSP/1toN.fig
> @@ -189,6 +193,7 @@ lib/X11/xfig/Libraries/Electronic/
> lib/X11/xfig/Libraries/Electronic/Physical/
> lib/X11/xfig/Libraries/Electronic/Physical/README
> lib/X11/xfig/Libraries/Electronic/Physical/bal_mike.fig
> +lib/X11/xfig/Libraries/Electronic/Physical/bnc.fig
> lib/X11/xfig/Libraries/Electronic/Physical/conn_db15.fig
> lib/X11/xfig/Libraries/Electronic/Physical/conn_db25.fig
> lib/X11/xfig/Libraries/Electronic/Physical/conn_db37.fig
> @@ -1227,7 +1232,6 @@ lib/X11/xfig/Libraries/Electronic/Schema
> lib/X11/xfig/Libraries/Electronic/Schematic/pnp.fig
> lib/X11/xfig/Libraries/Electronic/Schematic/pushbutton_nc.fig
> lib/X11/xfig/Libraries/Electronic/Schematic/pushbutton_no.fig
> -lib/X11/xfig/Libraries/Electronic/Schematic/relay.fig
> lib/X11/xfig/Libraries/Electronic/Schematic/relay_dpdt.fig
> lib/X11/xfig/Libraries/Electronic/Schematic/relay_spdt.fig
> lib/X11/xfig/Libraries/Electronic/Schematic/resistor.fig
> @@ -1313,6 +1317,7 @@ lib/X11/xfig/Libraries/Examples/tsr2-sid
> lib/X11/xfig/Libraries/Examples/uno_hand.fig
> lib/X11/xfig/Libraries/Examples/watch.fig
> lib/X11/xfig/Libraries/Examples/window.fig
> +lib/X11/xfig/Libraries/Examples/xfig.exe.stackdump
> lib/X11/xfig/Libraries/Fasteners/
> lib/X11/xfig/Libraries/Fasteners/Bolts/
> lib/X11/xfig/Libraries/Fasteners/Bolts/Hexhead_Shld_bolt.fig
> @@ -1326,7 +1331,7 @@ lib/X11/xfig/Libraries/Fasteners/Bolts/R
> lib/X11/xfig/Libraries/Fasteners/Bolts/Roundhead_Shld_bolt.fig
> lib/X11/xfig/Libraries/Fasteners/Bolts/Roundhead_Slotted_bolt.fig
> lib/X11/xfig/Libraries/Fasteners/Bolts/Roundhead_bolt.fig
> -lib/X11/xfig/Libraries/Fasteners/Fasteners.tar.gz
> +lib/X11/xfig/Libraries/Fasteners/Fasteners.tar
> lib/X11/xfig/Libraries/Fasteners/Machinescrews/
> lib/X11/xfig/Libraries/Fasteners/Machinescrews/Hexhead_Shld_screw.fig
> lib/X11/xfig/Libraries/Fasteners/Machinescrews/Hexhead_screw.fig
> @@ -2250,9 +2255,11 @@ lib/X11/xfig/Libraries/Networks/ATM/syno
> lib/X11/xfig/Libraries/Networks/Devices/
> lib/X11/xfig/Libraries/Networks/Devices/bridge.fig
> lib/X11/xfig/Libraries/Networks/Devices/dsu-csu.fig
> +lib/X11/xfig/Libraries/Networks/Devices/firewall-pair.fig
> lib/X11/xfig/Libraries/Networks/Devices/firewall.fig
> lib/X11/xfig/Libraries/Networks/Devices/generic_hw.fig
> lib/X11/xfig/Libraries/Networks/Devices/imux.fig
> +lib/X11/xfig/Libraries/Networks/Devices/internet.fig
> lib/X11/xfig/Libraries/Networks/Devices/microwave1.fig
> lib/X11/xfig/Libraries/Networks/Devices/microwave2.fig
> lib/X11/xfig/Libraries/Networks/Devices/netcloud.fig
> @@ -2279,13 +2286,16 @@ lib/X11/xfig/Libraries/Networks/Hubs/hub
> lib/X11/xfig/Libraries/Networks/Hubs/hub3.fig
> lib/X11/xfig/Libraries/Networks/Hubs/hub4.fig
> lib/X11/xfig/Libraries/Networks/Hubs/netgearhub.fig
> +lib/X11/xfig/Libraries/Networks/NodeB.fig
> lib/X11/xfig/Libraries/Networks/README
> lib/X11/xfig/Libraries/Networks/Routers/
> lib/X11/xfig/Libraries/Networks/Routers/cisco_7010.fig
> lib/X11/xfig/Libraries/Networks/Routers/cisco_7513.fig
> +lib/X11/xfig/Libraries/Networks/Routers/router-pair.fig
> lib/X11/xfig/Libraries/Networks/Routers/router.fig
> lib/X11/xfig/Libraries/Networks/Routers/router2.fig
> lib/X11/xfig/Libraries/Networks/Routers/router3.fig
> +lib/X11/xfig/Libraries/Networks/Routers/router4.fig
> lib/X11/xfig/Libraries/Networks/Switches/
> lib/X11/xfig/Libraries/Networks/Switches/ExtremeSummit.fig
> lib/X11/xfig/Libraries/Networks/Switches/cisco_catalyst.fig
> @@ -2295,7 +2305,9 @@ lib/X11/xfig/Libraries/Networks/Switches
> lib/X11/xfig/Libraries/Networks/Switches/ether_switch2.fig
> lib/X11/xfig/Libraries/Networks/Switches/extreme_blk_dmnd.fig
> lib/X11/xfig/Libraries/Networks/Switches/extreme_summit.fig
> +lib/X11/xfig/Libraries/Networks/Switches/switch-pair.fig
> lib/X11/xfig/Libraries/Networks/Switches/switch.fig
> +lib/X11/xfig/Libraries/Networks/Switches/switch2.fig
> lib/X11/xfig/Libraries/Networks/Switches/switching_hub.fig
> lib/X11/xfig/Libraries/Networks/TestEquip/
> lib/X11/xfig/Libraries/Networks/TestEquip/smartbit.fig
> @@ -2306,6 +2318,9 @@ lib/X11/xfig/Libraries/Networks/VideoPla
> lib/X11/xfig/Libraries/Networks/VideoPlayers/minervavnp.fig
> lib/X11/xfig/Libraries/Networks/VideoPlayers/minervavnp_panel.fig
> lib/X11/xfig/Libraries/Networks/VideoPlayers/mmedia_explorer.fig
> +lib/X11/xfig/Libraries/Networks/cloud.fig
> +lib/X11/xfig/Libraries/Networks/router.fig
> +lib/X11/xfig/Libraries/Networks/wlan.fig
> lib/X11/xfig/Libraries/OfficeEquip/
> lib/X11/xfig/Libraries/OfficeEquip/filecabinet.fig
> lib/X11/xfig/Libraries/OfficeEquip/overhead.fig
> @@ -2631,7 +2646,6 @@ share/doc/xfig/html/accelerators.html
> share/doc/xfig/html/animate.js
> share/doc/xfig/html/attributes.html
> share/doc/xfig/html/authors.html
> -@comment share/doc/xfig/html/authors.html.orig
> share/doc/xfig/html/bugs_fixed.html
> share/doc/xfig/html/but_frm_accelerators.html
> share/doc/xfig/html/but_frm_attributes.html
> @@ -2652,12 +2666,9 @@ share/doc/xfig/html/but_frm_options.html
> share/doc/xfig/html/but_frm_panning.html
> share/doc/xfig/html/but_frm_printing.html
> share/doc/xfig/html/contents.html
> -@comment share/doc/xfig/html/contents.html.orig
> share/doc/xfig/html/drawing.html
> share/doc/xfig/html/editing.html
> -@comment share/doc/xfig/html/editing.html.orig
> share/doc/xfig/html/faq.html
> -@comment share/doc/xfig/html/faq.html.orig
> share/doc/xfig/html/fig-format.html
> share/doc/xfig/html/frm_accelerators.html
> share/doc/xfig/html/frm_attributes.html
> @@ -2795,7 +2806,6 @@ share/doc/xfig/html/images/export-panel-
> share/doc/xfig/html/images/export-panel-postscript.png
> share/doc/xfig/html/images/export-panel.png
> share/doc/xfig/html/images/file-accel.png
> -@comment share/doc/xfig/html/images/file-accel.png.orig
> share/doc/xfig/html/images/file-menu-button.png
> share/doc/xfig/html/images/file-panel.png
> share/doc/xfig/html/images/fill-color-button.png
> @@ -2870,6 +2880,7 @@ share/doc/xfig/html/images/polyline-exam
> share/doc/xfig/html/images/power-supply.png
> share/doc/xfig/html/images/power-supply_sm.png
> share/doc/xfig/html/images/print-panel.png
> +share/doc/xfig/html/images/pspbrwse.jbf
> share/doc/xfig/html/images/redball.png
> share/doc/xfig/html/images/redballdot.png
> share/doc/xfig/html/images/regular-polygon-button.png
> @@ -2894,7 +2905,6 @@ share/doc/xfig/html/images/smart-link-sl
> share/doc/xfig/html/images/snap-accel.png
> share/doc/xfig/html/images/spell-check-panel.png
> share/doc/xfig/html/images/spinner.png
> -share/doc/xfig/html/images/splash-screen.png
> share/doc/xfig/html/images/spline-curves.png
> share/doc/xfig/html/images/spline-examples.png
> share/doc/xfig/html/images/spline-line-button.png
> @@ -2933,7 +2943,6 @@ share/doc/xfig/html/images/vertical-alig
> share/doc/xfig/html/images/vertical-align-none.png
> share/doc/xfig/html/images/vertical-align-top.png
> share/doc/xfig/html/images/view-accel.png
> -@comment share/doc/xfig/html/images/view-accel.png.orig
> share/doc/xfig/html/images/view-menu-button.png
> share/doc/xfig/html/images/watch.png
> share/doc/xfig/html/images/watch_sm.png
> @@ -2949,19 +2958,14 @@ share/doc/xfig/html/images/zoom-panel.pn
> share/doc/xfig/html/index.html
> share/doc/xfig/html/installation.html
> share/doc/xfig/html/introduction.html
> -share/doc/xfig/html/introduction.html.save
> share/doc/xfig/html/latex_and_xfig.html
> share/doc/xfig/html/layers.html
> share/doc/xfig/html/main_menus.html
> -@comment share/doc/xfig/html/main_menus.html.orig
> share/doc/xfig/html/miscellaneous.html
> -@comment share/doc/xfig/html/miscellaneous.html.orig
> share/doc/xfig/html/new_features.html
> -@comment share/doc/xfig/html/new_features.html.orig
> share/doc/xfig/html/options.html
> share/doc/xfig/html/panning.html
> share/doc/xfig/html/printing.html
> share/doc/xfig/html/screen_image_map.html
> share/doc/xfig/xfig-howto.pdf
> -share/doc/xfig/xfig_man.html
> share/doc/xfig/xfig_ref_en.pdf
>
