From b073a2656d1ce3ce695bf10e308369d915eae853 Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Sun, 30 Jan 2005 10:29:22 +0000 Subject: [PATCH] Fix the another big small typo and preemptively fix perl invocation, too. --- print/alignmargins/Makefile | 3 ++- print/alignmargins/files/patch-alignmargins | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/print/alignmargins/Makefile b/print/alignmargins/Makefile index aa5ec2e6fcb0..b918674bde1d 100644 --- a/print/alignmargins/Makefile +++ b/print/alignmargins/Makefile @@ -7,6 +7,7 @@ PORTNAME= alignmargins PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= http://people.freebsd.org/~lofi/ \ http://www.linuxprinting.org/download/printing/ @@ -16,7 +17,7 @@ MAINTAINER= lofi@FreeBSD.org COMMENT= Utility script to generate custom margins in PPDs for CUPS NO_BUILD= yes -USE_PERL= yes +USE_PERL5= yes USE_REINPLACE= yes do-extract: diff --git a/print/alignmargins/files/patch-alignmargins b/print/alignmargins/files/patch-alignmargins index 20983d8a631f..6a3cb052c85a 100644 --- a/print/alignmargins/files/patch-alignmargins +++ b/print/alignmargins/files/patch-alignmargins @@ -1,12 +1,13 @@ ---- alignmargins.orig Fri Jan 28 11:19:27 2005 -+++ alignmargins Fri Jan 28 11:22:34 2005 +--- alignmargins.orig Sun Jan 30 11:24:53 2005 ++++ alignmargins Sun Jan 30 11:25:06 2005 @@ -1,17 +1,17 @@ - #! /usr/bin/perl +-#! /usr/bin/perl ++#! /usr/bin/env perl $0 =~ m!^(.*)/[^/]+$!; my $programpath = $1; -my $printcommand = '/usr/bin/lpr -P '; -my $egrep = '/bin/egrep'; -+my $printcommand = '%%LOCALBASE%%/bin/lpr -P '; ++my $printcommand = '/usr/local/bin/lpr -P '; +my $egrep = '/usr/bin/egrep'; my $cat = '/bin/cat'; my $cut = '/usr/bin/cut'; @@ -17,9 +18,9 @@ -my $adjustmentpagepath = ($programpath ? "${programpath}:" : "") . '.:~:/usr/share/alignmargins:/usr/local/share/alignmargins:/usr/share:/usr/local/share:/usr/share/printer-testpages:/usr/local/share/printer-testpages:/usr/share/ghostscript/*/lib:/usr/local/share/ghostscript/*/lib'; -my $ppddir = '/etc/cups/ppd'; -my $printerconffile = '/etc/cups/printers.conf'; -+my $adjustmentpagepath = ($programpath ? "${programpath}:" : "") . '.:~:%%DATADIR%%:/usr/share/alignmargins:/usr/local/share/alignmargins:/usr/share:/usr/local/share:/usr/share/printer-testpages:/usr/local/share/printer-testpages:/usr/share/ghostscript/*/lib:/usr/local/share/ghostscript/*/lib'; -+my $ppddir = '%%LOCALBASE%%/etc/cups/ppd'; -+my $printerconffile = '%%LOCALBASE%%/etc/cups/printers.conf'; ++my $adjustmentpagepath = ($programpath ? "${programpath}:" : "") . '.:~:/usr/local/share/alignmargins:/usr/share/alignmargins:/usr/local/share/alignmargins:/usr/share:/usr/local/share:/usr/share/printer-testpages:/usr/local/share/printer-testpages:/usr/share/ghostscript/*/lib:/usr/local/share/ghostscript/*/lib'; ++my $ppddir = '/usr/local/etc/cups/ppd'; ++my $printerconffile = '/usr/local/etc/cups/printers.conf'; # Find "ælign.ps"