From 78727c1589192294de33626a3566084e913c604f Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 6 Jun 2003 21:27:17 +0000 Subject: Avoid hardcoding /usr/pkg in patch files, using REPLACE_PERL to fix perl location in scripts. Add dependancy on perl, so installed scripts work. Bump PKGREVISION to 3. --- graphics/fly/Makefile | 17 +++++++++++++++-- graphics/fly/distinfo | 8 ++++---- graphics/fly/patches/patch-am | 11 +++++------ graphics/fly/patches/patch-ao | 8 +------- graphics/fly/patches/patch-ap | 9 ++++----- 5 files changed, 29 insertions(+), 24 deletions(-) (limited to 'graphics/fly') diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index 20b140d3384..076caca4165 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2002/11/28 10:56:37 tron Exp $ +# $NetBSD: Makefile,v 1.19 2003/06/06 21:27:17 jmmv Exp $ DISTNAME= fly-1.6.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics www MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/ @@ -12,8 +12,21 @@ COMMENT= command-file interface for creating and modifying PNG images BUILD_DEPENDS+= gif2png>=2.4.2:../../graphics/gif2png USE_BUILDLINK2= YES +USE_PERL5= YES USE_X11= YES +REPLACE_PERL= ${WRKSRC}/examples/cgi-perl-example.pl \ + ${WRKSRC}/examples/fly-tester.pl \ + ${WRKSRC}/examples/size.pl \ + ${WRKSRC}/examples/perl.example + +pre-configure: + ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ + < ${WRKSRC}/examples/cgi-perl-example.pl \ + > ${WRKSRC}/examples/cgi-perl-example.pl.new + ${MV} ${WRKSRC}/examples/cgi-perl-example.pl.new \ + ${WRKSRC}/examples/cgi-perl-example.pl + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fly diff --git a/graphics/fly/distinfo b/graphics/fly/distinfo index 495b86f47c1..ca434ea904d 100644 --- a/graphics/fly/distinfo +++ b/graphics/fly/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:11 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/06/06 21:27:18 jmmv Exp $ SHA1 (fly-1.6.5.tar.gz) = 7a76046aedf84478d0670c2dbd2d05849cc0035e Size (fly-1.6.5.tar.gz) = 127349 bytes @@ -14,8 +14,8 @@ SHA1 (patch-ai) = 8dcc18ede42d15621b59feedf577e1932e3420b5 SHA1 (patch-aj) = 194d9489ad3fef13890d1ad354f2e1c05fb681cb SHA1 (patch-ak) = 83be459b1ddef75f8c829084ae8071a7c5b345de SHA1 (patch-al) = 3f720d2ab45169cd6e2aa3904e84bbd6210abb19 -SHA1 (patch-am) = 20606d23c07373fe643c7894a91a62a6128fdc18 +SHA1 (patch-am) = beb38d8609fb015fa4d786d2b688adba20a9d75e SHA1 (patch-an) = a2e84081e1e11a779cdd67f62cb88db689c7e317 -SHA1 (patch-ao) = c6d89458ad2b7b0aa3af9f5418af2a5aa50ce720 -SHA1 (patch-ap) = 3e0d8ecd4add141d4a37cd2a399596e249318d5c +SHA1 (patch-ao) = d3f2ea1ea8bf95c621afbe9aaeb65f52ddfd0313 +SHA1 (patch-ap) = 5789e8ed89bc49c456abe51e798d82854fc66fe2 SHA1 (patch-aq) = 87ee541dfc67bbbc51a3a3b9b916ba9da35d2fc7 diff --git a/graphics/fly/patches/patch-am b/graphics/fly/patches/patch-am index a044aecc509..b03dce25823 100644 --- a/graphics/fly/patches/patch-am +++ b/graphics/fly/patches/patch-am @@ -1,16 +1,15 @@ -$NetBSD: patch-am,v 1.1 1999/11/01 03:31:46 jlam Exp $ +$NetBSD: patch-am,v 1.2 2003/06/06 21:27:18 jmmv Exp $ ---- examples/cgi-perl-example.pl.orig Thu Jan 14 17:37:31 1999 -+++ examples/cgi-perl-example.pl Sun Oct 31 00:27:09 1999 +--- examples/cgi-perl-example.pl.orig 1999-01-14 23:37:31.000000000 +0100 ++++ examples/cgi-perl-example.pl @@ -1,8 +1,8 @@ --#!/usr/local/bin/perl -+#!/usr/pkg/bin/perl + #!/usr/local/bin/perl -print "Content-type: image/gif\n\n"; +print "Content-type: image/png\n\n"; -$flyprog = "/usr/local/web/bin/fly"; -+$flyprog = "/usr/pkg/bin/fly"; ++$flyprog = "@PREFIX@/bin/fly"; $infile = "/tmp/fly.$$"; diff --git a/graphics/fly/patches/patch-ao b/graphics/fly/patches/patch-ao index 5d3b053b2d2..63fbf8ef83b 100644 --- a/graphics/fly/patches/patch-ao +++ b/graphics/fly/patches/patch-ao @@ -1,13 +1,7 @@ -$NetBSD: patch-ao,v 1.1 1999/11/01 03:31:46 jlam Exp $ +$NetBSD: patch-ao,v 1.2 2003/06/06 21:27:18 jmmv Exp $ --- examples/fly-tester.pl.orig Thu Jun 10 19:14:53 1999 +++ examples/fly-tester.pl Sun Oct 31 00:28:28 1999 -@@ -1,4 +1,4 @@ --#!/usr/local/web/bin/perl -+#!/usr/pkg/bin/perl - ### ---------------------------------------------------------------------- ### - # - # Fly tester @@ -108,9 +108,9 @@ exit 0; } diff --git a/graphics/fly/patches/patch-ap b/graphics/fly/patches/patch-ap index cad93fc3233..e11b1bd490e 100644 --- a/graphics/fly/patches/patch-ap +++ b/graphics/fly/patches/patch-ap @@ -1,10 +1,9 @@ -$NetBSD: patch-ap,v 1.1 1999/11/01 03:31:46 jlam Exp $ +$NetBSD: patch-ap,v 1.2 2003/06/06 21:27:18 jmmv Exp $ ---- examples/perl.example.orig Thu Jan 14 17:37:31 1999 -+++ examples/perl.example Sun Oct 31 00:27:45 1999 +--- examples/perl.example.orig 1999-01-14 23:37:31.000000000 +0100 ++++ examples/perl.example @@ -1,7 +1,7 @@ --#!/usr/local/bin/perl -+#!/usr/pkg/bin/perl + #!/usr/local/bin/perl $flyprog = "../fly"; -$outfile = "temp.gif"; -- cgit v1.2.3