transfig: remove, replaced by print/fig2dev

18 files changed, 15 insertions, 347 deletions

diff --git a/biology/chemtool/DESCR b/biology/chemtool/DESCR
index 18eb36e250d..9b38721f811 100644
--- a/biology/chemtool/DESCR
+++ b/biology/chemtool/DESCR
@@ -3,5 +3,5 @@ them as a X bitmap file. It runs under the X Window System using the
 GTK widget set.
 
 Molecules can be exported in X bitmap format. Encapsulated postscript,
-fig, or PicTeX formats are also possible if the fig2dev program from
-the transfig package (pkgsrc/print/transfig/) is installed.
+fig, or PicTeX formats are also possible if the fig2dev
+(pkgsrc/print/fig2dev) is installed.
diff --git a/cross/avr-libc/options.mk b/cross/avr-libc/options.mk
index fc9b48f1efe..8d877ac314b 100644
--- a/cross/avr-libc/options.mk
+++ b/cross/avr-libc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2016/11/15 20:30:01 riastradh Exp $
+# $NetBSD: options.mk,v 1.2 2017/10/03 15:12:42 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.avr-libc
 PKG_SUPPORTED_OPTIONS+=		doc
@@ -32,7 +32,7 @@ BUILD_DEPENDS+=         tex-tabu-[0-9]*:../../print/tex-tabu
 BUILD_DEPENDS+=         tex-tocloft-[0-9]*:../../print/tex-tocloft
 BUILD_DEPENDS+=         tex-xcolor-[0-9]*:../../print/tex-xcolor
 BUILD_DEPENDS+=         tex-xkeyval-[0-9]*:../../print/tex-xkeyval
-BUILD_DEPENDS+=         transfig-[0-9]*:../../print/transfig
+BUILD_DEPENDS+=         fig2dev-[0-9]*:../../print/fig2dev
 BUILD_DEPENDS+=         makeindexk-[0-9]*:../../textproc/makeindexk
 
 post-extract:
diff --git a/doc/CHANGES-2017 b/doc/CHANGES-2017
index 3ecf40e7efc..6b178a9e476 100644
--- a/doc/CHANGES-2017
+++ b/doc/CHANGES-2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.4294 2017/10/03 15:09:47 wiz Exp $
+$NetBSD: CHANGES-2017,v 1.4295 2017/10/03 15:12:43 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -6097,3 +6097,4 @@ Changes to the packages collection and infrastructure in 2017:
 	Updated math/gnumeric112 to 1.12.35 [wiz 2017-10-03]
 	Added print/fig2dev version 3.2.6a [wiz 2017-10-03]
 	Updated graphics/xfig to 3.2.6a [wiz 2017-10-03]
+	Removed print/transfig [wiz 2017-10-03]
diff --git a/editors/lyx/MESSAGE b/editors/lyx/MESSAGE
index a24d7466dd9..38bc5ebf5ce 100644
--- a/editors/lyx/MESSAGE
+++ b/editors/lyx/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2017/09/26 10:27:00 wiz Exp $
+$NetBSD: MESSAGE,v 1.5 2017/10/03 15:12:42 wiz Exp $
 
 After upgrading LyX or adding new converters, document previewers,
 TeX fonts, or other features, LyX users should consider running
@@ -9,7 +9,7 @@ options to further configure these features.
 
 Examples of packages that can be used to extend LyX include:
 converters/latex2rtf, converters/wv, graphics/ImageMagick,
-graphics/tgif, graphics/tiff, print/dvipdfmx, print/gv, print/transfig,
+graphics/tgif, graphics/tiff, print/dvipdfmx, print/gv, print/fig2dev,
 textproc/dsssl-docbook-modular, textproc/ispell-base, and
 textproc/latex2html.
 
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 7bf6a7a7dff..a6c071aeb33 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2017/08/16 20:45:43 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.34 2017/10/03 15:12:42 wiz Exp $
 
 DISTNAME=	apsfilter-7.2.8
+PKGREVISION=	1
 CATEGORIES=	print
 #MASTER_SITES=	http://www.apsfilter.org/download/
 
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	recode-[0-9]*:../../converters/recode
 #DEPENDS+=	html2ps-[0-9]*:../../print/html2ps
-DEPENDS+=	transfig-[0-9]*:../../print/transfig
+DEPENDS+=	fig2dev-[0-9]*:../../print/fig2dev
 DEPENDS+=	jpeg>=6b:../../graphics/jpeg
 DEPENDS+=	netpbm>=9.7nb1:../../graphics/netpbm
 DEPENDS+=	a2ps-[0-9]*:../../print/a2ps
diff --git a/print/transfig/DESCR b/print/transfig/DESCR
deleted file mode 100644
index 66b2237f81e..00000000000
--- a/print/transfig/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-TransFig is a set of tools for creating TeX documents with graphics
-which are portable, in the sense that they can be printed in a wide
-variety of environments.
diff --git a/print/transfig/MESSAGE b/print/transfig/MESSAGE
deleted file mode 100644
index 5d737250e33..00000000000
--- a/print/transfig/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/03/27 21:59:22 rh Exp $
-
-Please note that Ghostscript is required if you want to convert Xfig
-drawings to Postscript, PDF, or related formats.  You need to install
-one of the Ghostscript packages (see pkgsrc/print/ghostscript*) for
-this.
-===========================================================================
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
deleted file mode 100644
index cdd067cdca7..00000000000
--- a/print/transfig/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.44 2014/02/24 12:12:02 wiz Exp $
-
-DISTNAME=	transfig.3.2.5e
-PKGNAME=	${DISTNAME:S/g./g-/}
-CATEGORIES=	graphics print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mcj/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.xfig.org/
-COMMENT=	TeX document creation tool utilizing portable graphics
-
-USE_IMAKE=		yes
-
-.include "../../mk/bsd.prefs.mk"
-
-# A default paper size is used only in the IBM-GL/HP-GL driver:
-.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
-MAKE_ENV+=		DDA4="-DA4"
-.endif
-
-MAKE_ENV+=		ICONVLIBS="${BUILDLINK_LDADD.iconv}"
-
-# fig2ps2tex needs csh which might not be present on eg. Linux
-CHECK_INTERPRETER_SKIP=	bin/fig2ps2tex
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/PLIST b/print/transfig/PLIST
deleted file mode 100644
index 685c107e239..00000000000
--- a/print/transfig/PLIST
+++ /dev/null
@@ -1,77 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2014/02/24 12:12:02 wiz Exp $
-bin/fig2dev
-bin/fig2ps2tex
-bin/fig2ps2tex.sh
-bin/pic2tpic
-bin/transfig
-lib/X11/xfig/bitmaps/bricks.bmp
-lib/X11/xfig/bitmaps/circles.bmp
-lib/X11/xfig/bitmaps/crosshatch.bmp
-lib/X11/xfig/bitmaps/crosshatch30.bmp
-lib/X11/xfig/bitmaps/crosshatch45.bmp
-lib/X11/xfig/bitmaps/dash.bmp
-lib/X11/xfig/bitmaps/dashDot.bmp
-lib/X11/xfig/bitmaps/dashDotDot.bmp
-lib/X11/xfig/bitmaps/dashDotDotDot.bmp
-lib/X11/xfig/bitmaps/dot.bmp
-lib/X11/xfig/bitmaps/fishscales.bmp
-lib/X11/xfig/bitmaps/hexagons.bmp
-lib/X11/xfig/bitmaps/horiz_saw.bmp
-lib/X11/xfig/bitmaps/horizontal.bmp
-lib/X11/xfig/bitmaps/left30.bmp
-lib/X11/xfig/bitmaps/left45.bmp
-lib/X11/xfig/bitmaps/leftshingle.bmp
-lib/X11/xfig/bitmaps/octagons.bmp
-lib/X11/xfig/bitmaps/p13.bmp
-lib/X11/xfig/bitmaps/right30.bmp
-lib/X11/xfig/bitmaps/right45.bmp
-lib/X11/xfig/bitmaps/sp0.bmp
-lib/X11/xfig/bitmaps/rightshingle.bmp
-lib/X11/xfig/bitmaps/small_fishscales.bmp
-lib/X11/xfig/bitmaps/sp1.bmp
-lib/X11/xfig/bitmaps/sp10.bmp
-lib/X11/xfig/bitmaps/sp11.bmp
-lib/X11/xfig/bitmaps/sp12.bmp
-lib/X11/xfig/bitmaps/sp13.bmp
-lib/X11/xfig/bitmaps/sp14.bmp
-lib/X11/xfig/bitmaps/sp15.bmp
-lib/X11/xfig/bitmaps/sp16.bmp
-lib/X11/xfig/bitmaps/sp17.bmp
-lib/X11/xfig/bitmaps/sp18.bmp
-lib/X11/xfig/bitmaps/sp19.bmp
-lib/X11/xfig/bitmaps/sp2.bmp
-lib/X11/xfig/bitmaps/sp20.bmp
-lib/X11/xfig/bitmaps/sp3.bmp
-lib/X11/xfig/bitmaps/sp4.bmp
-lib/X11/xfig/bitmaps/sp5.bmp
-lib/X11/xfig/bitmaps/sp6.bmp
-lib/X11/xfig/bitmaps/sp7.bmp
-lib/X11/xfig/bitmaps/sp8.bmp
-lib/X11/xfig/bitmaps/sp9.bmp
-lib/X11/xfig/bitmaps/vert_bricks.bmp
-lib/X11/xfig/bitmaps/vert_leftshingle.bmp
-lib/X11/xfig/bitmaps/vert_rightshingle.bmp
-lib/X11/xfig/bitmaps/vert_saw.bmp
-lib/X11/xfig/bitmaps/vertical.bmp
-lib/fig2dev/japanese.ps
-lib/fig2dev/ja.ps
-lib/fig2dev/ja_JP.ps
-lib/fig2dev/ja_JP.ujis.ps
-lib/fig2dev/ja_JP.eucJP.ps
-lib/fig2dev/ja_JP.EUC.ps
-lib/fig2dev/korean.ps
-lib/fig2dev/ko.ps
-lib/fig2dev/ko_KR.ps
-lib/fig2dev/ko_KR.eucKR.ps
-lib/fig2dev/ko_KR.EUC.ps
-lib/fig2dev/cs_CZ.ps
-lib/fig2dev/hr_HR.ps
-lib/fig2dev/hu_HU.ps
-lib/fig2dev/ro_RO.ps
-lib/fig2dev/pl_PL.ps
-lib/fig2dev/sk_SK.ps
-lib/fig2dev/sl_SI.ps
-${IMAKE_MAN_DIR}/fig2dev.1
-${IMAKE_MAN_DIR}/fig2ps2tex.1
-${IMAKE_MAN_DIR}/pic2tpic.1
-${IMAKE_MAN_DIR}/transfig.1
diff --git a/print/transfig/buildlink3.mk b/print/transfig/buildlink3.mk
deleted file mode 100644
index 9f986ac895e..00000000000
--- a/print/transfig/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.13 2013/02/16 11:18:03 wiz Exp $
-
-BUILDLINK_TREE+=	transfig
-
-.if !defined(TRANSFIG_BUILDLINK3_MK)
-TRANSFIG_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.transfig+=	transfig>=3.2.4
-BUILDLINK_ABI_DEPENDS.transfig+=	transfig>=3.2.5dnb1
-BUILDLINK_PKGSRCDIR.transfig?=	../../print/transfig
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.endif # TRANSFIG_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-transfig
diff --git a/print/transfig/distinfo b/print/transfig/distinfo
deleted file mode 100644
index 721fcdd1210..00000000000
--- a/print/transfig/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.23 2017/07/15 14:09:22 wiz Exp $
-
-SHA1 (transfig.3.2.5e.tar.gz) = 27aa9691bf84f8775db9be39c453a8132148bad1
-RMD160 (transfig.3.2.5e.tar.gz) = cc919f081483c3f570abeca6a8cadd4796d25015
-SHA512 (transfig.3.2.5e.tar.gz) = ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-Size (transfig.3.2.5e.tar.gz) = 531256 bytes
-SHA1 (patch-aa) = 1c831b806eca90142348aab8e565d020466e6a96
-SHA1 (patch-ab) = b056ff88914bccfc172f15adb663eda0f254e125
-SHA1 (patch-ac) = 6508bac36a86a69b910f5e3b4f08e09a25055dfe
-SHA1 (patch-ae) = d38a07c99e27606a238b3dc89cd938ed9635291d
-SHA1 (patch-fig2dev_dev_genibmgl.c) = 86d75d687066e77f90f5e35914a5edc409708e3e
diff --git a/print/transfig/patches/patch-aa b/print/transfig/patches/patch-aa
deleted file mode 100644
index 4401ffe414c..00000000000
--- a/print/transfig/patches/patch-aa
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2017/07/15 14:09:23 wiz Exp $
-
---- fig2dev/Imakefile.orig	2010-06-02 19:18:16.000000000 +0000
-+++ fig2dev/Imakefile
-@@ -34,7 +34,7 @@ XCOMM ******
- XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
- XCOMM and installed xfig.
- 
--XFIGLIBDIR =	/usr/local/lib/X11/xfig
-+XFIGLIBDIR =	$(PROJECTROOT)/lib/X11/xfig
- 
- XCOMM ******
- XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
-@@ -53,7 +53,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
- 
--XCOMM USEINLINE = -DUSE_INLINE
-+USEINLINE = 
- 
- XCOMM ****************
- XCOMM Change RGB if necessary, to point to your rgb.txt color database
-@@ -76,7 +76,7 @@ XCOMM file are in different places
- #ifdef USEPNG
- PNGLIBDIR = $(USRLIBDIR)
- ZLIBDIR = $(USRLIBDIR)
--PNGINC = -I/usr/include/X11
-+PNGINC = -I$(LOCALBASE)/include
- #endif
- 
- XCOMM ****************
-@@ -92,7 +92,19 @@ XCOMM
- 
- #ifdef USEXPM
- XPMLIBDIR = $(USRLIBDIR)
--XPMINC = -I/usr/include/X11
-+XPMINC = -I$(LOCALBASE)/include/X11
-+#endif
-+
-+XCOMM ****************
-+XCOMM Uncomment the #define for USEICONV if you want to use the iconv(3). If the
-+XCOMM iconv(3) is in separate library (-liconv), define USELIBICONV too.
-+
-+#define USEICONV
-+XCOMM #define USELIBICONV
-+
-+#ifdef USEICONV
-+ICONVLIBDIR = $(USRLIBDIR)
-+ICONVINC = -I$(LOCALBASE)/include
- #endif
- 
- XCOMM ****************
-@@ -141,8 +153,8 @@ XCOMM Comment out the next line if you h
- 
- #ifdef I18N
- I18N_DEFS = -DI18N 
--FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
--I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
-+FIG2DEV_LIBDIR = $(PROJECTROOT)/lib/fig2dev
-+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR)
- 
- #endif /* I18N */
- 
-@@ -150,30 +162,37 @@ XCOMM **********************************
- XCOMM *** You shouldn't have to change anything below this point ***
- XCOMM **************************************************************
- 
--DIR_DEFS=	-DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\"
-+DIR_DEFS=	-DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\" -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
- 
- #ifdef USEPNG
- DUSEPNG = -DUSE_PNG
--PNGLIBS = -L$(PNGLIBDIR) -lpng -L$(ZLIBDIR) -lz
-+PNGLIBS = -Wl,-R$(LOCALBASE)/lib -L$(PNGLIBDIR) -lpng -lz
- #endif /* USEPNG */
- 
- #ifdef USEXPM
- DUSEXPM = -DUSE_XPM
--XPMLIBS = -L$(XPMLIBDIR) -lXpm -lX11
-+XPMLIBS = -Wl,-R$(XPMLIBDIR) -L$(XPMLIBDIR) -lXpm -lX11
- #endif /* USEXPM */
- 
-+#ifdef USEICONV
-+DUSEICONV = -DUSE_ICONV
-+#ifdef USELIBICONV
-+ICONVLIBS = -L$(ICONVLIBDIR) -liconv
-+#endif /* USELIBICONV */
-+#endif /* USEICONV */
-+
- #if defined(NOSTRSTR) 
- STRSTRC=	strstr.c
- STRSTRO=	strstr.o
- #endif /* defined(NOSTRSTR) */
- 
- DEFINES = $(NEED_STRERROR) $(HAVE_NO_STRCASECMP) $(HAVE_NO_STRNCASECMP) $(DDNFSS) $(USEINLINE) \
--	$(I18N_DEFS) $(HAVE_SETMODE) $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC)
-+	$(I18N_DEFS) $(HAVE_SETMODE) $(DUSEPNG) $(DUSEXPM) $(DUSEICONV) $(PNGINC) $(XPMINC) $(ICONVINC)
- 
- 
--IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) $(I18N_DEV_DEFS) 
-+IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) $(I18N_DEV_DEFS) $(DUSEICONV)
- 
--DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
-+DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(DUSEICONV) $(PNGINC) $(XPMINC) $(ICONVINC) $(DDNFSS) $(DDA4) \
- 		$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
- 
- #define IHaveSubdirs
-@@ -189,9 +208,9 @@ INCLUDES = -I..
- 
- LOCAL_LIBRARIES = $(LIBTRANSFIG)
- #if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
--SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) -lm -lcompat
-+SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) $(ICONVLIBS) -lm -lcompat
- #else
--SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) -lm
-+SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) $(ICONVLIBS) -lm
- #endif
- DEPLIBS = $(LIBTRANSFIG)
- 
-@@ -255,3 +274,4 @@ pic2tpic.man:: ../doc/pic2tpic.1
- 	$(RM) pic2tpic.man
- 	-$(LN) ../doc/pic2tpic.1 pic2tpic.man
- 
-+LOCAL_LDFLAGS=	${LDFLAGS}
diff --git a/print/transfig/patches/patch-ab b/print/transfig/patches/patch-ab
deleted file mode 100644
index dcb9826fbfb..00000000000
--- a/print/transfig/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/12/20 18:13:23 joerg Exp $
-
---- fig2dev/read.c.orig	2005-12-20 18:05:06.000000000 +0000
-+++ fig2dev/read.c
-@@ -37,8 +37,6 @@ strerror(e)
- }
- #endif
- 
--extern int            errno;
--
- extern F_arrow		*make_arrow();
- 
- static void		 read_colordef();
diff --git a/print/transfig/patches/patch-ac b/print/transfig/patches/patch-ac
deleted file mode 100644
index 54941db7d77..00000000000
--- a/print/transfig/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2017/07/15 14:09:23 wiz Exp $
-
---- transfig/Imakefile.orig	2003-03-25 20:52:38.000000000 +0000
-+++ transfig/Imakefile
-@@ -32,7 +32,7 @@ XCOMM Uncomment the USELATEX2E flag to u
- XCOMM \\usepackage{} command for LaTeX2e. 
- XCOMM The default is to use \\documentstyle{} for LaTeX209.
- 
--XCOMM USELATEX2E = -DLATEX2E
-+USELATEX2E = -DLATEX2E
- 
- XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT *******
- 
-@@ -68,3 +68,5 @@ pic2tpic.man:: ../doc/pic2tpic.1
- 
- clean::
- 	rm -f *.man
-+
-+LOCAL_LDFLAGS=	${LDFLAGS}
diff --git a/print/transfig/patches/patch-ae b/print/transfig/patches/patch-ae
deleted file mode 100644
index c657f10df6f..00000000000
--- a/print/transfig/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2014/04/17 21:32:25 asau Exp $
-
---- fig2dev/fig2dev.h.orig	2010-03-16 18:53:20.000000000 +0000
-+++ fig2dev/fig2dev.h
-@@ -214,13 +214,14 @@ struct Cmap {
- #endif /* MAXPATHLEN */
- #endif /* PATH_MAX */
- 
--#if ( !defined(__NetBSD__) && !defined(__DARWIN__) && !defined(__FreeBSD) )
-+#if ( !defined(__NetBSD__) && !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__DragonFly__) )
- extern int		sys_nerr, errno;
- #endif
- 
- #if ( !(defined(BSD) && (BSD >= 199306)) && !defined(__NetBSD__) && \
- 	!defined(__GNU_LIBRARY__) && !defined(__FreeBSD__) && \
--	!defined(__GLIBC__) && !defined(__CYGWIN__) && !defined(__DARWIN__))
-+	!defined(__GLIBC__) && !defined(__CYGWIN__) && \
-+	!defined(__DARWIN__) && !defined(__DragonFly__))
- 	    extern char *sys_errlist[];
- #endif
- 
diff --git a/print/transfig/patches/patch-fig2dev_dev_genibmgl.c b/print/transfig/patches/patch-fig2dev_dev_genibmgl.c
deleted file mode 100644
index f4279765ac5..00000000000
--- a/print/transfig/patches/patch-fig2dev_dev_genibmgl.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-fig2dev_dev_genibmgl.c,v 1.1 2012/05/04 16:31:59 joerg Exp $
-
---- fig2dev/dev/genibmgl.c.orig	2012-04-27 18:39:11.000000000 +0000
-+++ fig2dev/dev/genibmgl.c
-@@ -567,7 +567,7 @@ double	length;
-  * set_width - issue line width commands as appropriate
-  *		NOTE: HPGL/2 command used
-  */
--static set_width(w)
-+static void set_width(w)
-     int	w;
- {
-     static int current_width=-1;
diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index 69c501042cc..eaef43e333f 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2017/08/16 11:35:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2017/10/03 15:12:43 wiz Exp $
 
 DISTNAME=	dblatex-0.3.10
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dblatex/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/textproc/dblatex/options.mk b/textproc/dblatex/options.mk
index de2d5a562bf..fcc8381f873 100644
--- a/textproc/dblatex/options.mk
+++ b/textproc/dblatex/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/10 12:27:27 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2017/10/03 15:12:42 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dblatex
 PKG_SUPPORTED_OPTIONS=	dblatex-fig
@@ -7,5 +7,5 @@ PKG_SUGGESTED_OPTIONS=	dblatex-fig
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdblatex-fig)
-DEPENDS+=	transfig-[0-9]*:../../print/transfig
+DEPENDS+=	fig2dev-[0-9]*:../../print/fig2dev
 .endif