4 files changed, 11 insertions, 85 deletions

diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index fbdaa59248d7..a834d7a8a4f6 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -6,31 +6,29 @@
 #
 
 PORTNAME=	epstool
-PORTVERSION=	2.10
+PORTVERSION=	3.0
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/
-DISTNAME=	gsv42src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create or extract preview bitmaps in EPS files
 
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-USE_ZIP=	yes
-MAKEFILE=	makefile.unx
+USE_GMAKE=	yes
+MAKEFILE=	makefile
+MAKE_ARGS=	CC="${CC}" CDEBUG="${CFLAGS}" LINK="${CC}" EPSLIB=""
+ALL_TARGET=	${PORTNAME}
 
 post-extract:
-.for file in epstool.zip src.zip
-	@cd ${WRKDIR} && unzip -q -aa ${file}
-.endfor
+	@${RM} -f ${WRKSRC}/epstool
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/epstool ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/epstool.htm ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/../gsview.css ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/epstool.htm ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/gsview.css ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/epstool/distinfo b/graphics/epstool/distinfo
index 223ea2c4ae9e..5cf6b1f0b17e 100644
--- a/graphics/epstool/distinfo
+++ b/graphics/epstool/distinfo
@@ -1 +1 @@
-MD5 (gsv42src.zip) = b22a9f76b4741687a5d0bc81c91219d9
+MD5 (epstool-3.0.tar.gz) = 5de32de51f41939f9d3a388d0e8ccbcb
diff --git a/graphics/epstool/files/patch-aa b/graphics/epstool/files/patch-aa
deleted file mode 100644
index 30a22daf3976..000000000000
--- a/graphics/epstool/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- makefile.unx.orig	Mon Nov  6 09:58:48 2000
-+++ makefile.unx	Thu Jan 11 22:48:17 2001
-@@ -20,13 +20,13 @@
- RM=/bin/rm -f
- SHELL=/bin/sh
- 
--BINDIR=/usr/local/bin
--INCLUDES=-I/usr/openwin/include -I../src -I.
-+BINDIR=${PREFIX}/bin
-+INCLUDES=-I../src -I.
- LIBS=
- # if you have a strict ANSI compiler, add -D__STDC__
- DEFINES=-DUNIX -DEPSTOOL -DHAVE_UNISTD_H
- OBJ=o
--CC=gcc
-+#CC=gcc
- 
- OBJS=epstool.$(OBJ) gvceps.$(OBJ) dscparse.$(OBJ) dscutil.$(OBJ)
- 
-@@ -61,5 +61,5 @@
- 	-$(RM) epstool
- 
- install: epstool
--	cp epstool $(BINDIR)
--	chmod 755 $(BINDIR)/epstool
-+	${BSD_INSTALL_PROGRAM} epstool $(BINDIR)
-+
diff --git a/graphics/epstool/files/patch-ab b/graphics/epstool/files/patch-ab
deleted file mode 100644
index 885284021dbe..000000000000
--- a/graphics/epstool/files/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
---- epstool.c.orig	Fri Nov 23 16:43:50 2001
-+++ epstool.c	Sun Dec  2 05:05:41 2001
-@@ -26,7 +26,7 @@
- char gsname[MAXSTR] = GSCOMMAND;
- char gsarg[MAXSTR];
- char bmpname[MAXSTR];
--char devname[MAXSTR];
-+char gsdevname[MAXSTR];
- char szScratch[] = "ep";
- char szAppName[] = "epstool";
- int resolution = 72;
-@@ -167,9 +167,9 @@
- 	find_gs(gsname, sizeof(gsname)-1, 550, FALSE);
- #endif
- #ifdef UNIX
--	strcpy(devname, "pbmraw");
-+	strcpy(gsdevname, "pbmraw");
- #else
--	strcpy(devname, "bmpmono");
-+	strcpy(gsdevname, "bmpmono");
- #endif
- 	if (scan_args(argc, argv))
- 	   return 1;
-@@ -463,10 +463,10 @@
- 	fclose(tempfile);
- #ifdef UNIX
- 	sprintf(gscommand, "\042%s\042 %s -dNOPAUSE -dQUIET -sDEVICE=%s -sOutputFile=\042%s\042 -r%d -g%dx%d %s",
--	   gsname, gsarg, devname, bmpname, resolution, width, height, tempname);
-+	   gsname, gsarg, gsdevname, bmpname, resolution, width, height, tempname);
- #else
- 	sprintf(gscommand, "-dNOPAUSE\n-dQUIET\n-sDEVICE=%s\n-sOutputFile=\042%s\042\n-r%d\n-g%dx%d\n\042%s\042",
--	   devname, bmpname, resolution, width, height, tempname);
-+	   gsdevname, bmpname, resolution, width, height, tempname);
- 	if (!quiet) {
- 	    fputs(gscommand, stderr);
- 	    fputs("\n", stderr);
-@@ -654,7 +654,7 @@
- 		  break;
- 		case 'z':
- 		  if (argp[2])
--		      strcpy(devname, argp+2);
-+		      strcpy(gsdevname, argp+2);
- 		  break;
- 		case 'c':
- 		  if (got_op) {