- Fix WWW

- Support CFLAGS properly
- Bump PORTREVISION

PR:		ports/155791
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 11 insertions, 42 deletions

diff --git a/print/c2ps-letter/Makefile b/print/c2ps-letter/Makefile
index 50e41cfbc2f5..b356ca625409 100644
--- a/print/c2ps-letter/Makefile
+++ b/print/c2ps-letter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	c2ps-${PAPERSIZE}
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.cs.technion.ac.il/users/c2ps/
 DISTNAME=	c2ps-${PORTVERSION}
@@ -14,20 +15,23 @@ DISTNAME=	c2ps-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A PostScript pretty-printer for C source
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
+MAKE_ARGS=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
+		DEFAULT_PAPER_TYPE="${PS}"
 
 MAN1=		c2ps.1
 PLIST_FILES=	bin/c2ps
-MAKE_ENV=	DEFAULT_PAPER_TYPE=${PS}
 
 PAPERSIZE?=	letter
 PS!=		echo ${PAPERSIZE} | awk '{print toupper($$1)}'
-.if ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter
+.if ${PAPERSIZE:L} != a4 && ${PAPERSIZE:L} != letter
 .BEGIN:
-	@${ECHO} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
-	@${ECHO} "Possible values are:  a4, and letter."
+	@${ECHO_MSG} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
+	@${ECHO_MSG} "Possible values are:  a4, and letter."
 	@${FALSE}
 .endif
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/c2ps ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/c2ps.1 ${MANPREFIX}/man/man1
+
 .include <bsd.port.mk>
diff --git a/print/c2ps-letter/files/patch-aa b/print/c2ps-letter/files/patch-aa
index e8f9470cd98a..e69de29bb2d1 100644
--- a/print/c2ps-letter/files/patch-aa
+++ b/print/c2ps-letter/files/patch-aa
@@ -1,35 +0,0 @@
---- Makefile.orig	Thu May 15 11:50:56 1997
-+++ Makefile	Thu Nov 20 22:06:51 1997
-@@ -2,10 +2,7 @@
- # Last modified: Sat Apr 19 1997
- 
- RM	= 	rm -f
--CC	=	gcc
--CCFLAGS =       -O
- 
--PREFIX	=	/usr/local
- BIN	=	$(PREFIX)/bin
- MAN	=	$(PREFIX)/man/man1
- 
-@@ -20,8 +17,6 @@
- FUNCTION_FONT	= \"Bookman-LightItalic\"
- 
- COMMENT_DIMMING_DEGREE	= 0.75
--DEFAULT_PAPER_TYPE	= A4
--# possible values are A4 and LETTER
- 
- 
- #___You don't need to change anything below__________________
-@@ -39,10 +34,10 @@
- install:	bininstall maninstall
- 
- bininstall:	c2ps
--	install -m 755 c2ps $(BIN)
-+	$(BSD_INSTALL_PROGRAM) c2ps $(BIN)
- 
- maninstall:	c2ps.1
--	install -m 644 c2ps.1 $(MAN)
-+	$(BSD_INSTALL_MAN) c2ps.1 $(MAN)
- 
- compile:	c2ps.c
- 	$(CC) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c
diff --git a/print/c2ps-letter/pkg-descr b/print/c2ps-letter/pkg-descr
index 0f45a3f0fed6..f2e8a59364d6 100644
--- a/print/c2ps-letter/pkg-descr
+++ b/print/c2ps-letter/pkg-descr
@@ -3,4 +3,4 @@ A PostScript pretty-printer for C source with numerous features.
 Released under the GPL by Dmitri Shtilman <dash@vision10.technion.ac.il>
 and Dmitri Makarov <dimm@vnet.ibm.com>.
 
-WWW: http://www.geocities.com/SiliconValley/Park/2055/
+WWW: http://www.cs.technion.ac.il/users/c2ps/