- Update to 1.2.5.

PR:		81437
Submitted by:	Hideyuki KURASHINA <rushani@FreeBSD.org>

5 files changed, 39 insertions, 48 deletions

diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index d7830ac9a18f..72037edcd033 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bmeps
-PORTVERSION=	1.0.7a
+PORTVERSION=	1.2.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,9 +18,6 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		netpbm.1:${PORTSDIR}/graphics/netpbm
 
-USE_AUTOCONF_VER=213
-USE_BZIP2=	yes
-
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include"
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -30,9 +27,12 @@ MAN1=		bmeps.1
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bmeps ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/bmeps.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/bmepsoe.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/jpgeps.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/pngeps.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/pnmeps.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/libbmeps.a ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/bmeps.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/bmeps.1 ${PREFIX}/man/man1
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/bmeps/distinfo b/graphics/bmeps/distinfo
index 233ef36b7082..ae930b30a57a 100644
--- a/graphics/bmeps/distinfo
+++ b/graphics/bmeps/distinfo
@@ -1,2 +1,2 @@
-MD5 (bmeps-1.0.7a.tar.bz2) = a7437a5d28fb5347c9012d200fb8e24a
-SIZE (bmeps-1.0.7a.tar.bz2) = 1196671
+MD5 (bmeps-1.2.5.tar.gz) = 4f5512be8d0ddceb3d708e15c1db7da2
+SIZE (bmeps-1.2.5.tar.gz) = 1593971
diff --git a/graphics/bmeps/files/patch-aa b/graphics/bmeps/files/patch-aa
index b392032c36b0..5bd5377862e4 100644
--- a/graphics/bmeps/files/patch-aa
+++ b/graphics/bmeps/files/patch-aa
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Tue Nov 18 22:06:17 2003
-+++ Makefile.in	Tue Jan  6 17:44:08 2004
-@@ -16,6 +16,7 @@
- 
- INCLUDES=	-I. -I$(srcdir) -I$(incdir)
+--- Makefile.in.orig	Mon Apr  4 09:28:15 2005
++++ Makefile.in	Wed May 18 07:33:32 2005
+@@ -21,7 +21,7 @@
  DEFS=		@DEFS@
-+LDFLAGS=	-L$(libdir)
  
- COMPILEC=	$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(VERSNO)
- LINK=		$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@
+ COMPILEC=	$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(VERSNO)
+-
++LDFLAGS=	-L@libdir@
+ LINK=		$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -L. $(LDFLAGS) -o $@
+ MKSO=		$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(VERSNO) -shared
+ 
diff --git a/graphics/bmeps/files/patch-ab b/graphics/bmeps/files/patch-ab
deleted file mode 100644
index bf0fd6a80c15..000000000000
--- a/graphics/bmeps/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	Tue Jan  6 16:44:59 2004
-+++ configure.in	Tue Jan  6 16:45:16 2004
-@@ -15,7 +15,7 @@
- AC_HEADER_CHECK(io.h, AC_DEFINE(HAVE_IO_H))
- AC_HEADER_CHECK(fcntl.h, AC_DEFINE(HAVE_FCNTL_H))
- AC_HAVE_FUNCS(strcasecmp stricmp unlink remove getpid)
--AC_HAVE_FUNCS(getmode _getmode setmode _setmode fileno _fileno)
-+dnl	AC_HAVE_FUNCS(getmode _getmode setmode _setmode fileno _fileno)
- AC_CHECK_LIB(z, deflate, ZLIB='-lz';AC_DEFINE(HAVE_ZLIB),ZLIB='')
- AC_SUBST(ZLIB)
- echo "Checking for libpng... "
-@@ -39,7 +39,7 @@
- xelval maxval;
- cols = rows = format = 0;
- pnm_readpnminit(stdin, &cols, &rows, &maxval, &format);
--],echo yes;LIBPNM='-lpnm -lppm -lpgm -lpbm';AC_DEFINE(HAVE_PNM_H),LIBPNM='';echo no)
-+],echo yes;LIBPNM='-lnetpbm';AC_DEFINE(HAVE_PNM_H),LIBPNM='';echo no)
- AC_SUBST(LIBPNM)
- AC_OUTPUT(Makefile)
- 
diff --git a/graphics/bmeps/pkg-plist b/graphics/bmeps/pkg-plist
index 512f76795cf5..827dc3188e45 100644
--- a/graphics/bmeps/pkg-plist
+++ b/graphics/bmeps/pkg-plist
@@ -1,40 +1,50 @@
 bin/bmeps
 include/bmeps.h
+include/bmepsoe.h
+include/jpgeps.h
+include/pngeps.h
 include/pnmeps.h
 lib/libbmeps.a
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/changes.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/bmeps.pdf
 %%PORTDOCS%%%%DOCSDIR%%/1g.png
 %%PORTDOCS%%%%DOCSDIR%%/2c8r.png
 %%PORTDOCS%%%%DOCSDIR%%/2g8r.png
 %%PORTDOCS%%%%DOCSDIR%%/3c8rf.png
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/bg3c8rf.png
 %%PORTDOCS%%%%DOCSDIR%%/bg3c8rfa.png
 %%PORTDOCS%%%%DOCSDIR%%/bg3c8rfam.png
 %%PORTDOCS%%%%DOCSDIR%%/bg3c8rfams0_255_255.png
-%%PORTDOCS%%%%DOCSDIR%%/d.png
+%%PORTDOCS%%%%DOCSDIR%%/bmeps.pdf
 %%PORTDOCS%%%%DOCSDIR%%/bmeps.tex
+%%PORTDOCS%%%%DOCSDIR%%/changes.html
+%%PORTDOCS%%%%DOCSDIR%%/d.png
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/inst_w32.pdf
+%%PORTDOCS%%%%DOCSDIR%%/inst_w32.tex
+%%PORTDOCS%%%%DOCSDIR%%/install.html
 %%PORTDOCS%%%%DOCSDIR%%/ntmak.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/stefan_255_rgba.bb
-%%PORTDOCS%%%%EXAMPLESDIR%%/arch5.jpg
+%%PORTDOCS%%%%DOCSDIR%%/projbody.txt
+%%PORTDOCS%%%%DOCSDIR%%/projects.html
+%%PORTDOCS%%%%DOCSDIR%%/projfoot.txt
+%%PORTDOCS%%%%DOCSDIR%%/projhead.txt
+%%PORTDOCS%%%%DOCSDIR%%/sflogo.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/usage.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/1g.ps
 %%PORTDOCS%%%%EXAMPLESDIR%%/2c8r.ps
 %%PORTDOCS%%%%EXAMPLESDIR%%/2g8r.ps
 %%PORTDOCS%%%%EXAMPLESDIR%%/3c8rf.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/arch5.jpg
 %%PORTDOCS%%%%EXAMPLESDIR%%/bg3c8rf.ps
 %%PORTDOCS%%%%EXAMPLESDIR%%/bg3c8rfa.ps
 %%PORTDOCS%%%%EXAMPLESDIR%%/bg3c8rfam.ps
 %%PORTDOCS%%%%EXAMPLESDIR%%/bg3c8rfams0_255_255.ps
 %%PORTDOCS%%%%EXAMPLESDIR%%/d.ps
 %%PORTDOCS%%%%EXAMPLESDIR%%/example.tex
+%%PORTDOCS%%%%EXAMPLESDIR%%/example.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/german.tex
 %%PORTDOCS%%%%EXAMPLESDIR%%/pdfexample.tex
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.txt
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/stefan_255_rgba.bb
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%