- Update to 2.2.10a

PR:		ports/158560
Submitted by:	Takefu <takefu@airport.fm>
Approved by:	Rob Farmer <rfarmer@predatorlabs.net> (maintainer)

5 files changed, 52 insertions, 136 deletions

diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index 5d9e95da7529..b1210caff8fa 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -6,36 +6,45 @@
 #
 
 PORTNAME=	bmeps
-PORTVERSION=	2.1.5
-CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PORTVERSION=	2.2.20a
+CATEGORIES=	graphics perl5
+MASTER_SITES=	SF/dktools/dktools/dktools-${PORTVERSION:S,a,,}
+DISTNAME=	dktools-${PORTVERSION}
 
 MAINTAINER=	rfarmer@predatorlabs.net
 COMMENT=	Convert bitmap images (PNG/JPEG/NetPBM) to EPS
 
-LIB_DEPENDS=	dkbif.1:${PORTSDIR}/devel/dklibs
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/bsdlic.txt
 
-MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include"
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+		netpbm:${PORTSDIR}/graphics/netpbm \
+		png:${PORTSDIR}/graphics/png
+
+USE_ZIP=	yes
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=	bmeps.1
-.endif
-
-post-install:
-.if !defined(NO_INSTALL_MANPAGES)
-	${MKDIR} ${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 ${MANPREFIX}/man/man1
-.endif
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/DOCU/*.css ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/DOCU/*.pdf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/DOCU/*.png ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/DOCU/*.html ${DOCSDIR}
-.endif
+USE_AUTOTOOLS=	aclocal autoconf
+
+MAKE_ARGS=	bmeps
+WRKSRC=		${WRKDIR}/${DISTNAME:S,a,,}
+
+CFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
+
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/dktools\
+		--with-lzw\
+		--libdir=${PREFIX}/lib\
+		--includedir=${PREFIX}/include
+
+MAN1=		bmeps.1
+
+do-install:
+	@${MKDIR}		${DATADIR}
+	@${INSTALL_PROGRAM}	${WRKSRC}/bmeps					${PREFIX}/bin
+	@${INSTALL_MAN}		${WRKSRC}/man/man1/bmeps.1			${PREFIX}/man/man1
+	@${INSTALL_DATA}	${WRKSRC}/bmeps.str				${DATADIR}
+	@${INSTALL_DATA}	${WRKSRC}/share/dktools/en/bmeps.stt.bz2	${DATADIR}
+	@${INSTALL_DATA}	${WRKSRC}/share/dktools/en/bmeps.txt		${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/bmeps/distinfo b/graphics/bmeps/distinfo
index dc8812f65ef2..743cb46fb495 100644
--- a/graphics/bmeps/distinfo
+++ b/graphics/bmeps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bmeps-2.1.5.tar.gz) = 910fe460c2c9796807f9ed68b369a9f73937889ba5e85f8732e5be1b4eff1cb4
-SIZE (bmeps-2.1.5.tar.gz) = 8599468
+SHA256 (dktools-2.2.20a.zip) = b0b4b1f20de404fe54d3bfd261ca254f787c1b65b37ea580ecd1ffb59158cbff
+SIZE (dktools-2.2.20a.zip) = 4627866
diff --git a/graphics/bmeps/files/patch-Makefile.in b/graphics/bmeps/files/patch-Makefile.in
deleted file mode 100644
index aa2074056ba0..000000000000
--- a/graphics/bmeps/files/patch-Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- Makefile.in.orig	2010-02-04 01:23:13.951139949 -0800
-+++ Makefile.in	2010-02-04 01:25:05.758312928 -0800
-@@ -48,16 +48,12 @@
- 
- all:	bmeps
- 	-[ -d lib ] || mkdir -p lib
--	-[ -d share/doc/bmeps ] || mkdir -p share/doc/bmeps
- 	-[ -d share/bmeps ] || mkdir -p share/bmeps
--	-(cd DOCU; tar cf - .) | (cd share/doc/bmeps; tar xf -)
- 	stc bmeps.str share/bmeps
- 	find lib -type d -exec chmod 755 {} \;
- 	find lib -type f -exec chmod 644 {} \;
- 	find share -type d -exec chmod 755 {} \;
- 	find share -type f -exec chmod 644 {} \;
--	chmod 755 bmepsgui.jar
--	chmod 755 bmeps-gui
- 	touch all
- 	./transform-mkpdfsls ${PERL} ${datadir}
- 
-@@ -70,30 +66,14 @@
- 	-chmod 755 $(pp)$(incdir)
- 	-[ -d $(pp)$(datadir) ] || mkdir -p $(pp)$(datadir)
- 	-chmod 755 $(pp)$(datadir)
--	-[ -d $(pp)$(datadir)/doc ] || mkdir -p $(pp)$(datadir)/doc
--	-chmod 755 $(pp)$(datadir)/doc
--	-[ -d $(pp)$(datadir)/doc/javadoc ] || mkdir -p $(pp)$(datadir)/doc/javadoc
--	-chmod 755 $(pp)$(datadir)/doc/javadoc
--	-[ -d $(pp)$(datadir)/doc/javadoc/BmepsGUI ] || mkdir -p $(pp)$(datadir)/doc/javadoc/BmepsGUI
--	chmod 755 $(pp)$(datadir)/doc/javadoc/BmepsGUI
- 	cp bmeps  $(pp)$(bindir)/bmeps
- 	chmod 755 $(pp)$(bindir)/bmeps
- 	cp mkpdfsls.pl $(pp)$(bindir)/mkpdfsls.pl
- 	chmod 755 $(pp)$(bindir)/mkpdfsls.pl
--	cp bmepsgui.jar $(pp)$(bindir)/bmepsgui.jar
--	chmod 755 $(pp)$(bindir)/bmepsgui.jar
--	cp bmeps-gui $(pp)$(bindir)/bmeps-gui
--	chmod 755 $(pp)$(bindir)/bmeps-gui
- 	cp libbmeps.a $(pp)$(libdir)/libbmeps.a
- 	chmod 644 $(pp)$(libdir)/libbmeps.a
- 	cp bmeps.h $(pp)$(incdir)/bmeps.h
- 	chmod 644 $(pp)$(incdir)/bmeps.h
--	-(cd share; tar cf - ./*) | (cd $(pp)$(datadir) ; tar xf -)
--	-[ -d $(pp)$(mandir)/man1 ] || mkdir -p $(pp)$(mandir)/man1
--	-chmod 755 $(pp)$(mandir)/man1
--	cp man/man1/bmeps.1 $(pp)$(mandir)/man1/bmeps.1
--	chmod 644 $(pp)$(mandir)/man1/bmeps.1
--	@echo Documentation resides in $(pp)$(datadir)/doc/bmeps.
- 
- # IMGLIBS= -lpnm -lppm -lpgm -lpbm @LIBJPG@ @LIBPNG@
- IMGLIBS= @BIFLIBS@
diff --git a/graphics/bmeps/files/patch-configure.ac b/graphics/bmeps/files/patch-configure.ac
new file mode 100644
index 000000000000..8ca0f8936f34
--- /dev/null
+++ b/graphics/bmeps/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2011-06-22 04:02:05.000000000 +0900
++++ configure.ac	2011-07-01 14:32:44.000000000 +0900
+@@ -103,7 +103,7 @@
+ AC_HEADER_CHECK(vararg.h, AC_DEFINE(HAVE_VARARG_H))
+ AC_HEADER_CHECK(varargs.h, AC_DEFINE(HAVE_VARARGS_H))
+ AC_HEADER_CHECK(termios.h, AC_DEFINE(HAVE_TERMIOS_H))
+-AC_HEADER_CHECK(sys/termios.h, AC_DEFINE(HAVE_SYS_TERMIOS_H))
++dnl AC_HEADER_CHECK(sys/termios.h, AC_DEFINE(HAVE_SYS_TERMIOS_H))
+ AC_HEADER_CHECK(sys/ttold.h, AC_DEFINE(HAVE_SYS_TTOLD_H))
+ CRYPTLIB=''
+ USERAUDPROGS=''
diff --git a/graphics/bmeps/pkg-plist b/graphics/bmeps/pkg-plist
index 7d1ce6908821..a3688904a495 100644
--- a/graphics/bmeps/pkg-plist
+++ b/graphics/bmeps/pkg-plist
@@ -1,60 +1,6 @@
+@comment $FreeBSD$
 bin/bmeps
-bin/mkpdfsls.pl
-include/bmeps.h
-lib/libbmeps.a
-%%PORTDOCS%%%%DOCSDIR%%/bmeps.pdf
-%%PORTDOCS%%%%DOCSDIR%%/bmepsde.pdf
-%%PORTDOCS%%%%DOCSDIR%%/bmlogo.png
-%%PORTDOCS%%%%DOCSDIR%%/bt6.pdf
-%%PORTDOCS%%%%DOCSDIR%%/bt7.pdf
-%%PORTDOCS%%%%DOCSDIR%%/bt9.pdf
-%%PORTDOCS%%%%DOCSDIR%%/changes.html
-%%PORTDOCS%%%%DOCSDIR%%/compression.png
-%%PORTDOCS%%%%DOCSDIR%%/ex.html
-%%PORTDOCS%%%%DOCSDIR%%/examples.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/fbt-multi.html
-%%PORTDOCS%%%%DOCSDIR%%/fbt.png
-%%PORTDOCS%%%%DOCSDIR%%/gui.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/mkpdfsls.html
-%%PORTDOCS%%%%DOCSDIR%%/projects.html
-%%PORTDOCS%%%%DOCSDIR%%/sc-win-1.png
-%%PORTDOCS%%%%DOCSDIR%%/sc-win-2.png
-%%PORTDOCS%%%%DOCSDIR%%/sc-win-3.png
-%%PORTDOCS%%%%DOCSDIR%%/sc-win-4.png
-%%PORTDOCS%%%%DOCSDIR%%/sc-win-5.png
-%%PORTDOCS%%%%DOCSDIR%%/sc01.png
-%%PORTDOCS%%%%DOCSDIR%%/sc02.png
-%%PORTDOCS%%%%DOCSDIR%%/sc03.png
-%%PORTDOCS%%%%DOCSDIR%%/sc04.png
-%%PORTDOCS%%%%DOCSDIR%%/sc05.png
-%%PORTDOCS%%%%DOCSDIR%%/sc06.png
-%%PORTDOCS%%%%DOCSDIR%%/sc07.png
-%%PORTDOCS%%%%DOCSDIR%%/sc08.png
-%%PORTDOCS%%%%DOCSDIR%%/sc09.png
-%%PORTDOCS%%%%DOCSDIR%%/sc1.png
-%%PORTDOCS%%%%DOCSDIR%%/sc10.png
-%%PORTDOCS%%%%DOCSDIR%%/sc11.png
-%%PORTDOCS%%%%DOCSDIR%%/sc12.png
-%%PORTDOCS%%%%DOCSDIR%%/sc13.png
-%%PORTDOCS%%%%DOCSDIR%%/sc14.png
-%%PORTDOCS%%%%DOCSDIR%%/sc15.png
-%%PORTDOCS%%%%DOCSDIR%%/sc16.png
-%%PORTDOCS%%%%DOCSDIR%%/sc17.png
-%%PORTDOCS%%%%DOCSDIR%%/sc18.png
-%%PORTDOCS%%%%DOCSDIR%%/sc19.png
-%%PORTDOCS%%%%DOCSDIR%%/sc2.png
-%%PORTDOCS%%%%DOCSDIR%%/sc20.png
-%%PORTDOCS%%%%DOCSDIR%%/sc3.png
-%%PORTDOCS%%%%DOCSDIR%%/sc4.png
-%%PORTDOCS%%%%DOCSDIR%%/sc5.png
-%%PORTDOCS%%%%DOCSDIR%%/sc6.png
-%%PORTDOCS%%%%DOCSDIR%%/sc7.png
-%%PORTDOCS%%%%DOCSDIR%%/sc8.png
-%%PORTDOCS%%%%DOCSDIR%%/sflogo.png
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/workshop.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/bmeps.stt.bz2
+%%DATADIR%%/bmeps.str
+%%DATADIR%%/bmeps.txt
+@dirrm %%DATADIR%%