4 files changed, 16 insertions, 28 deletions

diff --git a/graphics/jpeg2ps-letter/Makefile b/graphics/jpeg2ps-letter/Makefile
index ef678228d72d..78876a1d4052 100644
--- a/graphics/jpeg2ps-letter/Makefile
+++ b/graphics/jpeg2ps-letter/Makefile
@@ -7,38 +7,35 @@
 
 PORTNAME=	jpeg2ps
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics converters
 MASTER_SITES=	http://www.pdflib.com/products/more/jpeg2ps/
 PKGNAMESUFFIX=	-${PAPERSIZE}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converter for JPEG compressed images to PostScript Level 2
 
-PAPERSIZE?=	letter
-
-INSTALL_TARGET=
+MAKE_ARGS+=	CFLAGS="-c ${CFLAGS}" LD="${CC}"
 
-MAN1=           jpeg2ps.1
+MAN1=		jpeg2ps.1
+PLIST_FILES=	bin/jpeg2ps
 
-PLIST_FILES=	bin/jpeg2ps %%DOCSDIR%%/jpeg2ps.txt
-PLIST_DIRS=	%%DOCSDIR%%
+PAPERSIZE?=	letter
 
-.include <bsd.port.pre.mk>
+.if !defined(NOPORTDOCS)
+PORTDOCS=	jpeg2ps.txt
+.endif
 
 .if ${PAPERSIZE} == a4
-post-patch:
-	${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.input
-	${SED} "s%CCFLAGS=-O -c%CCFLAGS=-O -c -DA4%" ${WRKSRC}/Makefile.input > ${WRKSRC}/Makefile
-	${RM} -f ${WRKSRC}/Makefile.input
+CFLAGS+=	-DA4
 .endif
 
-post-install:
+do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jpeg2ps ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/jpeg2ps.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/jpeg2ps.txt ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/jpeg2ps.1 ${MANPREFIX}/man/man1
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/jpeg2ps-letter/distinfo b/graphics/jpeg2ps-letter/distinfo
index b47b5219efdd..b2f20b144003 100644
--- a/graphics/jpeg2ps-letter/distinfo
+++ b/graphics/jpeg2ps-letter/distinfo
@@ -1,2 +1,3 @@
 MD5 (jpeg2ps-1.9.tar.gz) = e654f6a584435e6717b6c2659c07db28
+SHA256 (jpeg2ps-1.9.tar.gz) = e09919ff55bb1fd26299adfe92e5ea0e7daaa3bfa0277a0483cac9764eac25a2
 SIZE (jpeg2ps-1.9.tar.gz) = 67105
diff --git a/graphics/jpeg2ps-letter/files/patch-aa b/graphics/jpeg2ps-letter/files/patch-aa
deleted file mode 100644
index 59ac870197e9..000000000000
--- a/graphics/jpeg2ps-letter/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	Mon Feb  4 03:39:21 2002
-+++ Makefile	Sun Oct 19 02:44:27 2003
-@@ -14,7 +14,8 @@
- # The following was reported to work for emx/gcc 0.9c fix04 under OS/2:
- # make -f Makefile "CFLAGS=-c -DA4 -DDOS -O2" "LDFLAGS=-Zexe -s"
- 
--CFLAGS=-c -DA4
-+CFLAGS?=-O -pipe
-+CFLAGS+=-c
- LD=cc
- LDFLAGS=
- OBJ=o
diff --git a/graphics/jpeg2ps-letter/pkg-descr b/graphics/jpeg2ps-letter/pkg-descr
index 941ee793dc10..76388bb59f4d 100644
--- a/graphics/jpeg2ps-letter/pkg-descr
+++ b/graphics/jpeg2ps-letter/pkg-descr
@@ -8,3 +8,5 @@ file. Decompression is done by the PostScript interpreter (only PostScript
 Level 2 and 3 interpreters support JPEG compression and decompression).
 If you have a slow communication channel and a fast printer, sending
 compressed image data is a big win.
+
+WWW: http://www.pdflib.com/products/more/jpeg2ps.html