From rv@puget.esil.univ-mrs.fr  Mon Feb 10 06:50:05 2003
Return-Path: <rv@puget.esil.univ-mrs.fr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E7C1A37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Feb 2003 06:50:05 -0800 (PST)
Received: from puget.esil.univ-mrs.fr (puget.esil.univ-mrs.fr [139.124.41.103])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C55F143F75
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Feb 2003 06:50:04 -0800 (PST)
	(envelope-from rv@puget.esil.univ-mrs.fr)
Received: from puget.esil.univ-mrs.fr (localhost.esil.univ-mrs.fr [127.0.0.1])
	by puget.esil.univ-mrs.fr (8.12.6/8.12.6) with ESMTP id h1AEpcZl076848
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Feb 2003 15:51:39 +0100 (CET)
	(envelope-from rv@puget.esil.univ-mrs.fr)
Received: (from rv@localhost)
	by puget.esil.univ-mrs.fr (8.12.6/8.12.6/Submit) id h1AEpcTq076847;
	Mon, 10 Feb 2003 15:51:38 +0100 (CET)
Message-Id: <200302101451.h1AEpcTq076847@puget.esil.univ-mrs.fr>
Date: Mon, 10 Feb 2003 15:51:38 +0100 (CET)
From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
Reply-To: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update Port: print/apsfilter (conditional A4 dependencies)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48140
>Category:       ports
>Synopsis:       Update Port: print/apsfilter (conditional A4 dependencies)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    andreas
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 10 07:00:25 PST 2003
>Closed-Date:    Sat Feb 28 08:05:00 PST 2004
>Last-Modified:  Sat Feb 28 08:05:00 PST 2004
>Originator:     
>Release:        FreeBSD 5.0-RELEASE i386
>Organization:
Universite de la Mediterranee
>Environment:
System: FreeBSD puget.esil.univ-mrs.fr 5.0-RELEASE FreeBSD 5.0-RELEASE #0: Tue Jan 28 12:10:55 CET 2003 root@puget.esil.univ-mrs.fr:/usr/obj/usr/src/sys/ASSIMILATED i386


>Description:
	Patch to allow A4 psutils and a2ps dependencies when using BATCH mode.
>How-To-Repeat:
>Fix:


diff -u apsfilter.old/Makefile apsfilter/Makefile
--- apsfilter.old/Makefile	Fri Feb  7 16:29:12 2003
+++ apsfilter/Makefile	Fri Feb  7 16:33:41 2003
@@ -37,7 +37,13 @@
 # - APSFILTER_ALL	build and install all supported filter utilities
 # - WITHOUT_X11		toggles not to build tools that need X11, even if
 #			APSFILTER_ALL is set
+# - A4_PAPER		sets the default paper size to A4 for dependencies
 #
+.if defined(A4_PAPER)
+PAPER_SIZE=a4
+.else
+PAPER_SIZE=letter
+.endif
 .if defined(BATCH) && defined(APSFILTER_ALL)
 #
 # Build and install all filter apsfilter knows about (rather expensive)
@@ -55,8 +61,8 @@
 RUN_DEPENDS+=	melt:${PORTSDIR}/archivers/freeze
 RUN_DEPENDS+=	lzop:${PORTSDIR}/archivers/lzop
 # all needed "ASCII to ps" filter utilities
-RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
-RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-letter
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-${PAPER_SIZE}
+RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-${PAPER_SIZE}
 RUN_DEPENDS+=	mpage:${PORTSDIR}/print/mpage
 RUN_DEPENDS+=	recode:${PORTSDIR}/converters/recode
 # all needed "ARCHIVE" extraction utilities
@@ -71,7 +77,7 @@
 # all needed "xxx to ps" filter utilities
 RUN_DEPENDS+=	fitstopnm:${PORTSDIR}/graphics/netpbm
 RUN_DEPENDS+=	htmldoc:${PORTSDIR}/textproc/htmldoc
-RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
+RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-${PAPER_SIZE}
 .if !defined(WITHOUT_X11)
 # "xxx to ps" filter utilities that require X
 RUN_DEPENDS+=	acroread4:${PORTSDIR}/print/acroread4
@@ -101,8 +107,8 @@
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 .endif
 # most important "xxx to ps" filter utilities
-RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
-RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-${PAPER_SIZE}
+RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-${PAPER_SIZE}
 .endif
 
 # needed for aps2file :-/
Common subdirectories: apsfilter.old/scripts and apsfilter/scripts

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->andreas 
Responsible-Changed-By: pat 
Responsible-Changed-When: Mon Feb 10 12:42:28 PST 2003 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48140 
State-Changed-From-To: open->closed 
State-Changed-By: andreas 
State-Changed-When: Sat Feb 28 08:00:04 PST 2004 
State-Changed-Why:  
Thanks for your kind suggestion and for sending a patch. 
I modified your suggestion and decided, not to introduce 
two more variables. 
Instead of this I use the PAPERSIZE variable, that a2ps 
and psutils already use. 
This unique solution makes it possible later, to migrate this more 
easily into the macros part of the ports collection ... (ports/Mk/...) 
---------------------------- 
revision 1.115 
date: 2004/02/28 15:59:39;  author: andreas;  state: Exp;  lines: +18 -9 
- honour PAPERSIZE variable like in a2ps and psutils ports 
- default to letter 
- inspired by PR but using a more suitable solution to use the 
environment variable already used by other ports instead by 
using new one (PAPER_SIZE and A4_PAPER) 

PR:             48140 
---------------------------- 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48140 
>Unformatted:
