Enabled command line options such as TOP_MARGIN, etc.

PR:		ports/4645
Submitted by:	MITA Yoshio <mita@jp.FreeBSD.org>

4 files changed, 40 insertions, 28 deletions

diff --git a/japanese/escpf/Makefile b/japanese/escpf/Makefile
index a03c0f26b5c4..c155451b32a0 100644
--- a/japanese/escpf/Makefile
+++ b/japanese/escpf/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 June 1996
 # Whom:			Mita Yoshio <mita@iis.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/12/19 03:33:09 max Exp $
+# $Id: Makefile,v 1.2 1997/09/14 21:34:34 max Exp $
 #
 
 DISTNAME=	escpf-0.4beta2
@@ -14,10 +14,26 @@ MASTER_SITES=	http://www.bekkoame.or.jp/~wing/Linux/Escpf/
 MAINTAINER=	mita@jp.FreeBSD.org
 
 DOCDIR=		${PREFIX}/share/doc/escpf
+LINES?=		66
+COLUMNS?=	80
+TOP_MERGIN?=	5
+LEFT_MERGIN?=	5
+LARGE_FONT?=	-DLARGE_FONT
+MAKE_ENV+=	LINES=${LINES} COLUMNS=${COLUMNS} \
+		TOP_MERGIN=${TOP_MERGIN} LEFT_MERGIN=${LEFT_MERGIN} \
+		LARGE_FONT="${LARGE_FONT}"
+# You can specify page layout with:
+#       LINES           : lines per page
+#       COLUMNS         : characters per line
+#       TOP_MERGIN      : top mergin with lines
+#       LEFT_MERGIN     : left mergin with cahacters
+#       LARGE_FONT      : if "-DLARGE_FONT" large font, "" small font
 
 post-install:
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/escpf.doc ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/escpf.euc ${DOCDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/escpf/files/patch-aa b/japanese/escpf/files/patch-aa
index 0fa5a3bb642f..fc9ea56fd9bc 100644
--- a/japanese/escpf/files/patch-aa
+++ b/japanese/escpf/files/patch-aa
@@ -1,25 +1,35 @@
-*** Makefile.orig	Tue Aug 20 21:22:04 1996
---- Makefile	Wed Dec 18 23:39:21 1996
+*** Makefile.orig	Tue Aug 20 14:22:04 1996
+--- Makefile	Sun Sep 28 11:19:23 1997
 ***************
-*** 6,13 ****
+*** 6,18 ****
   #
   
   # user setting 
 ! BINDIR		= /usr/sbin		# Linux
 ! #BINDIR 	= /usr/local/libexec	# FreeBSD
-  
-  LINES		= 66
-  COLUMNS		= 80
---- 6,14 ----
+! 
+! LINES		= 66
+! COLUMNS		= 80
+! TOP_MERGIN	= 0
+! LEFT_MERGIN	= 0
+  
+  CC	= cc
+  CFLAGS	= -O -DLINES=${LINES} -DCOLUMNS=${COLUMNS} -DTOP_MERGIN=${TOP_MERGIN} -DLEFT_MERGIN=${LEFT_MERGIN}
+--- 6,19 ----
   #
   
   # user setting 
 ! #BINDIR		= /usr/sbin		# Linux
 ! PREFIX?= /usr/local
 ! BINDIR 	= ${PREFIX}/libexec	# FreeBSD
-  
-  LINES		= 66
-  COLUMNS		= 80
+! 
+! LINES		?= 66
+! COLUMNS		?= 80
+! TOP_MERGIN	?= 0
+! LEFT_MERGIN	?= 0
+  
+  CC	= cc
+  CFLAGS	= -O -DLINES=${LINES} -DCOLUMNS=${COLUMNS} -DTOP_MERGIN=${TOP_MERGIN} -DLEFT_MERGIN=${LEFT_MERGIN}
 ***************
 *** 41,50 ****
   # ${OBJS}: ${SRCS} ${HEADERS}
diff --git a/japanese/escpf/pkg-descr b/japanese/escpf/pkg-descr
index d34394c1b5ab..80589068edea 100644
--- a/japanese/escpf/pkg-descr
+++ b/japanese/escpf/pkg-descr
@@ -8,20 +8,5 @@ escpagesf:	text to ESC/Page code trough ESC/PS mode.
 
 JIS, and EUC KANJI code are detected and converted automatically.
 
-A simple usage:
-Add escp entry to /etc/printcap like:
-
-escp|ESC/P printer filter :\            
-        :lp=/dev/lpt0:sd=/var/spool/lpd:\
-	:if=/usr/local/libexec/escpf:\
-	:mx#0:\ 
-	:pw#80:pl#66:\
-	:rw:sh:fo:\
-	:lf=/var/log/lpd-errs:
-
-after restarting lpd, you can print out text file by typing:
-
-lpr -Pescp textfilename
-
-See /usr/local/share/doc/escpf/escpf.doc (in English), or escpf.euc (
-in Japanese) for details.
+Read /usr/local/share/doc/escpf/escpf.doc (in English), or escpf.euc 
+(in Japanese) for details.
diff --git a/japanese/escpf/pkg-plist b/japanese/escpf/pkg-plist
index 23a05201d75e..cfe7526ead82 100644
--- a/japanese/escpf/pkg-plist
+++ b/japanese/escpf/pkg-plist
@@ -4,3 +4,4 @@ libexec/escpf
 libexec/escpsf
 libexec/escpagef
 libexec/escpagesf
+@dirrm share/doc/escpf